diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml index 6329e1d9ea11..ae95fd0de05f 100644 --- a/.github/workflows/codeowners-v2.yml +++ b/.github/workflows/codeowners-v2.yml @@ -19,6 +19,8 @@ name: Codeowners v2 # # This split is done because checking code owners requires handling untrusted PR input, # while requesting code owners requires PR write access, and those shouldn't be mixed. +# +# Note that the latter is also used for ./eval.yml requesting reviewers. on: pull_request_target: @@ -104,6 +106,6 @@ jobs: run: nix-build ci -A requestReviews - name: Request reviews - run: result/bin/request-reviews.sh ${{ github.repository }} ${{ github.event.number }} "$OWNERS_FILE" + run: result/bin/request-code-owner-reviews.sh ${{ github.repository }} ${{ github.event.number }} "$OWNERS_FILE" env: GH_TOKEN: ${{ steps.app-token.outputs.token }} diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index 06cff2b878d3..72b2103b8720 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -133,6 +133,7 @@ jobs: uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: ref: ${{ needs.get-merge-commit.outputs.mergedSha }} + fetch-depth: 2 path: nixpkgs - name: Install Nix @@ -194,12 +195,18 @@ jobs: - name: Compare against the base branch if: steps.baseRunId.outputs.baseRunId run: | - nix-build nixpkgs/ci -A eval.compare \ + git -C nixpkgs worktree add ../base ${{ needs.attrs.outputs.baseSha }} + git -C nixpkgs diff --name-only ${{ needs.attrs.outputs.baseSha }} ${{ needs.attrs.outputs.mergedSha }} \ + | jq --raw-input --slurp 'split("\n")[:-1]' > touched-files.json + + # Use the base branch to get accurate maintainer info + nix-build base/ci -A eval.compare \ --arg beforeResultDir ./baseResult \ --arg afterResultDir ./prResult \ + --arg touchedFilesJson ./touched-files.json \ -o comparison + cat comparison/step-summary.md >> "$GITHUB_STEP_SUMMARY" - # TODO: Request reviews from maintainers for packages whose files are modified in the PR - name: Upload the combined results if: steps.baseRunId.outputs.baseRunId @@ -212,19 +219,42 @@ jobs: tag: name: Tag runs-on: ubuntu-latest - needs: process + needs: [ attrs, process ] if: needs.process.outputs.baseRunId 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@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1.11.0 + id: app-token + with: + app-id: ${{ vars.OWNER_APP_ID }} + private-key: ${{ secrets.OWNER_APP_PRIVATE_KEY }} + - name: Download process result uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 with: name: comparison path: comparison - - name: Tagging pull request + - name: Install Nix + uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30 + + # Important: This workflow job runs with extra permissions, + # so we need to make sure to not run untrusted code from PRs + - name: Check out Nixpkgs at the base commit + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + with: + ref: ${{ needs.attrs.outputs.baseSha }} + path: base + sparse-checkout: ci + + - name: Build the requestReviews derivation + run: nix-build base/ci -A requestReviews + + - name: Labelling pull request run: | # Get all currently set rebuild labels gh api \ @@ -252,11 +282,26 @@ jobs: /repos/"$REPOSITORY"/issues/"$NUMBER"/labels \ -f "labels[]=$toAdd" done < <(comm -13 before after) + env: GH_TOKEN: ${{ github.token }} REPOSITORY: ${{ github.repository }} NUMBER: ${{ github.event.number }} + - name: Requesting maintainer reviews + run: | + # maintainers.json contains GitHub IDs. Look up handles to request reviews from. + # There appears to be no API to request reviews based on GitHub IDs + jq -r 'keys[]' comparison/maintainers.json \ + | while read -r id; do gh api /user/"$id" --jq .login; done \ + | GH_TOKEN=${{ steps.app-token.outputs.token }} result/bin/request-reviewers.sh "$REPOSITORY" "$NUMBER" "$AUTHOR" + + env: + GH_TOKEN: ${{ github.token }} + REPOSITORY: ${{ github.repository }} + NUMBER: ${{ github.event.number }} + AUTHOR: ${{ github.event.pull_request.user.login }} + - name: Add eval summary to commit statuses if: ${{ github.event_name == 'pull_request_target' }} run: | diff --git a/.github/workflows/no-channel.yml b/.github/workflows/no-channel.yml index 90c38f22c007..623a011c6e73 100644 --- a/.github/workflows/no-channel.yml +++ b/.github/workflows/no-channel.yml @@ -1,18 +1,17 @@ name: "No channel PR" on: - pull_request: + pull_request_target: + # Re-run should be triggered when the base branch is updated, instead of silently failing + types: [opened, synchronize, reopened, edited] branches: - 'nixos-**' - 'nixpkgs-**' -permissions: - contents: read +permissions: {} jobs: fail: - permissions: - contents: none name: "This PR is is targeting a channel branch" runs-on: ubuntu-latest steps: diff --git a/.github/workflows/ofborg-pending.yml b/.github/workflows/ofborg-pending.yml deleted file mode 100644 index 2eba88598d7f..000000000000 --- a/.github/workflows/ofborg-pending.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: "Set pending OfBorg status" -on: - pull_request_target: - -# Sets the ofborg-eval status to "pending" to signal that we are waiting for -# OfBorg even if it is running late. The status will be overwritten by OfBorg -# once it starts evaluation. - -# WARNING: -# When extending this action, be aware that $GITHUB_TOKEN allows (restricted) write access to -# the GitHub repository. This means that it should not evaluate user input in a -# way that allows code injection. - -permissions: - contents: read - -jobs: - action: - name: set-ofborg-pending - if: github.repository_owner == 'NixOS' - permissions: - statuses: write - runs-on: ubuntu-latest - steps: - - name: "Set pending OfBorg status" - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - curl \ - -X POST \ - -H "Accept: application/vnd.github.v3+json" \ - -H "Authorization: Bearer $GITHUB_TOKEN" \ - -d '{"context": "ofborg-eval", "state": "pending", "description": "Waiting for OfBorg..."}' \ - "https://api.github.com/repos/NixOS/nixpkgs/commits/${{ github.event.pull_request.head.sha }}/statuses" diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml index 08570d60e1d4..cee07aa7d669 100644 --- a/.github/workflows/periodic-merge-24h.yml +++ b/.github/workflows/periodic-merge-24h.yml @@ -33,8 +33,6 @@ jobs: max-parallel: 1 matrix: pairs: - - from: master - into: haskell-updates - from: release-24.11 into: staging-next-24.11 - from: staging-next-24.11 diff --git a/.github/workflows/periodic-merge-haskell-updates.yml b/.github/workflows/periodic-merge-haskell-updates.yml new file mode 100644 index 000000000000..46011d66061c --- /dev/null +++ b/.github/workflows/periodic-merge-haskell-updates.yml @@ -0,0 +1,59 @@ +# This action periodically merges a merge base of master and staging into haskell-updates. +# +# haskell-updates is based on master (so there are little unrelated failures and the cache +# is already prepopulated), but needs to target staging due to the high amount of rebuilds +# it typically causes. To prevent unrelated commits clattering the GitHub UI, we need to +# take care to only merge the merge-base of master and staging into haskell-updates. +# +# See also https://github.com/NixOS/nixpkgs/issues/361143. + +name: "Periodic Merges (haskell-updates)" + + +on: + schedule: + # * is a special character in YAML so you have to quote this string + # Merge every 24 hours + - cron: '0 0 * * *' + workflow_dispatch: + +permissions: + contents: read + +jobs: + periodic-merge: + permissions: + contents: write # for devmasx/merge-branch to merge branches + pull-requests: write # for peter-evans/create-or-update-comment to create or update comment + if: github.repository_owner == 'NixOS' + runs-on: ubuntu-latest + name: git merge-base master staging → haskell-updates + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + with: + fetch-depth: 0 + + # Note: If we want to do something similar for more branches, we can move this into a + # separate job, so we can use the matrix strategy again. + - name: Find merge base of master and staging + id: find_merge_base_step + run: | + merge_base="$(git merge-base refs/remotes/origin/master refs/remotes/origin/staging)" + echo "Found merge base: $merge_base" >&2 + echo "merge_base=$merge_base" >> "$GITHUB_OUTPUT" + + - name: git merge-base master staging → haskell-updates + uses: devmasx/merge-branch@854d3ac71ed1e9deb668e0074781b81fdd6e771f # 1.4.0 + with: + type: now + head_to_merge: ${{ steps.find_merge_base_step.outputs.merge_base }} + target_branch: haskell-updates + github_token: ${{ secrets.GITHUB_TOKEN }} + + - name: Comment on failure + uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0 + if: ${{ failure() }} + with: + issue-number: 367709 + body: | + Periodic merge from `${{ steps.find_merge_base_step.outputs.merge_base }}` into `haskell-updates` has [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}). diff --git a/.mailmap b/.mailmap index 5dab7144bb1a..9004483d7055 100644 --- a/.mailmap +++ b/.mailmap @@ -10,6 +10,9 @@ Fiona Behrens Fiona Behrens goatastronaut0212 Janne Heß +jopejoe1 +jopejoe1 +jopejoe1 <34899572+jopejoe1@users.noreply.github.com> Jörg Thalheim Lin Jian Lin Jian <75130626+jian-lin@users.noreply.github.com> diff --git a/COPYING b/COPYING index 40eae096b709..ed4495408b9f 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 2003-2024 Eelco Dolstra and the Nixpkgs/NixOS contributors +Copyright (c) 2003-2025 Eelco Dolstra and the Nixpkgs/NixOS contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix index cfcdd3c1a217..0c55b01c7160 100644 --- a/ci/eval/compare/default.nix +++ b/ci/eval/compare/default.nix @@ -5,7 +5,11 @@ writeText, ... }: -{ beforeResultDir, afterResultDir }: +{ + beforeResultDir, + afterResultDir, + touchedFilesJson, +}: let /* Derivation that computes which packages are affected (added, changed or removed) between two revisions of nixpkgs. @@ -77,11 +81,11 @@ let # - values: lists of `packagePlatformPath`s diffAttrs = diff beforeAttrs afterAttrs; + rebuilds = uniqueStrings (diffAttrs.added ++ diffAttrs.changed); + rebuildsPackagePlatformAttrs = convertToPackagePlatformAttrs rebuilds; + changed-paths = let - rebuilds = uniqueStrings (diffAttrs.added ++ diffAttrs.changed); - rebuildsPackagePlatformAttrs = convertToPackagePlatformAttrs rebuilds; - rebuildsByPlatform = groupByPlatform rebuildsPackagePlatformAttrs; rebuildsByKernel = groupByKernel rebuildsPackagePlatformAttrs; rebuildCountByKernel = lib.mapAttrs ( @@ -104,10 +108,17 @@ let ); } ); + + maintainers = import ./maintainers.nix { + changedattrs = lib.unique (map (a: a.packagePath) rebuildsPackagePlatformAttrs); + changedpathsjson = touchedFilesJson; + }; in runCommand "compare" { nativeBuildInputs = [ jq ]; + maintainers = builtins.toJSON maintainers; + passAsFile = [ "maintainers" ]; } '' mkdir $out @@ -115,5 +126,8 @@ runCommand "compare" cp ${changed-paths} $out/changed-paths.json jq -r -f ${./generate-step-summary.jq} < ${changed-paths} > $out/step-summary.md + + cp "$maintainersPath" "$out/maintainers.json" + # TODO: Compare eval stats '' diff --git a/ci/eval/compare/maintainers.nix b/ci/eval/compare/maintainers.nix new file mode 100644 index 000000000000..6728929952d4 --- /dev/null +++ b/ci/eval/compare/maintainers.nix @@ -0,0 +1,123 @@ +# Almost directly vendored from https://github.com/NixOS/ofborg/blob/5a4e743f192fb151915fcbe8789922fa401ecf48/ofborg/src/maintainers.nix +{ changedattrs, changedpathsjson }: +let + pkgs = import ../../.. { + system = "x86_64-linux"; + config = { }; + overlays = [ ]; + }; + inherit (pkgs) lib; + + changedpaths = builtins.fromJSON (builtins.readFile changedpathsjson); + + anyMatchingFile = + filename: + let + matching = builtins.filter (changed: lib.strings.hasSuffix changed filename) changedpaths; + in + (builtins.length matching) > 0; + + anyMatchingFiles = files: (builtins.length (builtins.filter anyMatchingFile files)) > 0; + + enrichedAttrs = builtins.map (path: { + path = path; + name = builtins.concatStringsSep "." path; + }) changedattrs; + + validPackageAttributes = builtins.filter ( + pkg: + if (lib.attrsets.hasAttrByPath pkg.path pkgs) then + ( + if (builtins.tryEval (lib.attrsets.attrByPath pkg.path null pkgs)).success then + true + else + builtins.trace "Failed to access ${pkg.name} even though it exists" false + ) + else + builtins.trace "Failed to locate ${pkg.name}." false + ) enrichedAttrs; + + attrsWithPackages = builtins.map ( + pkg: pkg // { package = lib.attrsets.attrByPath pkg.path null pkgs; } + ) validPackageAttributes; + + attrsWithMaintainers = builtins.map ( + pkg: pkg // { maintainers = (pkg.package.meta or { }).maintainers or [ ]; } + ) attrsWithPackages; + + attrsWeCanPing = builtins.filter ( + pkg: + if (builtins.length pkg.maintainers) > 0 then + true + else + builtins.trace "Package has no maintainers: ${pkg.name}" false + ) attrsWithMaintainers; + + relevantFilenames = + drv: + (lib.lists.unique ( + builtins.map (pos: lib.strings.removePrefix (toString ../..) pos.file) ( + builtins.filter (x: x != null) [ + (builtins.unsafeGetAttrPos "maintainers" (drv.meta or { })) + (builtins.unsafeGetAttrPos "src" drv) + # broken because name is always set by stdenv: + # # A hack to make `nix-env -qa` and `nix search` ignore broken packages. + # # TODO(@oxij): remove this assert when something like NixOS/nix#1771 gets merged into nix. + # name = assert validity.handled; name + lib.optionalString + #(builtins.unsafeGetAttrPos "name" drv) + (builtins.unsafeGetAttrPos "pname" drv) + (builtins.unsafeGetAttrPos "version" drv) + + # Use ".meta.position" for cases when most of the package is + # defined in a "common" section and the only place where + # reference to the file with a derivation the "pos" + # attribute. + # + # ".meta.position" has the following form: + # "pkgs/tools/package-management/nix/default.nix:155" + # We transform it to the following: + # { file = "pkgs/tools/package-management/nix/default.nix"; } + { file = lib.head (lib.splitString ":" (drv.meta.position or "")); } + ] + ) + )); + + attrsWithFilenames = builtins.map ( + pkg: pkg // { filenames = relevantFilenames pkg.package; } + ) attrsWithMaintainers; + + attrsWithModifiedFiles = builtins.filter (pkg: anyMatchingFiles pkg.filenames) attrsWithFilenames; + + listToPing = lib.lists.flatten ( + builtins.map ( + pkg: + builtins.map (maintainer: { + id = maintainer.githubId; + packageName = pkg.name; + dueToFiles = pkg.filenames; + }) pkg.maintainers + ) attrsWithModifiedFiles + ); + + byMaintainer = lib.lists.foldr ( + ping: collector: + collector + // { + "${toString ping.id}" = [ + { inherit (ping) packageName dueToFiles; } + ] ++ (collector."${toString ping.id}" or [ ]); + } + ) { } listToPing; + + textForPackages = + packages: lib.strings.concatStringsSep ", " (builtins.map (pkg: pkg.packageName) packages); + + textPerMaintainer = lib.attrsets.mapAttrs ( + maintainer: packages: "- @${maintainer} for ${textForPackages packages}" + ) byMaintainer; + + packagesPerMaintainer = lib.attrsets.mapAttrs ( + maintainer: packages: builtins.map (pkg: pkg.packageName) packages + ) byMaintainer; +in +packagesPerMaintainer diff --git a/ci/eval/compare/utils.nix b/ci/eval/compare/utils.nix index 82ba64e06a17..04ac4f6e6162 100644 --- a/ci/eval/compare/utils.nix +++ b/ci/eval/compare/utils.nix @@ -11,6 +11,7 @@ rec { into { name = "hello"; + packagePath = [ "hello" ]; platform = "aarch64-linux"; } */ @@ -30,6 +31,9 @@ rec { null else { + # [ "python312Packages" "numpy" ] + inherit packagePath; + # python312Packages.numpy inherit name; @@ -52,12 +56,12 @@ rec { ] into [ - { name = "hello"; platform = "aarch64-linux"; } - { name = "hello"; platform = "x86_64-linux"; } - { name = "hello"; platform = "aarch64-darwin"; } - { name = "hello"; platform = "x86_64-darwin"; } - { name = "bye"; platform = "aarch64-darwin"; } - { name = "bye"; platform = "x86_64-darwin"; } + { name = "hello"; platform = "aarch64-linux"; packagePath = [ "hello" ]; } + { name = "hello"; platform = "x86_64-linux"; packagePath = [ "hello" ]; } + { name = "hello"; platform = "aarch64-darwin"; packagePath = [ "hello" ]; } + { name = "hello"; platform = "x86_64-darwin"; packagePath = [ "hello" ]; } + { name = "bye"; platform = "aarch64-darwin"; packagePath = [ "hello" ]; } + { name = "bye"; platform = "x86_64-darwin"; packagePath = [ "hello" ]; } ] */ convertToPackagePlatformAttrs = @@ -120,12 +124,12 @@ rec { Turns [ - { name = "hello"; platform = "aarch64-linux"; } - { name = "hello"; platform = "x86_64-linux"; } - { name = "hello"; platform = "aarch64-darwin"; } - { name = "hello"; platform = "x86_64-darwin"; } - { name = "bye"; platform = "aarch64-darwin"; } - { name = "bye"; platform = "x86_64-darwin"; } + { name = "hello"; platform = "aarch64-linux"; ... } + { name = "hello"; platform = "x86_64-linux"; ... } + { name = "hello"; platform = "aarch64-darwin"; ... } + { name = "hello"; platform = "x86_64-darwin"; ... } + { name = "bye"; platform = "aarch64-darwin"; ... } + { name = "bye"; platform = "x86_64-darwin"; ... } ] into { @@ -145,12 +149,12 @@ rec { # Turns # [ - # { name = "hello"; platform = "aarch64-linux"; } - # { name = "hello"; platform = "x86_64-linux"; } - # { name = "hello"; platform = "aarch64-darwin"; } - # { name = "hello"; platform = "x86_64-darwin"; } - # { name = "bye"; platform = "aarch64-darwin"; } - # { name = "bye"; platform = "x86_64-darwin"; } + # { name = "hello"; platform = "aarch64-linux"; ... } + # { name = "hello"; platform = "x86_64-linux"; ... } + # { name = "hello"; platform = "aarch64-darwin"; ... } + # { name = "hello"; platform = "x86_64-darwin"; ... } + # { name = "bye"; platform = "aarch64-darwin"; ... } + # { name = "bye"; platform = "x86_64-darwin"; ... } # ] # # into diff --git a/ci/request-reviews/default.nix b/ci/request-reviews/default.nix index b51d896539d8..b180d60be97c 100644 --- a/ci/request-reviews/default.nix +++ b/ci/request-reviews/default.nix @@ -14,8 +14,9 @@ stdenvNoCC.mkDerivation { src = lib.fileset.toSource { root = ./.; fileset = lib.fileset.unions [ - ./get-reviewers.sh - ./request-reviews.sh + ./get-code-owners.sh + ./request-reviewers.sh + ./request-code-owner-reviews.sh ./verify-base-branch.sh ./dev-branches.txt ]; diff --git a/ci/request-reviews/get-reviewers.sh b/ci/request-reviews/get-code-owners.sh similarity index 71% rename from ci/request-reviews/get-reviewers.sh rename to ci/request-reviews/get-code-owners.sh index 1107edd9e6f1..f447e2a7e597 100755 --- a/ci/request-reviews/get-reviewers.sh +++ b/ci/request-reviews/get-code-owners.sh @@ -1,8 +1,6 @@ #!/usr/bin/env bash -# Get the code owners of the files changed by a PR, -# suitable to be consumed by the API endpoint to request reviews: -# https://docs.github.com/en/rest/pulls/review-requests?apiVersion=2022-11-28#request-reviewers-for-a-pull-request +# Get the code owners of the files changed by a PR, returning one username per line set -euo pipefail @@ -10,18 +8,15 @@ log() { echo "$@" >&2 } -if (( "$#" < 7 )); then - log "Usage: $0 GIT_REPO OWNERS_FILE BASE_REPO BASE_REF HEAD_REF PR_NUMBER PR_AUTHOR" +if (( "$#" < 4 )); then + log "Usage: $0 GIT_REPO OWNERS_FILE BASE_REF HEAD_REF" exit 1 fi gitRepo=$1 ownersFile=$2 -baseRepo=$3 -baseRef=$4 -headRef=$5 -prNumber=$6 -prAuthor=$7 +baseRef=$3 +headRef=$4 tmp=$(mktemp -d) trap 'rm -rf "$tmp"' exit @@ -98,29 +93,4 @@ for file in "${touchedFiles[@]}"; do done -# Cannot request a review from the author -if [[ -v users[${prAuthor,,}] ]]; then - log "One or more files are owned by the PR author, ignoring" - unset 'users[${prAuthor,,}]' -fi - -gh api \ - -H "Accept: application/vnd.github+json" \ - -H "X-GitHub-Api-Version: 2022-11-28" \ - "/repos/$baseRepo/pulls/$prNumber/reviews" \ - --jq '.[].user.login' > "$tmp/already-reviewed-by" - -# And we don't want to rerequest reviews from people who already reviewed -while read -r user; do - if [[ -v users[${user,,}] ]]; then - log "User $user is a code owner but has already left a review, ignoring" - unset 'users[${user,,}]' - fi -done < "$tmp/already-reviewed-by" - -# Turn it into a JSON for the GitHub API call to request PR reviewers -jq -n \ - --arg users "${!users[*]}" \ - '{ - reviewers: $users | split(" "), - }' +printf "%s\n" "${!users[@]}" diff --git a/ci/request-reviews/request-reviews.sh b/ci/request-reviews/request-code-owner-reviews.sh similarity index 80% rename from ci/request-reviews/request-reviews.sh rename to ci/request-reviews/request-code-owner-reviews.sh index b21354560242..fefc8c3be3fa 100755 --- a/ci/request-reviews/request-reviews.sh +++ b/ci/request-reviews/request-code-owner-reviews.sh @@ -77,19 +77,6 @@ if ! "$SCRIPT_DIR"/verify-base-branch.sh "$tmp/nixpkgs.git" "$headRef" "$baseRep exit 1 fi -log "Getting code owners to request reviews from" -"$SCRIPT_DIR"/get-reviewers.sh "$tmp/nixpkgs.git" "$ownersFile" "$baseRepo" "$baseBranch" "$headRef" "$prNumber" "$prAuthor" > "$tmp/reviewers.json" - -log "Requesting reviews from: $(<"$tmp/reviewers.json")" - -if ! response=$(effect gh api \ - --method POST \ - -H "Accept: application/vnd.github+json" \ - -H "X-GitHub-Api-Version: 2022-11-28" \ - "/repos/$baseRepo/pulls/$prNumber/requested_reviewers" \ - --input "$tmp/reviewers.json"); then - log "Failed to request reviews: $response" - exit 1 -fi - -log "Successfully requested reviews" +log "Requesting reviews from code owners" +"$SCRIPT_DIR"/get-code-owners.sh "$tmp/nixpkgs.git" "$ownersFile" "$baseBranch" "$headRef" | \ + "$SCRIPT_DIR"/request-reviewers.sh "$baseRepo" "$prNumber" "$prAuthor" diff --git a/ci/request-reviews/request-reviewers.sh b/ci/request-reviews/request-reviewers.sh new file mode 100755 index 000000000000..7bb4d110fe1b --- /dev/null +++ b/ci/request-reviews/request-reviewers.sh @@ -0,0 +1,83 @@ +#!/usr/bin/env bash + +# Request reviewers for a PR, reading line-separated usernames on stdin, +# filtering for valid reviewers before using the API endpoint to request reviews: +# https://docs.github.com/en/rest/pulls/review-requests?apiVersion=2022-11-28#request-reviewers-for-a-pull-request + +set -euo pipefail + +tmp=$(mktemp -d) +trap 'rm -rf "$tmp"' exit + +log() { + echo "$@" >&2 +} + +effect() { + if [[ -n "${DRY_MODE:-}" ]]; then + log "Skipping in dry mode:" "${@@Q}" + else + "$@" + fi +} + +if (( "$#" < 3 )); then + log "Usage: $0 BASE_REPO PR_NUMBER PR_AUTHOR" + exit 1 +fi + +baseRepo=$1 +prNumber=$2 +prAuthor=$3 + +tmp=$(mktemp -d) +trap 'rm -rf "$tmp"' exit + +declare -A users=() +while read -r handle && [[ -n "$handle" ]]; do + users[${handle,,}]= +done + +# Cannot request a review from the author +if [[ -v users[${prAuthor,,}] ]]; then + log "One or more files are owned by the PR author, ignoring" + unset 'users[${prAuthor,,}]' +fi + +gh api \ + -H "Accept: application/vnd.github+json" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + "/repos/$baseRepo/pulls/$prNumber/reviews" \ + --jq '.[].user.login' > "$tmp/already-reviewed-by" + +# And we don't want to rerequest reviews from people who already reviewed +while read -r user; do + if [[ -v users[${user,,}] ]]; then + log "User $user is a potential reviewer, but has already left a review, ignoring" + unset 'users[${user,,}]' + fi +done < "$tmp/already-reviewed-by" + +for user in "${!users[@]}"; do + if ! gh api \ + -H "Accept: application/vnd.github+json" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + "/repos/$baseRepo/collaborators/$user" >&2; then + log "User $user is not a repository collaborator, probably missed the automated invite to the maintainers team (see ), ignoring" + unset 'users[$user]' + fi +done + +for user in "${!users[@]}"; do + log "Requesting review from: $user" + + if ! response=$(jq -n --arg user "$user" '{ reviewers: [ $user ] }' | \ + effect gh api \ + --method POST \ + -H "Accept: application/vnd.github+json" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + "/repos/$baseRepo/pulls/$prNumber/requested_reviewers" \ + --input -); then + log "Failed to request review from $user: $response" + fi +done diff --git a/doc/build-helpers/fetchers.chapter.md b/doc/build-helpers/fetchers.chapter.md index 567d47a1499b..fd7b41f64c70 100644 --- a/doc/build-helpers/fetchers.chapter.md +++ b/doc/build-helpers/fetchers.chapter.md @@ -728,7 +728,7 @@ buildPythonPackage rec { (fetchDebianPatch { inherit pname version; debianRevision = "5"; - name = "Add-quotes-to-SOAPAction-header-in-SoapClient.patch"; + patch = "Add-quotes-to-SOAPAction-header-in-SoapClient.patch"; hash = "sha256-xA8Wnrpr31H8wy3zHSNfezFNjUJt1HbSXn3qUMzeKc0="; }) ]; diff --git a/doc/languages-frameworks/index.md b/doc/languages-frameworks/index.md index a8a13ce5b9e2..fe5f0e65a52e 100644 --- a/doc/languages-frameworks/index.md +++ b/doc/languages-frameworks/index.md @@ -95,6 +95,5 @@ scheme.section.md swift.section.md tcl.section.md texlive.section.md -titanium.section.md vim.section.md ``` diff --git a/doc/languages-frameworks/titanium.section.md b/doc/languages-frameworks/titanium.section.md deleted file mode 100644 index 306ad8662767..000000000000 --- a/doc/languages-frameworks/titanium.section.md +++ /dev/null @@ -1,110 +0,0 @@ -# Titanium {#titanium} - -The Nixpkgs repository contains facilities to deploy a variety of versions of -the [Titanium SDK](https://www.appcelerator.com) versions, a cross-platform -mobile app development framework using JavaScript as an implementation language, -and includes a function abstraction making it possible to build Titanium -applications for Android and iOS devices from source code. - -Not all Titanium features supported -- currently, it can only be used to build -Android and iOS apps. - -## Building a Titanium app {#building-a-titanium-app} - -We can build a Titanium app from source for Android or iOS and for debugging or -release purposes by invoking the `titaniumenv.buildApp {}` function: - -```nix -titaniumenv.buildApp { - name = "myapp"; - src = ./myappsource; - - preBuild = ""; - target = "android"; # or 'iphone' - tiVersion = "7.1.0.GA"; - release = true; - - androidsdkArgs = { - platformVersions = [ "25" "26" ]; - }; - androidKeyStore = ./keystore; - androidKeyAlias = "myfirstapp"; - androidKeyStorePassword = "secret"; - - xcodeBaseDir = "/Applications/Xcode.app"; - xcodewrapperArgs = { - version = "9.3"; - }; - iosMobileProvisioningProfile = ./myprovisioning.profile; - iosCertificateName = "My Company"; - iosCertificate = ./mycertificate.p12; - iosCertificatePassword = "secret"; - iosVersion = "11.3"; - iosBuildStore = false; - - enableWirelessDistribution = true; - installURL = "/installipa.php"; -} -``` - -The `titaniumenv.buildApp {}` function takes the following parameters: - -* The `name` parameter refers to the name in the Nix store. -* The `src` parameter refers to the source code location of the app that needs - to be built. -* `preRebuild` contains optional build instructions that are carried out before - the build starts. -* `target` indicates for which device the app must be built. Currently only - 'android' and 'iphone' (for iOS) are supported. -* `tiVersion` can be used to optionally override the requested Titanium version - in `tiapp.xml`. If not specified, it will use the version in `tiapp.xml`. -* `release` should be set to true when building an app for submission to the - Google Playstore or Apple Appstore. Otherwise, it should be false. - -When the `target` has been set to `android`, we can configure the following -parameters: - -* The `androidSdkArgs` parameter refers to an attribute set that propagates all - parameters to the `androidenv.composeAndroidPackages {}` function. This can - be used to install all relevant Android plugins that may be needed to perform - the Android build. If no parameters are given, it will deploy the platform - SDKs for API-levels 25 and 26 by default. - -When the `release` parameter has been set to true, you need to provide -parameters to sign the app: - -* `androidKeyStore` is the path to the keystore file -* `androidKeyAlias` is the key alias -* `androidKeyStorePassword` refers to the password to open the keystore file. - -When the `target` has been set to `iphone`, we can configure the following -parameters: - -* The `xcodeBaseDir` parameter refers to the location where Xcode has been - installed. When none value is given, the above value is the default. -* The `xcodewrapperArgs` parameter passes arbitrary parameters to the - `xcodeenv.composeXcodeWrapper {}` function. This can, for example, be used - to adjust the default version of Xcode. - -When `release` has been set to true, you also need to provide the following -parameters: - -* `iosMobileProvisioningProfile` refers to a mobile provisioning profile needed - for signing. -* `iosCertificateName` refers to the company name in the P12 certificate. -* `iosCertificate` refers to the path to the P12 file. -* `iosCertificatePassword` contains the password to open the P12 file. -* `iosVersion` refers to the iOS SDK version to use. It defaults to the latest - version. -* `iosBuildStore` should be set to `true` when building for the Apple Appstore - submission. For enterprise or ad-hoc builds it should be set to `false`. - -When `enableWirelessDistribution` has been enabled, you must also provide the -path of the PHP script (`installURL`) (that is included with the iOS build -environment) to enable wireless ad-hoc installations. - -## Emulating or simulating the app {#emulating-or-simulating-the-app} - -It is also possible to simulate the correspond iOS simulator build by using -`xcodeenv.simulateApp {}` and emulate an Android APK by using -`androidenv.emulateApp {}`. diff --git a/doc/manual.md.in b/doc/manual.md.in index e5f58a23a399..07e587190d84 100644 --- a/doc/manual.md.in +++ b/doc/manual.md.in @@ -14,3 +14,7 @@ development.md contributing.md interoperability.md ``` + +```{=include=} appendix html:into-file=//release-notes.html +release-notes/release-notes.md +``` diff --git a/doc/module-system/module-system.chapter.md b/doc/module-system/module-system.chapter.md index 927f66073748..d24faa255259 100644 --- a/doc/module-system/module-system.chapter.md +++ b/doc/module-system/module-system.chapter.md @@ -7,9 +7,12 @@ The module system is a language for handling configuration, implemented as a Nix Compared to plain Nix, it adds documentation, type checking and composition or extensibility. ::: {.note} -This chapter is new and not complete yet. For a gentle introduction to the module system, in the context of NixOS, see [Writing NixOS Modules](https://nixos.org/manual/nixos/unstable/index.html#sec-writing-modules) in the NixOS manual. -::: +This chapter is new and not complete yet. +See also: +- Introduction to the module system, in the context of NixOS, see [Writing NixOS Modules](https://nixos.org/manual/nixos/unstable/index.html#sec-writing-modules) in the NixOS manual. +- Generic guide to the module system on [nix.dev](https://nix.dev/tutorials/module-system/index.html). +::: ## `lib.evalModules` {#module-system-lib-evalModules} diff --git a/doc/packages/build-support.md b/doc/packages/build-support.md index cf6a13384753..80392f4d121e 100644 --- a/doc/packages/build-support.md +++ b/doc/packages/build-support.md @@ -98,5 +98,5 @@ substituteAllFiles { } ``` -in the resulting derivation, every instance of `@hello@` will be replaced with `there` in `$out/foo.txt` and` `$out/bar.txt`; `baz.txt` will not be processed nor will it appear in `$out`. +in the resulting derivation, every instance of `@hello@` will be replaced with `there` in `$out/foo.txt` and `$out/bar.txt`; `baz.txt` will not be processed nor will it appear in `$out`. ::: diff --git a/doc/redirects.json b/doc/redirects.json index e86ad9f7e9d7..330c25effc14 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -1,4 +1,7 @@ { + "chap-release-notes": [ + "release-notes.html#chap-release-notes" + ], "nixpkgs-manual": [ "index.html#nixpkgs-manual" ], @@ -50,6 +53,24 @@ "chap-overlays": [ "index.html#chap-overlays" ], + "sec-nixpkgs-release-25.05": [ + "release-notes.html#sec-nixpkgs-release-25.05" + ], + "sec-nixpkgs-release-25.05-incompatibilities": [ + "release-notes.html#sec-nixpkgs-release-25.05-incompatibilities" + ], + "sec-nixpkgs-release-25.05-incompatibilities-titanium-removed": [ + "release-notes.html#sec-nixpkgs-release-25.05-incompatibilities-titanium-removed", + "index.html#titanium", + "index.html#building-a-titanium-app", + "index.html#emulating-or-simulating-the-app" + ], + "sec-nixpkgs-release-25.05-lib": [ + "release-notes.html#sec-nixpkgs-release-25.05-lib" + ], + "sec-nixpkgs-release-25.05-lib-breaking": [ + "release-notes.html#sec-nixpkgs-release-25.05-lib-breaking" + ], "sec-overlays-install": [ "index.html#sec-overlays-install" ], @@ -3736,15 +3757,6 @@ "sec-language-texlive-lualatex-font-cache": [ "index.html#sec-language-texlive-lualatex-font-cache" ], - "titanium": [ - "index.html#titanium" - ], - "building-a-titanium-app": [ - "index.html#building-a-titanium-app" - ], - "emulating-or-simulating-the-app": [ - "index.html#emulating-or-simulating-the-app" - ], "vim": [ "index.html#vim" ], diff --git a/doc/release-notes/release-notes.md b/doc/release-notes/release-notes.md new file mode 100644 index 000000000000..454ea7c50a9e --- /dev/null +++ b/doc/release-notes/release-notes.md @@ -0,0 +1,7 @@ +# Release Notes {#chap-release-notes} + +This section lists the release notes for each stable version of Nixpkgs and current unstable revision. + +```{=include=} sections +rl-2505.section.md +``` diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md new file mode 100644 index 000000000000..9fa72cc1f484 --- /dev/null +++ b/doc/release-notes/rl-2505.section.md @@ -0,0 +1,19 @@ +# Nixpkgs 25.05 (2025.05/??) {#sec-nixpkgs-release-25.05} + +## Backward Incompatibilities {#sec-nixpkgs-release-25.05-incompatibilities} + + + + + +### Titanium removed {#sec-nixpkgs-release-25.05-incompatibilities-titanium-removed} + +- `titaniumenv`, `titanium`, and `titanium-alloy` have been removed due to lack of maintenance in Nixpkgs. + +## Nixpkgs Library {#sec-nixpkgs-release-25.05-lib} + +### Breaking changes {#sec-nixpkgs-release-25.05-lib-breaking} + +- Structure of the `functor` of some types has changed. `functor` is an implementation detail and should not be relied upon. If you did rely on it let us know in this [PR](https://github.com/NixOS/nixpkgs/pull/363565). + - [`lib.types.enum`](https://nixos.org/manual/nixos/unstable/#sec-option-types-basic): Previously the `functor.payload` was the list of enum values directly. Now it is an attribute set containing the values in the `values` attribute. + - [`lib.types.separatedString`](https://nixos.org/manual/nixos/unstable/#sec-option-types-string): Previously the `functor.payload` was the seperator directly. Now it is an attribute set containing the seperator in the `sep` attribute. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6ac51d6214de..77493c7f1090 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5892,6 +5892,11 @@ githubId = 283316; name = "Dane Lipscombe"; }; + dlurak = { + github = "dlurak"; + githubId = 84224239; + name = "dlurak"; + }; dmadisetti = { email = "nix@madisetti.me"; github = "dmadisetti"; @@ -5988,6 +5993,12 @@ githubId = 57304299; keys = [ { fingerprint = "33CD 5C0A 673C C54D 661E 5E4C 0DB5 361B EEE5 30AB"; } ]; }; + dopplerian = { + name = "Dopplerian"; + github = "Dopplerian"; + githubId = 53937537; + keys = [ { fingerprint = "BBC4 C071 516B A147 8D07 F9DC D2FD E6EC 2E8C 2BF4"; } ]; + }; doriath = { email = "tomasz.zurkowski@gmail.com"; github = "doriath"; @@ -9218,6 +9229,13 @@ githubId = 287215; keys = [ { fingerprint = "D618 7A03 A40A 3D56 62F5 4B46 03EF BF83 9A5F DC15"; } ]; }; + hlad = { + email = "hlad+nix@hlad.org"; + name = "Marek Hladky"; + matrix = "@hlad:hlad.org"; + github = "hlad"; + githubId = 6285728; + }; hleboulanger = { email = "hleboulanger@protonmail.com"; name = "Harold Leboulanger"; @@ -10134,6 +10152,12 @@ githubId = 45084216; keys = [ { fingerprint = "1BF9 8D10 E0D0 0B41 5723 5836 4C13 3A84 E646 9228"; } ]; }; + jaculabilis = { + name = "Tim Van Baak"; + email = "tim.vanbaak@gmail.com"; + github = "Jaculabilis"; + githubId = 10787844; + }; jaduff = { email = "jdduffpublic@proton.me"; github = "jaduff"; @@ -11135,11 +11159,11 @@ githubId = 13179; }; jopejoe1 = { - email = "johannes@joens.email"; + email = "nixpkgs@missing.ninja"; matrix = "@jopejoe1:matrix.org"; github = "jopejoe1"; githubId = 34899572; - name = "Johannes Jöns"; + name = "jopejoe1"; }; jordanisaacs = { name = "Jordan Isaacs"; @@ -12511,6 +12535,12 @@ githubId = 168301; name = "Victor Engmark"; }; + l1npengtul = { + email = "l1npengtul@l1npengtul.lol"; + github = "l1npengtul"; + githubId = 35755164; + name = "l1npengtul"; + }; l33tname = { name = "l33tname"; email = "hi@l33t.name"; @@ -13732,6 +13762,17 @@ githubId = 24735185; name = "Mahmoud Ayman"; }; + mahtaran = { + email = "luka.leer@gmail.com"; + github = "mahtaran"; + githubId = 22727323; + name = "Luka Leer"; + keys = [ + { + fingerprint = "C7FF B72E 0527 423A D470 E132 AA82 C4EB CB16 82E0"; + } + ]; + }; majesticmullet = { email = "hoccthomas@gmail.com.au"; github = "MajesticMullet"; @@ -15300,6 +15341,12 @@ githubId = 44561540; name = "Synth Morxemplum"; }; + MostafaKhaled = { + email = "mostafa.khaled.5422@gmail.com"; + github = "mostafa-khaled775"; + githubId = 112074172; + name = "Mostafa Khaled"; + }; MostAwesomeDude = { email = "cds@corbinsimpson.com"; github = "MostAwesomeDude"; @@ -15627,6 +15674,12 @@ githubId = 38578268; name = "Morgan Wolfe"; }; + mx2uller = { + email = "mx2uller@pm.me"; + github = "mx2uller"; + githubId = 93703653; + name = "Marko Müller"; + }; mxkrsv = { email = "mxkrsv@disroot.org"; github = "mxkrsv"; @@ -15655,6 +15708,12 @@ githubId = 9636071; name = "Myrl Hex"; }; + myypo = { + email = "nikirsmcgl@gmail.com"; + github = "myypo"; + githubId = 110892040; + name = "Mykyta Polchanov"; + }; mzacho = { email = "nixpkgs@martinzacho.net"; github = "mzacho"; @@ -16560,6 +16619,13 @@ githubId = 22592293; name = "Kartik Gokte"; }; + nullcube = { + email = "nullcub3@gmail.com"; + name = "NullCube"; + github = "nullcub3"; + githubId = 51034487; + matrix = "@nullcube:matrix.org"; + }; nullishamy = { email = "spam@amyerskine.me"; name = "nullishamy"; @@ -18638,6 +18704,12 @@ githubId = 40905037; name = "qwqawawow"; }; + qxrein = { + email = "mnv07@proton.me"; + github = "qxrein"; + githubId = 101001298; + name = "qxrein"; + }; qyliss = { email = "hi@alyssa.is"; github = "alyssais"; @@ -21657,6 +21729,13 @@ githubId = 22163194; name = "Stel Abrego"; }; + stellessia = { + name = "Rachel Podya"; + email = "homicide@disroot.org"; + github = "stellessia"; + githubId = 81514356; + keys = [ { fingerprint = "38E8 7F79 AE86 CA98 F8BC 45F8 1060 00A0 5E5B DB90"; } ]; + }; stepbrobd = { name = "Yifei Sun"; email = "ysun@hey.com"; @@ -21738,6 +21817,13 @@ githubId = 853468; name = "Steven Roose"; }; + stevestreza = { + email = "nixpkgs@stevestreza.com"; + github = "stevestreza"; + githubId = 28552; + name = "Steve Streza"; + keys = [ { fingerprint = "DFED 4E42 34E7 348C 57D4 6568 C4DC 30F8 5ABC 6FA1"; } ]; + }; stianlagstad = { email = "stianlagstad@gmail.com"; github = "stianlagstad"; @@ -22282,6 +22368,12 @@ github = "teatwig"; githubId = 18734648; }; + tebriel = { + email = "tebriel@frodux.in"; + name = "tebriel"; + github = "tebriel"; + githubId = 821688; + }; techknowlogick = { email = "techknowlogick@gitea.com"; github = "techknowlogick"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 66c2440b0bdc..4778365d5c9a 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -197,6 +197,7 @@ with lib.maintainers; siraben vbgl alizter + stepbrobd ]; scope = "Maintain the Coq theorem prover and related packages."; shortName = "Coq"; diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 177a05b37532..5b171420b24d 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -79,6 +79,8 @@ let prepareManualFromMD = '' cp -r --no-preserve=all $inputs/* . + cp -r ${../../../doc/release-notes} ./release-notes-nixpkgs + substituteInPlace ./manual.md \ --replace-fail '@NIXOS_VERSION@' "${version}" substituteInPlace ./configuration/configuration.md \ diff --git a/nixos/doc/manual/development/unit-handling.section.md b/nixos/doc/manual/development/unit-handling.section.md index deb120b9fadd..709a55f934d6 100644 --- a/nixos/doc/manual/development/unit-handling.section.md +++ b/nixos/doc/manual/development/unit-handling.section.md @@ -58,11 +58,16 @@ checks: before the activation script is run. This behavior is different when the service is socket-activated, as outlined in the following steps. - - The last thing that is taken into account is whether the unit is a service - and socket-activated. If `X-StopIfChanged` is **not** set, the service - is **restart**ed with the others. If it is set, both the service and the - socket are **stop**ped and the socket is **start**ed, leaving socket - activation to start the service when it's needed. + - The last thing that is taken into account is whether the unit is a + service and socket-activated. A correspondence between a + `.service` and its `.socket` unit is detected automatically, but + services can **opt out** of that detection by setting + `X-NotSocketActivated` to `yes` in their `[Service]` + section. Otherwise, if `X-StopIfChanged` is **not** set, the + service is **restart**ed with the others. If it is set, both the + service and the socket are **stop**ped and the socket is + **start**ed, leaving socket activation to start the service when + it's needed. ## Sysinit reactivation {#sec-sysinit-reactivation} diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json index 428dbdcc54c2..106148d1dd04 100644 --- a/nixos/doc/manual/redirects.json +++ b/nixos/doc/manual/redirects.json @@ -1886,11 +1886,23 @@ "sec-release-25.05-notable-changes": [ "release-notes.html#sec-release-25.05-notable-changes" ], - "sec-release-25.05-lib": [ - "release-notes.html#sec-release-25.05-lib" + "sec-nixpkgs-release-25.05": [ + "release-notes.html#sec-nixpkgs-release-25.05" ], - "sec-release-25.05-lib-breaking": [ - "release-notes.html#sec-release-25.05-lib-breaking" + "sec-nixpkgs-release-25.05-incompatibilities": [ + "release-notes.html#sec-nixpkgs-release-25.05-incompatibilities" + ], + "sec-nixpkgs-release-25.05-incompatibilities-titanium-removed": [ + "release-notes.html#sec-nixpkgs-release-25.05-incompatibilities-titanium-removed", + "index.html#titanium", + "index.html#building-a-titanium-app", + "index.html#emulating-or-simulating-the-app" + ], + "sec-nixpkgs-release-25.05-lib": [ + "release-notes.html#sec-nixpkgs-release-25.05-lib" + ], + "sec-nixpkgs-release-25.05-lib-breaking": [ + "release-notes.html#sec-nixpkgs-release-25.05-lib-breaking" ], "sec-release-24.11": [ "release-notes.html#sec-release-24.11" diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index c9e5123743be..0295deffc3d0 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -51,6 +51,8 @@ - [networking.modemmanager](options.html#opt-networking.modemmanager) has been split out of [networking.networkmanager](options.html#opt-networking.networkmanager). NetworkManager still enables ModemManager by default, but options exist now to run NetworkManager without ModemManager. +- [ncps](https://github.com/kalbasit/ncps), a Nix binary cache proxy service implemented in Go using [go-nix](https://github.com/nix-community/go-nix). Available as [services.ncps](options.html#opt-services.ncps.enable). + - [Conduwuit](https://conduwuit.puppyirl.gay/), a federated chat server implementing the Matrix protocol, forked from Conduit. Available as [services.conduwuit](#opt-services.conduwuit.enable). - [Traccar](https://www.traccar.org/), a modern GPS Tracking Platform. Available as [services.traccar](#opt-services.traccar.enable). @@ -79,6 +81,8 @@ - [Actual Budget](https://actualbudget.org/), a local-first personal finance app. Available as [services.actual](#opt-services.actual.enable). +- [immich-public-proxy](https://github.com/alangrainger/immich-public-proxy), a proxy for sharing Immich albums without exposing the Immich API. Available as [services.immich-public-proxy](#opt-services.immich-public-proxy.enable). + - [mqtt-exporter](https://github.com/kpetremann/mqtt-exporter/), a Prometheus exporter for exposing messages from MQTT. Available as [services.prometheus.exporters.mqtt](#opt-services.prometheus.exporters.mqtt.enable). - [nvidia-gpu](https://github.com/utkuozdemir/nvidia_gpu_exporter), a Prometheus exporter that scrapes `nvidia-smi` for GPU metrics. Available as [services.prometheus.exporters.nvidia-gpu](#opt-services.prometheus.exporters.nvidia-gpu.enable). @@ -113,6 +117,15 @@ - `ps3-disc-dumper` was updated to 4.2.5, which removed the CLI project and now exclusively offers the GUI +- [](#opt-services.nextcloud.config.dbtype) is unset by default, the previous default was `sqlite`. + This was done because `sqlite` is not a reasonable default since it's + [not recommended by upstream](https://docs.nextcloud.com/server/30/admin_manual/installation/system_requirements.html) + and thus doesn't qualify as default. + +- Nextcloud's default FPM pool settings have been increased according to upstream recommentations. It's advised + to review the new defaults and description of + [](#opt-services.nextcloud.poolSettings). + - `asusd` has been upgraded to version 6 which supports multiple aura devices. To account for this, the single `auraConfig` configuration option has been replaced with `auraConfigs` which is an attribute set of config options per each device. The config files may also be now specified as either source files or text strings; to account for this you will need to specify that `text` is used for your existing configs, e.g.: ```diff -services.asusd.asusdConfig = '''file contents''' @@ -127,6 +140,11 @@ - `zammad` has had its support for MySQL removed, since it was never working correctly and is now deprecated upstream. Check the [migration guide](https://docs.zammad.org/en/latest/appendix/migrate-to-postgresql.html) for how to convert your database to PostgreSQL. +- The `earlyoom` service is now using upstream systemd service, which enables + hardening and filesystem isolation by default. If you need filesystem write + access or want to access home directory via `killHook`, hardening setting can + be changed via, e.g. `systemd.services.earlyoom.serviceConfig.ProtectSystem`. + - `nodePackages.vls` has been deprecated, as the upstream consumer of it, vetur, has been deprecated by upstream. Upstream suggests migrating to Volar for Vue LSP tooling instead. - `nodePackages.create-react-native-app` has been removed, as it is deprecated. Upstream suggests using a framework for React Native apps instead. @@ -299,6 +317,10 @@ - `services.avahi.ipv6` now defaults to true. +- For matrix homeserver Synapse we are now following the upstream recommendation to enable jemalloc as the memory allocator by default. + +- `services.kmonad` now creates a determinate symlink (in `/dev/input/by-id/`) to each of KMonad virtual devices. + - `bind.cacheNetworks` now only controls access for recursive queries, where it previously controlled access for all queries. - Caddy can now be built with plugins by using `caddy.withPlugins`, a `passthru` function that accepts an attribute set as a parameter. The `plugins` argument represents a list of Caddy plugins, with each Caddy plugin being a versioned module. The `hash` argument represents the `vendorHash` of the resulting Caddy source code with the plugins added. @@ -333,10 +355,6 @@ -## Nixpkgs Library {#sec-release-25.05-lib} - -### Breaking changes {#sec-release-25.05-lib-breaking} - -- Structure of the `functor` of some types has changed. `functor` is an implementation detail and should not be relied upon. If you did rely on it let us know in this [PR](https://github.com/NixOS/nixpkgs/pull/363565). - - [`lib.types.enum`](https://nixos.org/manual/nixos/unstable/#sec-option-types-basic): Previously the `functor.payload` was the list of enum values directly. Now it is an attribute set containing the values in the `values` attribute. - - [`lib.types.separatedString`](https://nixos.org/manual/nixos/unstable/#sec-option-types-string): Previously the `functor.payload` was the seperator directly. Now it is an attribute set containing the seperator in the `sep` attribute. +```{=include=} sections +../release-notes-nixpkgs/rl-2505.section.md +``` diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index 8bab3752073f..ad028013f65f 100644 --- a/nixos/lib/eval-config.nix +++ b/nixos/lib/eval-config.nix @@ -65,6 +65,14 @@ let withWarnings = x: lib.warnIf (evalConfigArgs?extraArgs) "The extraArgs argument to eval-config.nix is deprecated. Please set config._module.args instead." lib.warnIf (evalConfigArgs?check) "The check argument to eval-config.nix is deprecated. Please set config._module.check instead." + lib.warnIf (specialArgs?pkgs) '' + You have set specialArgs.pkgs, which means that options like nixpkgs.config + and nixpkgs.overlays will be ignored. If you wish to reuse an already created + pkgs, which you know is configured correctly for this NixOS configuration, + please import the `nixosModules.pkgsReadOnly` module from the nixpkgs flake or + `(modulesPath + "/misc/nixpkgs/read-only.nix"), and set `{ nixpkgs.pkgs = ; }`. + This properly disables the ignored options to prevent future surprises. + '' x; legacyModules = diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 5efa4e51dc06..648f2f774ddf 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -619,9 +619,6 @@ let format' = format; in let # __noChroot for example). export HOME=$TMPDIR NIXOS_INSTALL_BOOTLOADER=1 nixos-enter --root $mountPoint -- /nix/var/nix/profiles/system/bin/switch-to-configuration boot - - # The above scripts will generate a random machine-id and we don't want to bake a single ID into all our images - rm -f $mountPoint/etc/machine-id ''} # Set the ownerships of the contents. The modes are set in preVM. diff --git a/nixos/lib/systemd-lib.nix b/nixos/lib/systemd-lib.nix index 39961f0f25d5..b8848f56a6c0 100644 --- a/nixos/lib/systemd-lib.nix +++ b/nixos/lib/systemd-lib.nix @@ -579,6 +579,9 @@ in rec { '' else "") + optionalString (def ? stopIfChanged && !def.stopIfChanged) '' X-StopIfChanged=false + '' + + optionalString (def ? notSocketActivated && def.notSocketActivated) '' + X-NotSocketActivated=true '' + attrsToSection def.serviceConfig); }; diff --git a/nixos/lib/systemd-unit-options.nix b/nixos/lib/systemd-unit-options.nix index b02a11ef33a6..b158ab7fca96 100644 --- a/nixos/lib/systemd-unit-options.nix +++ b/nixos/lib/systemd-unit-options.nix @@ -535,6 +535,18 @@ in rec { ''; }; + notSocketActivated = mkOption { + type = types.bool; + default = false; + description = '' + If set, a changed unit is never assumed to be + socket-activated on configuration switch, even if + it might have associated socket units. Instead, the unit + will be restarted (or stopped/started) as if it had no + associated sockets. + ''; + }; + startAt = mkOption { type = with types; either str (listOf str); default = []; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 06979a4df508..7a1d087d92cb 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1160,6 +1160,7 @@ ./services/networking/nats.nix ./services/networking/nbd.nix ./services/networking/ncdns.nix + ./services/networking/ncps.nix ./services/networking/ndppd.nix ./services/networking/nebula.nix ./services/networking/netbird.nix @@ -1485,6 +1486,7 @@ ./services/web-apps/icingaweb2/module-monitoring.nix ./services/web-apps/ifm.nix ./services/web-apps/immich.nix + ./services/web-apps/immich-public-proxy.nix ./services/web-apps/invidious.nix ./services/web-apps/invoiceplane.nix ./services/web-apps/isso.nix diff --git a/nixos/modules/profiles/minimal.nix b/nixos/modules/profiles/minimal.nix index 4ca2b8cc207f..f4b0ea0668a6 100644 --- a/nixos/modules/profiles/minimal.nix +++ b/nixos/modules/profiles/minimal.nix @@ -1,40 +1,46 @@ # This module defines a small NixOS configuration. It does not # contain any graphical stuff. -{ config, lib, ... }: - -with lib; - { - documentation.enable = mkDefault false; + lib, + ... +}: +let + inherit (lib) mkDefault; +in +{ + documentation = { + enable = mkDefault false; + doc.enable = mkDefault false; + info.enable = mkDefault false; + man.enable = mkDefault false; + nixos.enable = mkDefault false; + }; - documentation.doc.enable = mkDefault false; + environment = { + # Perl is a default package. + defaultPackages = mkDefault [ ]; + stub-ld.enable = mkDefault false; + }; - documentation.info.enable = mkDefault false; - - documentation.man.enable = mkDefault false; - - documentation.nixos.enable = mkDefault false; - - # Perl is a default package. - environment.defaultPackages = mkDefault [ ]; - - environment.stub-ld.enable = mkDefault false; - - # The lessopen package pulls in Perl. - programs.less.lessopen = mkDefault null; + programs = { + # The lessopen package pulls in Perl. + less.lessopen = mkDefault null; + command-not-found.enable = mkDefault false; + }; # This pulls in nixos-containers which depends on Perl. boot.enableContainers = mkDefault false; - programs.command-not-found.enable = mkDefault false; + services = { + logrotate.enable = mkDefault false; + udisks2.enable = mkDefault false; + }; - services.logrotate.enable = mkDefault false; - - services.udisks2.enable = mkDefault false; - - xdg.autostart.enable = mkDefault false; - xdg.icons.enable = mkDefault false; - xdg.mime.enable = mkDefault false; - xdg.sounds.enable = mkDefault false; + xdg = { + autostart.enable = mkDefault false; + icons.enable = mkDefault false; + mime.enable = mkDefault false; + sounds.enable = mkDefault false; + }; } diff --git a/nixos/modules/programs/tsm-client.nix b/nixos/modules/programs/tsm-client.nix index 9e50e38acc92..abbcfa9055eb 100644 --- a/nixos/modules/programs/tsm-client.nix +++ b/nixos/modules/programs/tsm-client.nix @@ -75,7 +75,7 @@ let { freeformType = attrsOf (either scalarType (listOf scalarType)); # Client system-options file directives are explained here: - # https://www.ibm.com/docs/en/storage-protect/8.1.24?topic=commands-processing-options + # https://www.ibm.com/docs/en/storage-protect/8.1.25?topic=commands-processing-options options.servername = mkOption { type = servernameType; default = name; diff --git a/nixos/modules/services/audio/navidrome.nix b/nixos/modules/services/audio/navidrome.nix index 7b195a94677c..e69bfef48438 100644 --- a/nixos/modules/services/audio/navidrome.nix +++ b/nixos/modules/services/audio/navidrome.nix @@ -45,6 +45,12 @@ in description = "Port to run Navidrome on."; type = port; }; + + EnableInsightsCollector = mkOption { + default = false; + description = "Enable anonymous usage data collection, see for details."; + type = bool; + }; }; }; default = { }; diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix index a9a4564ad86b..c1594ff2086a 100644 --- a/nixos/modules/services/backup/borgbackup.nix +++ b/nixos/modules/services/backup/borgbackup.nix @@ -44,8 +44,8 @@ let borgWrapper () { local result borg "$@" && result=$? || result=$? - if [[ -z "${toString cfg.failOnWarnings}" ]] && [[ "$result" == 1 ]]; then - echo "ignoring warning return value 1" + if [[ -z "${toString cfg.failOnWarnings}" ]] && [[ "$result" == 1 || ("$result" -ge 100 && "$result" -le 127) ]]; then + echo "ignoring warning return value $result" return 0 else return "$result" diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix index 0fb601cce589..e4ca2740f8e1 100644 --- a/nixos/modules/services/backup/restic.nix +++ b/nixos/modules/services/backup/restic.nix @@ -412,7 +412,7 @@ in ]} PATH=${config.systemd.services."restic-backups-${name}".environment.PATH}:$PATH - exec ${resticCmd} $@ + exec ${resticCmd} "$@" '') (lib.filterAttrs (_: v: v.createWrapper) config.services.restic.backups); }; } diff --git a/nixos/modules/services/backup/tsm.nix b/nixos/modules/services/backup/tsm.nix index 8dd27ccd2342..697f798b7fcf 100644 --- a/nixos/modules/services/backup/tsm.nix +++ b/nixos/modules/services/backup/tsm.nix @@ -89,7 +89,7 @@ in environment.HOME = "/var/lib/tsm-backup"; serviceConfig = { # for exit status description see - # https://www.ibm.com/docs/en/storage-protect/8.1.24?topic=clients-client-return-codes + # https://www.ibm.com/docs/en/storage-protect/8.1.25?topic=clients-client-return-codes SuccessExitStatus = "4 8"; # The `-se` option must come after the command. # The `-optfile` option suppresses a `dsm.opt`-not-found warning. diff --git a/nixos/modules/services/backup/zfs-replication.nix b/nixos/modules/services/backup/zfs-replication.nix index ed635a35617b..3828db386f66 100644 --- a/nixos/modules/services/backup/zfs-replication.nix +++ b/nixos/modules/services/backup/zfs-replication.nix @@ -80,9 +80,10 @@ in let args = lib.map lib.escapeShellArg ( [ - "-l" + "--verbose" + "--user" cfg.username - "-i" + "--identity-file" cfg.identityFilePath cfg.host cfg.remoteFilesystem diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix index 98f601d8886e..aa759e20f49f 100644 --- a/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -205,9 +205,14 @@ in }; extraConfig = mkOption { - description = "Kubernetes kubelet extra configuration file entries."; + description = '' + Kubernetes kubelet extra configuration file entries. + + See also [Set Kubelet Parameters Via A Configuration File](https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/) + and [Kubelet Configuration](https://kubernetes.io/docs/reference/config-api/kubelet-config.v1beta1/). + ''; default = { }; - type = attrsOf attrs; + type = attrsOf ((pkgs.formats.json { }).type); }; featureGates = mkOption { diff --git a/nixos/modules/services/hardware/kmonad.nix b/nixos/modules/services/hardware/kmonad.nix index fc548d51603e..fa9b8fbb610f 100644 --- a/nixos/modules/services/hardware/kmonad.nix +++ b/nixos/modules/services/hardware/kmonad.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + utils, ... }: @@ -15,6 +16,7 @@ let options = { name = lib.mkOption { type = lib.types.str; + default = name; example = "laptop-internal"; description = "Keyboard name."; }; @@ -35,16 +37,16 @@ let Since KMonad runs as an unprivileged user, it may sometimes need extra permissions in order to read the keyboard device file. If your keyboard's device file isn't in the input - group you'll need to list its group in this option. + group, you'll need to list its group in this option. ''; }; defcfg = { enable = lib.mkEnableOption '' - Automatically generate the defcfg block. + automatic generation of the defcfg block. - When this is option is set to true the config option for - this keyboard should not include a defcfg block. + When this option is set to true, the config option for + this keyboard should not include a defcfg block ''; compose = { @@ -55,15 +57,15 @@ let }; delay = lib.mkOption { - type = lib.types.int; + type = lib.types.ints.unsigned; default = 5; description = "The delay (in milliseconds) between compose key sequences."; }; }; - fallthrough = lib.mkEnableOption "Re-emit unhandled key events."; + fallthrough = lib.mkEnableOption "re-emitting unhandled key events"; - allowCommands = lib.mkEnableOption "Allow keys to run shell commands."; + allowCommands = lib.mkEnableOption "keys to run shell commands"; }; config = lib.mkOption { @@ -71,12 +73,10 @@ let description = "Keyboard configuration."; }; }; - - config = { - name = lib.mkDefault name; - }; }; + mkName = name: "kmonad-" + name; + # Create a complete KMonad configuration file: mkCfg = keyboard: @@ -84,7 +84,7 @@ let defcfg = '' (defcfg input (device-file "${keyboard.device}") - output (uinput-sink "kmonad-${keyboard.name}") + output (uinput-sink "${mkName keyboard.name}") ${lib.optionalString (keyboard.defcfg.compose.key != null) '' cmp-seq ${keyboard.defcfg.compose.key} cmp-seq-delay ${toString keyboard.defcfg.compose.delay} @@ -95,9 +95,9 @@ let ''; in pkgs.writeTextFile { - name = "kmonad-${keyboard.name}.cfg"; + name = "${mkName keyboard.name}.kbd"; text = lib.optionalString keyboard.defcfg.enable (defcfg + "\n") + keyboard.config; - checkPhase = "${cfg.package}/bin/kmonad -d $out"; + checkPhase = "${lib.getExe cfg.package} -d $out"; }; # Build a systemd path config that starts the service below when a @@ -105,7 +105,7 @@ let mkPath = keyboard: let - name = "kmonad-${keyboard.name}"; + name = mkName keyboard.name; in lib.nameValuePair name { description = "KMonad trigger for ${keyboard.device}"; @@ -119,19 +119,8 @@ let # Build a systemd service that starts KMonad: mkService = keyboard: - let - cmd = - [ - (lib.getExe cfg.package) - "--input" - ''device-file "${keyboard.device}"'' - ] - ++ cfg.extraArgs - ++ [ "${mkCfg keyboard}" ]; - in - lib.nameValuePair "kmonad-${keyboard.name}" { + lib.nameValuePair (mkName keyboard.name) { description = "KMonad for ${keyboard.device}"; - script = lib.escapeShellArgs cmd; unitConfig = { # Control rate limiting. # Stop the restart logic if we restart more than @@ -140,6 +129,10 @@ let StartLimitBurst = 5; }; serviceConfig = { + ExecStart = '' + ${lib.getExe cfg.package} ${mkCfg keyboard} \ + ${utils.escapeSystemdExecArgs cfg.extraArgs} + ''; Restart = "always"; # Restart at increasing intervals from 2s to 1m RestartSec = 2; @@ -155,13 +148,26 @@ let config.users.groups.uinput.name ] ++ keyboard.extraGroups; }; + # make sure the new config is used after nixos-rebuild switch + # stopIfChanged controls[0] how a service is "restarted" during + # nixos-rebuild switch. By default, stopIfChanged is true, which stops + # the old service and then starts the new service after config updates. + # Since we use path-based activation[1] here, the service unit will + # immediately[2] be started by the path unit. Probably that start is + # before config updates, whcih causes the service unit to use the old + # config after nixos-rebuild switch. Setting stopIfChanged to false works + # around this issue by restarting the service after config updates. + # [0]: https://nixos.org/manual/nixos/unstable/#sec-switching-systems + # [1]: man 7 daemon + # [2]: man 5 systemd.path + stopIfChanged = false; }; in { options.services.kmonad = { - enable = lib.mkEnableOption "KMonad: An advanced keyboard manager."; + enable = lib.mkEnableOption "KMonad: an advanced keyboard manager"; - package = lib.mkPackageOption pkgs "kmonad" { }; + package = lib.mkPackageOption pkgs "KMonad" { default = "kmonad"; }; keyboards = lib.mkOption { type = lib.types.attrsOf (lib.types.submodule keyboard); @@ -183,9 +189,27 @@ in config = lib.mkIf cfg.enable { hardware.uinput.enable = true; + services.udev.extraRules = + let + mkRule = name: '' + ACTION=="add", KERNEL=="event*", SUBSYSTEM=="input", ATTRS{name}=="${name}", ATTRS{id/product}=="5679", ATTRS{id/vendor}=="1235", SYMLINK+="input/by-id/${name}" + ''; + in + lib.foldlAttrs ( + rules: _: keyboard: + rules + "\n" + mkRule (mkName keyboard.name) + ) "" cfg.keyboards; + systemd = { paths = lib.mapAttrs' (_: mkPath) cfg.keyboards; services = lib.mapAttrs' (_: mkService) cfg.keyboards; }; }; + + meta = { + maintainers = with lib.maintainers; [ + linj + rvdp + ]; + }; } diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 0d6c78cf29c4..d56e7eba3897 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -459,10 +459,10 @@ in fi ''; - systemd.services.systemd-udevd = - { restartTriggers = [ config.environment.etc."udev/rules.d".source ]; - }; - + systemd.services.systemd-udevd = { + restartTriggers = [ config.environment.etc."udev/rules.d".source ]; + notSocketActivated = true; + }; }; imports = [ diff --git a/nixos/modules/services/matrix/synapse.nix b/nixos/modules/services/matrix/synapse.nix index 2b0eb43605d8..48372d9c4874 100644 --- a/nixos/modules/services/matrix/synapse.nix +++ b/nixos/modules/services/matrix/synapse.nix @@ -705,7 +705,7 @@ in withJemalloc = mkOption { type = types.bool; - default = false; + default = true; description = '' Whether to preload jemalloc to reduce memory fragmentation and overall usage. ''; @@ -1462,6 +1462,7 @@ in baseServiceConfig = { environment = optionalAttrs (cfg.withJemalloc) { LD_PRELOAD = "${pkgs.jemalloc}/lib/libjemalloc.so"; + PYTHONMALLOC = "malloc"; }; serviceConfig = { Type = "notify"; diff --git a/nixos/modules/services/misc/jellyseerr.nix b/nixos/modules/services/misc/jellyseerr.nix index e09de7aec50b..c500cc8b3a62 100644 --- a/nixos/modules/services/misc/jellyseerr.nix +++ b/nixos/modules/services/misc/jellyseerr.nix @@ -20,6 +20,12 @@ in default = 5055; description = ''The port which the Jellyseerr web UI should listen to.''; }; + + configDir = lib.mkOption { + type = lib.types.path; + default = "/var/lib/jellyseerr/config"; + description = "Config data directory"; + }; }; config = lib.mkIf cfg.enable { @@ -27,14 +33,15 @@ in description = "Jellyseerr, a requests manager for Jellyfin"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - environment.PORT = toString cfg.port; + environment = { + PORT = toString cfg.port; + CONFIG_DIRECTORY = cfg.configDir; + }; serviceConfig = { Type = "exec"; StateDirectory = "jellyseerr"; - WorkingDirectory = "${cfg.package}/libexec/jellyseerr/deps/jellyseerr"; DynamicUser = true; ExecStart = lib.getExe cfg.package; - BindPaths = [ "/var/lib/jellyseerr/:${cfg.package}/libexec/jellyseerr/deps/jellyseerr/config/" ]; Restart = "on-failure"; ProtectHome = true; ProtectSystem = "strict"; diff --git a/nixos/modules/services/misc/pykms.nix b/nixos/modules/services/misc/pykms.nix index c9613f684e84..a8f08e5ab186 100644 --- a/nixos/modules/services/misc/pykms.nix +++ b/nixos/modules/services/misc/pykms.nix @@ -24,9 +24,12 @@ in description = "Whether to enable the PyKMS service."; }; + package = lib.mkPackageOption pkgs "pykms" { }; + listenAddress = lib.mkOption { type = lib.types.str; default = "0.0.0.0"; + example = "::"; description = "The IP address on which to listen."; }; @@ -78,13 +81,13 @@ in wantedBy = [ "multi-user.target" ]; # python programs with DynamicUser = true require HOME to be set environment.HOME = libDir; - serviceConfig = with pkgs; { + serviceConfig = { DynamicUser = true; StateDirectory = baseNameOf libDir; - ExecStartPre = "${lib.getBin pykms}/libexec/create_pykms_db.sh ${libDir}/clients.db"; + ExecStartPre = "${lib.getBin cfg.package}/libexec/create_pykms_db.sh ${libDir}/clients.db"; ExecStart = lib.concatStringsSep " " ( [ - "${lib.getBin pykms}/bin/server" + "${lib.getBin cfg.package}/bin/server" "--logfile=STDOUT" "--loglevel=${cfg.logLevel}" "--sqlite=${libDir}/clients.db" diff --git a/nixos/modules/services/monitoring/prometheus/exporters/fastly.nix b/nixos/modules/services/monitoring/prometheus/exporters/fastly.nix index e470ebe2eb59..dab8b7a283b8 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/fastly.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/fastly.nix @@ -31,18 +31,17 @@ in ''; }; - tokenPath = mkOption { + environmentFile = mkOption { type = path; description = '' - A run-time path to the token file, which is supposed to be provisioned - outside of Nix store. + An environment file containg at least the FASTLY_API_TOKEN= environment + variable. ''; }; }; serviceOpts = { serviceConfig = { - LoadCredential = "fastly-api-token:${cfg.tokenPath}"; - Environment = [ "FASTLY_API_TOKEN=%d/fastly-api-token" ]; + EnvironmentFile = cfg.environmentFile; ExecStart = escapeSystemdExecArgs ( [ (getExe pkgs.prometheus-fastly-exporter) diff --git a/nixos/modules/services/networking/coturn.nix b/nixos/modules/services/networking/coturn.nix index b50aad89871b..8a0d08f6d9cb 100644 --- a/nixos/modules/services/networking/coturn.nix +++ b/nixos/modules/services/networking/coturn.nix @@ -36,8 +36,6 @@ let ${lib.optionalString (cfg.cert != null) "cert=${cfg.cert}"} ${lib.optionalString (cfg.pkey != null) "pkey=${cfg.pkey}"} ${lib.optionalString (cfg.dh-file != null) "dh-file=${cfg.dh-file}"} - no-stdout-log - syslog pidfile=${pidfile} ${lib.optionalString cfg.secure-stun "secure-stun"} ${lib.optionalString cfg.no-cli "no-cli"} diff --git a/nixos/modules/services/networking/ncps.nix b/nixos/modules/services/networking/ncps.nix new file mode 100644 index 000000000000..12b51bf05217 --- /dev/null +++ b/nixos/modules/services/networking/ncps.nix @@ -0,0 +1,326 @@ +{ + config, + pkgs, + lib, + ... +}: +let + cfg = config.services.ncps; + + logLevels = [ + "trace" + "debug" + "info" + "warn" + "error" + "fatal" + "panic" + ]; + + globalFlags = lib.concatStringsSep " " ( + [ "--log-level='${cfg.logLevel}'" ] + ++ (lib.optionals cfg.openTelemetry.enable ( + [ + "--otel-enabled" + ] + ++ (lib.optional ( + cfg.openTelemetry.grpcURL != null + ) "--otel-grpc-url='${cfg.openTelemetry.grpcURL}'") + )) + ); + + serveFlags = lib.concatStringsSep " " ( + [ + "--cache-hostname='${cfg.cache.hostName}'" + "--cache-data-path='${cfg.cache.dataPath}'" + "--cache-database-url='${cfg.cache.databaseURL}'" + "--server-addr='${cfg.server.addr}'" + ] + ++ (lib.optional cfg.cache.allowDeleteVerb "--cache-allow-delete-verb") + ++ (lib.optional cfg.cache.allowPutVerb "--cache-allow-put-verb") + ++ (lib.optional (cfg.cache.maxSize != null) "--cache-max-size='${cfg.cache.maxSize}'") + ++ (lib.optionals (cfg.cache.lru.schedule != null) [ + "--cache-lru-schedule='${cfg.cache.lru.schedule}'" + "--cache-lru-schedule-timezone='${cfg.cache.lru.scheduleTimeZone}'" + ]) + ++ (lib.optional (cfg.cache.secretKeyPath != null) "--cache-secret-key-path='%d/secretKey'") + ++ (lib.forEach cfg.upstream.caches (url: "--upstream-cache='${url}'")) + ++ (lib.forEach cfg.upstream.publicKeys (pk: "--upstream-public-key='${pk}'")) + ); + + isSqlite = lib.strings.hasPrefix "sqlite:" cfg.cache.databaseURL; + + dbPath = lib.removePrefix "sqlite:" cfg.cache.databaseURL; + dbDir = dirOf dbPath; +in +{ + options = { + services.ncps = { + enable = lib.mkEnableOption "ncps: Nix binary cache proxy service implemented in Go"; + + package = lib.mkPackageOption pkgs "ncps" { }; + + dbmatePackage = lib.mkPackageOption pkgs "dbmate" { }; + + openTelemetry = { + enable = lib.mkEnableOption "Enable OpenTelemetry logs, metrics, and tracing"; + + grpcURL = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + description = '' + Configure OpenTelemetry gRPC URL. Missing or "https" scheme enables + secure gRPC, "insecure" otherwise. Omit to emit telemetry to + stdout. + ''; + }; + }; + + logLevel = lib.mkOption { + type = lib.types.enum logLevels; + default = "info"; + description = '' + Set the level for logging. Refer to + for + more information. + ''; + }; + + cache = { + allowDeleteVerb = lib.mkEnableOption '' + Whether to allow the DELETE verb to delete narinfo and nar files from + the cache. + ''; + + allowPutVerb = lib.mkEnableOption '' + Whether to allow the PUT verb to push narinfo and nar files directly + to the cache. + ''; + + hostName = lib.mkOption { + type = lib.types.str; + description = '' + The hostname of the cache server. **This is used to generate the + private key used for signing store paths (.narinfo)** + ''; + }; + + dataPath = lib.mkOption { + type = lib.types.str; + default = "/var/lib/ncps"; + description = '' + The local directory for storing configuration and cached store paths + ''; + }; + + databaseURL = lib.mkOption { + type = lib.types.str; + default = "sqlite:${cfg.cache.dataPath}/db/db.sqlite"; + defaultText = "sqlite:/var/lib/ncps/db/db.sqlite"; + description = '' + The URL of the database (currently only SQLite is supported) + ''; + }; + + lru = { + schedule = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + example = "0 2 * * *"; + description = '' + The cron spec for cleaning the store to keep it under + config.ncps.cache.maxSize. Refer to + https://pkg.go.dev/github.com/robfig/cron/v3#hdr-Usage for + documentation. + ''; + }; + + scheduleTimeZone = lib.mkOption { + type = lib.types.str; + default = "Local"; + example = "America/Los_Angeles"; + description = '' + The name of the timezone to use for the cron schedule. See + + for a comprehensive list of possible values for this setting. + ''; + }; + }; + + maxSize = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + example = "100G"; + description = '' + The maximum size of the store. It can be given with units such as + 5K, 10G etc. Supported units: B, K, M, G, T. + ''; + }; + + secretKeyPath = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + description = '' + The path to load the secretKey for signing narinfos. Leave this + empty to automatically generate a private/public key. + ''; + }; + }; + + server = { + addr = lib.mkOption { + type = lib.types.str; + default = ":8501"; + description = '' + The address and port the server listens on. + ''; + }; + }; + + upstream = { + caches = lib.mkOption { + type = lib.types.listOf lib.types.str; + example = [ "https://cache.nixos.org" ]; + description = '' + A list of URLs of upstream binary caches. + ''; + }; + + publicKeys = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + example = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ]; + description = '' + A list of public keys of upstream caches in the format + `host[-[0-9]*]:public-key`. This flag is used to verify the + signatures of store paths downloaded from upstream caches. + ''; + }; + }; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = cfg.cache.lru.schedule == null || cfg.cache.maxSize != null; + message = "You must specify config.ncps.cache.lru.schedule when config.ncps.cache.maxSize is set"; + } + + { + assertion = cfg.cache.secretKeyPath == null || (builtins.pathExists cfg.cache.secretKeyPath); + message = "config.ncps.cache.secresecretKeyPath=${cfg.cache.secretKeyPath} must exist but does not"; + } + ]; + + users.users.ncps = { + isSystemUser = true; + group = "ncps"; + }; + users.groups.ncps = { }; + + systemd.services.ncps-create-datadirs = { + description = "Created required directories by ncps"; + serviceConfig = { + Type = "oneshot"; + UMask = "0066"; + }; + script = + (lib.optionalString (cfg.cache.dataPath != "/var/lib/ncps") '' + if ! test -d ${cfg.cache.dataPath}; then + mkdir -p ${cfg.cache.dataPath} + chown ncps:ncps ${cfg.cache.dataPath} + fi + '') + + (lib.optionalString isSqlite '' + if ! test -d ${dbDir}; then + mkdir -p ${dbDir} + chown ncps:ncps ${dbDir} + fi + ''); + wantedBy = [ "ncps.service" ]; + before = [ "ncps.service" ]; + }; + + systemd.services.ncps = { + description = "ncps binary cache proxy service"; + + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + preStart = '' + ${lib.getExe cfg.dbmatePackage} --migrations-dir=${cfg.package}/share/ncps/db/migrations --url=${cfg.cache.databaseURL} up + ''; + + serviceConfig = lib.mkMerge [ + { + ExecStart = "${lib.getExe cfg.package} ${globalFlags} serve ${serveFlags}"; + User = "ncps"; + Group = "ncps"; + Restart = "on-failure"; + RuntimeDirectory = "ncps"; + } + + # credentials + (lib.mkIf (cfg.cache.secretKeyPath != null) { + LoadCredential = "secretKey:${cfg.cache.secretKeyPath}"; + }) + + # ensure permissions on required directories + (lib.mkIf (cfg.cache.dataPath != "/var/lib/ncps") { + ReadWritePaths = [ cfg.cache.dataPath ]; + }) + (lib.mkIf (cfg.cache.dataPath == "/var/lib/ncps") { + StateDirectory = "ncps"; + StateDirectoryMode = "0700"; + }) + (lib.mkIf (isSqlite && !lib.strings.hasPrefix "/var/lib/ncps" dbDir) { + ReadWritePaths = [ dbDir ]; + }) + + # Hardening + { + SystemCallFilter = [ + "@system-service" + "~@privileged" + "~@resources" + ]; + CapabilityBoundingSet = ""; + PrivateUsers = true; + DevicePolicy = "closed"; + DeviceAllow = [ "" ]; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectControlGroups = true; + ProtectKernelLogs = true; + ProtectHostname = true; + ProtectClock = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + ProtectHome = true; + RestrictSUIDSGID = true; + RestrictRealtime = true; + MemoryDenyWriteExecute = true; + ProcSubset = "pid"; + RestrictNamespaces = true; + SystemCallArchitectures = "native"; + PrivateNetwork = false; + PrivateTmp = true; + PrivateDevices = true; + PrivateMounts = true; + NoNewPrivileges = true; + LockPersonality = true; + RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6"; + LimitNOFILE = 65536; + UMask = "0066"; + } + ]; + + unitConfig.RequiresMountsFor = lib.concatStringsSep " " ( + [ "${cfg.cache.dataPath}" ] ++ lib.optional (isSqlite) dbDir + ); + }; + }; + + meta.maintainers = with lib.maintainers; [ kalbasit ]; +} diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index 8c5bc82ffcb1..8570d0ee377d 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -143,10 +143,10 @@ in restartTriggers = [ cfg.unifiPackage cfg.mongodbPackage ]; serviceConfig = { - Type = "simple"; + Type = "notify"; ExecStart = "${cmd} start"; ExecStop = "${cmd} stop"; - Restart = "on-failure"; + Restart = "always"; TimeoutSec = "5min"; User = "unifi"; UMask = "0077"; diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index 543522c534b4..f7f86496d822 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -419,7 +419,7 @@ in ${optionalString (containsGutenprint cfg.drivers) '' if [ -d /var/lib/cups/ppd ]; then - ${getGutenprint cfg.drivers}/bin/cups-genppdupdate -p /var/lib/cups/ppd + ${getGutenprint cfg.drivers}/bin/cups-genppdupdate -x -p /var/lib/cups/ppd fi ''} ''; diff --git a/nixos/modules/services/security/certmgr.nix b/nixos/modules/services/security/certmgr.nix index 4a156539b438..84f17bf87d51 100644 --- a/nixos/modules/services/security/certmgr.nix +++ b/nixos/modules/services/security/certmgr.nix @@ -130,7 +130,7 @@ in type = addCheck str ( x: cfg.svcManager == "command" - || elem x [ + || lib.elem x [ "restart" "reload" "nop" diff --git a/nixos/modules/services/security/cfssl.nix b/nixos/modules/services/security/cfssl.nix index 574649de75a9..2d0465d6a0b8 100644 --- a/nixos/modules/services/security/cfssl.nix +++ b/nixos/modules/services/security/cfssl.nix @@ -193,7 +193,7 @@ in ExecStart = with cfg; let - opt = n: v: optionalString (v != null) ''-${n}="${v}"''; + opt = n: v: lib.optionalString (v != null) ''-${n}="${v}"''; in lib.concatStringsSep " \\\n" [ "${pkgs.cfssl}/bin/cfssl serve" diff --git a/nixos/modules/services/security/endlessh-go.nix b/nixos/modules/services/security/endlessh-go.nix index a44652e8afd8..b8b51acc81d0 100644 --- a/nixos/modules/services/security/endlessh-go.nix +++ b/nixos/modules/services/security/endlessh-go.nix @@ -94,14 +94,14 @@ in Restart = "always"; ExecStart = with cfg; - concatStringsSep " " ( + lib.concatStringsSep " " ( [ (lib.getExe cfg.package) "-logtostderr" "-host=${listenAddress}" "-port=${toString port}" ] - ++ optionals prometheus.enable [ + ++ lib.optionals prometheus.enable [ "-enable_prometheus" "-prometheus_host=${prometheus.listenAddress}" "-prometheus_port=${toString prometheus.port}" @@ -149,7 +149,7 @@ in }; }; - networking.firewall.allowedTCPPorts = with cfg; optionals openFirewall [ port ]; + networking.firewall.allowedTCPPorts = with cfg; lib.optionals openFirewall [ port ]; }; meta.maintainers = with lib.maintainers; [ azahi ]; diff --git a/nixos/modules/services/security/endlessh.nix b/nixos/modules/services/security/endlessh.nix index cac6de5c3cf3..cd5b9c5c8254 100644 --- a/nixos/modules/services/security/endlessh.nix +++ b/nixos/modules/services/security/endlessh.nix @@ -60,7 +60,7 @@ in Restart = "always"; ExecStart = with cfg; - concatStringsSep " " ( + lib.concatStringsSep " " ( [ "${pkgs.endlessh}/bin/endlessh" "-p ${toString port}" @@ -109,7 +109,7 @@ in }; }; - networking.firewall.allowedTCPPorts = with cfg; optionals openFirewall [ port ]; + networking.firewall.allowedTCPPorts = with cfg; lib.optionals openFirewall [ port ]; }; meta.maintainers = with lib.maintainers; [ azahi ]; diff --git a/nixos/modules/services/security/opensnitch.nix b/nixos/modules/services/security/opensnitch.nix index 97700987025d..c56501c98a5f 100644 --- a/nixos/modules/services/security/opensnitch.nix +++ b/nixos/modules/services/security/opensnitch.nix @@ -150,7 +150,7 @@ in }; Ebpf.ModulesPath = lib.mkOption { - type = lib.types.path; + type = lib.types.nullOr lib.types.path; default = if cfg.settings.ProcMonitorMethod == "ebpf" then "${config.boot.kernelPackages.opensnitch-ebpf}/etc/opensnitchd" @@ -202,10 +202,16 @@ in services.opensnitchd = { wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = [ - "" - "${pkgs.opensnitch}/bin/opensnitchd --config-file ${format.generate "default-config.json" cfg.settings}" - ]; + ExecStart = + let + preparedSettings = removeAttrs cfg.settings ( + lib.optional (cfg.settings.ProcMonitorMethod != "ebpf") "Ebpf" + ); + in + [ + "" + "${pkgs.opensnitch}/bin/opensnitchd --config-file ${format.generate "default-config.json" preparedSettings}" + ]; }; preStart = lib.mkIf (cfg.rules != { }) ( let diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index eb36e727fb0c..7002aa9dabb6 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -5,7 +5,6 @@ pkgs, ... }: -with builtins; let cfg = config.services.tor; opt = options.services.tor; @@ -15,7 +14,7 @@ let See [torrc manual](https://2019.www.torproject.org/docs/tor-manual.html.en#${option}). ''; bindsPrivilegedPort = - any + lib.any ( p0: let @@ -25,20 +24,22 @@ let false else let - p2 = if isInt p1 then p1 else toInt p1; + p2 = if lib.isInt p1 then p1 else lib.toInt p1; in p1 != null && 0 < p2 && p2 < 1024 ) - (flatten [ - cfg.settings.ORPort - cfg.settings.DirPort - cfg.settings.DNSPort - cfg.settings.ExtORPort - cfg.settings.HTTPTunnelPort - cfg.settings.NATDPort - cfg.settings.SOCKSPort - cfg.settings.TransPort - ]); + ( + lib.flatten [ + cfg.settings.ORPort + cfg.settings.DirPort + cfg.settings.DNSPort + cfg.settings.ExtORPort + cfg.settings.HTTPTunnelPort + cfg.settings.NATDPort + cfg.settings.SOCKSPort + cfg.settings.TransPort + ] + ); optionBool = optionName: lib.mkOption { @@ -68,7 +69,7 @@ let description = (descriptionGeneric optionName); }; optionAddress = lib.mkOption { - type = with types; nullOr str; + type = with lib.types; nullOr str; default = null; example = "0.0.0.0"; description = '' @@ -76,7 +77,7 @@ let ''; }; optionUnix = lib.mkOption { - type = with types; nullOr path; + type = with lib.types; nullOr path; default = null; description = '' Unix domain socket path to use. @@ -84,7 +85,7 @@ let }; optionPort = lib.mkOption { type = - with types; + with lib.types; nullOr (oneOf [ port (enum [ "auto" ]) @@ -125,8 +126,8 @@ let ); config = { flags = - filter (name: config.${name} == true) isolateFlags - ++ optional (config.SessionGroup != null) "SessionGroup=${toString config.SessionGroup}"; + lib.filter (name: config.${name} == true) isolateFlags + ++ lib.optional (config.SessionGroup != null) "SessionGroup=${toString config.SessionGroup}"; }; } )) @@ -195,14 +196,14 @@ let config = lib.mkIf doConfig { # Only add flags in SOCKSPort to avoid duplicates flags = - filter (name: config.${name} == true) flags - ++ optional (config.SessionGroup != null) "SessionGroup=${toString config.SessionGroup}"; + lib.filter (name: config.${name} == true) flags + ++ lib.optional (config.SessionGroup != null) "SessionGroup=${toString config.SessionGroup}"; }; } )) ]; optionFlags = lib.mkOption { - type = with types; listOf str; + type = with lib.types; listOf str; default = [ ]; }; optionORPort = @@ -243,7 +244,7 @@ let } ); config = { - flags = filter (name: config.${name} == true) flags; + flags = lib.filter (name: config.${name} == true) flags; }; } )) @@ -270,33 +271,33 @@ let k: v: if v == null then "" - else if isBool v then + else if lib.isBool v then (if v then "1" else "0") else if v ? "unix" && v.unix != null then - "unix:" + v.unix + optionalString (v ? "flags") (" " + concatStringsSep " " v.flags) + "unix:" + v.unix + lib.optionalString (v ? "flags") (" " + lib.concatStringsSep " " v.flags) else if v ? "port" && v.port != null then - optionalString (v ? "addr" && v.addr != null) "${v.addr}:" + lib.optionalString (v ? "addr" && v.addr != null) "${v.addr}:" + toString v.port - + optionalString (v ? "flags") (" " + concatStringsSep " " v.flags) + + lib.optionalString (v ? "flags") (" " + lib.concatStringsSep " " v.flags) else if k == "ServerTransportPlugin" then - optionalString (v.transports != [ ]) "${concatStringsSep "," v.transports} exec ${v.exec}" + lib.optionalString (v.transports != [ ]) "${lib.concatStringsSep "," v.transports} exec ${v.exec}" else if k == "HidServAuth" then v.onion + " " + v.auth else - generators.mkValueStringDefault { } v; + lib.generators.mkValueStringDefault { } v; genTorrc = settings: - generators.toKeyValue + lib.generators.toKeyValue { listsAsDuplicateKeys = true; - mkKeyValue = k: generators.mkKeyValueDefault { mkValueString = mkValueString k; } " " k; + mkKeyValue = k: lib.generators.mkKeyValueDefault { mkValueString = mkValueString k; } " " k; } ( lib.mapAttrs ( k: v: # Not necesssary, but prettier rendering if - elem k [ + lib.elem k [ "AutomapHostsSuffixes" "DirPolicy" "ExitPolicy" @@ -304,15 +305,15 @@ let ] && v != [ ] then - concatStringsSep "," v + lib.concatStringsSep "," v else v ) (lib.filterAttrs (k: v: !(v == null || v == "")) settings) ); torrc = pkgs.writeText "torrc" ( genTorrc cfg.settings - + concatStrings ( - mapAttrsToList ( + + lib.concatStrings ( + lib.mapAttrsToList ( name: onion: "HiddenServiceDir ${onion.path}\n" + genTorrc onion.settings ) cfg.relay.onionServices ) @@ -506,7 +507,7 @@ in }; type = lib.types.attrsOf ( lib.types.submodule ( - { name, config, ... }: + { ... }: { options.clientAuthorizations = lib.mkOption { description = '' @@ -748,7 +749,7 @@ in ]); apply = map ( v: - if isInt v then + if lib.isInt v then { port = v; target = null; @@ -810,11 +811,11 @@ in }; }; config = { - path = mkDefault ((if config.secretKey == null then stateDir else runDir) + "/onion/${name}"); + path = lib.mkDefault ((if config.secretKey == null then stateDir else runDir) + "/onion/${name}"); settings.HiddenServiceVersion = config.version; settings.HiddenServiceAuthorizeClient = if config.authorizeClient != null then - config.authorizeClient.authType + " " + concatStringsSep "," config.authorizeClient.clientNames + config.authorizeClient.authType + " " + lib.concatStringsSep "," config.authorizeClient.clientNames else null; settings.HiddenServicePort = map ( @@ -890,7 +891,7 @@ in options.ConnDirectionStatistics = optionBool "ConnDirectionStatistics"; options.ConstrainedSockets = optionBool "ConstrainedSockets"; options.ContactInfo = optionString "ContactInfo"; - options.ControlPort = lib.mkOption rec { + options.ControlPort = lib.mkOption { description = (descriptionGeneric "ControlPort"); default = [ ]; example = [ { port = 9051; } ]; @@ -927,7 +928,7 @@ in } ); config = { - flags = filter (name: config.${name} == true) flags; + flags = lib.filter (name: config.${name} == true) flags; }; } )) @@ -996,7 +997,7 @@ in } )) ]); - apply = p: if isInt p || isString p then { port = p; } else p; + apply = p: if lib.isInt p || lib.isString p then { port = p; } else p; }; options.ExtORPortCookieAuthFile = optionPath "ExtORPortCookieAuthFile"; options.ExtORPortCookieAuthFileGroupReadable = optionBool "ExtORPortCookieAuthFileGroupReadable"; @@ -1177,8 +1178,11 @@ in # Not sure if `cfg.relay.role == "private-bridge"` helps as tor # sends a lot of stats warnings = - optional - (cfg.settings.BridgeRelay && flatten (mapAttrsToList (n: o: o.map) cfg.relay.onionServices) != [ ]) + lib.optional + ( + cfg.settings.BridgeRelay + && lib.flatten (lib.mapAttrsToList (n: o: o.map) cfg.relay.onionServices) != [ ] + ) '' Running Tor hidden services on a public relay makes the presence of hidden services visible through simple statistical @@ -1189,21 +1193,21 @@ in actually hide your hidden services. In either case, you can always create a container/VM with a separate Tor daemon instance. '' - ++ flatten ( - mapAttrsToList ( + ++ lib.flatten ( + lib.mapAttrsToList ( n: o: - optionals (o.settings.HiddenServiceVersion == 2) [ - (optional (o.settings.HiddenServiceExportCircuitID != null) '' + lib.optionals (o.settings.HiddenServiceVersion == 2) [ + (lib.optional (o.settings.HiddenServiceExportCircuitID != null) '' HiddenServiceExportCircuitID is used in the HiddenService: ${n} but this option is only for v3 hidden services. '') ] - ++ optionals (o.settings.HiddenServiceVersion != 2) [ - (optional (o.settings.HiddenServiceAuthorizeClient != null) '' + ++ lib.optionals (o.settings.HiddenServiceVersion != 2) [ + (lib.optional (o.settings.HiddenServiceAuthorizeClient != null) '' HiddenServiceAuthorizeClient is used in the HiddenService: ${n} but this option is only for v2 hidden services. '') - (optional (o.settings.RendPostPeriod != null) '' + (lib.optional (o.settings.RendPostPeriod != null) '' RendPostPeriod is used in the HiddenService: ${n} but this option is only for v2 hidden services. '') @@ -1220,12 +1224,12 @@ in uid = config.ids.uids.tor; }; - services.tor.settings = mkMerge [ - (mkIf cfg.enableGeoIP { + services.tor.settings = lib.mkMerge [ + (lib.mkIf cfg.enableGeoIP { GeoIPFile = "${cfg.package.geoip}/share/tor/geoip"; GeoIPv6File = "${cfg.package.geoip}/share/tor/geoip6"; }) - (mkIf cfg.controlSocket.enable { + (lib.mkIf cfg.controlSocket.enable { ControlPort = [ { unix = runDir + "/control"; @@ -1234,47 +1238,47 @@ in } ]; }) - (mkIf cfg.relay.enable ( - optionalAttrs (cfg.relay.role != "exit") { - ExitPolicy = mkForce [ "reject *:*" ]; + (lib.mkIf cfg.relay.enable ( + lib.optionalAttrs (cfg.relay.role != "exit") { + ExitPolicy = lib.mkForce [ "reject *:*" ]; } // - optionalAttrs - (elem cfg.relay.role [ + lib.optionalAttrs + (lib.elem cfg.relay.role [ "bridge" "private-bridge" ]) { BridgeRelay = true; - ExtORPort.port = mkDefault "auto"; - ServerTransportPlugin.transports = mkDefault [ "obfs4" ]; - ServerTransportPlugin.exec = mkDefault "${lib.getExe pkgs.obfs4} managed"; + ExtORPort.port = lib.mkDefault "auto"; + ServerTransportPlugin.transports = lib.mkDefault [ "obfs4" ]; + ServerTransportPlugin.exec = lib.mkDefault "${lib.getExe pkgs.obfs4} managed"; } - // optionalAttrs (cfg.relay.role == "private-bridge") { + // lib.optionalAttrs (cfg.relay.role == "private-bridge") { ExtraInfoStatistics = false; PublishServerDescriptor = false; } )) - (mkIf (!cfg.relay.enable) { + (lib.mkIf (!cfg.relay.enable) { # Avoid surprises when leaving ORPort/DirPort configurations in cfg.settings, # because it would still enable Tor as a relay, # which can trigger all sort of problems when not carefully done, # like the blocklisting of the machine's IP addresses # by some hosting providers... - DirPort = mkForce [ ]; - ORPort = mkForce [ ]; - PublishServerDescriptor = mkForce false; + DirPort = lib.mkForce [ ]; + ORPort = lib.mkForce [ ]; + PublishServerDescriptor = lib.mkForce false; }) - (mkIf (!cfg.client.enable) { + (lib.mkIf (!cfg.client.enable) { # Make sure application connections via SOCKS are disabled # when services.tor.client.enable is false - SOCKSPort = mkForce [ 0 ]; + SOCKSPort = lib.mkForce [ 0 ]; }) - (mkIf cfg.client.enable ( + (lib.mkIf cfg.client.enable ( { SOCKSPort = [ cfg.client.socksListenAddress ]; } - // optionalAttrs cfg.client.transparentProxy.enable { + // lib.optionalAttrs cfg.client.transparentProxy.enable { TransPort = [ { addr = "127.0.0.1"; @@ -1282,7 +1286,7 @@ in } ]; } - // optionalAttrs cfg.client.dns.enable { + // lib.optionalAttrs cfg.client.dns.enable { DNSPort = [ { addr = "127.0.0.1"; @@ -1292,8 +1296,8 @@ in AutomapHostsOnResolve = true; } // - optionalAttrs - (flatten (mapAttrsToList (n: o: o.clientAuthorizations) cfg.client.onionServices) != [ ]) + lib.optionalAttrs + (lib.flatten (lib.mapAttrsToList (n: o: o.clientAuthorizations) cfg.client.onionServices) != [ ]) { ClientOnionAuthDir = runDir + "/ClientOnionAuthDir"; } @@ -1302,15 +1306,20 @@ in networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = - concatMap + lib.concatMap ( o: - if isInt o && o > 0 then [ o ] else optionals (o ? "port" && isInt o.port && o.port > 0) [ o.port ] + if lib.isInt o && o > 0 then + [ o ] + else + lib.optionals (o ? "port" && lib.isInt o.port && o.port > 0) [ o.port ] ) - (flatten [ - cfg.settings.ORPort - cfg.settings.DirPort - ]); + ( + lib.flatten [ + cfg.settings.ORPort + cfg.settings.DirPort + ] + ); }; systemd.services.tor = { @@ -1331,40 +1340,40 @@ in ( "+" + pkgs.writeShellScript "ExecStartPre" ( - concatStringsSep "\n" ( - flatten ( + lib.concatStringsSep "\n" ( + lib.flatten ( [ "set -eu" ] - ++ mapAttrsToList ( + ++ lib.mapAttrsToList ( name: onion: - optional (onion.authorizedClients != [ ]) '' - rm -rf ${escapeShellArg onion.path}/authorized_clients - install -d -o tor -g tor -m 0700 ${escapeShellArg onion.path} ${escapeShellArg onion.path}/authorized_clients + lib.optional (onion.authorizedClients != [ ]) '' + rm -rf ${lib.escapeShellArg onion.path}/authorized_clients + install -d -o tor -g tor -m 0700 ${lib.escapeShellArg onion.path} ${lib.escapeShellArg onion.path}/authorized_clients '' - ++ imap0 (i: pubKey: '' + ++ lib.imap0 (i: pubKey: '' echo ${pubKey} | - install -o tor -g tor -m 0400 /dev/stdin ${escapeShellArg onion.path}/authorized_clients/${toString i}.auth + install -o tor -g tor -m 0400 /dev/stdin ${lib.escapeShellArg onion.path}/authorized_clients/${toString i}.auth '') onion.authorizedClients - ++ optional (onion.secretKey != null) '' - install -d -o tor -g tor -m 0700 ${escapeShellArg onion.path} - key="$(cut -f1 -d: ${escapeShellArg onion.secretKey} | head -1)" + ++ lib.optional (onion.secretKey != null) '' + install -d -o tor -g tor -m 0700 ${lib.escapeShellArg onion.path} + key="$(cut -f1 -d: ${lib.escapeShellArg onion.secretKey} | head -1)" case "$key" in ("== ed25519v"*"-secret") - install -o tor -g tor -m 0400 ${escapeShellArg onion.secretKey} ${escapeShellArg onion.path}/hs_ed25519_secret_key;; + install -o tor -g tor -m 0400 ${lib.escapeShellArg onion.secretKey} ${lib.escapeShellArg onion.path}/hs_ed25519_secret_key;; (*) echo >&2 "NixOS does not (yet) support secret key type for onion: ${name}"; exit 1;; esac '' ) cfg.relay.onionServices - ++ mapAttrsToList ( + ++ lib.mapAttrsToList ( name: onion: - imap0 ( + lib.imap0 ( i: prvKeyPath: let - hostname = removeSuffix ".onion" name; + hostname = lib.removeSuffix ".onion" name; in '' - printf "%s:" ${escapeShellArg hostname} | cat - ${escapeShellArg prvKeyPath} | + printf "%s:" ${lib.escapeShellArg hostname} | cat - ${lib.escapeShellArg prvKeyPath} | install -o tor -g tor -m 0700 /dev/stdin \ - ${runDir}/ClientOnionAuthDir/${escapeShellArg hostname}.${toString i}.auth_private + ${runDir}/ClientOnionAuthDir/${lib.escapeShellArg hostname}.${toString i}.auth_private '' ) onion.clientAuthorizations ) cfg.client.onionServices @@ -1393,9 +1402,9 @@ in "tor" "tor/onion" ] - ++ flatten ( - mapAttrsToList ( - name: onion: optional (onion.secretKey == null) "tor/onion/${name}" + ++ lib.flatten ( + lib.mapAttrsToList ( + name: onion: lib.optional (onion.secretKey == null) "tor/onion/${name}" ) cfg.relay.onionServices ); # The following options are only to optimize: @@ -1407,10 +1416,10 @@ in BindPaths = [ stateDir ]; BindReadOnlyPaths = [ - storeDir + builtins.storeDir "/etc" ] - ++ optionals config.services.resolved.enable [ + ++ lib.optionals config.services.resolved.enable [ "/run/systemd/resolve/stub-resolv.conf" "/run/systemd/resolve/resolv.conf" ]; @@ -1423,7 +1432,7 @@ in NoNewPrivileges = true; PrivateDevices = true; PrivateMounts = true; - PrivateNetwork = mkDefault false; + PrivateNetwork = lib.mkDefault false; PrivateTmp = true; # Tor cannot currently bind privileged port when PrivateUsers=true, # see https://gitlab.torproject.org/legacy/trac/-/issues/20930 diff --git a/nixos/modules/services/system/cloud-init.nix b/nixos/modules/services/system/cloud-init.nix index cf8585dc90bb..372fa8aac804 100644 --- a/nixos/modules/services/system/cloud-init.nix +++ b/nixos/modules/services/system/cloud-init.nix @@ -17,9 +17,9 @@ let util-linux busybox ] - ++ optional cfg.btrfs.enable btrfs-progs - ++ optional cfg.ext4.enable e2fsprogs - ++ optional cfg.xfs.enable xfsprogs + ++ lib.optional cfg.btrfs.enable btrfs-progs + ++ lib.optional cfg.ext4.enable e2fsprogs + ++ lib.optional cfg.xfs.enable xfsprogs ++ cfg.extraPackages; hasFs = fsName: lib.any (fs: fs.fsType == fsName) (lib.attrValues config.fileSystems); settingsFormat = pkgs.formats.yaml { }; diff --git a/nixos/modules/services/system/earlyoom.nix b/nixos/modules/services/system/earlyoom.nix index 7e012dee02cb..616dea3eb236 100644 --- a/nixos/modules/services/system/earlyoom.nix +++ b/nixos/modules/services/system/earlyoom.nix @@ -1,11 +1,14 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let cfg = config.services.earlyoom; inherit (lib) - concatStringsSep - escapeShellArg literalExpression mkDefault mkEnableOption @@ -15,7 +18,8 @@ let mkRemovedOptionModule optionalString optionals - types; + types + ; in { meta = { @@ -115,6 +119,11 @@ in [README](https://github.com/rfjakob/earlyoom#notifications) and [the man page](https://github.com/rfjakob/earlyoom/blob/master/MANPAGE.md#-n-pathtoscript) for details. + + WARNING: earlyoom is running in a sandbox with ProtectSystem="strict" + by default, so filesystem write is also prohibited for the hook. + If you want to change these protection rules, override the systemd + service via `systemd.services.earlyoom.serviceConfig.ProtectSystem`. ''; }; @@ -127,8 +136,11 @@ in extraArgs = mkOption { type = types.listOf types.str; - default = []; - example = [ "-g" "--prefer '(^|/)(java|chromium)$'" ]; + default = [ ]; + example = [ + "-g" + "--prefer '(^|/)(java|chromium)$'" + ]; description = "Extra command-line arguments to be passed to earlyoom."; }; }; @@ -149,25 +161,33 @@ in config = mkIf cfg.enable { services.systembus-notify.enable = mkDefault cfg.enableNotifications; + systemd.packages = [ cfg.package ]; + systemd.services.earlyoom = { - description = "Early OOM Daemon for Linux"; + overrideStrategy = "asDropin"; + wantedBy = [ "multi-user.target" ]; path = optionals cfg.enableNotifications [ pkgs.dbus ]; - serviceConfig = { - StandardError = "journal"; - ExecStart = concatStringsSep " " ([ - "${lib.getExe cfg.package}" - ("-m ${toString cfg.freeMemThreshold}" - + optionalString (cfg.freeMemKillThreshold != null) ",${toString cfg.freeMemKillThreshold}") - ("-s ${toString cfg.freeSwapThreshold}" - + optionalString (cfg.freeSwapKillThreshold != null) ",${toString cfg.freeSwapKillThreshold}") - "-r ${toString cfg.reportInterval}" - ] - ++ optionals cfg.enableDebugInfo [ "-d" ] - ++ optionals cfg.enableNotifications [ "-n" ] - ++ optionals (cfg.killHook != null) [ "-N ${escapeShellArg cfg.killHook}" ] - ++ cfg.extraArgs); - }; + + # We setup `EARLYOOM_ARGS` via drop-ins, so disable the default import + # from /etc/default/earlyoom. + serviceConfig.EnvironmentFile = ""; + + environment.EARLYOOM_ARGS = + lib.cli.toGNUCommandLineShell { } { + m = + "${toString cfg.freeMemThreshold}" + + optionalString (cfg.freeMemKillThreshold != null) ",${toString cfg.freeMemKillThreshold}"; + s = + "${toString cfg.freeSwapThreshold}" + + optionalString (cfg.freeSwapKillThreshold != null) ",${toString cfg.freeSwapKillThreshold}"; + r = "${toString cfg.reportInterval}"; + d = cfg.enableDebugInfo; + n = cfg.enableNotifications; + N = if cfg.killHook != null then cfg.killHook else null; + } + + " " + + lib.escapeShellArgs cfg.extraArgs; }; }; } diff --git a/nixos/modules/services/system/swapspace.nix b/nixos/modules/services/system/swapspace.nix index 9dfea492cd67..4fe0ca3a3b07 100644 --- a/nixos/modules/services/system/swapspace.nix +++ b/nixos/modules/services/system/swapspace.nix @@ -9,11 +9,27 @@ let cfg = config.services.swapspace; inherit (lib) types + mkIf mkOption mkPackageOption mkEnableOption ; - configFile = pkgs.writeText "swapspace.conf" (lib.generators.toKeyValue { } cfg.settings); + inherit (pkgs) + makeWrapper + runCommand + writeText + ; + configFile = writeText "swapspace.conf" (lib.generators.toKeyValue { } cfg.settings); + userWrapper = + runCommand "swapspace" + { + buildInputs = [ makeWrapper ]; + } + '' + mkdir -p "$out/bin" + makeWrapper '${lib.getExe cfg.package}' "$out/bin/swapspace" \ + --add-flags "-c '${configFile}'" + ''; in { options.services.swapspace = { @@ -28,6 +44,13 @@ in ]; description = "Any extra arguments to pass to swapspace"; }; + installWrapper = mkOption { + type = types.bool; + default = true; + description = '' + This will add swapspace wrapped with the generated config, to environment.systemPackages + ''; + }; settings = mkOption { type = types.submodule { options = { @@ -92,8 +115,8 @@ in }; }; - config = lib.mkIf cfg.enable { - environment.systemPackages = [ cfg.package ]; + config = mkIf cfg.enable { + environment.systemPackages = [ (if cfg.installWrapper then userWrapper else cfg.package) ]; systemd.packages = [ cfg.package ]; systemd.services.swapspace = { wantedBy = [ "multi-user.target" ]; diff --git a/nixos/modules/services/torrent/magnetico.nix b/nixos/modules/services/torrent/magnetico.nix index 51a4dc4c715f..b62613eccdf7 100644 --- a/nixos/modules/services/torrent/magnetico.nix +++ b/nixos/modules/services/torrent/magnetico.nix @@ -15,7 +15,7 @@ let credentialsFile else pkgs.writeText "magnetico-credentials" ( - concatStrings (mapAttrsToList (user: hash: "${user}:${hash}\n") cfg.web.credentials) + lib.concatStrings (lib.mapAttrsToList (user: hash: "${user}:${hash}\n") cfg.web.credentials) ); # default options in magneticod/main.go @@ -28,7 +28,7 @@ let crawlerArgs = with cfg.crawler; - escapeShellArgs ( + lib.escapeShellArgs ( [ "--database=${dbURI}" "--indexer-addr=${address}:${toString port}" @@ -40,7 +40,7 @@ let webArgs = with cfg.web; - escapeShellArgs ( + lib.escapeShellArgs ( [ "--database=${dbURI}" ( diff --git a/nixos/modules/services/video/frigate.nix b/nixos/modules/services/video/frigate.nix index b46910505f7d..7dff18c52790 100644 --- a/nixos/modules/services/video/frigate.nix +++ b/nixos/modules/services/video/frigate.nix @@ -477,6 +477,10 @@ in }; }; extraConfig = '' + # Frigate wants to connect on 127.0.0.1:5000 for unauthenticated requests + # https://github.com/NixOS/nixpkgs/issues/370349 + listen 127.0.0.1:5000; + # vod settings vod_base_url ""; vod_segments_base_url ""; diff --git a/nixos/modules/services/web-apps/galene.nix b/nixos/modules/services/web-apps/galene.nix index aec180702abc..013b8b3da8a0 100644 --- a/nixos/modules/services/web-apps/galene.nix +++ b/nixos/modules/services/web-apps/galene.nix @@ -152,7 +152,7 @@ in WorkingDirectory = cfg.stateDir; ExecStart = ''${cfg.package}/bin/galene \ ${optionalString (cfg.insecure) "-insecure"} \ - -http ${cfg.httpAddress}:${cfg.httpPort} \ + -http ${cfg.httpAddress}:${toString cfg.httpPort} \ -turn ${cfg.turnAddress} \ -data ${cfg.dataDir} \ -groups ${cfg.groupsDir} \ diff --git a/nixos/modules/services/web-apps/immich-public-proxy.nix b/nixos/modules/services/web-apps/immich-public-proxy.nix new file mode 100644 index 000000000000..85238e1cbacf --- /dev/null +++ b/nixos/modules/services/web-apps/immich-public-proxy.nix @@ -0,0 +1,98 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.services.immich-public-proxy; + format = pkgs.formats.json { }; + inherit (lib) + types + mkIf + mkOption + mkEnableOption + ; +in +{ + options.services.immich-public-proxy = { + enable = mkEnableOption "Immich Public Proxy"; + package = lib.mkPackageOption pkgs "immich-public-proxy" { }; + + immichUrl = mkOption { + type = types.str; + description = "URL of the Immich instance"; + }; + + port = mkOption { + type = types.port; + default = 3000; + description = "The port that IPP will listen on."; + }; + openFirewall = mkOption { + type = types.bool; + default = false; + description = "Whether to open the IPP port in the firewall"; + }; + + settings = mkOption { + type = types.submodule { + freeformType = format.type; + }; + default = { }; + description = '' + Configuration for IPP. See for options and defaults. + ''; + }; + }; + + config = mkIf cfg.enable { + systemd.services.immich-public-proxy = { + description = "Immich public proxy for sharing albums publicly without exposing your Immich instance"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + environment = { + IMMICH_URL = cfg.immichUrl; + IPP_PORT = builtins.toString cfg.port; + IPP_CONFIG = "${format.generate "config.json" cfg.settings}"; + }; + serviceConfig = { + ExecStart = lib.getExe cfg.package; + SyslogIdentifier = "ipp"; + User = "ipp"; + Group = "ipp"; + DynamicUser = true; + Type = "simple"; + Restart = "on-failure"; + RestartSec = 3; + + # Hardening + CapabilityBoundingSet = ""; + NoNewPrivileges = true; + PrivateUsers = true; + PrivateTmp = true; + PrivateDevices = true; + PrivateMounts = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + }; + }; + + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ]; + + meta.maintainers = with lib.maintainers; [ jaculabilis ]; + }; +} diff --git a/nixos/modules/services/web-apps/komga.nix b/nixos/modules/services/web-apps/komga.nix index d7ab2a9e612e..5245552b2130 100644 --- a/nixos/modules/services/web-apps/komga.nix +++ b/nixos/modules/services/web-apps/komga.nix @@ -9,18 +9,31 @@ let cfg = config.services.komga; inherit (lib) mkOption mkEnableOption maintainers; inherit (lib.types) port str bool; + + settingsFormat = pkgs.formats.yaml { }; in { + imports = [ + (lib.mkRenamedOptionModule + [ + "services" + "komga" + "port" + ] + [ + "services" + "komga" + "settings" + "server" + "port" + ] + ) + ]; + options = { services.komga = { enable = mkEnableOption "Komga, a free and open source comics/mangas media server"; - port = mkOption { - type = port; - default = 8080; - description = "The port that Komga will listen on."; - }; - user = mkOption { type = str; default = "komga"; @@ -39,10 +52,25 @@ in description = "State and configuration directory Komga will use."; }; + settings = lib.mkOption { + inherit (settingsFormat) type; + default = { }; + defaultText = lib.literalExpression '' + { + server.port = 8080; + } + ''; + description = '' + Komga configuration. + + See [documentation](https://komga.org/docs/installation/configuration). + ''; + }; + openFirewall = mkOption { type = bool; default = false; - description = "Whether to open the firewall for the port in {option}`services.komga.port`."; + description = "Whether to open the firewall for the port in {option}`services.komga.settings.server.port`."; }; }; }; @@ -52,6 +80,16 @@ in inherit (lib) mkIf getExe; in mkIf cfg.enable { + assertions = [ + { + assertion = (cfg.settings.komga.config-dir or cfg.stateDir) == cfg.stateDir; + message = "You must use the `services.komga.stateDir` option to properly configure `komga.config-dir`."; + } + ]; + + services.komga.settings = { + server.port = lib.mkDefault 8080; + }; networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ]; @@ -66,9 +104,17 @@ in }; }; + systemd.tmpfiles.settings."10-komga" = { + ${cfg.stateDir}.d = { + inherit (cfg) user group; + }; + "${cfg.stateDir}/application.yml"."L+" = { + argument = builtins.toString (settingsFormat.generate "application.yml" cfg.settings); + }; + }; + systemd.services.komga = { environment = { - SERVER_PORT = builtins.toString cfg.port; KOMGA_CONFIGDIR = cfg.stateDir; }; diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index eae005bca545..64c17aa44b4a 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -374,14 +374,18 @@ in { type = with types; attrsOf (oneOf [ str int bool ]); default = { "pm" = "dynamic"; - "pm.max_children" = "32"; - "pm.start_servers" = "2"; - "pm.min_spare_servers" = "2"; - "pm.max_spare_servers" = "4"; + "pm.max_children" = "120"; + "pm.start_servers" = "12"; + "pm.min_spare_servers" = "6"; + "pm.max_spare_servers" = "18"; "pm.max_requests" = "500"; }; description = '' - Options for nextcloud's PHP pool. See the documentation on `php-fpm.conf` for details on configuration directives. + Options for nextcloud's PHP pool. See the documentation on `php-fpm.conf` for details on + configuration directives. The above are recommended for a server with 4GiB of RAM. + + It's advisable to read the [section about PHPFPM tuning in the upstream manual](https://docs.nextcloud.com/server/30/admin_manual/installation/server_tuning.html#tune-php-fpm) + and consider customizing the values. ''; }; @@ -416,7 +420,6 @@ in { config = { dbtype = mkOption { type = types.enum [ "sqlite" "pgsql" "mysql" ]; - default = "sqlite"; description = "Database type."; }; dbname = mkOption { diff --git a/nixos/modules/services/x11/window-managers/dwm.nix b/nixos/modules/services/x11/window-managers/dwm.nix index c81a834a0679..10ec7563d4af 100644 --- a/nixos/modules/services/x11/window-managers/dwm.nix +++ b/nixos/modules/services/x11/window-managers/dwm.nix @@ -6,15 +6,20 @@ let cfg = config.services.xserver.windowManager.dwm; -in - -{ +in { ###### interface options = { services.xserver.windowManager.dwm = { enable = mkEnableOption "dwm"; + extraSessionCommands = mkOption { + default = ""; + type = types.lines; + description = '' + Shell commands executed just before dwm is started. + ''; + }; package = mkPackageOption pkgs "dwm" { example = '' pkgs.dwm.overrideAttrs (oldAttrs: rec { @@ -30,20 +35,20 @@ in }; }; - ###### implementation config = mkIf cfg.enable { - services.xserver.windowManager.session = singleton - { name = "dwm"; - start = - '' - export _JAVA_AWT_WM_NONREPARENTING=1 - dwm & - waitPID=$! - ''; - }; + services.xserver.windowManager.session = singleton { + name = "dwm"; + start = '' + ${cfg.extraSessionCommands} + + export _JAVA_AWT_WM_NONREPARENTING=1 + dwm & + waitPID=$! + ''; + }; environment.systemPackages = [ cfg.package ]; diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index 5220f8ef8c09..3553c5fce4ce 100755 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -544,6 +544,13 @@ sub handle_modified_unit { ## no critic(Subroutines::ProhibitManyArgs, Subroutin } } + if (parse_systemd_bool(\%new_unit_info, "Service", "X-NotSocketActivated", 0)) { + # If the unit explicitly opts out of socket + # activation, restart it as if it weren't (but do + # restart its sockets, that's fine): + $socket_activated = 0; + } + # If the unit is not socket-activated, record # that this unit needs to be started below. # We write this to a file to ensure that the diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index d2ba1e54e22e..421fde5b07af 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -159,7 +159,7 @@ def copy_from_file(file: str, dry_run: bool = False) -> str: def write_entry(profile: str | None, generation: int, specialisation: str | None, - machine_id: str, bootspec: BootSpec, current: bool) -> None: + machine_id: str | None, bootspec: BootSpec, current: bool) -> None: if specialisation: bootspec = bootspec.specialisations[specialisation] kernel = copy_from_file(bootspec.kernel) @@ -281,11 +281,7 @@ def install_bootloader(args: argparse.Namespace) -> None: except IOError as e: if e.errno != errno.ENOENT: raise - # Since systemd version 232 a machine ID is required and it might not - # be there on newly installed systems, so let's generate one so that - # bootctl can find it and we can also pass it to write_entry() later. - cmd = [f"{SYSTEMD}/bin/systemd-machine-id-setup", "--print"] - machine_id = run(cmd, stdout=subprocess.PIPE).stdout.rstrip() + machine_id = None if os.getenv("NIXOS_INSTALL_GRUB") == "1": warnings.warn("NIXOS_INSTALL_GRUB env var deprecated, use NIXOS_INSTALL_BOOTLOADER", DeprecationWarning) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index a97b99d24ee1..831b665029fe 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -2901,6 +2901,7 @@ let config.environment.etc."systemd/networkd.conf".source ]; aliases = [ "dbus-org.freedesktop.network1.service" ]; + notSocketActivated = true; }; networking.iproute2 = mkIf (cfg.config.addRouteTablesToIPRoute2 && cfg.config.routeTables != { }) { diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 8bdbd75783a4..98190e7e2276 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -88,9 +88,13 @@ in ] } pushd $out - tar -Sc $diskImage | gzip -${toString cfg.compressionLevel} > \ + # RTFM: + # https://cloud.google.com/compute/docs/images/create-custom + # https://cloud.google.com/compute/docs/import/import-existing-image + mv $diskImage disk.raw + tar -Sc disk.raw | gzip -${toString cfg.compressionLevel} > \ ${config.image.fileName} - rm $diskImage + rm disk.raw popd ''; format = "raw"; diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 35f5c4070b5a..165876910749 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -13,7 +13,12 @@ let ''; qemuConfigFile = pkgs.writeText "qemu.conf" '' ${optionalString cfg.qemu.ovmf.enable '' - nvram = [ "/run/libvirt/nix-ovmf/AAVMF_CODE.fd:/run/libvirt/nix-ovmf/AAVMF_VARS.fd", "/run/libvirt/nix-ovmf/OVMF_CODE.fd:/run/libvirt/nix-ovmf/OVMF_VARS.fd" ] + nvram = [ + "/run/libvirt/nix-ovmf/AAVMF_CODE.fd:/run/libvirt/nix-ovmf/AAVMF_VARS.fd", + "/run/libvirt/nix-ovmf/AAVMF_CODE.ms.fd:/run/libvirt/nix-ovmf/AAVMF_VARS.ms.fd", + "/run/libvirt/nix-ovmf/OVMF_CODE.fd:/run/libvirt/nix-ovmf/OVMF_VARS.fd", + "/run/libvirt/nix-ovmf/OVMF_CODE.ms.fd:/run/libvirt/nix-ovmf/OVMF_VARS.ms.fd" + ] ''} ${optionalString (!cfg.qemu.runAsRoot) '' user = "qemu-libvirtd" @@ -451,10 +456,10 @@ in }; in '' - ln -s --force ${ovmfpackage}/FV/AAVMF_CODE.fd /run/${dirName}/nix-ovmf/ - ln -s --force ${ovmfpackage}/FV/OVMF_CODE.fd /run/${dirName}/nix-ovmf/ - ln -s --force ${ovmfpackage}/FV/AAVMF_VARS.fd /run/${dirName}/nix-ovmf/ - ln -s --force ${ovmfpackage}/FV/OVMF_VARS.fd /run/${dirName}/nix-ovmf/ + ln -s --force ${ovmfpackage}/FV/AAVMF_CODE{,.ms}.fd /run/${dirName}/nix-ovmf/ + ln -s --force ${ovmfpackage}/FV/OVMF_CODE{,.ms}.fd /run/${dirName}/nix-ovmf/ + ln -s --force ${ovmfpackage}/FV/AAVMF_VARS{,.ms}.fd /run/${dirName}/nix-ovmf/ + ln -s --force ${ovmfpackage}/FV/OVMF_VARS{,.ms}.fd /run/${dirName}/nix-ovmf/ '')} # Symlink hooks to /var/lib/libvirt diff --git a/nixos/modules/virtualisation/oci-containers.nix b/nixos/modules/virtualisation/oci-containers.nix index 61593dc234ab..89e2b7e0f863 100644 --- a/nixos/modules/virtualisation/oci-containers.nix +++ b/nixos/modules/virtualisation/oci-containers.nix @@ -14,7 +14,7 @@ let defaultBackend = options.virtualisation.oci-containers.backend.default; containerOptions = - { ... }: + { name, ... }: { options = { @@ -59,6 +59,13 @@ let example = literalExpression "pkgs.dockerTools.streamLayeredImage {...};"; }; + serviceName = mkOption { + type = types.str; + default = "${cfg.backend}-${name}"; + defaultText = "-"; + description = "Systemd service name that manages the container"; + }; + login = { username = mkOption { @@ -525,9 +532,7 @@ in config = lib.mkIf (cfg.containers != { }) ( lib.mkMerge [ { - systemd.services = mapAttrs' ( - n: v: nameValuePair "${cfg.backend}-${n}" (mkService n v) - ) cfg.containers; + systemd.services = mapAttrs' (n: v: nameValuePair v.serviceName (mkService n v)) cfg.containers; assertions = let diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 5a020f5520c5..4772cedb4beb 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -1314,6 +1314,7 @@ in { device = "tmpfs"; fsType = "tmpfs"; + options = [ "mode=755" ]; } else { diff --git a/nixos/modules/virtualisation/vmware-guest.nix b/nixos/modules/virtualisation/vmware-guest.nix index 5b9f309f153a..74dc7d4156a8 100644 --- a/nixos/modules/virtualisation/vmware-guest.nix +++ b/nixos/modules/virtualisation/vmware-guest.nix @@ -8,6 +8,7 @@ let inherit (lib) getExe' literalExpression + maintainers mkEnableOption mkIf mkOption @@ -25,7 +26,7 @@ in ]; meta = { - maintainers = [ lib.maintainers.kjeremy ]; + maintainers = [ maintainers.kjeremy ]; }; options.virtualisation.vmware.guest = { diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 613ff1314488..d4ab460e4136 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -144,6 +144,7 @@ in { audiobookshelf = handleTest ./audiobookshelf.nix {}; auth-mysql = handleTest ./auth-mysql.nix {}; authelia = handleTest ./authelia.nix {}; + auto-cpufreq = handleTest ./auto-cpufreq.nix {}; avahi = handleTest ./avahi.nix {}; avahi-with-resolved = handleTest ./avahi.nix { networkd = true; }; ayatana-indicators = runTest ./ayatana-indicators.nix; @@ -467,6 +468,7 @@ in { ifm = handleTest ./ifm.nix {}; iftop = handleTest ./iftop.nix {}; immich = handleTest ./web-apps/immich.nix {}; + immich-public-proxy = handleTest ./web-apps/immich-public-proxy.nix {}; incron = handleTest ./incron.nix {}; incus = pkgs.recurseIntoAttrs (handleTest ./incus { lts = false; inherit system pkgs; }); incus-lts = pkgs.recurseIntoAttrs (handleTest ./incus { inherit system pkgs; }); @@ -520,6 +522,7 @@ in { keyd = handleTest ./keyd.nix {}; keymap = handleTest ./keymap.nix {}; kimai = handleTest ./kimai.nix {}; + kmonad = runTest ./kmonad.nix; knot = handleTest ./knot.nix {}; komga = handleTest ./komga.nix {}; krb5 = discoverTests (import ./krb5); @@ -658,6 +661,11 @@ in { navidrome = handleTest ./navidrome.nix {}; nbd = handleTest ./nbd.nix {}; ncdns = handleTest ./ncdns.nix {}; + ncps = runTest ./ncps.nix; + ncps-custom-cache-datapath = runTest { + imports = [ ./ncps.nix ]; + defaults.services.ncps.cache.dataPath = "/path/to/ncps"; + }; ndppd = handleTest ./ndppd.nix {}; nix-channel = pkgs.callPackage ../modules/config/nix-channel/test.nix { }; nebula = handleTest ./nebula.nix {}; diff --git a/nixos/tests/auto-cpufreq.nix b/nixos/tests/auto-cpufreq.nix new file mode 100644 index 000000000000..79129cf1ffaf --- /dev/null +++ b/nixos/tests/auto-cpufreq.nix @@ -0,0 +1,33 @@ +import ./make-test-python.nix ( + { pkgs, ... }: + + { + name = "auto-cpufreq-server"; + + nodes = { + machine = + { pkgs, ... }: + { + # service will still start but since vm inside qemu cpufreq adjustments + # cannot be made. This will resource in the following error but the service + # remains up: + # ERROR: + # Couldn't find any of the necessary scaling governors. + services.auto-cpufreq = { + enable = true; + settings = { + charger = { + turbo = "auto"; + }; + }; + }; + }; + }; + + testScript = '' + machine.start() + machine.wait_for_unit("auto-cpufreq.service") + machine.succeed("auto-cpufreq --force reset") + ''; + } +) diff --git a/nixos/tests/earlyoom.nix b/nixos/tests/earlyoom.nix index b7850ddeaaab..259fb5aa5d44 100644 --- a/nixos/tests/earlyoom.nix +++ b/nixos/tests/earlyoom.nix @@ -1,16 +1,43 @@ -import ./make-test-python.nix ({ lib, ... }: { - name = "earlyoom"; - meta = { - maintainers = with lib.maintainers; [ ncfavier AndersonTorres ]; - }; - - machine = { - services.earlyoom = { - enable = true; +import ./make-test-python.nix ( + { lib, ... }: + { + name = "earlyoom"; + meta = { + maintainers = with lib.maintainers; [ + ncfavier + AndersonTorres + oxalica + ]; }; - }; - testScript = '' - machine.wait_for_unit("earlyoom.service") - ''; -}) + nodes.machine = + { pkgs, ... }: + { + # Limit VM resource usage. + virtualisation.memorySize = 1024; + + services.earlyoom = { + enable = true; + # Use SIGKILL, or `tail` will catch SIGTERM and exit successfully. + freeMemKillThreshold = 90; + }; + + systemd.services.testbloat = { + description = "Create a lot of memory pressure"; + serviceConfig = { + ExecStart = "${pkgs.coreutils}/bin/tail /dev/zero"; + }; + }; + }; + + testScript = '' + machine.wait_for_unit("earlyoom.service") + + with subtest("earlyoom should kill the bad service"): + machine.fail("systemctl start --wait testbloat.service") + assert machine.get_unit_info("testbloat.service")["Result"] == "signal" + output = machine.succeed('journalctl -u earlyoom.service -b0') + assert 'low memory! at or below SIGKILL limits' in output + ''; + } +) diff --git a/nixos/tests/frigate.nix b/nixos/tests/frigate.nix index 156d8d8cf916..5e6267512ad2 100644 --- a/nixos/tests/frigate.nix +++ b/nixos/tests/frigate.nix @@ -66,9 +66,12 @@ import ./make-test-python.nix ( # login and store session machine.log(machine.succeed(f"http --check-status --session=frigate post http://localhost/api/login user=admin password={password}")) - # make authenticated api requested + # make authenticated api request machine.log(machine.succeed("http --check-status --session=frigate get http://localhost/api/version")) + # make unauthenticated api request + machine.log(machine.succeed("http --check-status get http://localhost:5000/api/version")) + # wait for a recording to appear machine.wait_for_file("/var/cache/frigate/test@*.mp4") ''; diff --git a/nixos/tests/gitea.nix b/nixos/tests/gitea.nix index 255ff3485e5a..eb16c4742993 100644 --- a/nixos/tests/gitea.nix +++ b/nixos/tests/gitea.nix @@ -36,7 +36,6 @@ let meta.maintainers = with maintainers; [ aanderse kolaente - ma27 ]; nodes = { diff --git a/nixos/tests/kmonad.nix b/nixos/tests/kmonad.nix new file mode 100644 index 000000000000..0c880a99787e --- /dev/null +++ b/nixos/tests/kmonad.nix @@ -0,0 +1,52 @@ +{ lib, ... }: + +{ + name = "kmonad"; + + meta = { + maintainers = with lib.maintainers; [ linj ]; + }; + + nodes = { + machine = { + services.kmonad = { + enable = true; + extraArgs = [ + "--log-level=debug" + ]; + keyboards = { + defaultKbd = { + device = "/dev/input/by-id/vm-default-kbd"; + defcfg = { + enable = true; + fallthrough = true; + }; + config = '' + (defsrc :name default-src + 1) + (deflayer default-layer :source default-src + @T2) + (defalias + T2 2) + ''; + }; + }; + }; + + # make a determinate symlink to the default vm keyboard for kmonad to use + services.udev.extraRules = '' + ACTION=="add", KERNEL=="event*", SUBSYSTEM=="input", ATTRS{name}=="QEMU Virtio Keyboard", ATTRS{id/product}=="0001", ATTRS{id/vendor}=="0627", SYMLINK+="input/by-id/vm-default-kbd" + ''; + }; + }; + + testScript = '' + service_name = "kmonad-defaultKbd" + machine.wait_for_unit(f"{service_name}.service") + + with subtest("kmonad is running"): + machine.succeed(f"systemctl status {service_name}") + with subtest("kmonad symlink is created"): + machine.wait_for_file(f"/dev/input/by-id/{service_name}", timeout=5) + ''; +} diff --git a/nixos/tests/komga.nix b/nixos/tests/komga.nix index d48d19bbbdd3..e5eee346350d 100644 --- a/nixos/tests/komga.nix +++ b/nixos/tests/komga.nix @@ -8,7 +8,7 @@ import ./make-test-python.nix ({ lib, ... }: { pkgs, ... }: { services.komga = { enable = true; - port = 1234; + settings.server.port = 1234; }; }; diff --git a/nixos/tests/lvm2/default.nix b/nixos/tests/lvm2/default.nix index 0e4ec8d27fda..58eef6e0ccef 100644 --- a/nixos/tests/lvm2/default.nix +++ b/nixos/tests/lvm2/default.nix @@ -4,11 +4,11 @@ pkgs ? import ../../.. { inherit system config; }, lib ? pkgs.lib, kernelVersionsToTest ? [ - "4.19" "5.4" "5.10" "5.15" "6.1" + "6.6" "latest" ], }: @@ -33,7 +33,7 @@ let # systemd in stage 1 raid-sd-stage-1 = { test = callTest ./systemd-stage-1.nix; - kernelFilter = lib.id; + kernelFilter = lib.filter (v: v != "5.15"); flavour = "raid"; }; thinpool-sd-stage-1 = { diff --git a/nixos/tests/ncps.nix b/nixos/tests/ncps.nix new file mode 100644 index 000000000000..ce637246ff44 --- /dev/null +++ b/nixos/tests/ncps.nix @@ -0,0 +1,89 @@ +{ + lib, + pkgs, + ... +}: + +{ + name = "ncps"; + + nodes = { + harmonia = { + services.harmonia = { + enable = true; + signKeyPaths = [ + (pkgs.writeText "cache-key" "cache.example.com-1:9FhO0w+7HjZrhvmzT1VlAZw4OSAlFGTgC24Seg3tmPl4gZBdwZClzTTHr9cVzJpwsRSYLTu7hEAQe3ljy92CWg==") + ]; + settings.priority = 35; + }; + + networking.firewall.allowedTCPPorts = [ 5000 ]; + system.extraDependencies = [ pkgs.emptyFile ]; + }; + + ncps = { + services.ncps = { + enable = true; + + cache = { + hostName = "ncps"; + secretKeyPath = builtins.toString ( + pkgs.writeText "ncps-cache-key" "ncps:dcrGsrku0KvltFhrR5lVIMqyloAdo0y8vYZOeIFUSLJS2IToL7dPHSSCk/fi+PJf8EorpBn8PU7MNhfvZoI8mA==" + ); + }; + + upstream = { + caches = [ "http://harmonia:5000" ]; + publicKeys = [ + "cache.example.com-1:eIGQXcGQpc00x6/XFcyacLEUmC07u4RAEHt5Y8vdglo=" + ]; + }; + }; + + networking.firewall.allowedTCPPorts = [ 8501 ]; + }; + + client01 = { + nix.settings = { + substituters = lib.mkForce [ "http://ncps:8501" ]; + trusted-public-keys = lib.mkForce [ + "ncps:UtiE6C+3Tx0kgpP34vjyX/BKK6QZ/D1OzDYX72aCPJg=" + ]; + }; + }; + }; + + testScript = + { nodes, ... }: + let + narinfoName = + (lib.strings.removePrefix "/nix/store/" ( + lib.strings.removeSuffix "-empty-file" pkgs.emptyFile.outPath + )) + + ".narinfo"; + + narinfoNameChars = lib.strings.stringToCharacters narinfoName; + + narinfoPath = lib.concatStringsSep "/" [ + nodes.ncps.services.ncps.cache.dataPath + "store/narinfo" + (lib.lists.elemAt narinfoNameChars 0) + ((lib.lists.elemAt narinfoNameChars 0) + (lib.lists.elemAt narinfoNameChars 1)) + narinfoName + ]; + in + '' + start_all() + + harmonia.wait_for_unit("harmonia.service") + + ncps.wait_for_unit("ncps.service") + + client01.wait_until_succeeds("curl -f http://ncps:8501/ | grep '\"hostname\":\"${toString nodes.ncps.services.ncps.cache.hostName}\"' >&2") + + client01.succeed("cat /etc/nix/nix.conf >&2") + client01.succeed("nix-store --realise ${pkgs.emptyFile}") + + ncps.succeed("cat ${narinfoPath} >&2") + ''; +} diff --git a/nixos/tests/nextcloud/basic.nix b/nixos/tests/nextcloud/basic.nix index f8306503d85f..217f22714c1c 100644 --- a/nixos/tests/nextcloud/basic.nix +++ b/nixos/tests/nextcloud/basic.nix @@ -59,6 +59,7 @@ runTest ( services.nextcloud = { enable = true; + config.dbtype = "sqlite"; datadir = "/var/lib/nextcloud-data"; autoUpdateApps = { enable = true; diff --git a/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix b/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix index 6b0dd71f85ef..74343a22b7ae 100644 --- a/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix +++ b/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix @@ -69,14 +69,13 @@ runTest ( services.postgresql = { enable = true; - package = pkgs.postgresql_14; }; systemd.services.postgresql.postStart = pkgs.lib.mkAfter '' password=$(cat ${config.services.nextcloud.config.dbpassFile}) ${config.services.postgresql.package}/bin/psql <= 1.85 + (fetchpatch { + url = "https://github.com/Ardour/ardour/commit/f94bde59d740d65e67c5cd13af4d7ea51453aeaa.patch"; + hash = "sha256-dGRjkdF3REkANytDR17wIh8J2+AcLFmV4tKZied/OZg="; + }) ]; # Ardour's wscript requires git revision and date to be available. @@ -139,7 +144,6 @@ stdenv.mkDerivation rec { liblo libogg libpulseaudio - librdf_raptor librdf_rasqal libsamplerate libsigcxx diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index b444aa92a968..431fe22a8694 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.89"; + version = "1.93"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - hash = "sha256-s2HMzHJB85kLe3TuKH3oFloWUirmbSYDwh298dZlP6M="; + hash = "sha256-B91kLShg3nvOyOlBkLSpTydhUs5yHa+C/OWe8N+MB9c="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/audio/greg/default.nix b/pkgs/applications/audio/greg/default.nix index cb1e046fbe48..dc9fb72f4425 100644 --- a/pkgs/applications/audio/greg/default.nix +++ b/pkgs/applications/audio/greg/default.nix @@ -14,7 +14,7 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "manolomartinez"; repo = pname; - rev = "refs/tags/v${version}"; + tag = "v${version}"; sha256 = "sha256-o4+tXVJTgT52JyJOC+Glr2cvZjbTaZL8TIsmz+A4vE4="; }; diff --git a/pkgs/applications/audio/kmetronome/default.nix b/pkgs/applications/audio/kmetronome/default.nix index a7de91b61e5e..bcb5914bebf3 100644 --- a/pkgs/applications/audio/kmetronome/default.nix +++ b/pkgs/applications/audio/kmetronome/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "kmetronome"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-51uFAPR0xsY3z9rFc8SdSGu4ae/VzUmC1qC8RGdt48Y="; + hash = "sha256-FJVmSMu0KDoq8DHRxxGyHQQflPCvH1h+WdsV9wcPAPA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/littlegptracker/default.nix b/pkgs/applications/audio/littlegptracker/default.nix index 6340678de13c..ef6d8402ce49 100644 --- a/pkgs/applications/audio/littlegptracker/default.nix +++ b/pkgs/applications/audio/littlegptracker/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "djdiskmachine"; repo = "littlegptracker"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-1uXC5nJ63YguQuNIkuK0yx9lmrMBqw0WdlmCV8o11cE="; }; diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 4a06c49e49ef..04253607aadb 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -32,7 +32,6 @@ qtnetworkauth, qttools, nixosTests, - apple-sdk_11, }: stdenv.mkDerivation (finalAttrs: { @@ -127,9 +126,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib qtwayland - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 ]; postInstall = diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix index dd3473c069b4..c0d130b421ca 100644 --- a/pkgs/applications/audio/pithos/default.nix +++ b/pkgs/applications/audio/pithos/default.nix @@ -24,7 +24,7 @@ pythonPackages.buildPythonApplication rec { src = fetchFromGitHub { owner = pname; repo = pname; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-3j6IoMi30BQ8WHK4BxbsW+/3XZx7rBFd47EBENa2GiQ="; }; diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index 415e1ce8425e..4daeee6d4cb3 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "puddletag"; repo = "puddletag"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-oScT8YcQoDf2qZ+J7xKm22Sbfym3tkVUrWT5D2LU5e8="; }; diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index 77045ea36dfb..fdcfc0a8005e 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = pname; repo = pname; - rev = "refs/tags/${version}"; + tag = version; fetchSubmodules = true; hash = "sha256-0siAx141DZx39facXWmKbsi0rHBNpobApTdey07EcXg="; }; diff --git a/pkgs/applications/display-managers/greetd/regreet.nix b/pkgs/applications/display-managers/greetd/regreet.nix index 9d851879dd6a..b1eeeb6f5bf3 100644 --- a/pkgs/applications/display-managers/greetd/regreet.nix +++ b/pkgs/applications/display-managers/greetd/regreet.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "regreet"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "rharish101"; repo = "ReGreet"; rev = version; - hash = "sha256-ubKSqt3axp46ECIKwq9K1aHTPeuMQ3fCx6aRlhXh2F0="; + hash = "sha256-PYBRfBdy6+cv3VKBFu5RUec/yfuKrAEkRxpanihIt1E="; }; - cargoHash = "sha256-Gwz1xs6OhrBb4xOuUUmxDVKxTC2lyp4Ckzi+9bnaRgo="; + cargoHash = "sha256-SUIyekcuDbPIh/9+EKaAoep9hZDJv8BW+ovtWyDqiCI="; buildFeatures = [ "gtk4_8" ]; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix index 2225dff0872d..86109b57a2ac 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix @@ -4,23 +4,44 @@ editorconfig, f, fetchFromGitHub, + replaceVars, nodejs, s, melpaBuild, + copilot-node-server, }: +let + # The Emacs package isn't compatible with the latest + # copilot-node-server so we have to set a specific revision + # https://github.com/copilot-emacs/copilot.el/issues/344 + pinned-copilot-node-server = copilot-node-server.overrideAttrs (old: rec { + version = "1.27.0"; + src = fetchFromGitHub { + owner = "jfcherng"; + repo = "copilot-node-server"; + rev = version; + hash = "sha256-Ds2agoO7LBXI2M1dwvifQyYJ3F9fm9eV2Kmm7WITgyo="; + }; + }); +in melpaBuild { pname = "copilot"; - version = "0-unstable-2024-05-01"; + version = "0-unstable-2024-12-28"; src = fetchFromGitHub { owner = "copilot-emacs"; repo = "copilot.el"; - rev = "733bff26450255e092c10873580e9abfed8a81b8"; - sha256 = "sha256-Knp36PtgA73gtYO+W1clQfr570bKCxTFsGW3/iH86A0="; + rev = "c5dfa99f05878db5e6a6a378dc7ed09f11e803d4"; + sha256 = "sha256-FzI08AW7a7AleEM7kSQ8LsWsDYID8SW1SmSN6/mIB/A="; }; files = ''(:defaults "dist")''; + patches = [ + (replaceVars ./specify-copilot-install-dir.patch { + copilot-node-server = pinned-copilot-node-server; + }) + ]; packageRequires = [ dash editorconfig diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/specify-copilot-install-dir.patch b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/specify-copilot-install-dir.patch new file mode 100644 index 000000000000..c10f19133cac --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/specify-copilot-install-dir.patch @@ -0,0 +1,14 @@ +diff --git a/copilot.el b/copilot.el +index f1f5e51..ddf2b5b 100644 +--- a/copilot.el ++++ b/copilot.el +@@ -132,8 +132,7 @@ (defcustom copilot-indentation-alist + (defconst copilot-server-package-name "copilot-node-server" + "The name of the package to install copilot server.") + +-(defcustom copilot-install-dir (expand-file-name +- (locate-user-emacs-file (f-join ".cache" "copilot"))) ++(defcustom copilot-install-dir "@copilot-node-server@" + "Directory in which the servers will be installed." + :risky t + :type 'directory diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 02932d6a8ee7..317ed3f73f28 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -761,6 +761,9 @@ let # Optimizer error: too much on the stack ack-menu = ignoreCompilationError super.ack-menu; + # https://github.com/skeeto/emacs-aio/issues/31 + aio = ignoreCompilationError super.aio; + # https://github.com/gongo/airplay-el/issues/2 airplay = addPackageRequires super.airplay [ self.request-deferred ]; diff --git a/pkgs/applications/editors/jetbrains/source/build.nix b/pkgs/applications/editors/jetbrains/source/build.nix index 41550a6303a9..ad44e4ab435f 100644 --- a/pkgs/applications/editors/jetbrains/source/build.nix +++ b/pkgs/applications/editors/jetbrains/source/build.nix @@ -32,6 +32,13 @@ }: let + kotlin_2_0_21 = kotlin.overrideAttrs (oldAttrs: { + version = "2.0.21"; + src = fetchurl { + url = oldAttrs.src.url; + sha256 = "sha256-A1LApFvSL4D2sm5IXNBNqAR7ql3lSGUoH7n4mkp7zyo="; + }; + }); jbr = jetbrains.jdk-no-jcef-17; @@ -147,7 +154,7 @@ let sourceRoot = "${src.name}/platform/jps-bootstrap"; nativeBuildInputs = [ ant makeWrapper jbr ]; patches = [ ../patches/kotlinc-path.patch ]; - postPatch = "sed -i 's|KOTLIN_PATH_HERE|${kotlin}|' src/main/java/org/jetbrains/jpsBootstrap/KotlinCompiler.kt"; + postPatch = "sed -i 's|KOTLIN_PATH_HERE|${kotlin_2_0_21}|' src/main/java/org/jetbrains/jpsBootstrap/KotlinCompiler.kt"; buildPhase = '' runHook preInstall @@ -234,7 +241,7 @@ stdenvNoCC.mkDerivation rec { substituteInPlace \ platform/build-scripts/src/org/jetbrains/intellij/build/kotlin/KotlinCompilerDependencyDownloader.kt \ --replace-fail 'JPS_PLUGIN_CLASSPATH_HERE' '${kotlin-jps-plugin-classpath}' \ - --replace-fail 'KOTLIN_PATH_HERE' '${kotlin}' + --replace-fail 'KOTLIN_PATH_HERE' '${kotlin_2_0_21}' substituteInPlace \ platform/build-scripts/downloader/src/org/jetbrains/intellij/build/dependencies/JdkDownloader.kt \ --replace-fail 'JDK_PATH_HERE' '${jbr}/lib/openjdk' @@ -259,7 +266,7 @@ stdenvNoCC.mkDerivation rec { export JPS_BOOTSTRAP_COMMUNITY_HOME=/build/source jps-bootstrap \ -Dbuild.number=${buildNumber} \ - -Djps.kotlin.home=${kotlin} \ + -Djps.kotlin.home=${kotlin_2_0_21} \ -Dintellij.build.target.os=linux \ -Dintellij.build.target.arch=x64 \ -Dintellij.build.skip.build.steps=mac_artifacts,mac_dmg,mac_sit,windows_exe_installer,windows_sign,repair_utility_bundle_step,sources_archive \ @@ -275,7 +282,7 @@ stdenvNoCC.mkDerivation rec { runHook preBuild java \ - -Djps.kotlin.home=${kotlin} \ + -Djps.kotlin.home=${kotlin_2_0_21} \ "@java_argfile" runHook postBuild diff --git a/pkgs/applications/editors/lapce/default.nix b/pkgs/applications/editors/lapce/default.nix index ea649595d645..aca54f83db43 100644 --- a/pkgs/applications/editors/lapce/default.nix +++ b/pkgs/applications/editors/lapce/default.nix @@ -19,7 +19,6 @@ wayland, gobject-introspection, xorg, - apple-sdk_11, }: let rpathLibs = lib.optionals stdenv.hostPlatform.isLinux [ @@ -41,7 +40,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "lapce"; repo = "lapce"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; sha256 = "sha256-vBBYNHgZiW5JfGeUG6YZObf4oK0hHxTbsZNTfnIX95Y="; }; @@ -94,7 +93,6 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc - apple-sdk_11 ]; postInstall = diff --git a/pkgs/applications/editors/manuskript/default.nix b/pkgs/applications/editors/manuskript/default.nix index 56802dde7cd5..85b7ae070a43 100644 --- a/pkgs/applications/editors/manuskript/default.nix +++ b/pkgs/applications/editors/manuskript/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { repo = pname; owner = "olivierkes"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-/Ryvv5mHdZ3iwMpZjOa62h8D2B00pzknJ70DfjDTPPA="; }; diff --git a/pkgs/applications/editors/retext/default.nix b/pkgs/applications/editors/retext/default.nix index 095447a17a40..480be18986c8 100644 --- a/pkgs/applications/editors/retext/default.nix +++ b/pkgs/applications/editors/retext/default.nix @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "retext-project"; repo = pname; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-BToW9rPFEbgAErvJ5gtUpNadCLtlRihE7eKKFgO5N68="; }; diff --git a/pkgs/applications/editors/rstudio/clang-location.patch b/pkgs/applications/editors/rstudio/clang-location.patch index ea82678d1181..45e5e90cd3d6 100644 --- a/pkgs/applications/editors/rstudio/clang-location.patch +++ b/pkgs/applications/editors/rstudio/clang-location.patch @@ -1,38 +1,23 @@ +diff --git a/src/cpp/core/libclang/LibClang.cpp b/src/cpp/core/libclang/LibClang.cpp +index f166a43b37..d8024b2ce7 100644 --- a/src/cpp/core/libclang/LibClang.cpp +++ b/src/cpp/core/libclang/LibClang.cpp -@@ -62,7 +62,7 @@ - - // we need to add in the associated libclang headers as - // they are not discovered / used by default during compilation -- FilePath llvmPath = s_libraryPath.getParent().getParent(); -+ FilePath llvmPath("@libclang@"); - boost::format fmt("%1%/lib/clang/%2%/include"); - fmt % llvmPath.getAbsolutePath() % version.asString(); - std::string includePath = fmt.str(); -@@ -74,47 +74,7 @@ - - std::vector systemClangVersions() - { -- std::vector clangVersions; -- --#if defined(__APPLE__) -- // NOTE: the version of libclang.dylib bundled with Xcode -- // doesn't seem to work well when loaded as a library -- // (there seems to be extra orchestration required to get -- // include paths set up; easier to just depend on command -- // line tools since we request their installation in other -- // contexts as well) -- clangVersions = { +@@ -84,34 +84,13 @@ std::vector systemClangVersions() + // line tools since we request their installation in other + // contexts as well) + clangVersions = { - "/Library/Developer/CommandLineTools/usr/lib/libclang.dylib" -- }; --#elif defined(__unix__) -- // default set of versions -- clangVersions = { ++ "@libclang@/lib/libclang.dylib" + }; + #elif defined(__unix__) + // default set of versions + clangVersions = { - "/usr/lib/libclang.so", - "/usr/lib/llvm/libclang.so", - "/usr/lib64/libclang.so", - "/usr/lib64/llvm/libclang.so", -- }; ++ "@libclang@/lib/libclang.so", + }; - - // iterate through the set of available 'llvm' directories - for (const char* prefix : {"/usr/lib", "/usr/lib64"}) @@ -51,11 +36,6 @@ - if (path.getFilename().find("llvm") == 0) - clangVersions.push_back(path.completePath("lib/libclang.so.1").getAbsolutePath()); - } --#endif -- -- return clangVersions; -+ return std::vector { "@libclang.so@" }; - } - - - + #endif + + return clangVersions; diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index ff0c468fc509..867742d3b785 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -1,67 +1,39 @@ -{ lib -, stdenv -, mkDerivation -, fetchurl -, fetchFromGitHub -, makeDesktopItem -, copyDesktopItems -, cmake -, boost183 -, zlib -, openssl -, R -, qtbase -, qtxmlpatterns -, qtsensors -, qtwebengine -, qtwebchannel -, quarto -, libuuid -, hunspellDicts -, unzip -, ant -, jdk -, gnumake -, pandoc -, llvmPackages -, yaml-cpp -, soci -, postgresql -, nodejs -, qmake -, server ? false # build server version -, sqlite -, pam -, nixosTests +{ + lib, + stdenv, + fetchzip, + fetchFromGitHub, + replaceVars, + cmake, + boost183, + zlib, + openssl, + R, + libsForQt5, + quarto, + libuuid, + hunspellDicts, + ant, + jdk, + gnumake, + pandoc, + llvmPackages, + yaml-cpp, + soci, + sqlite, + nodejs, + yarn, + yarnConfigHook, + fetchYarnDeps, + server ? false, # build server version + pam, + nixosTests, }: let - pname = "RStudio"; - version = "2024.04.2+764"; - RSTUDIO_VERSION_MAJOR = lib.versions.major version; - RSTUDIO_VERSION_MINOR = lib.versions.minor version; - RSTUDIO_VERSION_PATCH = lib.versions.patch version; - RSTUDIO_VERSION_SUFFIX = "+" + toString ( - lib.tail (lib.splitString "+" version) - ); - - src = fetchFromGitHub { - owner = "rstudio"; - repo = "rstudio"; - rev = "v" + version; - hash = "sha256-j258eW1MYQrB6kkpjyolXdNuwQ3zSWv9so4q0QLsZuw="; - }; - - mathJaxSrc = fetchurl { + mathJaxSrc = fetchzip { url = "https://s3.amazonaws.com/rstudio-buildtools/mathjax-27.zip"; - hash = "sha256-xWy6psTOA8H8uusrXqPDEtL7diajYCVHcMvLiPsgQXY="; - }; - - rsconnectSrc = fetchFromGitHub { - owner = "rstudio"; - repo = "rsconnect"; - rev = "v1.2.2"; - hash = "sha256-wvM9Bm7Nb6yU9z0o+uF5lB2kdgjOW5wZSk6y48NPF2U="; + hash = "sha256-J7SZK/9q3HcXTD7WFHxvh++ttuCd89Vc4SEBrUEU0AI="; }; # Ideally, rev should match the rstudio release name. @@ -73,24 +45,46 @@ let hash = "sha256-lZnZvioztbBWWa6H177X6rRrrgACx2gMjVFDgNup93g="; }; - description = "Set of integrated tools for the R language"; + hunspellDictionaries = lib.filter lib.isDerivation (lib.unique (lib.attrValues hunspellDicts)); + # These dicts contain identically-named dict files, so we only keep the + # -large versions in case of clashes + largeDicts = lib.filter (d: lib.hasInfix "-large-wordlist" d.name) hunspellDictionaries; + otherDicts = lib.filter ( + d: !(lib.hasAttr "dictFileName" d && lib.elem d.dictFileName (map (d: d.dictFileName) largeDicts)) + ) hunspellDictionaries; + dictionaries = largeDicts ++ otherDicts; in -(if server then stdenv.mkDerivation else mkDerivation) - (rec { - inherit pname version src RSTUDIO_VERSION_MAJOR RSTUDIO_VERSION_MINOR RSTUDIO_VERSION_PATCH RSTUDIO_VERSION_SUFFIX; +stdenv.mkDerivation rec { + pname = "RStudio"; + version = "2024.04.2+764"; - nativeBuildInputs = [ + RSTUDIO_VERSION_MAJOR = lib.versions.major version; + RSTUDIO_VERSION_MINOR = lib.versions.minor version; + RSTUDIO_VERSION_PATCH = lib.versions.patch version; + RSTUDIO_VERSION_SUFFIX = "+" + toString (lib.tail (lib.splitString "+" version)); + + src = fetchFromGitHub { + owner = "rstudio"; + repo = "rstudio"; + rev = "refs/tags/v${version}"; + hash = "sha256-j258eW1MYQrB6kkpjyolXdNuwQ3zSWv9so4q0QLsZuw="; + }; + + nativeBuildInputs = + [ cmake - unzip ant jdk - pandoc nodejs - ] ++ lib.optionals (!server) [ - copyDesktopItems + yarn + yarnConfigHook + ] + ++ lib.optionals (!server) [ + libsForQt5.wrapQtAppsHook ]; - buildInputs = [ + buildInputs = + [ boost183 zlib openssl @@ -98,153 +92,130 @@ in libuuid yaml-cpp soci - postgresql - quarto - ] ++ (if server then [ sqlite.dev - pam - ] else [ - qtbase - qtxmlpatterns - qtsensors - qtwebengine - qtwebchannel - ]); - - cmakeFlags = [ - "-DRSTUDIO_TARGET=${if server then "Server" else "Desktop"}" - "-DRSTUDIO_USE_SYSTEM_SOCI=ON" - "-DRSTUDIO_USE_SYSTEM_BOOST=ON" - "-DRSTUDIO_USE_SYSTEM_YAML_CPP=ON" - "-DRSTUDIO_DISABLE_CHECK_FOR_UPDATES=ON" - "-DQUARTO_ENABLED=TRUE" - "-DPANDOC_VERSION=${pandoc.version}" - "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/lib/rstudio" - ] ++ lib.optionals (!server) [ - "-DQT_QMAKE_EXECUTABLE=${qmake}/bin/qmake" + ] + ++ lib.optionals server [ pam ] + ++ lib.optionals (!server) [ + libsForQt5.qtbase + libsForQt5.qtxmlpatterns + libsForQt5.qtsensors + libsForQt5.qtwebengine + libsForQt5.qtwebchannel ]; + cmakeFlags = + [ + (lib.cmakeFeature "RSTUDIO_TARGET" (if server then "Server" else "Desktop")) + (lib.cmakeBool "RSTUDIO_USE_SYSTEM_SOCI" true) + (lib.cmakeBool "RSTUDIO_USE_SYSTEM_BOOST" true) + (lib.cmakeBool "RSTUDIO_USE_SYSTEM_YAML_CPP" true) + (lib.cmakeBool "RSTUDIO_DISABLE_CHECK_FOR_UPDATES" true) + (lib.cmakeBool "QUARTO_ENABLED" true) + (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/lib/rstudio") + ] + ++ lib.optionals (!server) [ + (lib.cmakeFeature "QT_QMAKE_EXECUTABLE" "${libsForQt5.qmake}/bin/qmake") + (lib.cmakeBool "RSTUDIO_INSTALL_FREEDESKTOP" true) + ]; + + patches = [ # Hack RStudio to only use the input R and provided libclang. - patches = [ - ./r-location.patch - ./clang-location.patch - ./use-system-node.patch - ./fix-resources-path.patch - ./pandoc-nix-path.patch - ./use-system-quarto.patch - ./ignore-etc-os-release.patch - ]; + (replaceVars ./r-location.patch { + R = lib.getBin R; + }) + (replaceVars ./clang-location.patch { + libclang = lib.getLib llvmPackages.libclang; + }) - postPatch = '' - substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace-fail '@R@' ${R} + ./fix-resources-path.patch + ./ignore-etc-os-release.patch + ./dont-yarn-install.patch + ./dont-assume-pandoc-in-quarto.patch + ]; - substituteInPlace src/gwt/build.xml \ - --replace-fail '@node@' ${nodejs} \ - --replace-fail './lib/quarto' ${quartoSrc} + postPatch = '' + # fix .desktop Exec field + substituteInPlace src/node/desktop/resources/freedesktop/rstudio.desktop.in \ + --replace-fail "''${CMAKE_INSTALL_PREFIX}/rstudio" "rstudio" - substituteInPlace src/cpp/conf/rsession-dev.conf \ - --replace-fail '@node@' ${nodejs} + # set install path of freedesktop files + substituteInPlace src/{cpp,node}/desktop/CMakeLists.txt \ + --replace-fail "/usr/share" "$out/share" + ''; - substituteInPlace src/cpp/core/libclang/LibClang.cpp \ - --replace-fail '@libclang@' ${lib.getLib llvmPackages.libclang} \ - --replace-fail '@libclang.so@' ${lib.getLib llvmPackages.libclang}/lib/libclang.so + yarnOfflineCache = fetchYarnDeps { + yarnLock = quartoSrc + "/yarn.lock"; + hash = "sha256-Qw8O1Jzl2EO0DEF3Jrw/cIT9t22zs3jyKgDA5XZbuGA="; + }; - substituteInPlace src/cpp/session/CMakeLists.txt \ - --replace-fail '@pandoc@' ${pandoc} \ - --replace-fail '@quarto@' ${quarto} + dontYarnInstallDeps = true; # will call manually in preConfigure - substituteInPlace src/cpp/session/include/session/SessionConstants.hpp \ - --replace-fail '@pandoc@' ${pandoc}/bin \ - --replace-fail '@quarto@' ${quarto} - ''; + preConfigure = '' + # set up node_modules directory inside quarto so that panmirror can be built + mkdir src/gwt/lib/quarto + cp -r --no-preserve=all ${quartoSrc}/* src/gwt/lib/quarto + pushd src/gwt/lib/quarto + yarnConfigHook + popd - hunspellDictionaries = lib.filter lib.isDerivation (lib.unique (lib.attrValues hunspellDicts)); - # These dicts contain identically-named dict files, so we only keep the - # -large versions in case of clashes - largeDicts = lib.filter (d: lib.hasInfix "-large-wordlist" d.name) hunspellDictionaries; - otherDicts = lib.filter - (d: !(lib.hasAttr "dictFileName" d && - lib.elem d.dictFileName (map (d: d.dictFileName) largeDicts))) - hunspellDictionaries; - dictionaries = largeDicts ++ otherDicts; + ### set up dependencies that will be copied into the result + # note: only the directory names have to match upstream, the actual versions don't + # note: symlinks are preserved - preConfigure = '' - mkdir dependencies/dictionaries - for dict in ${builtins.concatStringsSep " " dictionaries}; do - for i in "$dict/share/hunspell/"*; do - ln -s $i dependencies/dictionaries/ - done + mkdir dependencies/dictionaries + for dict in ${builtins.concatStringsSep " " dictionaries}; do + for i in "$dict/share/hunspell/"*; do + ln -s $i dependencies/dictionaries/ done + done - unzip -q ${mathJaxSrc} -d dependencies/mathjax-27 + ln -s ${quarto} dependencies/quarto - # As of Chocolate Cosmos, node 18.20.3 is used for runtime - # 18.18.2 is still used for build - # see https://github.com/rstudio/rstudio/commit/facb5cf1ab38fe77813aaf36590804e4f865d780 - mkdir -p dependencies/common/node/18.20.3 + # version in dependencies/common/install-mathjax + ln -s ${mathJaxSrc} dependencies/mathjax-27 - mkdir -p dependencies/pandoc/${pandoc.version} - cp ${pandoc}/bin/pandoc dependencies/pandoc/${pandoc.version}/pandoc + # version in CMakeGlobals.txt (PANDOC_VERSION) + mkdir -p dependencies/pandoc/2.18 + ln -s ${lib.getBin pandoc}/bin/* dependencies/pandoc/2.18 - cp -r ${rsconnectSrc} dependencies/rsconnect - ( cd dependencies && ${R}/bin/R CMD build -d --no-build-vignettes rsconnect ) - ''; + # version in CMakeGlobals.txt (RSTUDIO_INSTALLED_NODE_VERSION) + mkdir -p dependencies/common/node + ln -s ${nodejs} dependencies/common/node/18.20.3 + ''; - postInstall = '' - mkdir -p $out/bin $out/share + postInstall = '' + mkdir -p $out/bin - ${lib.optionalString (!server) '' - mkdir -p $out/share/icons/hicolor/48x48/apps - ln $out/lib/rstudio/rstudio.png $out/share/icons/hicolor/48x48/apps - ''} + ${lib.optionalString server '' + ln -s $out/lib/rstudio/bin/{crash-handler-proxy,postback,r-ldpath,rpostback,rserver,rserver-pam,rsession,rstudio-server} $out/bin + ''} - for f in {${if server - then "crash-handler-proxy,postback,r-ldpath,rpostback,rserver,rserver-pam,rsession,rstudio-server" - else "diagnostics,rpostback,rstudio"}}; do - ln -s $out/lib/rstudio/bin/$f $out/bin - done + ${lib.optionalString (!server) '' + ln -s $out/lib/rstudio/bin/{diagnostics,rpostback,rstudio} $out/bin + ''} + ''; - for f in .gitignore .Rbuildignore LICENSE README; do - find . -name $f -delete - done + qtWrapperArgs = lib.optionals (!server) [ + "--suffix PATH : ${lib.makeBinPath [ gnumake ]}" + ]; - rm -r $out/lib/rstudio/{INSTALL,COPYING,NOTICE,README.md,SOURCE,VERSION} - ''; - - meta = { - broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); - inherit description; - homepage = "https://www.rstudio.com/"; - license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ ciil cfhammill ]; - mainProgram = "rstudio" + lib.optionalString server "-server"; - platforms = lib.platforms.linux; + passthru = { + inherit server; + tests = { + inherit (nixosTests) rstudio-server; }; + }; - passthru = { - inherit server; - tests = { inherit (nixosTests) rstudio-server; }; - }; - } // lib.optionalAttrs (!server) { - qtWrapperArgs = [ - "--suffix PATH : ${lib.makeBinPath [ gnumake ]}" + meta = { + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); + description = "Set of integrated tools for the R language"; + homepage = "https://www.rstudio.com/"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ + ciil + cfhammill ]; - - desktopItems = [ - (makeDesktopItem { - name = pname; - exec = "rstudio %F"; - icon = "rstudio"; - desktopName = "RStudio"; - genericName = "IDE"; - comment = description; - categories = [ "Development" ]; - mimeTypes = [ - "text/x-r-source" "text/x-r" "text/x-R" "text/x-r-doc" "text/x-r-sweave" "text/x-r-markdown" - "text/x-r-html" "text/x-r-presentation" "application/x-r-data" "application/x-r-project" - "text/x-r-history" "text/x-r-profile" "text/x-tex" "text/x-markdown" "text/html" - "text/css" "text/javascript" "text/x-chdr" "text/x-csrc" "text/x-c++hdr" "text/x-c++src" - ]; - }) - ]; - }) + mainProgram = "rstudio" + lib.optionalString server "-server"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/applications/editors/rstudio/dont-assume-pandoc-in-quarto.patch b/pkgs/applications/editors/rstudio/dont-assume-pandoc-in-quarto.patch new file mode 100644 index 000000000000..b86ec4079da2 --- /dev/null +++ b/pkgs/applications/editors/rstudio/dont-assume-pandoc-in-quarto.patch @@ -0,0 +1,48 @@ +diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt +index 0202e84..596b9f8 100644 +--- a/src/cpp/session/CMakeLists.txt ++++ b/src/cpp/session/CMakeLists.txt +@@ -59,11 +59,7 @@ endif() + + + # install pandoc +-# - by default, we use quarto + quarto's bundled pandoc +-# - if quarto is not enabled, use pandoc fallback +-if(QUARTO_ENABLED) +- set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}/bin/tools") +-elseif(EXISTS "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}") ++if(EXISTS "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}") + set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}") + else() + set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_DIR}/pandoc/${PANDOC_VERSION}") +@@ -733,11 +729,10 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNATE_BUILD) + PATTERN ".gitignore" + EXCLUDE) + endif() +- else() +- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_PANDOC_DIR}/" +- DESTINATION "${RSTUDIO_INSTALL_BIN}/pandoc" +- USE_SOURCE_PERMISSIONS) + endif() ++ install(DIRECTORY "${RSTUDIO_DEPENDENCIES_PANDOC_DIR}/" ++ DESTINATION "${RSTUDIO_INSTALL_BIN}/pandoc" ++ USE_SOURCE_PERMISSIONS) + + # install embedded packages + foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES}) +diff --git a/src/cpp/session/include/session/SessionConstants.hpp b/src/cpp/session/include/session/SessionConstants.hpp +index e6aef22..57491ec 100644 +--- a/src/cpp/session/include/session/SessionConstants.hpp ++++ b/src/cpp/session/include/session/SessionConstants.hpp +@@ -147,11 +147,7 @@ + #define kSessionTmpDirEnvVar "RS_SESSION_TMP_DIR" + #define kSessionTmpDir "rstudio-rsession" + +-#ifdef QUARTO_ENABLED +-# define kDefaultPandocPath "bin/quarto/bin/tools" +-#else + # define kDefaultPandocPath "bin/pandoc" +-#endif + + #define kDefaultNodePath "bin/node" + #define kDefaultQuartoPath "bin/quarto" diff --git a/pkgs/applications/editors/rstudio/dont-yarn-install.patch b/pkgs/applications/editors/rstudio/dont-yarn-install.patch new file mode 100644 index 000000000000..72a5e1c9050b --- /dev/null +++ b/pkgs/applications/editors/rstudio/dont-yarn-install.patch @@ -0,0 +1,16 @@ +diff --git a/src/gwt/build.xml b/src/gwt/build.xml +index 27ffe33..4218678 100644 +--- a/src/gwt/build.xml ++++ b/src/gwt/build.xml +@@ -139,11 +139,6 @@ + + + +- +- +- +- +- + + + diff --git a/pkgs/applications/editors/rstudio/pandoc-nix-path.patch b/pkgs/applications/editors/rstudio/pandoc-nix-path.patch deleted file mode 100644 index 2782a5a0d7a2..000000000000 --- a/pkgs/applications/editors/rstudio/pandoc-nix-path.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/src/cpp/session/include/session/SessionConstants.hpp -+++ b/src/cpp/session/include/session/SessionConstants.hpp -@@ -142,13 +142,13 @@ - #define kSessionTmpDir "rstudio-rsession" - - #ifdef QUARTO_ENABLED --# define kDefaultPandocPath "bin/quarto/bin/tools" -+# define kDefaultPandocPath "@pandoc@" - #else - # define kDefaultPandocPath "bin/pandoc" - #endif - - #define kDefaultNodePath "bin/node" --#define kDefaultQuartoPath "bin/quarto" -+#define kDefaultQuartoPath "@quarto@" - #define kDefaultRsclangPath "bin/rsclang" - - #ifdef _WIN32 diff --git a/pkgs/applications/editors/rstudio/use-system-node.patch b/pkgs/applications/editors/rstudio/use-system-node.patch deleted file mode 100644 index 5e8b2170da10..000000000000 --- a/pkgs/applications/editors/rstudio/use-system-node.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff --git a/src/cpp/conf/rsession-dev.conf b/src/cpp/conf/rsession-dev.conf -index d18362b..98cdd4c 100644 ---- a/src/cpp/conf/rsession-dev.conf -+++ b/src/cpp/conf/rsession-dev.conf -@@ -39,7 +39,7 @@ external-mathjax-path=${RSTUDIO_DEPENDENCIES_MATHJAX_DIR} - external-pandoc-path=${RSTUDIO_DEPENDENCIES_PANDOC_DIR} - external-quarto-path=${RSTUDIO_DEPENDENCIES_QUARTO_DIR} - external-libclang-path=${RSTUDIO_DEPENDENCIES_DIR}/common/libclang --external-node-path=${RSTUDIO_DEPENDENCIES_DIR}/common/node/18.18.2/bin/node -+external-node-path=@node@/bin/node - - # enable copilot - copilot-enabled=1 -diff --git a/src/gwt/build.xml b/src/gwt/build.xml -index 033d605..f1ee63d 100644 ---- a/src/gwt/build.xml -+++ b/src/gwt/build.xml -@@ -87,29 +87,7 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ - - - -@@ -133,28 +111,11 @@ - - - -- -- -- -- -- - -- -- -- -- -- -- -- -- -- -- -- -- -+ -+ -+ - -- -- -- - - - - diff --git a/pkgs/applications/editors/rstudio/use-system-quarto.patch b/pkgs/applications/editors/rstudio/use-system-quarto.patch deleted file mode 100644 index 89653219dbea..000000000000 --- a/pkgs/applications/editors/rstudio/use-system-quarto.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- a/src/cpp/session/CMakeLists.txt -+++ b/src/cpp/session/CMakeLists.txt -@@ -36,18 +36,14 @@ - else() - set(RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR "${RSTUDIO_DEPENDENCIES_DIR}/dictionaries") - endif() -- -+ - if(EXISTS "${RSTUDIO_TOOLS_ROOT}/mathjax-27") - set(RSTUDIO_DEPENDENCIES_MATHJAX_DIR "${RSTUDIO_TOOLS_ROOT}/mathjax-27") - else() - set(RSTUDIO_DEPENDENCIES_MATHJAX_DIR "${RSTUDIO_DEPENDENCIES_DIR}/mathjax-27") - endif() - -- if(EXISTS "${RSTUDIO_TOOLS_ROOT}/quarto") -- set(RSTUDIO_DEPENDENCIES_QUARTO_DIR "${RSTUDIO_TOOLS_ROOT}/quarto") -- else() -- set(RSTUDIO_DEPENDENCIES_QUARTO_DIR "${RSTUDIO_DEPENDENCIES_DIR}/quarto") -- endif() -+ set(RSTUDIO_DEPENDENCIES_QUARTO_DIR "@quarto@") - - endif() - -@@ -56,7 +52,7 @@ - # - by default, we use quarto + quarto's bundled pandoc - # - if quarto is not enabled, use pandoc fallback - if(QUARTO_ENABLED) -- set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}/bin/tools") -+ set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "@pandoc@/bin") - elseif(EXISTS "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}") - set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}") - else() -@@ -66,11 +62,9 @@ - - # validate our dependencies exist - foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR -- RSTUDIO_DEPENDENCIES_MATHJAX_DIR -- RSTUDIO_DEPENDENCIES_PANDOC_DIR -- RSTUDIO_DEPENDENCIES_QUARTO_DIR) -+ RSTUDIO_DEPENDENCIES_MATHJAX_DIR) -+ - -- - # skip quarto if not enabled - if("${VAR}" STREQUAL "RSTUDIO_DEPENDENCIES_QUARTO_DIR" AND NOT QUARTO_ENABLED) - continue() diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 8848db05fb55..82b430d1bff1 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1290,6 +1290,18 @@ final: prev: meta.homepage = "https://github.com/Saghen/blink.compat/"; }; + blink-ripgrep-nvim = buildVimPlugin { + pname = "blink-ripgrep.nvim"; + version = "2025-01-04"; + src = fetchFromGitHub { + owner = "mikavilpas"; + repo = "blink-ripgrep.nvim"; + rev = "1e0ff13ef364b585c1a21148d91b185cf3b246af"; + sha256 = "0hhv74pa61b3z990w7j5q59r9wd6l2c7vlxgak6xvgb5gksk3cbp"; + }; + meta.homepage = "https://github.com/mikavilpas/blink-ripgrep.nvim/"; + }; + block-nvim = buildVimPlugin { pname = "block.nvim"; version = "2023-10-10"; @@ -6062,6 +6074,18 @@ final: prev: meta.homepage = "https://github.com/junegunn/limelight.vim/"; }; + linediff-vim = buildVimPlugin { + pname = "linediff.vim"; + version = "2024-04-22"; + src = fetchFromGitHub { + owner = "AndrewRadev"; + repo = "linediff.vim"; + rev = "ddae71ef5f94775d101c1c70032ebe8799f32745"; + sha256 = "01dshpxm1svfhw9l447mz224qbvlbvywd7ai4wxwyjzgkhp36937"; + }; + meta.homepage = "https://github.com/AndrewRadev/linediff.vim/"; + }; + lingua-franca-vim = buildVimPlugin { pname = "lingua-franca.vim"; version = "2021-09-05"; @@ -9389,6 +9413,18 @@ final: prev: meta.homepage = "https://github.com/LhKipp/nvim-nu/"; }; + nvim-numbertoggle = buildVimPlugin { + pname = "nvim-numbertoggle"; + version = "2024-03-29"; + src = fetchFromGitHub { + owner = "sitiom"; + repo = "nvim-numbertoggle"; + rev = "c5827153f8a955886f1b38eaea6998c067d2992f"; + sha256 = "18nxqi3a3xamrjzpsabww411ix6vr44smprqi9prd47238lpshi2"; + }; + meta.homepage = "https://github.com/sitiom/nvim-numbertoggle/"; + }; + nvim-osc52 = buildVimPlugin { pname = "nvim-osc52"; version = "2024-05-24"; @@ -9761,6 +9797,18 @@ final: prev: meta.homepage = "https://github.com/RRethy/nvim-treesitter-textsubjects/"; }; + nvim-trevJ-lua = buildVimPlugin { + pname = "nvim-trevJ.lua"; + version = "2024-12-23"; + src = fetchFromGitHub { + owner = "AckslD"; + repo = "nvim-trevJ.lua"; + rev = "86445d0143d47aede944b6daa5c0a463e9d3e730"; + sha256 = "0wrmzk7wyr4mk8y0c7hq0qqk19ngdwvvd80690vqs3vby89a5zkj"; + }; + meta.homepage = "https://github.com/AckslD/nvim-trevJ.lua/"; + }; + nvim-ts-autotag = buildVimPlugin { pname = "nvim-ts-autotag"; version = "2024-12-02"; @@ -10616,6 +10664,18 @@ final: prev: meta.homepage = "https://github.com/ahmedkhalf/project.nvim/"; }; + projections-nvim = buildVimPlugin { + pname = "projections.nvim"; + version = "2023-06-29"; + src = fetchFromGitHub { + owner = "GnikDroy"; + repo = "projections.nvim"; + rev = "f18a8505f84f45a0fe024cafca5b969447f63cd5"; + sha256 = "1yljcd1k8ksjxcs61b20z3rw36960mczi62x07i8z4xrxqrn4k5y"; + }; + meta.homepage = "https://github.com/GnikDroy/projections.nvim/"; + }; + promise-async = buildVimPlugin { pname = "promise-async"; version = "2024-08-04"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index f9f3f0dff68a..0fd5010f7d51 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -2308,6 +2308,11 @@ in dependencies = [ self.nvim-treesitter ]; }; + nvim-trevJ-lua = super.nvim-trevJ-lua.overrideAttrs { + dependencies = [ self.nvim-treesitter ]; + nvimRequireCheck = "trevj"; + }; + nvim-ufo = super.nvim-ufo.overrideAttrs { dependencies = [ self.promise-async ]; nvimRequireCheck = "ufo"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 599d52852a3e..f12314273f58 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -104,6 +104,7 @@ https://github.com/max397574/better-escape.nvim/,, https://github.com/LunarVim/bigfile.nvim/,, https://github.com/APZelos/blamer.nvim/,HEAD, https://github.com/giuxtaposition/blink-cmp-copilot/,HEAD, +https://github.com/mikavilpas/blink-ripgrep.nvim/,HEAD, https://github.com/Saghen/blink.compat/,HEAD, https://github.com/HampusHauffman/block.nvim/,HEAD, https://github.com/blueballs-theme/blueballs-neovim/,, @@ -502,6 +503,7 @@ https://github.com/spywhere/lightline-lsp/,, https://github.com/itchyny/lightline.vim/,, https://github.com/ggandor/lightspeed.nvim/,, https://github.com/junegunn/limelight.vim/,, +https://github.com/AndrewRadev/linediff.vim/,HEAD, https://github.com/lf-lang/lingua-franca.vim/,, https://github.com/tamago324/lir.nvim/,, https://github.com/kkharji/lispdocs.nvim/,, @@ -779,6 +781,7 @@ https://github.com/nvim-neotest/nvim-nio/,HEAD, https://github.com/ya2s/nvim-nonicons/,, https://github.com/rcarriga/nvim-notify/,, https://github.com/LhKipp/nvim-nu/,HEAD, +https://github.com/sitiom/nvim-numbertoggle/,HEAD, https://github.com/ojroques/nvim-osc52/,, https://github.com/julienvincent/nvim-paredit/,, https://github.com/gpanders/nvim-parinfer/,HEAD, @@ -810,6 +813,7 @@ https://github.com/nvim-treesitter/nvim-treesitter-refactor/,, https://github.com/PaterJason/nvim-treesitter-sexp/,HEAD, https://github.com/nvim-treesitter/nvim-treesitter-textobjects/,, https://github.com/RRethy/nvim-treesitter-textsubjects/,HEAD, +https://github.com/AckslD/nvim-trevJ.lua/,HEAD, https://github.com/windwp/nvim-ts-autotag/,, https://github.com/joosepalviste/nvim-ts-context-commentstring/,, https://github.com/kevinhwang91/nvim-ufo/,HEAD, @@ -881,6 +885,7 @@ https://github.com/ewilazarus/preto/,HEAD, https://github.com/anuvyklack/pretty-fold.nvim/,HEAD, https://github.com/vim-scripts/prev_indent/,, https://github.com/ahmedkhalf/project.nvim/,, +https://github.com/GnikDroy/projections.nvim/,HEAD, https://github.com/kevinhwang91/promise-async/,HEAD, https://github.com/frigoeu/psc-ide-vim/,, https://github.com/Shougo/pum.vim/,HEAD, diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index b49e0786f8e7..e3f750fc1f91 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1672,6 +1672,22 @@ let }; }; + egirlcatnip.adwaita-github-theme = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "adwaita-github-theme"; + publisher = "egirlcatnip"; + version = "1.0.5"; + hash = "sha256-OvonS6137ICRUV5Tx4gD3we8nrza6ZgnRSs2SxFiCjU="; + }; + meta = { + description = "Adwaita VS Code theme with Github syntax highlighting"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=egirlcatnip.adwaita-github-theme"; + homepage = "https://github.com/egirlcatnip/adwaita-github-theme"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ thtrf ]; + }; + }; + elixir-lsp.vscode-elixir-ls = buildVscodeMarketplaceExtension { mktplcRef = { name = "elixir-ls"; @@ -4271,6 +4287,8 @@ let }; }; + saoudrizwan.claude-dev = callPackage ./saoudrizwan.claude-dev { }; + sainnhe.gruvbox-material = buildVscodeMarketplaceExtension { mktplcRef = { name = "gruvbox-material"; diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix index 79001403f3fa..a8aa75ababa3 100644 --- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix +++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix @@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension { name = "tinymist"; publisher = "myriad-dreamin"; inherit (tinymist) version; - hash = "sha256-nMuK51ktoJQTgJEfFivOjDmnMUx/lWNsIPZ7ZmreqYo="; + hash = "sha256-8QwUZfR0eTjXE6IgjpYx9TcWf8WrrVWA0VfTUX+WVCc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix new file mode 100644 index 000000000000..90a62814d973 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix @@ -0,0 +1,21 @@ +{ + lib, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "claude-dev"; + publisher = "saoudrizwan"; + version = "3.0.12"; + hash = "sha256-GlBo4MIoIazKEYHv4yXpRGLVElOnjYgD9gB6rMQxeGg="; + }; + + meta = { + description = "A VSCode extension providing an autonomous coding agent right in your IDE, capable of creating/editing files, executing commands, using the browser, and more with your permission every step of the way"; + downloadPage = "https://github.com/cline/cline"; + homepage = "https://github.com/cline/cline"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.drupol ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix index 20b81c3c70cd..a4dec529aba6 100644 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix +++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix @@ -199,7 +199,7 @@ stdenv.mkDerivation { description = "Native debugger extension for VSCode based on LLDB"; homepage = "https://github.com/vadimcn/vscode-lldb"; license = [ lib.licenses.mit ]; - maintainers = [ lib.maintainers.nigelgbanks ]; + maintainers = [ ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix index 9d2dd8d9ba28..ceece0447b0f 100644 --- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix +++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix @@ -1,49 +1,37 @@ { + stdenvNoCC, lib, - stdenv, vscode-utils, - fetchurl, }: -let - version = "0.13.4"; - - sources = { - "x86_64-linux" = { - arch = "linux-x64"; - url = "https://download.visualjj.com/visualjj-linux-x64-${version}.vsix"; - hash = "sha256-q9ubYkhrV28sB9CV1dyBEIFEkTrkGHRXdz5+4xjeVzI="; - }; - "x86_64-darwin" = { - arch = "darwin-x64"; - url = "https://download.visualjj.com/visualjj-darwin-x64-${version}.vsix"; - hash = "sha256-vV5u1QBICz3GIYRgH9UWM38a8YXtvW0u8r7c1SaKwxM="; - }; - "aarch64-linux" = { - arch = "linux-arm64"; - url = "https://download.visualjj.com/visualjj-linux-arm64-${version}.vsix"; - hash = "sha256-fgT4brIhHI6gNCcsbHpz+v4/diyox2VoFlvCnhPIbPM="; - }; - "aarch64-darwin" = { - arch = "darwin-arm64"; - url = "https://download.visualjj.com/visualjj-darwin-arm64-${version}.vsix"; - hash = "sha256-/uuLRkEY430R5RS7B6972iginpA3pWpApjI6RUTxcHM="; - }; - }; -in vscode-utils.buildVscodeMarketplaceExtension { - vsix = fetchurl { - url = sources.${stdenv.hostPlatform.system}.url; - hash = sources.${stdenv.hostPlatform.system}.hash; - name = "visualjj-visualjj-${version}.zip"; - }; - - mktplcRef = { - inherit version; - name = "visualjj"; - publisher = "visualjj"; - arch = sources.${stdenv.hostPlatform.system}.arch; - }; + mktplcRef = + let + sources = { + "x86_64-linux" = { + arch = "linux-x64"; + hash = "sha256-q9ubYkhrV28sB9CV1dyBEIFEkTrkGHRXdz5+4xjeVzI="; + }; + "x86_64-darwin" = { + arch = "darwin-x64"; + hash = "sha256-vV5u1QBICz3GIYRgH9UWM38a8YXtvW0u8r7c1SaKwxM="; + }; + "aarch64-linux" = { + arch = "linux-arm64"; + hash = "sha256-fgT4brIhHI6gNCcsbHpz+v4/diyox2VoFlvCnhPIbPM="; + }; + "aarch64-darwin" = { + arch = "darwin-arm64"; + hash = "sha256-/uuLRkEY430R5RS7B6972iginpA3pWpApjI6RUTxcHM="; + }; + }; + in + { + name = "visualjj"; + publisher = "visualjj"; + version = "0.13.4"; + } + // sources.${stdenvNoCC.system} or (throw "Unsupported system ${stdenvNoCC.system}"); meta = { description = "Jujutsu version control integration, for simpler Git workflow"; diff --git a/pkgs/applications/emulators/86box/default.nix b/pkgs/applications/emulators/86box/default.nix index f9c25f94a4ba..51961cc76e5a 100644 --- a/pkgs/applications/emulators/86box/default.nix +++ b/pkgs/applications/emulators/86box/default.nix @@ -1,6 +1,5 @@ { stdenv, - apple-sdk_11, lib, fetchFromGitHub, cmake, @@ -90,8 +89,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib ++ lib.optional enableWayland wayland - ++ lib.optional enableVncRenderer libvncserver - ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; + ++ lib.optional enableVncRenderer libvncserver; cmakeFlags = lib.optional stdenv.hostPlatform.isDarwin "-DCMAKE_MACOSX_BUNDLE=OFF" diff --git a/pkgs/applications/emulators/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix index 290f2f2a0f6c..b7aae1d4c7c0 100644 --- a/pkgs/applications/emulators/dolphin-emu/default.nix +++ b/pkgs/applications/emulators/dolphin-emu/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-5Eir8EQPGVSg2QXzzuHH9lf7CrV76KwmRsHiDqs6tD4="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/dosbox-x/default.nix b/pkgs/applications/emulators/dosbox-x/default.nix index a7cc9b5ea6a3..4b6ffafb9363 100644 --- a/pkgs/applications/emulators/dosbox-x/default.nix +++ b/pkgs/applications/emulators/dosbox-x/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dosbox-x"; - version = "2024.12.04"; + version = "2025.01.01"; src = fetchFromGitHub { owner = "joncampbell123"; repo = "dosbox-x"; rev = "dosbox-x-v${finalAttrs.version}"; - hash = "sha256-wZCLwEInUfzuOCcUsz8W+Gi00lp4Nwc0QZjLF8/e9iM="; + hash = "sha256-3zE/VDCFNQRgqpIL5hRAafDoc7agX2LIsiL4xwDBLJY="; }; # sips is unavailable in sandbox, replacing with imagemagick breaks build due to wrong Foundation propagation(?) so don't generate resolution variants diff --git a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix index f3c9551a9cc0..2410d8678765 100644 --- a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix +++ b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mednafen-pce-fast"; - version = "0-unstable-2024-11-15"; + version = "0-unstable-2024-12-27"; src = fetchFromGitHub { owner = "libretro"; repo = "beetle-pce-fast-libretro"; - rev = "931586f0512663f625a6e981d3047a6620281ab5"; - hash = "sha256-9Nne4upiQNSAlTZsyXcLNIwN8MMKUO1ycahowYW1sWg="; + rev = "cfbb0946f79de33bc615d0a079e1a92f1454c3e3"; + hash = "sha256-47Fap6QjwFwodLaHBa78kKUap2DB8FdaEe6AEv0qyCA="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/bsnes-hd.nix b/pkgs/applications/emulators/libretro/cores/bsnes-hd.nix index 5353a8ef49b5..2e870f8ebc89 100644 --- a/pkgs/applications/emulators/libretro/cores/bsnes-hd.nix +++ b/pkgs/applications/emulators/libretro/cores/bsnes-hd.nix @@ -6,13 +6,13 @@ }: mkLibretroCore { core = "bsnes-hd-beta"; - version = "0-unstable-2023-04-26"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "DerKoun"; repo = "bsnes-hd"; - rev = "f46b6d6368ea93943a30b5d4e79e8ed51c2da5e8"; - hash = "sha256-Y3FhGtcz7BzwUSBy1SGMuylJdZti/JB8qQnabIkG/dI="; + rev = "0bb7b8645e22ea2476cabd58f32e987b14686601"; + hash = "sha256-YzWSZMn6v5hWIHnp6KmmpevCsf35Vi2BCcmFMnrFPH0="; }; extraBuildInputs = [ diff --git a/pkgs/applications/emulators/libretro/cores/bsnes.nix b/pkgs/applications/emulators/libretro/cores/bsnes.nix index 0e31a09943da..570d37aa3659 100644 --- a/pkgs/applications/emulators/libretro/cores/bsnes.nix +++ b/pkgs/applications/emulators/libretro/cores/bsnes.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "bsnes"; - version = "0-unstable-2024-09-06"; + version = "0-unstable-2024-12-13"; src = fetchFromGitHub { owner = "libretro"; repo = "bsnes-libretro"; - rev = "20c55eb6333a11395ba637df8583066483e58cb2"; - hash = "sha256-IP00xtxS3wwnQSmYltrX8GEHZX/65xnx2EsmQlE1VZM="; + rev = "a0bb11bbb1fc5d6b478baca53c3efe526c43986c"; + hash = "sha256-unOJ2hdCA5LxNUcJe7fJCAetLpqrQzujxFDOsxLzXow="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/gpsp.nix b/pkgs/applications/emulators/libretro/cores/gpsp.nix index cd4c55e916c6..eb93437d04cd 100644 --- a/pkgs/applications/emulators/libretro/cores/gpsp.nix +++ b/pkgs/applications/emulators/libretro/cores/gpsp.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "gpsp"; - version = "0-unstable-2024-09-18"; + version = "0-unstable-2024-12-26"; src = fetchFromGitHub { owner = "libretro"; repo = "gpsp"; - rev = "36061caf8cc5e15c3c92fb772b6b8560c7c59ec7"; - hash = "sha256-o36OUdgm7p+rAMN6R2e2Lqi4oBLTyxziw7Lr20ERBg0="; + rev = "66ced08c693094f2eaefed5e11bd596c41028959"; + hash = "sha256-gXk9T62wns7QixY98RSjfM/OW6SfH8N3NcjZ328WSAM="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix index d895438cef5e..2773bb0f89c9 100644 --- a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix +++ b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mame2003-plus"; - version = "0-unstable-2024-11-01"; + version = "0-unstable-2024-12-29"; src = fetchFromGitHub { owner = "libretro"; repo = "mame2003-plus-libretro"; - rev = "b00ea1c9574126d75ae7b80c3b41e1186421fc1d"; - hash = "sha256-Zq4P5UsZh3p9/zasfTC+pzWiLAo7T2qAgZw4bJ4ADdM="; + rev = "aaf1a95728d9ca6d4cf6633b6a839f8daa27db81"; + hash = "sha256-AjeXfISAcH6RiHU5gJutZUdpg2p+ASVKsI1+Nl76xSY="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/nestopia.nix b/pkgs/applications/emulators/libretro/cores/nestopia.nix index daa4dc980625..b2c909155c55 100644 --- a/pkgs/applications/emulators/libretro/cores/nestopia.nix +++ b/pkgs/applications/emulators/libretro/cores/nestopia.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "nestopia"; - version = "0-unstable-2024-12-14"; + version = "0-unstable-2024-12-22"; src = fetchFromGitHub { owner = "libretro"; repo = "nestopia"; - rev = "e7b65504ffc7f14fc5c74954d02b18f44c3aaf43"; - hash = "sha256-WI/EPWfTmcPM8SSVroqlya6U5cEgmesSJGbPOjxCSUg="; + rev = "6bbfff9a56ead67f0da696ab2c3aea3c11896964"; + hash = "sha256-D2FtfabikcZq0dl+ot/NJJkOaQXj0Sl5P2ioNrvxgSs="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/prboom.nix b/pkgs/applications/emulators/libretro/cores/prboom.nix index 64d4e28d286f..30bc6ad2f30a 100644 --- a/pkgs/applications/emulators/libretro/cores/prboom.nix +++ b/pkgs/applications/emulators/libretro/cores/prboom.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "prboom"; - version = "0-unstable-2024-10-21"; + version = "0-unstable-2024-12-27"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-prboom"; - rev = "d25ccfb9739069824d8fff99e3ae78a58a09df01"; - hash = "sha256-IaMreS2MSkFdZ3Jff2FOZBvKIIa4KIkp41LIg3PLl44="; + rev = "b3e5f8b2e8855f9c6fc7ff7a0036e4e61379177d"; + hash = "sha256-FtPn54s/QUu8fjeUBaAQMZ6EWAixV+gawuCv2eM+qrs="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/twenty-fortyeight.nix b/pkgs/applications/emulators/libretro/cores/twenty-fortyeight.nix index 5c9c39ac3a08..e4d48438ed93 100644 --- a/pkgs/applications/emulators/libretro/cores/twenty-fortyeight.nix +++ b/pkgs/applications/emulators/libretro/cores/twenty-fortyeight.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "2048"; - version = "0-unstable-2024-06-28"; + version = "0-unstable-2024-12-27"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-2048"; - rev = "5474ed1ab880b3296c9860d0943d7de1970c79dd"; - hash = "sha256-i6bbxsLpSicDDGYKAxTMCMioHHfvBzVokun3PNYgDsc="; + rev = "86e02d3c2dd76858db7370f5df1ccfc33b3abee1"; + hash = "sha256-k3te3XZCw86NkqXpjZaYWi4twUvh9UBkiPyqposLTEs="; }; meta = { diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index d4fe0df36791..86948a575ca9 100644 --- a/pkgs/applications/emulators/mame/default.nix +++ b/pkgs/applications/emulators/mame/default.nix @@ -39,14 +39,14 @@ let in stdenv.mkDerivation rec { pname = "mame"; - version = "0.272"; + version = "0.273"; srcVersion = builtins.replaceStrings [ "." ] [ "" ] version; src = fetchFromGitHub { owner = "mamedev"; repo = "mame"; rev = "mame${srcVersion}"; - hash = "sha256-qD9xWP4KtPJWqje9QVb5wozgLTc+hE84kkEFM6Re+Sk="; + hash = "sha256-aOBYnkdcFKDkw/KFiv0IRgpOChn8NRKD2xmbfExYGKY="; }; outputs = [ diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 294666f19201..1d83dde7f3db 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch2 , pkg-config , libtool , bzip2Support ? true, bzip2 @@ -51,22 +50,15 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.1-40"; + version = "7.1.1-43"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = finalAttrs.version; - hash = "sha256-NrTIx1OvwPIeVlA39hGkXZ2Atk4FCsU3/55SZeSc40E="; + hash = "sha256-4JzCBKtXiKGLsZ29+7z5U+3aN3ppusQ7mz+sOZYpXGY="; }; - patches = [ - (fetchpatch2 { - url = "https://github.com/ImageMagick/ImageMagick/commit/bf5650f0dd41b500102a129d6867cb568f4edee4.patch"; - hash = "sha256-nxvSTyNZ35DqjR41nM5uidWwRFWzd1e/LFE0n3fpbb8="; - }) - ]; - outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big outputMan = "out"; # it's tiny diff --git a/pkgs/applications/graphics/eddy/default.nix b/pkgs/applications/graphics/eddy/default.nix index f8ee5bf288d0..71157b656031 100644 --- a/pkgs/applications/graphics/eddy/default.nix +++ b/pkgs/applications/graphics/eddy/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "obdasystems"; repo = pname; - rev = "refs/tags/v${version}"; + tag = "v${version}"; sha256 = "sha256-vRmLUIqU0qfcnKzymBGb9gfM/uQiAcUHUnyz8iH/GrM="; }; diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix index b476a11d4993..924ff6866d92 100644 --- a/pkgs/applications/graphics/f3d/default.nix +++ b/pkgs/applications/graphics/f3d/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "f3d-app"; repo = "f3d"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-S3eigdW6rkDRSm4uCCTFHx5fhJGNVWpAAAKboougr08="; }; diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 33d595fd2ea0..cb23ed7f17d7 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -21,7 +21,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-i9XeZJgB0oDimoc0D5UTYSBs9C55QXC6HIxv2gP8vWY="; }; diff --git a/pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix b/pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix index d511395889b0..084edb23f2db 100644 --- a/pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix +++ b/pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix @@ -30,7 +30,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "fablabnbg"; repo = pname; - rev = "refs/tags/v${version}"; + tag = "v${version}"; sha256 = "sha256-MfR88BuaAx6n5XRIjslpIk4PnDf6TLU9AsmHxKkcFS0="; }; diff --git a/pkgs/applications/graphics/inkscape/extensions/textext/default.nix b/pkgs/applications/graphics/inkscape/extensions/textext/default.nix index 312d018c13b4..09221bd35996 100644 --- a/pkgs/applications/graphics/inkscape/extensions/textext/default.nix +++ b/pkgs/applications/graphics/inkscape/extensions/textext/default.nix @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "textext"; repo = "textext"; - rev = "refs/tags/${version}"; + tag = version; sha256 = "sha256-JbI/ScCFCvHbK9JZzHuT67uSAL3546et+gtTkwRnCSE="; }; diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index ff49948bdb14..8e42bb6d43ad 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "otfried"; repo = "ipe"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-bvwEgEP/cinigixJr8e964sm6secSK+7Ul7WFfwM0gE="; }; diff --git a/pkgs/applications/graphics/yacreader/default.nix b/pkgs/applications/graphics/yacreader/default.nix index af1d7579bbca..692463174da6 100644 --- a/pkgs/applications/graphics/yacreader/default.nix +++ b/pkgs/applications/graphics/yacreader/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "yacreader"; - version = "9.14.2"; + version = "9.15.0"; src = fetchFromGitHub { owner = "YACReader"; repo = pname; rev = version; - sha256 = "sha256-gQ4Aaapini6j3lCtowFbrfwbe91aFl50hp1EfxTO8uY="; + sha256 = "sha256-5vCjr8WRwa7Q/84Itgg07K1CJKGnWA1z53et2IxxReE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/avalonia-ilspy/default.nix b/pkgs/applications/misc/avalonia-ilspy/default.nix index 4413f853b011..69aeb11e2bbd 100644 --- a/pkgs/applications/misc/avalonia-ilspy/default.nix +++ b/pkgs/applications/misc/avalonia-ilspy/default.nix @@ -1,23 +1,24 @@ -{ lib -, stdenv -, fetchFromGitHub -, buildDotnetModule -, dotnetCorePackages -, libX11 -, libICE -, libSM -, libXi -, libXcursor -, libXext -, libXrandr -, fontconfig -, glew -, makeDesktopItem -, copyDesktopItems -, icoutils -, bintools -, fixDarwinDylibNames -, autoSignDarwinBinariesHook +{ + lib, + stdenv, + fetchFromGitHub, + buildDotnetModule, + dotnetCorePackages, + libX11, + libICE, + libSM, + libXi, + libXcursor, + libXext, + libXrandr, + fontconfig, + glew, + makeDesktopItem, + copyDesktopItems, + icoutils, + bintools, + fixDarwinDylibNames, + autoSignDarwinBinariesHook, }: buildDotnetModule rec { @@ -28,19 +29,28 @@ buildDotnetModule rec { owner = "icsharpcode"; repo = "AvaloniaILSpy"; rev = "v${version}"; - sha256 = "cCQy5cSpJNiVZqgphURcnraEM0ZyXGhzJLb5AThNfPQ="; + hash = "sha256-cCQy5cSpJNiVZqgphURcnraEM0ZyXGhzJLb5AThNfPQ="; }; patches = [ # Remove dead nuget package source ./remove-broken-sources.patch + # Upgrade project to .NET 8.0 + ./dotnet-8-upgrade.patch ]; - nativeBuildInputs = [ - copyDesktopItems - icoutils - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ bintools fixDarwinDylibNames ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ]; + nativeBuildInputs = + [ + copyDesktopItems + icoutils + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + bintools + fixDarwinDylibNames + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ + autoSignDarwinBinariesHook + ]; buildInputs = [ # Dependencies of nuget packages w/ native binaries @@ -61,21 +71,22 @@ buildDotnetModule rec { glew ]; - postInstall = '' - icotool --icon -x ILSpy/ILSpy.ico - for i in 16 32 48 256; do - size=''${i}x''${i} - install -Dm444 *_''${size}x32.png $out/share/icons/hicolor/$size/apps/ILSpy.png - done - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - install -Dm444 ILSpy/Info.plist $out/Applications/ILSpy.app/Contents/Info.plist - install -Dm444 ILSpy/ILSpy.icns $out/Applications/ILSpy.app/Contents/Resources/ILSpy.icns - mkdir -p $out/Applications/ILSpy.app/Contents/MacOS - ln -s $out/bin/ILSpy $out/Applications/ILSpy.app/Contents/MacOS/ILSpy - ''; + postInstall = + '' + icotool --icon -x ILSpy/ILSpy.ico + for i in 16 32 48 256; do + size=''${i}x''${i} + install -Dm444 *_''${size}x32.png $out/share/icons/hicolor/$size/apps/ILSpy.png + done + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + install -Dm444 ILSpy/Info.plist $out/Applications/ILSpy.app/Contents/Info.plist + install -Dm444 ILSpy/ILSpy.icns $out/Applications/ILSpy.app/Contents/Resources/ILSpy.icns + mkdir -p $out/Applications/ILSpy.app/Contents/MacOS + ln -s $out/bin/ILSpy $out/Applications/ILSpy.app/Contents/MacOS/ILSpy + ''; - dotnet-sdk = dotnetCorePackages.sdk_6_0; - dotnet-runtime = dotnetCorePackages.runtime_6_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0; projectFile = "ILSpy/ILSpy.csproj"; nugetDeps = ./deps.json; @@ -108,8 +119,15 @@ buildDotnetModule rec { lgpl21Only mspl ]; - sourceProvenance = with sourceTypes; [ fromSource binaryBytecode binaryNativeCode ]; - maintainers = with maintainers; [ AngryAnt emilytrau ]; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode + binaryNativeCode + ]; + maintainers = with maintainers; [ + AngryAnt + emilytrau + ]; mainProgram = "ILSpy"; }; } diff --git a/pkgs/applications/misc/avalonia-ilspy/deps.json b/pkgs/applications/misc/avalonia-ilspy/deps.json index 7259717dcfc1..c37cf06f99ab 100644 --- a/pkgs/applications/misc/avalonia-ilspy/deps.json +++ b/pkgs/applications/misc/avalonia-ilspy/deps.json @@ -2,1068 +2,1303 @@ { "pname": "Avalonia", "version": "0.10.13", - "sha256": "1df46dvjyax8jjdcvdavpzq5bwxacrw71j557mcm1401vv3r1vn3" + "hash": "sha256-w+6Qx94BkFBZPaXIcHhmqvNV8L9btc2alKgrL3czxLU=" }, { "pname": "Avalonia.Angle.Windows.Natives", "version": "2.1.0.2020091801", - "sha256": "04jm83cz7vkhhr6n2c9hya2k8i2462xbf6np4bidk55as0jdq43a" + "hash": "sha256-ahDcJNCqlNniItcat7owREQ0hfIwMWFNhnDu89lAVRI=" }, { "pname": "Avalonia.AvaloniaEdit", "version": "0.10.12.2", - "sha256": "1sn8k71xcfnjxgxfqzdrv1hy7h7pvdk820nyzkmrf02gi77mx7nw" + "hash": "sha256-3J5ez4lPAJfr/N4CgWbb98DjYdi5fez669I61sOZyOo=" }, { "pname": "Avalonia.Controls.DataGrid", "version": "0.10.13", - "sha256": "1yl402l5cwbv6gwy3p8r702ypp3p8w5wi8im25c2bjnv31889l8r" + "hash": "sha256-GdGEUBjbyiVYETWiyAtHd9zrBTgZ3eH5M3txVqgAhPo=" }, { "pname": "Avalonia.Desktop", "version": "0.10.13", - "sha256": "1y206hrfwyg8023z0m7dik1hlir1r18h8q0f0zqz3sabyy5k276w" + "hash": "sha256-3Bwxi/dL6fHxBw5gBFHIIUcKw4ztVPCHAOh57jI0QPg=" }, { "pname": "Avalonia.Diagnostics", "version": "0.10.13", - "sha256": "11khr3w7gwlm1bajfh5zhrsfcfd9kbw5mbgwnbjq7i5lq9glriid" + "hash": "sha256-LcZMX8K0xIPlsvytWviaqTnmdIa/QCfVCpXyd/jIcIY=" }, { "pname": "Avalonia.FreeDesktop", "version": "0.10.13", - "sha256": "18gygzg12facawvzmfgpja4rsagy670dv1dcrx4shfl7w8l998jp" + "hash": "sha256-V6KUKOKHOqhJz6yF3cAx/imdiZL3ufo3V0w5Ed5//qE=" }, { "pname": "Avalonia.Markup.Xaml.Loader", "version": "0.10.13", - "sha256": "187r64xpidliqbp9c3qar0grhn97ffvc0mp0gyrxxszrff9vf69k" + "hash": "sha256-Mxm3k3P5696zf+BWwLZzJ1mYH8gKD5buwpG2eDsx+aA=" }, { "pname": "Avalonia.Native", "version": "0.10.13", - "sha256": "18b2pykfcgw9pyjmdqq7i1n8j330n7xrwyldl9bpkvahswinvhza" + "hash": "sha256-6sNtI9dQ7XlXoo16nvuxYAyJbIgH41alv4k/5qa/YqE=" }, { "pname": "Avalonia.Remote.Protocol", "version": "0.10.13", - "sha256": "0j0kdh6dbii59v972azhwq69rmak63lp5f5jqz3pi94mifx4bayy" + "hash": "sha256-3qtFuouVpHjHx7K4cukwU9WcDObwK3HSTiXG1QxsE0g=" }, { "pname": "Avalonia.Skia", "version": "0.10.13", - "sha256": "0k5y0w164m03q278m4wr7zzf3vfq9nb0am9vmmprivpn1xwwa7ml" + "hash": "sha256-tB7FeQ/27phvrTtVBZZN2O3h/j+Zk4qOwANUYgIHvkw=" }, { "pname": "Avalonia.Win32", "version": "0.10.13", - "sha256": "0jyl1rrn1n07dnqn76ijwhxgkc45dmsfh2d811n4695ndaz85nkl" + "hash": "sha256-dNqCvmq2JENsCKgJ6HRthbD5OuQymmOxbQfYYHMO1Es=" }, { "pname": "Avalonia.X11", "version": "0.10.13", - "sha256": "1y8x9hjdlxg4q8q958i364cbak8xjh4nldp38cnxwjir814p0xwh" + "hash": "sha256-kHdwSUA5St4tQ+M2agmUHU21GDEjopIwwuR12iRMHfk=" }, { "pname": "HarfBuzzSharp", "version": "2.8.2-preview.178", - "sha256": "1p5nwzl7jpypsd6df7hgcf47r977anjlyv21wacmalsj6lvdgnvn" + "hash": "sha256-dtvXNjVSU1WZ4kFsT6VV56R8iGMPHtdM09dfeejnttw=" }, { "pname": "HarfBuzzSharp.NativeAssets.Linux", "version": "2.8.2-preview.178", - "sha256": "1402ylkxbgcnagcarqlfvg4gppy2pqs3bmin4n5mphva1g7bqb2p" + "hash": "sha256-Vyy8zgtqw1uLJTbWNTS+wt/7yNuO4qzYU5a91Sf1ApA=" }, { "pname": "HarfBuzzSharp.NativeAssets.macOS", "version": "2.8.2-preview.178", - "sha256": "0p8miaclnbfpacc1jaqxwfg0yfx9byagi4j4k91d9621vd19i8b2" + "hash": "sha256-YqGYQttBmNRCmkSS+JRfqTsPnuMdKxkYU9ctS5mKFV0=" }, { "pname": "HarfBuzzSharp.NativeAssets.WebAssembly", "version": "2.8.2-preview.178", - "sha256": "1n9jay9sji04xly6n8bzz4591fgy8i65p21a8mv5ip9lsyj1c320" + "hash": "sha256-QAwWpNc03Vh2RSqIW0xE/rmQCvl/IWs87QREqZNXMtk=" }, { "pname": "HarfBuzzSharp.NativeAssets.Win32", "version": "2.8.2-preview.178", - "sha256": "1r5syii96wv8q558cvsqw3lr10cdw6677lyiy82p6i3if51v3mr7" + "hash": "sha256-J9exQ3FxRHMF8tHTc4zhjYGQ6eBYb4ZKwWhzk2L0uuQ=" }, { "pname": "ICSharpCode.Decompiler", "version": "7.1.0.6543", - "sha256": "1xrajs5dcd7aqsg9ibhdcy39yrd8737kknkmqf907n7fqs2jxr46" + "hash": "sha256-huQuhcbu2AOSw3XaOc84qGWfhmcNrpiexuo01oqWKvc=" }, { "pname": "ICSharpCode.Decompiler", "version": "7.2.1.6856", - "sha256": "19z68rgzl93lh1h8anbgzw119mhvcgr9nh5q2nxk6qihl2mx97ba" + "hash": "sha256-ap3Uq6AwYjO7FbhAm/JjG9YUAv9vWYVggHQk+l9G5qc=" }, { "pname": "JetBrains.Annotations", "version": "10.3.0", - "sha256": "1grdx28ga9fp4hwwpwv354rizm8anfq4lp045q4ss41gvhggr3z8" + "hash": "sha256-6I/8HtwvEK0JLgRcSrCzCtUfMylj88s5JNcl9ZDoLb8=" }, { "pname": "Microsoft.CodeAnalysis.Analyzers", "version": "2.9.6", - "sha256": "18mr1f0wpq0fir8vjnq0a8pz50zpnblr7sabff0yqx37c975934a" + "hash": "sha256-ioxUTmJndOyBc0vpk+my94PyL1IAW7lRjg7gy4ELuaI=" }, { "pname": "Microsoft.CodeAnalysis.Common", "version": "3.4.0", - "sha256": "12rn6gl4viycwk3pz5hp5df63g66zvba4hnkwr3f0876jj5ivmsw" + "hash": "sha256-XNcdi5TmIOBG5tNCotb+xrxhXCsXln/H5MzHTegzNos=" }, { "pname": "Microsoft.CodeAnalysis.CSharp", "version": "3.4.0", - "sha256": "0rhylcwa95bxawcgixk64knv7p7xrykdjcabmx3gknk8hvj1ai9y" + "hash": "sha256-PkUV5IZo2vlGr0sx2abP/dyz7SRm9vgYV32VpDijHmY=" }, { "pname": "Microsoft.CodeAnalysis.CSharp.Scripting", "version": "3.4.0", - "sha256": "1h2f0z9xnw987x8bydka1sd42ijqjx973md6v1gvpy1qc6ad244g" + "hash": "sha256-jxDRlGE4+Ltf2KbVcVKXWEZBmg5qNr9QPyhx29MHTsA=" }, { "pname": "Microsoft.CodeAnalysis.Scripting.Common", "version": "3.4.0", - "sha256": "195gqnpwqkg2wlvk8x6yzm7byrxfq9bki20xmhf6lzfsdw3z4mf2" + "hash": "sha256-wlXyB2/afWocrB2IOFfCrme/Tv3edDQ35eJNzK/Fr6Q=" }, { "pname": "Microsoft.CSharp", "version": "4.0.1", - "sha256": "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj" + "hash": "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8=" }, { "pname": "Microsoft.CSharp", "version": "4.3.0", - "sha256": "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb" + "hash": "sha256-a3dAiPaVuky0wpcHmpTVtAQJNGZ2v91/oArA+dpJgj8=" }, { "pname": "Microsoft.DiaSymReader", "version": "1.4.0", - "sha256": "0li9shnm941jza40kqfkbbys77mrr55nvi9h3maq9fipq4qwx92d" + "hash": "sha256-TaTOMcE3uoRVHTDFbUvJuZ6j/VrT4QmI+jKQVC3UKVI=" }, { "pname": "Microsoft.DiaSymReader.Converter.Xml", "version": "1.1.0-beta2-22164-02", - "sha256": "1f8ha43xp0zy7kn1n98aaaapv6fdxl3a2qabg29fq74jzb16j9fp", + "hash": "sha256-1yVpwvqSHOySeEthoQbtzZl9lVIKJRvsPP6D2wdRELk=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.diasymreader.converter.xml/1.1.0-beta2-22164-02/microsoft.diasymreader.converter.xml.1.1.0-beta2-22164-02.nupkg" }, { "pname": "Microsoft.DiaSymReader.Native", "version": "17.0.0-beta1.21524.1", - "sha256": "0gash3xgzvcb78w2xqv003l0cld199zpfilnjbagwbr5ikdh6f3s" + "hash": "sha256-ejgD24wlL/7UkpZGd39KoVEG6ABg4y44Oovt//qAWj0=" }, { "pname": "Microsoft.DiaSymReader.PortablePdb", "version": "1.7.0-beta-21525-03", - "sha256": "0jb70rjgdif61jjc93pysfrr52hi5jlfmjdaqic7s0a3rfg0ahyk", + "hash": "sha256-00MFnstDAX1YxKrJ6qgsEYqSs9P+jsSkDMbF9mQGZ0k=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.diasymreader.portablepdb/1.7.0-beta-21525-03/microsoft.diasymreader.portablepdb.1.7.0-beta-21525-03.nupkg" }, { "pname": "Microsoft.NETCore.Platforms", "version": "1.0.1", - "sha256": "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr" + "hash": "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU=" }, { "pname": "Microsoft.NETCore.Platforms", "version": "1.1.0", - "sha256": "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm" + "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" }, { "pname": "Microsoft.NETCore.Platforms", "version": "1.1.1", - "sha256": "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj" + "hash": "sha256-8hLiUKvy/YirCWlFwzdejD2Db3DaXhHxT7GSZx/znJg=" }, { "pname": "Microsoft.NETCore.Platforms", "version": "2.0.0", - "sha256": "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0" + "hash": "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro=" }, { "pname": "Microsoft.NETCore.Platforms", "version": "2.1.2", - "sha256": "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141" + "hash": "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q=" }, { "pname": "Microsoft.NETCore.Platforms", "version": "5.0.0", - "sha256": "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc" + "hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c=" }, { "pname": "Microsoft.NETCore.Targets", "version": "1.0.1", - "sha256": "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p" + "hash": "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4=" }, { "pname": "Microsoft.NETCore.Targets", "version": "1.1.0", - "sha256": "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh" + "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" }, { "pname": "Microsoft.NETCore.Targets", "version": "1.1.3", - "sha256": "05smkcyxir59rgrmp7d6327vvrlacdgldfxhmyr1azclvga1zfsq" + "hash": "sha256-WLsf1NuUfRWyr7C7Rl9jiua9jximnVvzy6nk2D2bVRc=" }, { "pname": "Microsoft.VisualStudio.Composition", "version": "17.1.20", - "sha256": "028bcxrzqc0nng2l7fqqaa0z1k4wc541jfhcdwjvw9f45q6nf3fs" + "hash": "sha256-2g1nDS7EJb4lbww6GUhhnMzwgVIYu0PFsxYw/HNnCwk=" }, { "pname": "Microsoft.VisualStudio.Composition.Analyzers", "version": "17.1.20", - "sha256": "14fm8j1bvqh0bpfg3x814c1m747q99i4q3xplqb8db7l2xkn3v7a" + "hash": "sha256-6uxhZxf0rIYWprcPTGJK+JBTAyMB9fHcXQDivYJE1ZE=" }, { "pname": "Microsoft.VisualStudio.Validation", "version": "17.0.34", - "sha256": "09la67gw6xdss3as3ph0ql3b3zhblni2qmkma9gz53kx1hav9ygp" + "hash": "sha256-9/m0FQx9jvJfUnVWLKKlC/6xBsUA3qHV0Lp1w98xiiY=" }, { "pname": "Microsoft.Win32.Primitives", "version": "4.0.1", - "sha256": "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7" + "hash": "sha256-B4t5El/ViBdxALMcpZulewc4j/3SIXf71HhJWhm4Ctk=" + }, + { + "pname": "Microsoft.Win32.Primitives", + "version": "4.3.0", + "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg=" }, { "pname": "Microsoft.Win32.Registry", "version": "4.0.0", - "sha256": "1spf4m9pikkc19544p29a47qnhcd885klncahz133hbnyqbkmz9k" + "hash": "sha256-M/06F/Z2wTHCh4pZOgtCjUGLD1FJXEJKCmzOeFMl7uo=" }, { "pname": "Microsoft.Win32.Registry", "version": "5.0.0", - "sha256": "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n" + "hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA=" }, { "pname": "Microsoft.Win32.SystemEvents", "version": "4.5.0", - "sha256": "0fnkv3ky12227zqg4zshx4kw2mvysq2ppxjibfw02cc3iprv4njq" + "hash": "sha256-WFqy842DMQG4W1H2ewXWflfBJ+lQf/LwP0KI4OfY0zo=" }, { "pname": "Mono.Cecil", "version": "0.11.3", - "sha256": "0xcx7pk9y2n1hr15c0l1balzi69kw5gy8dk7sb8jwqyyvm35q4j3" + "hash": "sha256-QxJcRt3eYy7R0mc25F/hM5n4qVqBAlZChsEKn+Y9nXU=" }, { "pname": "NETStandard.Library", - "version": "2.0.3", - "sha256": "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y" + "version": "1.6.0", + "hash": "sha256-ExWI1EKDCRishcfAeHVS/RoJphqSqohmJIC/wz3ZtVo=" + }, + { + "pname": "NETStandard.Library", + "version": "1.6.1", + "hash": "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw=" }, { "pname": "Newtonsoft.Json", "version": "9.0.1", - "sha256": "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r" + "hash": "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU=" }, { "pname": "NuGet.Client", "version": "4.2.0", - "sha256": "1s34w7yi0xcm0hi9g32xx9njy52hjkh4gbizldvpp48mkki6bfrl" + "hash": "sha256-NLtl4pwVkXt3oz+uR+CUUBQvbepdjJciBJV1EP3hZOg=" }, { "pname": "NuGet.Common", "version": "4.2.0", - "sha256": "0j8bk9nkaxcf52az2rxhx27rqn7hs9mmw0p48i0x7g8i9b40wvwc" + "hash": "sha256-jG8OyEoRvdNBROQCXmvS8Ficj+iwZ/GVKI51NW2aC0k=" }, { "pname": "NuGet.ContentModel", "version": "4.2.0", - "sha256": "1989zmdgwh13zwg9kafapdka6p46i50iw434fb8k22jp6amnwnvm" + "hash": "sha256-dVtuqzJXCjHRcmQQHkGJhlyjZrvKqZke/yNA/lr9CaU=" }, { "pname": "NuGet.Frameworks", "version": "4.2.0", - "sha256": "0dwzg8kq0fwdjzl00ag969sxakj3brppr4y7k37yx5w1slj7wsb3" + "hash": "sha256-Y2l+JNWBl+7PmMeTfG9eQ07VdTLpKQDol407gCd6nzc=" }, { "pname": "NuGet.Packaging", "version": "4.2.0", - "sha256": "1g83ry4x0zlcdcgwd7c8daxig4cx77jics6rlfasy223hyvss8p3" + "hash": "sha256-4yKtt4dDCK+Vo9loFuU5nZEXu2qIncYfa4x+0InPA70=" }, { "pname": "NuGet.Packaging.Core", "version": "4.2.0", - "sha256": "11dpszywsxb12ybx176z2703181xixzhxg3w3rc8ivw699ivsdfk" + "hash": "sha256-0zW9Y0qG74hYHny8Dn+PPaAwwBHfnNCXF2F1zf3Xt4U=" }, { "pname": "NuGet.Packaging.Core.Types", "version": "4.2.0", - "sha256": "031gzbs5sqb46c2rbqpybc9bw0i7ilidbbv2k7rdas3300cjp5kj" + "hash": "sha256-cpYrGQBjaNXymWKv1SKNJwK+Elv+4pUFM2RhXfT6Lww=" }, { "pname": "NuGet.Repositories", "version": "4.2.0", - "sha256": "0w18lj7q85grdd563p429cg0pg8hi9xmsrr4pzskha139vhfq0lp" + "hash": "sha256-lwLs4E4jKDj1vyRnXXuKEL0LHkuC3GFKa/kVhI+kKHA=" }, { "pname": "NuGet.RuntimeModel", "version": "4.2.0", - "sha256": "0k59ww2zk56bsqici62zn59h19wp4ai9v395hy5mq6wl6mz6qaax" + "hash": "sha256-XSlsfjWUG1yLhyWNnaIil6cAU7FfmMgi1suU+QXnqUw=" }, { "pname": "NuGet.Versioning", "version": "4.2.0", - "sha256": "1mx7b4hgdhl6g7yzp3lknmkxkyfjw372nxpsmvdznwhg214iz2d3" + "hash": "sha256-o4kfSRAPcvvbrvp2K87g0vnZZ7WTjvv9eYbC9iBZp9c=" }, { "pname": "runtime.any.System.Collections", "version": "4.3.0", - "sha256": "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0" + "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8=" }, { "pname": "runtime.any.System.Diagnostics.Tools", "version": "4.3.0", - "sha256": "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk" + "hash": "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I=" }, { "pname": "runtime.any.System.Diagnostics.Tracing", "version": "4.3.0", - "sha256": "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn" + "hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI=" }, { "pname": "runtime.any.System.Globalization", "version": "4.3.0", - "sha256": "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x" + "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU=" + }, + { + "pname": "runtime.any.System.Globalization.Calendars", + "version": "4.3.0", + "hash": "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4=" }, { "pname": "runtime.any.System.IO", "version": "4.3.0", - "sha256": "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x" + "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=" }, { "pname": "runtime.any.System.Reflection", "version": "4.3.0", - "sha256": "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly" + "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" }, { "pname": "runtime.any.System.Reflection.Extensions", "version": "4.3.0", - "sha256": "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33" + "hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8=" }, { "pname": "runtime.any.System.Reflection.Primitives", "version": "4.3.0", - "sha256": "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf" + "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=" }, { "pname": "runtime.any.System.Resources.ResourceManager", "version": "4.3.0", - "sha256": "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl" + "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4=" }, { "pname": "runtime.any.System.Runtime", "version": "4.3.0", - "sha256": "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b" + "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=" }, { "pname": "runtime.any.System.Runtime.Handles", "version": "4.3.0", - "sha256": "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x" + "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4=" }, { "pname": "runtime.any.System.Runtime.InteropServices", "version": "4.3.0", - "sha256": "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19" + "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA=" }, { "pname": "runtime.any.System.Text.Encoding", "version": "4.3.0", - "sha256": "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3" + "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=" }, { "pname": "runtime.any.System.Text.Encoding.Extensions", "version": "4.3.0", - "sha256": "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8" + "hash": "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM=" }, { "pname": "runtime.any.System.Threading.Tasks", "version": "4.3.0", - "sha256": "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va" + "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" + }, + { + "pname": "runtime.any.System.Threading.Timer", + "version": "4.3.0", + "hash": "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs=" }, { "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d" + "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps=" }, { "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59" + "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I=" }, { "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa" + "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA=" }, { "pname": "runtime.native.System", "version": "4.0.0", - "sha256": "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf" + "hash": "sha256-bmaM0ovT4X4aqDJOR255Yda/u3fmHZskU++lMnsy894=" }, { "pname": "runtime.native.System", "version": "4.3.0", - "sha256": "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4" + "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" }, { "pname": "runtime.native.System.IO.Compression", "version": "4.3.0", - "sha256": "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d" + "hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8=" + }, + { + "pname": "runtime.native.System.Net.Http", + "version": "4.0.1", + "hash": "sha256-5nWnTQrA1T6t9r8MqIiV4yTNu+IH0of2OX1qteoS+8E=" + }, + { + "pname": "runtime.native.System.Net.Http", + "version": "4.3.0", + "hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg=" }, { "pname": "runtime.native.System.Security.Cryptography", "version": "4.0.0", - "sha256": "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9" + "hash": "sha256-6Q8eYzC32BbGIiTHoQaE6B3cD81vYQcH5SCswYRSp0w=" + }, + { + "pname": "runtime.native.System.Security.Cryptography.Apple", + "version": "4.3.0", + "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw=" }, { "pname": "runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97" + "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I=" }, { "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3" + "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM=" }, { "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf" + "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4=" + }, + { + "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple", + "version": "4.3.0", + "hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM=" }, { "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3" + "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0=" }, { "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn" + "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4=" }, { "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3" + "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g=" }, { "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy" + "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc=" }, { "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5" + "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw=" }, { "pname": "runtime.unix.Microsoft.Win32.Primitives", "version": "4.3.0", - "sha256": "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id" + "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg=" + }, + { + "pname": "runtime.unix.System.Console", + "version": "4.3.1", + "hash": "sha256-dxyn/1Px4FKLZ2QMUrkFpW619Y1lhPeTiGLWYM6IbpY=" }, { "pname": "runtime.unix.System.Diagnostics.Debug", "version": "4.3.0", - "sha256": "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5" + "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI=" }, { "pname": "runtime.unix.System.IO.FileSystem", "version": "4.3.0", - "sha256": "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix" + "hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I=" + }, + { + "pname": "runtime.unix.System.Net.Primitives", + "version": "4.3.0", + "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0=" + }, + { + "pname": "runtime.unix.System.Net.Sockets", + "version": "4.3.0", + "hash": "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4=" }, { "pname": "runtime.unix.System.Private.Uri", "version": "4.3.0", - "sha256": "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk" + "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=" }, { "pname": "runtime.unix.System.Runtime.Extensions", "version": "4.3.0", - "sha256": "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p" + "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=" }, { "pname": "SkiaSharp", "version": "2.88.0-preview.178", - "sha256": "062g14s6b2bixanpwihj3asm3jwvfw15mhvzqv6901afrlgzx4nk" + "hash": "sha256-05L+H81OBZDMxn/DWgJ3m8tRtRoSRn6t6nGJZTQJTxg=" }, { "pname": "SkiaSharp.NativeAssets.Linux", "version": "2.88.0-preview.178", - "sha256": "07kga1j51l3l302nvf537zg5clf6rflinjy0xd6i06cmhpkf3ksw" + "hash": "sha256-XM/h5oWVGRBN68BLG6nLxlFW3j+juG0FGHTQUGRQbx4=" }, { "pname": "SkiaSharp.NativeAssets.macOS", "version": "2.88.0-preview.178", - "sha256": "14p95nxccs6yq4rn2h9zbb60k0232k6349zdpy31jcfr6gc99cgi" + "hash": "sha256-8bGU2DPZMRmGv+0nMswUQ4AJzFo/QWEzwd5oxrot6ZI=" }, { "pname": "SkiaSharp.NativeAssets.WebAssembly", "version": "2.88.0-preview.178", - "sha256": "09jmcg5k1vpsal8jfs90mwv0isf2y5wq3h4hd77rv6vffn5ic4sm" + "hash": "sha256-VRMWi3Vum53PaZDAgXnxwukINq8gaScRVfruMMtjVSY=" }, { "pname": "SkiaSharp.NativeAssets.Win32", "version": "2.88.0-preview.178", - "sha256": "0ficil702lv3fvwpngbqh5l85i05l5jafzyh4jprzshr2qbnd8nl" + "hash": "sha256-1KJmFxYZ6p+vJNB/p2ShBcSCaIF4PXv5dmNTAQ6NLDo=" + }, + { + "pname": "System.AppContext", + "version": "4.1.0", + "hash": "sha256-v6YfyfrKmhww+EYHUq6cwYUMj00MQ6SOfJtcGVRlYzs=" + }, + { + "pname": "System.AppContext", + "version": "4.3.0", + "hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg=" + }, + { + "pname": "System.Buffers", + "version": "4.0.0", + "hash": "sha256-+YUymoyS0O+xVyF2+LiAdZlMww8nofPN4ja9ylYqRo8=" }, { "pname": "System.Buffers", "version": "4.3.0", - "sha256": "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy" - }, - { - "pname": "System.Buffers", - "version": "4.4.0", - "sha256": "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19" - }, - { - "pname": "System.Buffers", - "version": "4.5.1", - "sha256": "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3" + "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=" }, { "pname": "System.Collections", "version": "4.0.11", - "sha256": "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6" + "hash": "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0=" }, { "pname": "System.Collections", "version": "4.3.0", - "sha256": "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9" + "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=" }, { "pname": "System.Collections.Concurrent", "version": "4.0.12", - "sha256": "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc" + "hash": "sha256-zIEM7AB4SyE9u6G8+o+gCLLwkgi6+3rHQVPdn/dEwB8=" + }, + { + "pname": "System.Collections.Concurrent", + "version": "4.3.0", + "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI=" }, { "pname": "System.Collections.Immutable", "version": "1.5.0", - "sha256": "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06" + "hash": "sha256-BliqYlL9ntbMXo5d7NUrKXwYN+PqdyqDIS5bp4qVr7Q=" }, { "pname": "System.Collections.Immutable", "version": "1.6.0", - "sha256": "1pbxzdz3pwqyybzv5ff2b7nrc281bhg7hq34w0fn1w3qfgrbwyw2" + "hash": "sha256-gnu+8nN48GAd4GRgeB5cAQmW7VnCubL/8h7zO377fd0=" }, { "pname": "System.Collections.Immutable", "version": "5.0.0", - "sha256": "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r" + "hash": "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8=" }, { "pname": "System.ComponentModel.Annotations", "version": "4.5.0", - "sha256": "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p" + "hash": "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso=" }, { "pname": "System.ComponentModel.Composition", "version": "6.0.0", - "sha256": "16zfx5mivkkykp76krw8x68izmjf79ldfmn26k9x3m55lmp9i77c" + "hash": "sha256-7JyYbqWl1NHTNMJW12g6TtYfkemI52nOnX7OHWvp7ps=" }, { "pname": "System.Composition", "version": "6.0.0", - "sha256": "1p7hysns39cc24af6dwd4m48bqjsrr3clvi4aws152mh2fgyg50z" + "hash": "sha256-H5TnnxOwihI0VyRuykbOWuKFSCWNN+MUEYyloa328Nw=" }, { "pname": "System.Composition.AttributedModel", "version": "6.0.0", - "sha256": "1mqrblb0l65hw39d0hnspqcv85didpn4wbiwhfgj4784wzqx2w6k" + "hash": "sha256-03DR8ecEHSKfgzwuTuxtsRW0Gb7aQtDS4LAYChZdGdc=" }, { "pname": "System.Composition.Convention", "version": "6.0.0", - "sha256": "02km3yb94p1c4s7liyhkmda0g71zm1rc8ijsfmy4bnlkq15xjw3b" + "hash": "sha256-a3DZS8CT2kV8dVpGxHKoP5wHVKsT+kiPJixckpYfdQo=" }, { "pname": "System.Composition.Hosting", "version": "6.0.0", - "sha256": "0big5nk8c44rxp6cfykhk7rxvn2cgwa99w6c3v2a36adc3lj36ky" + "hash": "sha256-fpoh6WBNmaHEHszwlBR/TNjd85lwesfM7ZkQhqYtLy4=" }, { "pname": "System.Composition.Runtime", "version": "6.0.0", - "sha256": "0vq5ik63yii1784gsa2f2kx9w6xllmm8b8rk0arid1jqdj1nyrlw" + "hash": "sha256-nGZvg2xYhhazAjOjhWqltBue+hROKP0IOiFGP8yMBW8=" }, { "pname": "System.Composition.TypedParts", "version": "6.0.0", - "sha256": "0y9pq3y60nyrpfy51f576a0qjjdh61mcv8vnik32pm4bz56h9q72" + "hash": "sha256-4uAETfmL1CvGjHajzWowsEmJgTKnuFC8u9lbYPzAN3k=" + }, + { + "pname": "System.Console", + "version": "4.0.0", + "hash": "sha256-jtZfT/TpJtLisV/y5Mk3IfCpE79zwhBYXtyGP9jC3Xo=" + }, + { + "pname": "System.Console", + "version": "4.3.0", + "hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo=" }, { "pname": "System.Diagnostics.Debug", "version": "4.0.11", - "sha256": "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz" + "hash": "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4=" }, { "pname": "System.Diagnostics.Debug", "version": "4.3.0", - "sha256": "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y" + "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=" + }, + { + "pname": "System.Diagnostics.DiagnosticSource", + "version": "4.0.0", + "hash": "sha256-dYh9UoFesuGcHY+ewsI+z2WnNy+bwHPsHQ3t85cbzNg=" + }, + { + "pname": "System.Diagnostics.DiagnosticSource", + "version": "4.3.0", + "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw=" }, { "pname": "System.Diagnostics.Process", "version": "4.1.0", - "sha256": "061lrcs7xribrmq7kab908lww6kn2xn1w3rdc41q189y0jibl19s" + "hash": "sha256-OgW6ogQ+oYADYS0PHmwXdhrOKQJpqXlwzSvmfjTLNBg=" }, { "pname": "System.Diagnostics.Tools", "version": "4.0.1", - "sha256": "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x" + "hash": "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U=" + }, + { + "pname": "System.Diagnostics.Tools", + "version": "4.3.0", + "hash": "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y=" }, { "pname": "System.Diagnostics.Tracing", "version": "4.1.0", - "sha256": "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394" + "hash": "sha256-JA0jJcLbU3zh52ub3zweob2EVHvxOqiC6SCYHrY5WbQ=" }, { "pname": "System.Diagnostics.Tracing", "version": "4.3.0", - "sha256": "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4" + "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q=" }, { "pname": "System.Drawing.Common", "version": "4.5.0", - "sha256": "0knqa0zsm91nfr34br8gx5kjqq4v81zdhqkacvs2hzc8nqk0ddhc" + "hash": "sha256-DLYGJraIfSj0Zmpi2H5Am2AsZ+kP5UVGdjakqj9Q2E4=" }, { "pname": "System.Dynamic.Runtime", "version": "4.0.11", - "sha256": "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9" + "hash": "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4=" }, { "pname": "System.Dynamic.Runtime", "version": "4.3.0", - "sha256": "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk" + "hash": "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU=" }, { "pname": "System.Globalization", "version": "4.0.11", - "sha256": "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d" + "hash": "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw=" }, { "pname": "System.Globalization", "version": "4.3.0", - "sha256": "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki" + "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=" + }, + { + "pname": "System.Globalization.Calendars", + "version": "4.0.1", + "hash": "sha256-EJN3LbN+b0O9Dr2eg7kfThCYpne0iJ/H/GIyUTNVYC8=" + }, + { + "pname": "System.Globalization.Calendars", + "version": "4.3.0", + "hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc=" + }, + { + "pname": "System.Globalization.Extensions", + "version": "4.0.1", + "hash": "sha256-zLtkPryJwqTGcJqMC6zoMMvMrT+aAL5GoumjmMtqUEI=" + }, + { + "pname": "System.Globalization.Extensions", + "version": "4.3.0", + "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk=" }, { "pname": "System.IO", "version": "4.1.0", - "sha256": "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp" + "hash": "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw=" }, { "pname": "System.IO", "version": "4.3.0", - "sha256": "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f" + "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=" }, { "pname": "System.IO.Compression", "version": "4.3.0", - "sha256": "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz" + "hash": "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA=" + }, + { + "pname": "System.IO.Compression.ZipFile", + "version": "4.0.1", + "hash": "sha256-An0Twb9JODl/nuVm6MR0kJ3aj4WxGpI/1/vVp5b94kA=" + }, + { + "pname": "System.IO.Compression.ZipFile", + "version": "4.3.0", + "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs=" }, { "pname": "System.IO.FileSystem", "version": "4.0.1", - "sha256": "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1" + "hash": "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0=" }, { "pname": "System.IO.FileSystem", "version": "4.3.0", - "sha256": "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw" + "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw=" }, { "pname": "System.IO.FileSystem.Primitives", "version": "4.0.1", - "sha256": "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612" + "hash": "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg=" }, { "pname": "System.IO.FileSystem.Primitives", "version": "4.3.0", - "sha256": "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c" + "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg=" }, { "pname": "System.Linq", "version": "4.1.0", - "sha256": "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5" + "hash": "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794=" }, { "pname": "System.Linq", "version": "4.3.0", - "sha256": "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7" + "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A=" }, { "pname": "System.Linq.Expressions", "version": "4.1.0", - "sha256": "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg" + "hash": "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4=" }, { "pname": "System.Linq.Expressions", "version": "4.3.0", - "sha256": "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv" + "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8=" }, { "pname": "System.Memory", "version": "4.5.3", - "sha256": "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a" + "hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk=" }, { - "pname": "System.Memory", - "version": "4.5.4", - "sha256": "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y" + "pname": "System.Net.Http", + "version": "4.1.0", + "hash": "sha256-y6PnGuObJvOkhl9CXNFJQcV3SXuEz5yRLOCxGGTEucQ=" }, { - "pname": "System.Numerics.Vectors", - "version": "4.4.0", - "sha256": "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba" + "pname": "System.Net.Http", + "version": "4.3.0", + "hash": "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q=" + }, + { + "pname": "System.Net.NameResolution", + "version": "4.3.0", + "hash": "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c=" + }, + { + "pname": "System.Net.Primitives", + "version": "4.0.11", + "hash": "sha256-2YSijNhCdw/ZU2yfH7vE+ReA8pgxRCXPnWr+ab36v4M=" + }, + { + "pname": "System.Net.Primitives", + "version": "4.3.0", + "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE=" + }, + { + "pname": "System.Net.Sockets", + "version": "4.1.0", + "hash": "sha256-muK7oXIX7ykqhXskuUt0KX6Hzg5VogJhUS0JiOB2BY0=" + }, + { + "pname": "System.Net.Sockets", + "version": "4.3.0", + "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus=" }, { "pname": "System.Numerics.Vectors", "version": "4.5.0", - "sha256": "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59" + "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8=" }, { "pname": "System.ObjectModel", "version": "4.0.12", - "sha256": "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj" + "hash": "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s=" }, { "pname": "System.ObjectModel", "version": "4.3.0", - "sha256": "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2" + "hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q=" }, { "pname": "System.Private.Uri", "version": "4.3.0", - "sha256": "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx" + "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=" }, { "pname": "System.Reactive", "version": "5.0.0", - "sha256": "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik" + "hash": "sha256-M5Z8pw8rVb8ilbnTdaOptzk5VFd5DlKa7zzCpuytTtE=" }, { "pname": "System.Reflection", "version": "4.1.0", - "sha256": "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9" + "hash": "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs=" }, { "pname": "System.Reflection", "version": "4.3.0", - "sha256": "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m" + "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" }, { "pname": "System.Reflection.Emit", "version": "4.0.1", - "sha256": "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp" + "hash": "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk=" }, { "pname": "System.Reflection.Emit", "version": "4.3.0", - "sha256": "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74" + "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU=" }, { "pname": "System.Reflection.Emit", "version": "4.7.0", - "sha256": "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp" + "hash": "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg=" }, { "pname": "System.Reflection.Emit.ILGeneration", "version": "4.0.1", - "sha256": "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0" + "hash": "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0=" }, { "pname": "System.Reflection.Emit.ILGeneration", "version": "4.3.0", - "sha256": "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q" - }, - { - "pname": "System.Reflection.Emit.ILGeneration", - "version": "4.7.0", - "sha256": "0l8jpxhpgjlf1nkz5lvp61r4kfdbhr29qi8aapcxn3izd9wd0j8r" + "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA=" }, { "pname": "System.Reflection.Emit.Lightweight", "version": "4.0.1", - "sha256": "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr" + "hash": "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g=" }, { "pname": "System.Reflection.Emit.Lightweight", "version": "4.3.0", - "sha256": "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c" + "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I=" }, { "pname": "System.Reflection.Extensions", "version": "4.0.1", - "sha256": "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn" + "hash": "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ=" }, { "pname": "System.Reflection.Extensions", "version": "4.3.0", - "sha256": "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq" + "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk=" }, { "pname": "System.Reflection.Metadata", "version": "1.6.0", - "sha256": "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4" + "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E=" }, { "pname": "System.Reflection.Metadata", "version": "5.0.0", - "sha256": "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss" + "hash": "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8=" }, { "pname": "System.Reflection.Primitives", "version": "4.0.1", - "sha256": "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28" + "hash": "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0=" }, { "pname": "System.Reflection.Primitives", "version": "4.3.0", - "sha256": "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276" + "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" }, { "pname": "System.Reflection.TypeExtensions", "version": "4.1.0", - "sha256": "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7" + "hash": "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4=" }, { "pname": "System.Reflection.TypeExtensions", "version": "4.3.0", - "sha256": "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1" + "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng=" }, { "pname": "System.Reflection.TypeExtensions", "version": "4.7.0", - "sha256": "04qw9km34pmzr2alckb3mqdb4fpqwlvzk59lg8c7jfidghcl4jqq" + "hash": "sha256-GEtCGXwtOnkYejSV+Tfl+DqyGq5jTUaVyL9eMupMHBM=" }, { "pname": "System.Resources.ResourceManager", "version": "4.0.1", - "sha256": "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi" + "hash": "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw=" }, { "pname": "System.Resources.ResourceManager", "version": "4.3.0", - "sha256": "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49" + "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=" }, { "pname": "System.Runtime", "version": "4.1.0", - "sha256": "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m" + "hash": "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo=" }, { "pname": "System.Runtime", "version": "4.3.0", - "sha256": "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7" + "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" }, { "pname": "System.Runtime", "version": "4.3.1", - "sha256": "03ch4d2acf6q037a4njxpll2kkx3dwzlg07yxr4z5m6j1kqgmm27" + "hash": "sha256-R9T68AzS1PJJ7v6ARz9vo88pKL1dWqLOANg4pkQjkA0=" }, { "pname": "System.Runtime.CompilerServices.Unsafe", "version": "4.5.2", - "sha256": "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi" - }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "4.5.3", - "sha256": "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln" + "hash": "sha256-8eUXXGWO2LL7uATMZye2iCpQOETn2jCcjUhG6coR5O8=" }, { "pname": "System.Runtime.CompilerServices.Unsafe", "version": "4.6.0", - "sha256": "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m" + "hash": "sha256-FTjQeMuvqnKxpoVsVh/OlQ21NMaZiFtOdv7VdZ+Iv3Y=" }, { "pname": "System.Runtime.Extensions", "version": "4.1.0", - "sha256": "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z" + "hash": "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc=" }, { "pname": "System.Runtime.Extensions", "version": "4.3.0", - "sha256": "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60" + "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=" }, { "pname": "System.Runtime.Extensions", "version": "4.3.1", - "sha256": "1bzkwqm1yhvm70yq2bx2s3mqfx2lr01sqsay8cl5n5xcbq07ynf6" + "hash": "sha256-xll/AF6sF1soQ15prAPIVHSH69CiL4E9OHVDHyrm868=" }, { "pname": "System.Runtime.Handles", "version": "4.0.1", - "sha256": "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g" + "hash": "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w=" }, { "pname": "System.Runtime.Handles", "version": "4.3.0", - "sha256": "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8" + "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=" }, { "pname": "System.Runtime.InteropServices", "version": "4.1.0", - "sha256": "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1" + "hash": "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY=" }, { "pname": "System.Runtime.InteropServices", "version": "4.3.0", - "sha256": "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j" + "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=" }, { - "pname": "System.Runtime.InteropServices.WindowsRuntime", + "pname": "System.Runtime.InteropServices.RuntimeInformation", + "version": "4.0.0", + "hash": "sha256-5j53amb76A3SPiE3B0llT2XPx058+CgE7OXL4bLalT4=" + }, + { + "pname": "System.Runtime.InteropServices.RuntimeInformation", "version": "4.3.0", - "sha256": "0bpsy91yqm2ryp5y9li8p6yh4yrxcvg9zvm569ifw25rpy67bgp9" + "hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA=" }, { "pname": "System.Runtime.Numerics", "version": "4.0.1", - "sha256": "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn" + "hash": "sha256-1pJt5ZGxLPTX1mjOi8qZPXyyOMkYV0NstoUCv91HYPg=" + }, + { + "pname": "System.Runtime.Numerics", + "version": "4.3.0", + "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc=" }, { "pname": "System.Runtime.Serialization.Primitives", "version": "4.1.1", - "sha256": "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k" + "hash": "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA=" }, { "pname": "System.Security.AccessControl", "version": "5.0.0", - "sha256": "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r" + "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54=" + }, + { + "pname": "System.Security.Claims", + "version": "4.3.0", + "hash": "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks=" }, { "pname": "System.Security.Cryptography.Algorithms", "version": "4.2.0", - "sha256": "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85" + "hash": "sha256-BelNIpEyToEp/VYKnje/q1P7KNEpQNtOzGPU18pLGpE=" + }, + { + "pname": "System.Security.Cryptography.Algorithms", + "version": "4.3.0", + "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8=" + }, + { + "pname": "System.Security.Cryptography.Cng", + "version": "4.2.0", + "hash": "sha256-7F+m3HnmBsgE4xWF8FeCGlaEgQM3drqA6HEaQr6MEoU=" + }, + { + "pname": "System.Security.Cryptography.Cng", + "version": "4.3.0", + "hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw=" + }, + { + "pname": "System.Security.Cryptography.Csp", + "version": "4.0.0", + "hash": "sha256-WHyR6vVK3zaT4De7jgQFUar1P5fiX9ECwiVkJDFFm7M=" + }, + { + "pname": "System.Security.Cryptography.Csp", + "version": "4.3.0", + "hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ=" }, { "pname": "System.Security.Cryptography.Encoding", "version": "4.0.0", - "sha256": "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4" + "hash": "sha256-ZO7ha39J5uHkIF2RoEKv/bW/bLbVvYMO4+rWyYsKHik=" + }, + { + "pname": "System.Security.Cryptography.Encoding", + "version": "4.3.0", + "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss=" + }, + { + "pname": "System.Security.Cryptography.OpenSsl", + "version": "4.0.0", + "hash": "sha256-mLijAozynzjiOMyh2P5BHcfVq3Ovd0T/phG08SIbXZs=" + }, + { + "pname": "System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4=" }, { "pname": "System.Security.Cryptography.Primitives", "version": "4.0.0", - "sha256": "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh" + "hash": "sha256-sEdPftfTxQd/8DpdpqUZC2XWC0SjVCPqAkEleLl17EQ=" + }, + { + "pname": "System.Security.Cryptography.Primitives", + "version": "4.3.0", + "hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318=" + }, + { + "pname": "System.Security.Cryptography.X509Certificates", + "version": "4.1.0", + "hash": "sha256-sBUUhJP+yYDXvcjNMKqNpn8yzGUpVABwK9vVUvYKjzI=" + }, + { + "pname": "System.Security.Cryptography.X509Certificates", + "version": "4.3.0", + "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0=" + }, + { + "pname": "System.Security.Principal", + "version": "4.3.0", + "hash": "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk=" + }, + { + "pname": "System.Security.Principal.Windows", + "version": "4.3.0", + "hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE=" }, { "pname": "System.Security.Principal.Windows", "version": "4.7.0", - "sha256": "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d" + "hash": "sha256-rWBM2U8Kq3rEdaa1MPZSYOOkbtMGgWyB8iPrpIqmpqg=" }, { "pname": "System.Security.Principal.Windows", "version": "5.0.0", - "sha256": "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8" + "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y=" }, { "pname": "System.Text.Encoding", "version": "4.0.11", - "sha256": "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw" + "hash": "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc=" }, { "pname": "System.Text.Encoding", "version": "4.3.0", - "sha256": "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr" + "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" }, { "pname": "System.Text.Encoding.CodePages", "version": "4.5.1", - "sha256": "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w" + "hash": "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw=" }, { "pname": "System.Text.Encoding.Extensions", "version": "4.3.0", - "sha256": "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy" + "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc=" }, { "pname": "System.Text.RegularExpressions", "version": "4.1.0", - "sha256": "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7" + "hash": "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c=" }, { "pname": "System.Text.RegularExpressions", "version": "4.3.0", - "sha256": "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l" + "hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0=" }, { "pname": "System.Threading", "version": "4.0.11", - "sha256": "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls" + "hash": "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac=" }, { "pname": "System.Threading", "version": "4.3.0", - "sha256": "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34" + "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=" }, { "pname": "System.Threading.Tasks", "version": "4.0.11", - "sha256": "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5" + "hash": "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs=" }, { "pname": "System.Threading.Tasks", "version": "4.3.0", - "sha256": "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7" + "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" }, { "pname": "System.Threading.Tasks.Dataflow", "version": "5.0.0", - "sha256": "028fimgwn5j9fv6m547c975a8b90d9qcnb89k5crjyspsnjcqbhy" + "hash": "sha256-Hi7MpNVXe5lZmQkty3BqIC2kyknskFLNdkkWy1+NDgk=" }, { "pname": "System.Threading.Tasks.Extensions", "version": "4.0.0", - "sha256": "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr" + "hash": "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE=" }, { "pname": "System.Threading.Tasks.Extensions", "version": "4.3.0", - "sha256": "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z" + "hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc=" }, { "pname": "System.Threading.Tasks.Extensions", "version": "4.5.3", - "sha256": "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i" - }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.5.4", - "sha256": "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153" + "hash": "sha256-8TglbC6KBHlDeSfgr6d5dGn7wu8td4XERl2JUyo0+Tw=" }, { "pname": "System.Threading.Thread", "version": "4.0.0", - "sha256": "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc" + "hash": "sha256-7EtSJuKqcW107FYA5Ko9NFXEWUPIzNDtlfKaQV2pvb8=" }, { "pname": "System.Threading.ThreadPool", "version": "4.0.10", - "sha256": "0fdr61yjcxh5imvyf93n2m3n5g9pp54bnw2l1d2rdl9z6dd31ypx" + "hash": "sha256-/fowWjM/0ZZFC1Rwu0i5N71iRxV2JOd3jQV2Jn0wuTk=" + }, + { + "pname": "System.Threading.ThreadPool", + "version": "4.3.0", + "hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg=" + }, + { + "pname": "System.Threading.Timer", + "version": "4.0.1", + "hash": "sha256-5lU6zt1O9JDSPr2KAHw4BYgysHnt0yyZrMNa5IIjxZY=" + }, + { + "pname": "System.Threading.Timer", + "version": "4.3.0", + "hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s=" }, { "pname": "System.ValueTuple", "version": "4.5.0", - "sha256": "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy" + "hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI=" }, { "pname": "System.Xml.ReaderWriter", "version": "4.0.11", - "sha256": "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5" + "hash": "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA=" + }, + { + "pname": "System.Xml.ReaderWriter", + "version": "4.3.0", + "hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA=" }, { "pname": "System.Xml.ReaderWriter", "version": "4.3.1", - "sha256": "15f9vd7r0bxmyv754238bdckfg6sxaa3d4yx71hdzkz9k0mhjcky" + "hash": "sha256-fjIJK5jpz99gON2TNpTq2jw3WVtoCFLO9rUvkE/byZU=" }, { "pname": "System.Xml.XDocument", "version": "4.0.11", - "sha256": "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18" + "hash": "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg=" + }, + { + "pname": "System.Xml.XDocument", + "version": "4.3.0", + "hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI=" }, { "pname": "Tmds.DBus", "version": "0.9.0", - "sha256": "0vvx6sg8lxm23g5jvm5wh2gfs95mv85vd52lkq7d1b89bdczczf3" + "hash": "sha256-w332WVsJrdAOnlSUtgvatSTtnoC81C3LG6J2ip42fW8=" } ] diff --git a/pkgs/applications/misc/avalonia-ilspy/dotnet-8-upgrade.patch b/pkgs/applications/misc/avalonia-ilspy/dotnet-8-upgrade.patch new file mode 100644 index 000000000000..60aa5abcb46f --- /dev/null +++ b/pkgs/applications/misc/avalonia-ilspy/dotnet-8-upgrade.patch @@ -0,0 +1,64 @@ +diff --git a/ICSharpCode.Decompiler.PdbProvider.Cecil/ICSharpCode.Decompiler.PdbProvider.Cecil.csproj b/ICSharpCode.Decompiler.PdbProvider.Cecil/ICSharpCode.Decompiler.PdbProvider.Cecil.csproj +index 397e0e5..dfa385c 100644 +--- a/ICSharpCode.Decompiler.PdbProvider.Cecil/ICSharpCode.Decompiler.PdbProvider.Cecil.csproj ++++ b/ICSharpCode.Decompiler.PdbProvider.Cecil/ICSharpCode.Decompiler.PdbProvider.Cecil.csproj +@@ -1,7 +1,7 @@ +  + + +- netstandard2.0 ++ net8.0 + 7.2 + true + +diff --git a/ILSpy.Core/ILSpy.Core.csproj b/ILSpy.Core/ILSpy.Core.csproj +index cd6d5e2..d725817 100644 +--- a/ILSpy.Core/ILSpy.Core.csproj ++++ b/ILSpy.Core/ILSpy.Core.csproj +@@ -2,7 +2,7 @@ + + + +- netstandard2.0 ++ net8.0 + False + false + True +diff --git a/ILSpy/ILSpy.csproj b/ILSpy/ILSpy.csproj +index 4deb56f..b9813ba 100644 +--- a/ILSpy/ILSpy.csproj ++++ b/ILSpy/ILSpy.csproj +@@ -1,7 +1,7 @@ +  + + +- net6.0 ++ net8.0 + WinExe + + true +diff --git a/SharpTreeView/SharpTreeView.csproj b/SharpTreeView/SharpTreeView.csproj +index d6f46c5..4183ffd 100644 +--- a/SharpTreeView/SharpTreeView.csproj ++++ b/SharpTreeView/SharpTreeView.csproj +@@ -1,6 +1,6 @@ +  + +- netstandard2.0 ++ net8.0 + False + false + True +diff --git a/TestPlugin/TestPlugin.csproj b/TestPlugin/TestPlugin.csproj +index 453a3ef..806f375 100644 +--- a/TestPlugin/TestPlugin.csproj ++++ b/TestPlugin/TestPlugin.csproj +@@ -2,7 +2,7 @@ + + + +- netstandard2.0 ++ net8.0 + Test.Plugin + + False diff --git a/pkgs/applications/misc/bitwarden-menu/default.nix b/pkgs/applications/misc/bitwarden-menu/default.nix index bfb1d646a919..2525e3f65b88 100644 --- a/pkgs/applications/misc/bitwarden-menu/default.nix +++ b/pkgs/applications/misc/bitwarden-menu/default.nix @@ -8,13 +8,13 @@ buildPythonApplication rec { pname = "bitwarden-menu"; - version = "0.4.3"; + version = "0.4.5"; pyproject = true; src = fetchPypi { pname = "bitwarden_menu"; inherit version; - hash = "sha256-tuIolWvQ/vKSJr6oUTL7ZLPgdkYsIZods5yQNNfWbWY="; + hash = "sha256-vUlNqSVdGhfN5WjDjf1ub32Y2WoBndIdFzfCNwo5+Vg="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/misc/cask-server/default.nix b/pkgs/applications/misc/cask-server/default.nix index f2d6b680be34..ece410684697 100644 --- a/pkgs/applications/misc/cask-server/default.nix +++ b/pkgs/applications/misc/cask-server/default.nix @@ -13,7 +13,7 @@ mkDerivation rec { src = fetchFromGitHub { owner = "Nitrux"; repo = pname; - rev = "refs/tags/v${version}"; + tag = "v${version}"; sha256 = "sha256-XUgLtZMcvzGewtUcgu7FbBCn/1zqOjWvw2AI9gUwWkc="; }; diff --git a/pkgs/applications/misc/databricks-sql-cli/default.nix b/pkgs/applications/misc/databricks-sql-cli/default.nix index 385910f68010..8393de6e9999 100644 --- a/pkgs/applications/misc/databricks-sql-cli/default.nix +++ b/pkgs/applications/misc/databricks-sql-cli/default.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "databricks"; repo = "databricks-sql-cli"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-wmwXw1o+pRsRjA7ai9x5o1el7mNBqM6xlGrvw0IqfMo="; }; diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index 89579d62a4f9..2cdcfef62bac 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "Electron-Cash"; repo = "Electron-Cash"; - rev = "refs/tags/${version}"; + tag = version; sha256 = "sha256-xOyj5XerOwgfvI0qj7+7oshDvd18h5IeZvcJTis8nWo="; }; diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index e6fde4b0a7a9..7888db1a27d6 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -40,7 +40,7 @@ mkDerivation rec { src = fetchFromGitHub { owner = "GoldenCheetah"; repo = "GoldenCheetah"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-6JAdnYaKULJsc/zdcTMbCkbOCbiVtnJivEazDKL721c="; }; diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index c26b63f5ec30..91e1e5853cf8 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -33,7 +33,7 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "gramps-project"; repo = "gramps"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-DfKKB+rgMGQ8HTqhCp11UTYLj3Fdd0B0v4a922GJ8L8="; }; diff --git a/pkgs/applications/misc/html5validator/default.nix b/pkgs/applications/misc/html5validator/default.nix index 154c36cd7718..8692e4ad735b 100644 --- a/pkgs/applications/misc/html5validator/default.nix +++ b/pkgs/applications/misc/html5validator/default.nix @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "svenkreiss"; repo = "html5validator"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-yvclqE4+2R9q/UJU9W95U1/xVJeNj+5eKvT6VQel9k8="; }; diff --git a/pkgs/applications/misc/inkcut/default.nix b/pkgs/applications/misc/inkcut/default.nix index b23d544071ac..cf0a61e62fbc 100644 --- a/pkgs/applications/misc/inkcut/default.nix +++ b/pkgs/applications/misc/inkcut/default.nix @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = pname; repo = pname; - rev = "refs/tags/v${version}"; + tag = "v${version}"; sha256 = "sha256-S5IrNWVoUp1w+P7DrKlOUOyY3Q16CHSct9ndZOB3UpU="; }; diff --git a/pkgs/applications/misc/maliit-framework/default.nix b/pkgs/applications/misc/maliit-framework/default.nix index e295ba09bf4d..87d388e02d29 100644 --- a/pkgs/applications/misc/maliit-framework/default.nix +++ b/pkgs/applications/misc/maliit-framework/default.nix @@ -31,7 +31,7 @@ mkDerivation rec { src = fetchFromGitHub { owner = "maliit"; repo = "framework"; - rev = "refs/tags/${version}"; + tag = version; sha256 = "sha256-q+hiupwlA0PfG+xtomCUp2zv6HQrGgmOd9CU193ucrY="; }; diff --git a/pkgs/applications/misc/mbutil/default.nix b/pkgs/applications/misc/mbutil/default.nix index 962df1d4dfb9..bbfadd2bb105 100644 --- a/pkgs/applications/misc/mbutil/default.nix +++ b/pkgs/applications/misc/mbutil/default.nix @@ -14,7 +14,7 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "mapbox"; repo = "mbutil"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-vxAF49NluEI/cZMUv1dlQBpUh1jfZ6KUVkYAmFAWphk="; }; diff --git a/pkgs/applications/misc/meerk40t/default.nix b/pkgs/applications/misc/meerk40t/default.nix index 6406abad27bb..d694ecdfd874 100644 --- a/pkgs/applications/misc/meerk40t/default.nix +++ b/pkgs/applications/misc/meerk40t/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "meerk40t"; repo = pname; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-dybmbmEvvTka0wMBIUDYemqDaCvG9odgCbIWYhROJLI="; }; diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix index ef35db703087..8ac1a9099e37 100644 --- a/pkgs/applications/misc/megasync/default.nix +++ b/pkgs/applications/misc/megasync/default.nix @@ -1,51 +1,69 @@ -{ lib -, stdenv -, autoconf -, automake -, c-ares -, cryptopp -, curl -, doxygen -, fetchFromGitHub -, ffmpeg -, libmediainfo -, libraw -, libsodium -, libtool -, libuv -, libzen -, lsb-release -, mkDerivation -, pkg-config -, qtbase -, qttools -, qtx11extras -, sqlite -, swig -, unzip -, wget +{ + lib, + stdenv, + c-ares, + cmake, + cryptopp, + curl, + fetchFromGitHub, + fetchpatch, + ffmpeg, + hicolor-icon-theme, + icu, + libmediainfo, + libsodium, + libtool, + libuv, + libxcb, + libzen, + mkDerivation, + openssl, + pkg-config, + qtbase, + qtdeclarative, + qtgraphicaleffects, + qttools, + qtquickcontrols, + qtquickcontrols2, + qtsvg, + qtx11extras, + readline, + sqlite, + unzip, + wget, + xorg, + zlib, + qt5, }: mkDerivation rec { pname = "megasync"; - version = "4.9.1.0"; + version = "5.6.1.0"; - src = fetchFromGitHub { + src = fetchFromGitHub rec { owner = "meganz"; repo = "MEGAsync"; rev = "v${version}_Linux"; - hash = "sha256-Y1nfY5iP64iSCYwzqxbjZAQNHyj4yVbSudSInm+yJzY="; - fetchSubmodules = true; + hash = "sha256-EjXmx+beYH3J60RidkEbZHFS5ZAOpJKmNC+WCIM84RA="; + fetchSubmodules = false; # DesignTokensImporter cannot be fetched, see #1010 in github:meganz/megasync + leaveDotGit = true; + postFetch = '' + cd $out + + git remote add origin $url + git fetch origin + git clean -fdx + git checkout ${rev} + git submodule update --init src/MEGASync/mega + + rm -rf .git + ''; # Why so complicated, I just want a single submodule }; nativeBuildInputs = [ - autoconf - automake - doxygen + cmake libtool - lsb-release pkg-config qttools - swig unzip ]; buildInputs = [ @@ -53,23 +71,40 @@ mkDerivation rec { cryptopp curl ffmpeg + hicolor-icon-theme + icu libmediainfo - libraw libsodium libuv + libxcb libzen + openssl qtbase + qtdeclarative + qtgraphicaleffects + qtquickcontrols + qtquickcontrols2 + qtsvg qtx11extras + readline sqlite wget + zlib ]; patches = [ - # Distro and version targets attempt to use lsb_release which is broken - # (see issue: https://github.com/NixOS/nixpkgs/issues/22729) - ./noinstall-distro-version.patch - # megasync target is not part of the install rule thanks to a commented block - ./install-megasync.patch + (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/020-megasync-sdk-fix-cmake-dependencies-detection.patch?h=megasync&id=4b1eca5bc0d75709dee3a1260264d1b6386d3398"; + hash = "sha256-y3WhLkawFzQRzzRBpioiyAT3F1NDQvYBOm2888g5V5c="; + extraPrefix = "src/MEGASync/mega/"; + stripLen = true; + }) + (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/030-megasync-app-fix-cmake-dependencies-detection.patch?h=megasync&id=4b1eca5bc0d75709dee3a1260264d1b6386d3398"; + hash = "sha256-11XWctv1veUEguc9Xvz2hMYw26CaCwu6M4hyA+5r81U="; + }) + ./megasync-fix-cmake-install-bindir.patch + ./dont-fetch-clang-format.patch ]; postPatch = '' @@ -81,46 +116,24 @@ mkDerivation rec { dontUseQmakeConfigure = true; enableParallelBuilding = true; - preConfigure = '' - cd src/MEGASync/mega - ./autogen.sh - ''; - - configureFlags = [ - "--disable-examples" - "--disable-java" - "--disable-php" - "--enable-chat" - "--with-cares" - "--with-cryptopp" - "--with-curl" - "--with-ffmpeg" - "--without-freeimage" - "--without-readline" - "--without-termcap" - "--with-sodium" - "--with-sqlite" - "--with-zlib" + cmakeFlags = [ + (lib.cmakeBool "USE_PDFIUM" false) # PDFIUM is not in nixpkgs + (lib.cmakeBool "USE_FREEIMAGE" false) # freeimage is insecure + (lib.cmakeBool "ENABLE_DESIGN_TOKENS_IMPORTER" false) # cannot be fetched ]; - postConfigure = '' - cd ../.. - ''; - - preBuild = '' - qmake CONFIG+="nofreeimage release" MEGA.pro - pushd MEGASync - lrelease MEGASync.pro - DESKTOP_DESTDIR="$out" qmake PREFIX="$out" -o Makefile MEGASync.pro CONFIG+="nofreeimage release" - popd + preFixup = '' + qtWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ xorg.xrdb ]}) ''; meta = with lib; { - description = - "Easy automated syncing between your computers and your MEGA Cloud Drive"; + description = "Easy automated syncing between your computers and your MEGA Cloud Drive"; homepage = "https://mega.nz/"; license = licenses.unfree; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ + "i686-linux" + "x86_64-linux" + ]; maintainers = [ ]; }; } diff --git a/pkgs/applications/misc/megasync/dont-fetch-clang-format.patch b/pkgs/applications/misc/megasync/dont-fetch-clang-format.patch new file mode 100644 index 000000000000..ae76fbdcf5e2 --- /dev/null +++ b/pkgs/applications/misc/megasync/dont-fetch-clang-format.patch @@ -0,0 +1,10 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b04f57067..0f6e7b163 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -63,5 +63,3 @@ include(desktopapp_configuration) + # Load the MEGA targets + add_subdirectory(src) + +-include(get_clang_format) +-get_clang_format() diff --git a/pkgs/applications/misc/megasync/install-megasync.patch b/pkgs/applications/misc/megasync/install-megasync.patch deleted file mode 100644 index 7d8748528e7f..000000000000 --- a/pkgs/applications/misc/megasync/install-megasync.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: source/src/MEGASync/MEGASync.pro -=================================================================== ---- source.orig/src/MEGASync/MEGASync.pro -+++ source/src/MEGASync/MEGASync.pro -@@ -28,11 +28,11 @@ unix:!macx { - TARGET = megasync - - # Uncomment the following if "make install" doesn't copy megasync in /usr/bin directory --# isEmpty(PREFIX) { --# PREFIX = /usr --# } --# target.path = $$PREFIX/bin --# INSTALLS += target -+ isEmpty(PREFIX) { -+ PREFIX = /usr -+ } -+ target.path = $$PREFIX/bin -+ INSTALLS += target - } - else { - TARGET = MEGAsync diff --git a/pkgs/applications/misc/megasync/megasync-fix-cmake-install-bindir.patch b/pkgs/applications/misc/megasync/megasync-fix-cmake-install-bindir.patch new file mode 100644 index 000000000000..8e15acf60e8f --- /dev/null +++ b/pkgs/applications/misc/megasync/megasync-fix-cmake-install-bindir.patch @@ -0,0 +1,12 @@ +diff --git a/contrib/cmake/modules/desktopapp_configuration.cmake b/contrib/cmake/modules/desktopapp_configuration.cmake +index 8e9f35cb2..b62f5a9b5 100644 +--- a/contrib/cmake/modules/desktopapp_configuration.cmake ++++ b/contrib/cmake/modules/desktopapp_configuration.cmake +@@ -30,7 +30,6 @@ if(UNIX AND NOT APPLE) + # Used for building packages: in which install dir is a path construction folder that will not be there in packages + + set(CMAKE_INSTALL_LIBDIR "opt/megasync/lib") # override default "lib" from GNUInstallDirs +- set(CMAKE_INSTALL_BINDIR "usr/bin") # override default "bin" from GNUInstallDirs + + # Override CMAKE_INSTALL_PREFIX + if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) # In consecutive runs it will always be undef/false diff --git a/pkgs/applications/misc/megasync/noinstall-distro-version.patch b/pkgs/applications/misc/megasync/noinstall-distro-version.patch deleted file mode 100644 index bbf100737bc4..000000000000 --- a/pkgs/applications/misc/megasync/noinstall-distro-version.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: source/src/MEGASync/platform/platform.pri -=================================================================== ---- source.orig/src/MEGASync/platform/platform.pri -+++ source/src/MEGASync/platform/platform.pri -@@ -37,7 +37,7 @@ unix:!macx { - system(command -v lsb_release): version.commands = lsb_release -rs > $$version.target - version.files = $$version.target - -- INSTALLS += distro version -+ # INSTALLS += distro version - - QT += dbus - SOURCES += $$PWD/linux/LinuxPlatform.cpp \ diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix index 3a8f03259f21..e8642f86ded2 100644 --- a/pkgs/applications/misc/ola/default.nix +++ b/pkgs/applications/misc/ola/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "OpenLightingProject"; repo = "ola"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-8w8ZT3D/+8Pxl9z2KTXeydVxE5xiPjxZevgmMFgrblU="; }; diff --git a/pkgs/applications/misc/pagefind/default.nix b/pkgs/applications/misc/pagefind/default.nix index 611c9b002ed7..84164c0b04f0 100644 --- a/pkgs/applications/misc/pagefind/default.nix +++ b/pkgs/applications/misc/pagefind/default.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "cloudcannon"; repo = "pagefind"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-NIEiXwuy8zuUDxPsD4Hiq3x4cOG3VM+slfNIBSJU2Mk="; }; diff --git a/pkgs/applications/misc/remarkable/rmview/default.nix b/pkgs/applications/misc/remarkable/rmview/default.nix index 5831773cfd8c..780ac1b91bcf 100644 --- a/pkgs/applications/misc/remarkable/rmview/default.nix +++ b/pkgs/applications/misc/remarkable/rmview/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "bordaigorl"; repo = pname; - rev = "refs/tags/v${version}"; + tag = "v${version}"; sha256 = "sha256-V26zmu8cQkLs0IMR7eFO8x34McnT3xYyzlZfntApYkk="; }; diff --git a/pkgs/applications/misc/rofi-rbw/default.nix b/pkgs/applications/misc/rofi-rbw/default.nix index e1cb6a1e61bf..4e69d743cd05 100644 --- a/pkgs/applications/misc/rofi-rbw/default.nix +++ b/pkgs/applications/misc/rofi-rbw/default.nix @@ -24,7 +24,7 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "fdw"; repo = "rofi-rbw"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-wUb89GkNB2lEfb42hMvcxpbjc1O+wx8AkFjq7aJwAko="; }; diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index 51530cec1a28..d3b8dcc2bdff 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -165,6 +165,7 @@ buildPythonApplication rec { meta = { description = "Interactive terminal multitool for tabular data"; + mainProgram = "visidata"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ raskin diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 815c6456c52c..1429cb39683a 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -432,7 +432,7 @@ buildStdenv.mkDerivation { ] # LTO is done using clang and lld on Linux. ++ lib.optionals ltoSupport [ - "--enable-lto=cross" # Cross-Language LTO + "--enable-lto=cross,full" # Cross-Language LTO "--enable-linker=lld" ] ++ lib.optional (isElfhackPlatform stdenv) (enableFeature elfhackSupport "elf-hack") diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix index a8bdb51c2f08..81c3d4acca1e 100644 --- a/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/pkgs/applications/networking/browsers/ladybird/default.nix @@ -48,13 +48,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ladybird"; - version = "0-unstable-2024-12-23"; + version = "0-unstable-2024-12-30"; src = fetchFromGitHub { owner = "LadybirdWebBrowser"; repo = "ladybird"; - rev = "d5bbf8dcf803c429afab76610dfba3b1ee23f0ae"; - hash = "sha256-Kew/MFFCq6sTXt8jfXC78kpQNHAjX8cQyLWO3+MeikU="; + rev = "4324439006a6df1179440ce4f415b67658919957"; + hash = "sha256-vg2Nb85+fegs7Idika9Mbq+f27wrIO48pWQSUidLKwE="; }; postPatch = '' diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 1826209e2ced..9c0addbf085d 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-gk18N8iJve4lznkUb93Qzdgl93fTCOZCAXqm1BjsDak="; }; diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix index 91fca231275a..2bdd10248afd 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helm-unittest"; - version = "0.6.3"; + version = "0.7.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-OXl3Ax/sqCNcj2uDb0VctJ6Njrd5blkFuur6FT9HOl4="; + hash = "sha256-Ma/UcG+DkUR2FqRKFGMjPxMXDrbcbytZVi59zaK1W0k="; }; - vendorHash = "sha256-i9H65843XynaaNQLIQkBcgDsjnft3nxz6eWdZM9Dn9U="; + vendorHash = "sha256-7LI08qFcNRyZEZXVWpu2PR2PwpRlcTLIcE05Y5YgABg="; # NOTE: Remove the install and upgrade hooks. postPatch = '' diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index b9d78d1fb230..a2192004a62c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -207,13 +207,13 @@ "vendorHash": "sha256-A6/YN/iFxdfGjYO8Pum5nWysGmEeLaxgFPe8zaoPfjA=" }, "buildkite": { - "hash": "sha256-BaAl5rnE4soS4k76zxZwctQZ9uL6ejbbosQMpkwgVB4=", + "hash": "sha256-mhiPKnn5cOXMlz1cM0BrJnRVESWakgkiN/R5ZUUEv/M=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v1.15.1", + "rev": "v1.15.2", "spdx": "MIT", - "vendorHash": "sha256-DzKXTIPkNFZT/YrdWWsH3pEMkDFT3pD0xLwteRz677g=" + "vendorHash": "sha256-UdJxDq4VU7rWMoiSlXtb861yd+az2nrxGafvEj2K34Y=" }, "ccloud": { "hash": "sha256-Dpx0eugcHCJV8GNPqjxx4P9ohgJgB10DTnHr+CeN/iQ=", @@ -243,13 +243,13 @@ "vendorHash": null }, "cloudamqp": { - "hash": "sha256-jPiOgAQxQ6HIKJ/L5rh82fyd4rwrPOPgrQN3UMWBQF0=", + "hash": "sha256-IdL/c9uJMCFiAug1WpU9CkqwPM4tOkqYNLjsON3wmjw=", "homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp", "owner": "cloudamqp", "repo": "terraform-provider-cloudamqp", - "rev": "v1.32.1", + "rev": "v1.32.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-j3qdi19dxJL+R8Xa6MDag6KHMuBnzEZ9lUhuSAEZOAQ=" + "vendorHash": "sha256-QErIw/HQ4BMWmM0xEnYsOY0Vcfj50o6mnIWML4nK/SU=" }, "cloudflare": { "hash": "sha256-RC8/tw01yNxeqOlmLzzagRgxQm+o+4ztJ/7KWyBPJ+I=", @@ -570,13 +570,13 @@ "vendorHash": "sha256-TFH5tHOTRNPUMGYeYQ1ZbM6FjcojYnkB2NwnQOacTvg=" }, "helm": { - "hash": "sha256-8cYhbxbjTfloDd3cLYNPv98TzeC0XVrb4DQ2ScZDYvI=", + "hash": "sha256-LCvsZNeGQb4wWIASnQxXbH/3YJJaUZS9nY8mHq6M4FM=", "homepage": "https://registry.terraform.io/providers/hashicorp/helm", "owner": "hashicorp", "repo": "terraform-provider-helm", - "rev": "v2.16.1", + "rev": "v2.17.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-cMdWIciJEUvcrRaMMDlXI7fuJHXV6FCpyqG18Q926iQ=" + "vendorHash": "sha256-XjxpJ8u7apSefoQ4jw3nrptca5+EtvB0zlCaK1zzRPQ=" }, "heroku": { "hash": "sha256-B/NaFe8KOKGJJlF3vZnpdMnbD1VxBktqodPBk+4NZEc=", @@ -723,11 +723,11 @@ "vendorHash": "sha256-pE0WujGxCMW0/27F8aaNtyIHdsOJTwEJL+bdiHpzu7s=" }, "kubernetes": { - "hash": "sha256-gHLEk5CpF4btfSwrpiDJv2lyBdoewf1uLyioj1CQjm0=", + "hash": "sha256-eSAgeN/ExP75Kbhb099t3vW0XQA2TXIhiyv1RUt4ziM=", "homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes", "owner": "hashicorp", "repo": "terraform-provider-kubernetes", - "rev": "v2.35.0", + "rev": "v2.35.1", "spdx": "MPL-2.0", "vendorHash": "sha256-PfvIzUugDsnMKW7mSM2GyJZpXi3wJsEhYLKzlKq1U6A=" }, @@ -822,11 +822,11 @@ "vendorHash": "sha256-YFzYLUfyJglKaJSBksrI1DBHmK6+yoMIg9QlGIEZFkU=" }, "minio": { - "hash": "sha256-aSEzsncqNLWfVnnGfz/fDpRw9w2muGnybX8WYd1tP/Y=", + "hash": "sha256-GJU70N/8EocLNxTG/psIsRYVHkg5fALhA9/ewErNML0=", "homepage": "https://registry.terraform.io/providers/aminueza/minio", "owner": "aminueza", "repo": "terraform-provider-minio", - "rev": "v3.2.1", + "rev": "v3.2.2", "spdx": "AGPL-3.0", "vendorHash": "sha256-a9v1nVG3NiuyHwJGhIKKKXFDp4/Cb533EJxrfqK9h/A=" }, @@ -976,20 +976,20 @@ "vendorHash": null }, "ovh": { - "hash": "sha256-vHe/Yrz4vTWFJrbd4raQpbioxm6PXaValf/KW6uHmxs=", + "hash": "sha256-qF2Wfgse2hcQ6TCbwfk+taUNwEKnNWZh2929VlgCrb4=", "homepage": "https://registry.terraform.io/providers/ovh/ovh", "owner": "ovh", "repo": "terraform-provider-ovh", - "rev": "v1.2.0", + "rev": "v1.4.0", "spdx": "MPL-2.0", "vendorHash": null }, "pagerduty": { - "hash": "sha256-HJ2HXH2HKY1nPRVQ/UPyMwm7++H0KR9iunNNEtkttm4=", + "hash": "sha256-C0Ded8XrPh+yeN+0SvrOPaKONTWvvj4J15xsaXgsri4=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v3.18.2", + "rev": "v3.18.3", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1192,13 +1192,13 @@ "vendorHash": "sha256-c3R/7k7y7XS2Qli00nSj7gh/3Mj88PY4WybBTq/+pPs=" }, "spotinst": { - "hash": "sha256-vy0IOtH1S7Krud9JfID8oYYKpSrxolU4eStnppPjvpM=", + "hash": "sha256-odW3iNfCrl6VLWZGjwZoVfwWHJXCJXzfbjoh+QitbTo=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.202.0", + "rev": "v1.204.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-ehPfPVaIkeKXNfuqNYjL2WwEHV/kMVoOQDOIfYRfY2A=" + "vendorHash": "sha256-m2WVp5FdEl1yyvdAqAe0tqbH7GC6M5WkxJxXevXxCL4=" }, "ssh": { "hash": "sha256-1UN5QJyjCuxs2vQYlSuz2jsu/HgGTxOoWWRcv4qcwow=", @@ -1236,6 +1236,15 @@ "spdx": "MPL-2.0", "vendorHash": "sha256-YdWs2orKhbwAZSQYC73t4e/vvVxk8LrBPG9ZC38VcZE=" }, + "sysdig": { + "hash": "sha256-TvZ7x4dWOERkqTWtjmbILdcWy12kqsV+OzLJ4siQ7mA=", + "homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig", + "owner": "sysdiglabs", + "repo": "terraform-provider-sysdig", + "rev": "v1.42.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-nfVS4EXpPoriXyPpBK8k5OU9MTWxxrvTIwsF2uyQE/0=" + }, "tailscale": { "hash": "sha256-b2ZzXvlzlE+zv3Ufu4M5mcuLhyDkBbMznyM7NbiXAQs=", "homepage": "https://registry.terraform.io/providers/tailscale/tailscale", diff --git a/pkgs/applications/networking/cluster/tftui/default.nix b/pkgs/applications/networking/cluster/tftui/default.nix index 41a8fc4cbe74..dcdc0128c1be 100644 --- a/pkgs/applications/networking/cluster/tftui/default.nix +++ b/pkgs/applications/networking/cluster/tftui/default.nix @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "idoavrah"; repo = "terraform-tui"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-xOlPuPVwfVT7jfBJPqZ5FbOs80HE0k2ZqcA+Jcxh9p4="; }; diff --git a/pkgs/applications/networking/cluster/tubekit/default.nix b/pkgs/applications/networking/cluster/tubekit/default.nix index 7dcbf5c6c975..7a20bfe64543 100644 --- a/pkgs/applications/networking/cluster/tubekit/default.nix +++ b/pkgs/applications/networking/cluster/tubekit/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "reconquest"; repo = "tubekit"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-fUe5bMFF569A9Xdx3bfQH2DzbQDRfZ+ewlDL+gK2gWw="; }; diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix index 795a252ef043..ea7272336557 100644 --- a/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "martinrotter"; repo = pname; - rev = "refs/tags/${version}"; + tag = version; sha256 = "sha256-eF0jPT0gQnnBWu9IKfY0DwMwotL3IEjovqnQqx9v2NA="; }; diff --git a/pkgs/applications/networking/gopher/phetch/default.nix b/pkgs/applications/networking/gopher/phetch/default.nix index 90ad50006bae..2b3e9cf7d2aa 100644 --- a/pkgs/applications/networking/gopher/phetch/default.nix +++ b/pkgs/applications/networking/gopher/phetch/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "xvxx"; repo = pname; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-J+ka7/B37WzVPPE2Krkd/TIiVwuKfI2QYWmT0JHgBGQ="; }; diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 11f0059d6ae5..2d0e4413d46a 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -12,7 +12,7 @@ let stable = "0.0.78"; ptb = "0.0.124"; canary = "0.0.549"; - development = "0.0.56"; + development = "0.0.60"; } else { @@ -38,7 +38,7 @@ let }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - hash = "sha256-pxoFT1P/F/0Mhy5sECZlzIxrHK+/Y8Sy5BvgvNYRfM4="; + hash = "sha256-SL+lWMSXC1Y11Sk59sE7F8n04DED2365RKKeKFU8R6o="; }; }; x86_64-darwin = { diff --git a/pkgs/applications/networking/instant-messengers/kaidan/default.nix b/pkgs/applications/networking/instant-messengers/kaidan/default.nix index 63eb3776a97f..d0c19f23c0e7 100644 --- a/pkgs/applications/networking/instant-messengers/kaidan/default.nix +++ b/pkgs/applications/networking/instant-messengers/kaidan/default.nix @@ -22,14 +22,14 @@ mkDerivation rec { pname = "kaidan"; - version = "0.9.2"; + version = "0.10.1"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "network"; repo = pname; rev = "v${version}"; - hash = "sha256-2UzXWd/fR5UwGywebYGWhh817x+VC76zmVaVZSBOg7M="; + hash = "sha256-u+8uNBDfszH5YJokie4A2QhW04ANq/JTwkMeu5gY0to="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix index 807d8f9fbbb6..78056a158532 100644 --- a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix +++ b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "twitch-tui"; - version = "2.6.17"; + version = "2.6.18"; src = fetchFromGitHub { owner = "Xithrius"; repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-QwFCabksDG+G7nfQPtxshd4n71Dj/uKOGRRutnZxECM="; + tag = "v${version}"; + hash = "sha256-uo9QEwSRIJKjWza8dEQXDCMQ/ydKBk/BX2TaVhX+k1M="; }; - cargoHash = "sha256-EEZZaTIDrVcygfXg7/cLOnrVeDfpP88Q16RQ+Bl7eUI="; + cargoHash = "sha256-QYT5Aqwl2m/+SZlw55Ep3dIfmESSNowN30JJ52mY/Lk="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 1495b2daca70..4c4a1ccb04df 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja + perl pkg-config ]; @@ -38,7 +39,6 @@ stdenv.mkDerivation rec { libotr ncurses openssl - perl ]; configureFlags = [ diff --git a/pkgs/applications/networking/irc/tiny/default.nix b/pkgs/applications/networking/irc/tiny/default.nix index 6a875fcceedd..bda1d21c5b7e 100644 --- a/pkgs/applications/networking/irc/tiny/default.nix +++ b/pkgs/applications/networking/irc/tiny/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "tiny"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "osa1"; repo = "tiny"; rev = "v${version}"; - hash = "sha256-VlKhOHNggT+FbMvE/N2JQOJf0uB1N69HHdP09u89qSk="; + hash = "sha256-phjEae2SS3zkSpuhhE4iscUM8ij8DT47YLIMATMG/+Q="; }; - cargoHash = "sha256-AhQCfLCoJU7o8s+XL3hDOPmZi9QjOxXSA9uglA1KSuY="; + cargoHash = "sha256-DvFrRH6wObMvkRxS8vh3tlCrZNAiuZHfN0ARagMfG2k="; nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux pkg-config; buildInputs = diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix index 0027fe8804de..26ec805cb557 100644 --- a/pkgs/applications/networking/maestral-qt/default.nix +++ b/pkgs/applications/networking/maestral-qt/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral-qt"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-VkJOKKYnoXux3WjD1JwINGWwv1SMIXfidyV2ITE7dJc="; }; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/0001-Implemented-char_traits-for-SEXP-octet_t.patch b/pkgs/applications/networking/mailreaders/thunderbird/0001-Implemented-char_traits-for-SEXP-octet_t.patch new file mode 100644 index 000000000000..d2d48446b4e0 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/thunderbird/0001-Implemented-char_traits-for-SEXP-octet_t.patch @@ -0,0 +1,262 @@ +From 46744a14ffc235330bb99cebfaf294829c31bba4 Mon Sep 17 00:00:00 2001 +From: "Maxim [maxirmx] Samsonov" +Date: Mon, 3 Jun 2024 13:39:47 +0300 +Subject: [PATCH] Implemented char_traits for SEXP octet_t + +--- + comm/third_party/rnp/src/libsexpp/include/sexpp/sexp.h | 95 ++++++++++++++++++- + comm/third_party/rnp/src/libsexpp/tests/src/traits-tests.cpp | 116 ++++++++++++++++++++++++ + comm/third_party/rnp/src/libsexpp/version.txt | 2 +- + 3 files changed, 208 insertions(+), 7 deletions(-) + create mode 100644 tests/src/traits-tests.cpp + +diff --git a/comm/third_party/rnp/src/libsexpp/include/sexpp/sexp.h b/comm/third_party/rnp/src/libsexpp/include/sexpp/sexp.h +index bb6ae4e..3ffb735 100644 +--- a/comm/third_party/rnp/src/libsexpp/include/sexpp/sexp.h ++++ b/comm/third_party/rnp/src/libsexpp/include/sexpp/sexp.h +@@ -44,8 +44,93 @@ + #include "sexp-public.h" + #include "sexp-error.h" + ++// We are implementing char traits for octet_t with trhe following restrictions ++// -- limit visibility so that other traits for unsigned char are still possible ++// -- create template specializatio in std workspace (use workspace specialization ++// is not specified and causes issues at least with gcc 4.8 ++ + namespace sexp { ++using octet_t = uint8_t; ++} // namespace sexp ++ ++namespace std { ++ ++template <> struct char_traits { ++ typedef sexp::octet_t char_type; ++ typedef int int_type; ++ typedef std::streampos pos_type; ++ typedef std::streamoff off_type; ++ typedef mbstate_t state_type; ++ ++ static void assign(char_type &__c1, const char_type &__c2) noexcept { __c1 = __c2; } ++ ++ static constexpr bool eq(const char_type &__c1, const char_type &__c2) noexcept ++ { ++ return __c1 == __c2; ++ } ++ ++ static constexpr bool lt(const char_type &__c1, const char_type &__c2) noexcept ++ { ++ return __c1 < __c2; ++ } ++ ++ static int compare(const char_type *__s1, const char_type *__s2, size_t __n) ++ { ++ return memcmp(__s1, __s2, __n); ++ } ++ ++ static size_t length(const char_type *__s) ++ { ++ return strlen(reinterpret_cast(__s)); ++ } ++ ++ static const char_type *find(const char_type *__s, size_t __n, const char_type &__a) ++ { ++ return static_cast(memchr(__s, __a, __n)); ++ } ++ ++ static char_type *move(char_type *__s1, const char_type *__s2, size_t __n) ++ { ++ return static_cast(memmove(__s1, __s2, __n)); ++ } ++ ++ static char_type *copy(char_type *__s1, const char_type *__s2, size_t __n) ++ { ++ return static_cast(memcpy(__s1, __s2, __n)); ++ } ++ ++ static char_type *assign(char_type *__s, size_t __n, char_type __a) ++ { ++ return static_cast(memset(__s, __a, __n)); ++ } ++ ++ static constexpr char_type to_char_type(const int_type &__c) noexcept ++ { ++ return static_cast(__c); ++ } ++ ++ // To keep both the byte 0xff and the eof symbol 0xffffffff ++ // from ending up as 0xffffffff. ++ static constexpr int_type to_int_type(const char_type &__c) noexcept ++ { ++ return static_cast(static_cast(__c)); ++ } ++ ++ static constexpr bool eq_int_type(const int_type &__c1, const int_type &__c2) noexcept ++ { ++ return __c1 == __c2; ++ } ++ ++ static constexpr int_type eof() noexcept { return static_cast(0xFFFFFFFF); } + ++ static constexpr int_type not_eof(const int_type &__c) noexcept ++ { ++ return (__c == eof()) ? 0 : __c; ++ } ++}; ++} // namespace std ++ ++namespace sexp { + /* + * SEXP octet_t definitions + * We maintain some presumable redundancy with ctype +@@ -99,14 +184,14 @@ class sexp_input_stream_t; + * SEXP simple string + */ + +-typedef uint8_t octet_t; ++using octet_traits = std::char_traits; ++using octet_string = std::basic_string; + +-class SEXP_PUBLIC_SYMBOL sexp_simple_string_t : public std::basic_string, +- private sexp_char_defs_t { ++class SEXP_PUBLIC_SYMBOL sexp_simple_string_t : public octet_string, private sexp_char_defs_t { + public: + sexp_simple_string_t(void) = default; +- sexp_simple_string_t(const octet_t *dt) : std::basic_string{dt} {} +- sexp_simple_string_t(const octet_t *bt, size_t ln) : std::basic_string{bt, ln} {} ++ sexp_simple_string_t(const octet_t *dt) : octet_string{dt} {} ++ sexp_simple_string_t(const octet_t *bt, size_t ln) : octet_string{bt, ln} {} + sexp_simple_string_t &append(int c) + { + (*this) += (octet_t)(c & 0xFF); +diff --git a/comm/third_party/rnp/src/libsexpp/tests/src/traits-tests.cpp b/comm/third_party/rnp/src/libsexpp/tests/src/traits-tests.cpp +new file mode 100644 +index 0000000..52e1019 +--- /dev/null ++++ b/comm/third_party/rnp/src/libsexpp/tests/src/traits-tests.cpp +@@ -0,0 +1,116 @@ ++/** ++ * ++ * Copyright 2024 Ribose Inc. (https://www.ribose.com) ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy of ++ * this software and associated documentation files (the "Software"), to deal in ++ * the Software without restriction, including without limitation the rights to ++ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of ++ * the Software, and to permit persons to whom the Software is furnished to do so, ++ * subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in all ++ * copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS ++ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR ++ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER ++ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ * ++ */ ++ ++#include "sexp-tests.h" ++ ++using namespace sexp; ++ ++namespace { ++ ++TEST(OctetTraitsTest, Assign) ++{ ++ octet_t a = 0x12; ++ octet_t b = 0x34; ++ octet_traits::assign(a, b); ++ EXPECT_EQ(a, b); ++} ++ ++TEST(OctetTraitsTest, Eq) ++{ ++ octet_t a = 0x12; ++ octet_t b = 0x12; ++ EXPECT_TRUE(octet_traits::eq(a, b)); ++} ++ ++TEST(OctetTraitsTest, Lt) ++{ ++ octet_t a = 0x12; ++ octet_t b = 0x34; ++ EXPECT_TRUE(octet_traits::lt(a, b)); ++} ++ ++TEST(OctetTraitsTest, Compare) ++{ ++ octet_t s1[] = {0x12, 0x34, 0x56}; ++ octet_t s2[] = {0x12, 0x34, 0x57}; ++ EXPECT_LT(octet_traits::compare(s1, s2, 3), 0); ++} ++ ++TEST(OctetTraitsTest, Find) ++{ ++ octet_t s[] = {0x12, 0x34, 0x56}; ++ octet_t a = 0x34; ++ EXPECT_EQ(octet_traits::find(s, 3, a), s + 1); ++} ++ ++TEST(OctetTraitsTest, Move) ++{ ++ octet_t s1[] = {0x12, 0x34, 0x56}; ++ octet_t s2[3]; ++ octet_traits::move(s2, s1, 3); ++ EXPECT_EQ(memcmp(s1, s2, 3), 0); ++} ++ ++TEST(OctetTraitsTest, Copy) ++{ ++ octet_t s1[] = {0x12, 0x34, 0x56}; ++ octet_t s2[3]; ++ octet_traits::copy(s2, s1, 3); ++ EXPECT_EQ(memcmp(s1, s2, 3), 0); ++} ++ ++TEST(OctetTraitsTest, AssignMultiple) ++{ ++ octet_t s[3]; ++ octet_t a = 0x12; ++ octet_traits::assign(s, 3, a); ++ for (int i = 0; i < 3; i++) { ++ EXPECT_EQ(s[i], a); ++ } ++} ++ ++TEST(OctetTraitsTest, ToCharType) ++{ ++ octet_traits::int_type a = 0x12; ++ EXPECT_EQ(octet_traits::to_char_type(a), 0x12); ++} ++ ++TEST(OctetTraitsTest, ToIntType) ++{ ++ octet_t a = 0x12; ++ EXPECT_EQ(octet_traits::to_int_type(a), 0x12); ++} ++ ++TEST(OctetTraitsTest, EqIntType) ++{ ++ octet_traits::int_type a = 0x12; ++ octet_traits::int_type b = 0x12; ++ EXPECT_TRUE(octet_traits::eq_int_type(a, b)); ++} ++ ++TEST(OctetTraitsTest, NotEof) ++{ ++ octet_traits::int_type a = 0x12; ++ EXPECT_EQ(octet_traits::not_eof(a), 0x12); ++} ++} // namespace +diff --git a/comm/third_party/rnp/src/libsexpp/version.txt b/comm/third_party/rnp/src/libsexpp/version.txt +index 1e9b46b..6201b5f 100644 +--- a/comm/third_party/rnp/src/libsexpp/version.txt ++++ b/comm/third_party/rnp/src/libsexpp/version.txt +@@ -1 +1 @@ +-0.8.7 ++0.8.8 +-- +2.47.0 + diff --git a/pkgs/applications/networking/mailreaders/thunderbird/0001-Removed-lookup-against-basic_string-uint8_t.patch b/pkgs/applications/networking/mailreaders/thunderbird/0001-Removed-lookup-against-basic_string-uint8_t.patch new file mode 100644 index 000000000000..210accf06312 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/thunderbird/0001-Removed-lookup-against-basic_string-uint8_t.patch @@ -0,0 +1,100 @@ +From 20419f739f632fb30666650544f0055e8d4f1afa Mon Sep 17 00:00:00 2001 +From: Maxim Samsonov +Date: Wed, 19 Jun 2024 16:52:08 +0300 +Subject: [PATCH] Removed lookup against basic_string + +--- + comm/third_party/rnp/src/lib/types.h | 5 +---- + comm/third_party/rnp/src/lib/utils.cpp | 17 +---------------- + comm/third_party/rnp/src/librekey/key_store_g10.cpp | 8 ++++---- + 3 files changed, 7 insertions(+), 25 deletions(-) + +diff --git a/comm/third_party/rnp/src/lib/types.h b/comm/third_party/rnp/src/lib/types.h +index f0c25d3d..a7eac3a1 100644 +--- a/comm/third_party/rnp/src/lib/types.h ++++ b/comm/third_party/rnp/src/lib/types.h +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2017-2021, [Ribose Inc](https://www.ribose.com). ++ * Copyright (c) 2017-2024, [Ribose Inc](https://www.ribose.com). + * Copyright (c) 2009 The NetBSD Foundation, Inc. + * All rights reserved. + * +@@ -71,9 +71,6 @@ class id_str_pair { + static int lookup(const id_str_pair pair[], + const std::vector &bytes, + int notfound = 0); +- static int lookup(const id_str_pair pair[], +- const std::basic_string &bytes, +- int notfound = 0); + }; + + /** pgp_fingerprint_t */ +diff --git a/comm/third_party/rnp/src/lib/utils.cpp b/comm/third_party/rnp/src/lib/utils.cpp +index 3c6216c6..fd526379 100644 +--- a/comm/third_party/rnp/src/lib/utils.cpp ++++ b/comm/third_party/rnp/src/lib/utils.cpp +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2021, [Ribose Inc](https://www.ribose.com). ++ * Copyright (c) 2021, 2024 [Ribose Inc](https://www.ribose.com). + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without +@@ -63,18 +63,3 @@ id_str_pair::lookup(const id_str_pair pair[], const std::vector &bytes, + } + return notfound; + } +- +-int +-id_str_pair::lookup(const id_str_pair pair[], +- const std::basic_string &bytes, +- int notfound) +-{ +- while (pair && pair->str) { +- if ((strlen(pair->str) == bytes.size()) && +- !memcmp(pair->str, bytes.data(), bytes.size())) { +- return pair->id; +- } +- pair++; +- } +- return notfound; +-} +diff --git a/comm/third_party/rnp/src/librekey/key_store_g10.cpp b/comm/third_party/rnp/src/librekey/key_store_g10.cpp +index e646f02f..21136866 100644 +--- a/comm/third_party/rnp/src/librekey/key_store_g10.cpp ++++ b/comm/third_party/rnp/src/librekey/key_store_g10.cpp +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2017-2022, [Ribose Inc](https://www.ribose.com). ++ * Copyright (c) 2017-2024, [Ribose Inc](https://www.ribose.com). + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without +@@ -311,12 +311,12 @@ read_curve(const sexp_list_t *list, const std::string &name, pgp_ec_key_t &key) + + const auto &bytes = data->get_string(); + pgp_curve_t curve = static_cast( +- id_str_pair::lookup(g10_curve_aliases, data->get_string(), PGP_CURVE_UNKNOWN)); ++ id_str_pair::lookup(g10_curve_aliases, (const char *) bytes.data(), PGP_CURVE_UNKNOWN)); + if (curve != PGP_CURVE_UNKNOWN) { + key.curve = curve; + return true; + } +- RNP_LOG("Unknown curve: %.*s", (int) bytes.size(), (char *) bytes.data()); ++ RNP_LOG("Unknown curve: %.*s", (int) bytes.size(), (const char *) bytes.data()); + return false; + } + +@@ -807,7 +807,7 @@ g23_parse_seckey(pgp_key_pkt_t &seckey, + + auto & alg_bt = alg_s_exp->sexp_string_at(0)->get_string(); + pgp_pubkey_alg_t alg = static_cast( +- id_str_pair::lookup(g10_alg_aliases, alg_bt.c_str(), PGP_PKA_NOTHING)); ++ id_str_pair::lookup(g10_alg_aliases, (const char *) alg_bt.data(), PGP_PKA_NOTHING)); + if (alg == PGP_PKA_NOTHING) { + RNP_LOG( + "Unsupported algorithm: '%.*s'", (int) alg_bt.size(), (const char *) alg_bt.data()); +-- +2.47.0 + diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index ef1c62e808d7..3d0f43119390 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -42,6 +42,12 @@ let extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. ./no-buildconfig.patch + # clang-19 fixes for char_traits build issue + # https://github.com/rnpgp/rnp/pull/2242/commits/e0790a2c4ff8e09d52522785cec1c9db23d304ac + # https://github.com/rnpgp/sexpp/pull/54/commits/46744a14ffc235330bb99cebfaf294829c31bba4 + # Remove when upstream bumps bundled rnp version: https://bugzilla.mozilla.org/show_bug.cgi?id=1893950 + ./0001-Removed-lookup-against-basic_string-uint8_t.patch + ./0001-Implemented-char_traits-for-SEXP-octet_t.patch ]; extraPassthru = { diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 048ba5a35496..0a6fa325cf4b 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "gnunet"; - version = "0.22.1"; + version = "0.23.1"; src = fetchurl { url = "mirror://gnu/gnunet/gnunet-${version}.tar.gz"; - hash = "sha256-gWsgufvA4tLWosnpAYPdAIs4yJOWfjYj4E11/Ezgr6o="; + hash = "sha256-b9BbaQdrOxqOfiCyVOBE/dTG2lMTGWMX894Ij30CXPI="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/p2p/gnunet/gtk.nix b/pkgs/applications/networking/p2p/gnunet/gtk.nix index 95c1780256d7..2f1e31f48d91 100644 --- a/pkgs/applications/networking/p2p/gnunet/gtk.nix +++ b/pkgs/applications/networking/p2p/gnunet/gtk.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "gnunet-gtk"; - version = "0.21.0"; + version = "0.23.1"; src = fetchurl { url = "mirror://gnu/gnunet/gnunet-gtk-${version}.tar.gz"; - hash = "sha256-vQFtKFI57YG64WpKVngx1kq687hI+f1kpP9ooK53/aw="; + hash = "sha256-bmU3799pZVUyrsJ92MKgn5NIqCW76ml4N42Ewi+VWvI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index 047e86036d08..240979abe9d2 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "pjsip"; repo = "pjproject"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-LDA3o1QMrAxcGuOi/YRoMzXmw/wFkfDs2wweZuIJ2RY="; }; diff --git a/pkgs/applications/networking/protonvpn-cli/default.nix b/pkgs/applications/networking/protonvpn-cli/default.nix index 3c896200c98d..a06d76503eb0 100644 --- a/pkgs/applications/networking/protonvpn-cli/default.nix +++ b/pkgs/applications/networking/protonvpn-cli/default.nix @@ -18,7 +18,7 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "protonvpn"; repo = "linux-cli"; - rev = "refs/tags/${version}"; + tag = version; sha256 = "sha256-KhfogC23i7THe6YZJ6Sy1+q83vZupHsS69NurHCeo8I="; }; diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix index d81a48a9cf33..b9df3bd1faeb 100644 --- a/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/pkgs/applications/networking/protonvpn-gui/default.nix @@ -27,7 +27,7 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "ProtonVPN"; repo = "proton-vpn-gtk-app"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-+UnMsjIJ0M1YiF+BcY7RObUoCeDZGtE0ul6KBaODzeY="; }; diff --git a/pkgs/applications/networking/remote/vmware-horizon-client/default.nix b/pkgs/applications/networking/remote/vmware-horizon-client/default.nix index bfbcd8a8ab50..95c41b763900 100644 --- a/pkgs/applications/networking/remote/vmware-horizon-client/default.nix +++ b/pkgs/applications/networking/remote/vmware-horizon-client/default.nix @@ -88,6 +88,7 @@ let harfbuzz liberation_ttf libjpeg + libpng libpulseaudio libtiff libudev0-shim diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix index 7a985b7ad940..c11e062e33e0 100644 --- a/pkgs/applications/networking/sync/lsyncd/default.nix +++ b/pkgs/applications/networking/sync/lsyncd/default.nix @@ -11,11 +11,11 @@ docbook_xml_dtd_45, docbook_xsl, libxslt, - apple-sdk_11, + apple-sdk, }: let - xnu = apple-sdk_11.sourceRelease "xnu"; + xnu = apple-sdk.sourceRelease "xnu"; in stdenv.mkDerivation rec { pname = "lsyncd"; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { docbook_xml_dtd_45 docbook_xsl libxslt - ] ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; + ]; meta = with lib; { homepage = "https://github.com/axkibe/lsyncd"; diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix index 1d21cc6c2528..a86bd5899076 100644 --- a/pkgs/applications/networking/syncplay/default.nix +++ b/pkgs/applications/networking/syncplay/default.nix @@ -21,7 +21,7 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "Syncplay"; repo = "syncplay"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; sha256 = "sha256-ipo027XyN4BpMkxzXznbnaufsaG/YkHxFJYo+XWzbyE="; }; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 10c5fda3c15c..8c0e1ef2ca79 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -18,7 +18,7 @@ let src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-JW78n/3hssH600uXn4YLxcIJylPbSpEZICtKmqfqamI="; }; diff --git a/pkgs/applications/networking/twtxt/default.nix b/pkgs/applications/networking/twtxt/default.nix index bee27ef2a743..0725ae0b53db 100644 --- a/pkgs/applications/networking/twtxt/default.nix +++ b/pkgs/applications/networking/twtxt/default.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "buckket"; repo = "twtxt"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; sha256 = "sha256-CbFh1o2Ijinfb8X+h1GP3Tp+8D0D3/Czt/Uatd1B4cw="; }; diff --git a/pkgs/applications/office/cutemarked-ng/0001-remove-dependency-on-vendored-library.patch b/pkgs/applications/office/cutemarked-ng/0001-remove-dependency-on-vendored-library.patch deleted file mode 100644 index b42b7c3295c3..000000000000 --- a/pkgs/applications/office/cutemarked-ng/0001-remove-dependency-on-vendored-library.patch +++ /dev/null @@ -1,95 +0,0 @@ -From b9bf46966dd7931f9f33c30ed608a21d0e71e923 Mon Sep 17 00:00:00 2001 -From: rewine -Date: Tue, 19 Jul 2022 13:19:10 +0800 -Subject: [PATCH 1/2] remove dependency on vendored library - ---- - CuteMarkEd.pro | 4 +--- - app-static/app-static.pro | 11 ++--------- - app/app.pro | 2 -- - app/cutemarkdownhighlighter.h | 2 +- - 4 files changed, 4 insertions(+), 15 deletions(-) - -diff --git a/CuteMarkEd.pro b/CuteMarkEd.pro -index 4ee92e3..0d247a4 100644 ---- a/CuteMarkEd.pro -+++ b/CuteMarkEd.pro -@@ -9,12 +9,10 @@ TEMPLATE = subdirs - CONFIG += c++14 - - SUBDIRS = \ -- 3rdparty \ - libs \ - app-static \ - app \ -- fontawesomeicon \ -- test -+ fontawesomeicon - - # build order: 3rdparty -> libs -> app-static -> app & test - #libs.depends = 3rdparty -diff --git a/app-static/app-static.pro b/app-static/app-static.pro -index cd3c292..560b4fc 100644 ---- a/app-static/app-static.pro -+++ b/app-static/app-static.pro -@@ -13,7 +13,6 @@ CONFIG += c++11 - - INCLUDEPATH += $$PWD - # MD4C library --INCLUDEPATH += $$PWD/../3rdparty/md4c/src - - SOURCES += \ - snippets/jsonsnippettranslator.cpp \ -@@ -34,10 +33,7 @@ SOURCES += \ - revealviewsynchronizer.cpp \ - htmlpreviewcontroller.cpp \ - htmlviewsynchronizer.cpp \ -- yamlheaderchecker.cpp \ -- $$PWD/../3rdparty/md4c/src/md4c.c \ -- $$PWD/../3rdparty/md4c/src/entity.c \ -- $$PWD/../3rdparty/md4c/src/md4c-html.c -+ yamlheaderchecker.cpp - - HEADERS += \ - snippets/snippet.h \ -@@ -64,10 +60,7 @@ HEADERS += \ - revealviewsynchronizer.h \ - htmlpreviewcontroller.h \ - htmlviewsynchronizer.h \ -- yamlheaderchecker.h \ -- $$PWD/../3rdparty/md4c/src/md4c.h \ -- $$PWD/../3rdparty/md4c/src/entity.h \ -- $$PWD/../3rdparty/md4c/src/md4c-html.h -+ yamlheaderchecker.h - - - #unix:!symbian { -diff --git a/app/app.pro b/app/app.pro -index 4827673..ab961cf 100644 ---- a/app/app.pro -+++ b/app/app.pro -@@ -40,8 +40,6 @@ macx { - } - - #qmarkdowntextedit --include(../3rdparty/qmarkdowntextedit/qmarkdowntextedit.pri) --include(../3rdparty/hunspell/hunspell.pri) - INCLUDEPATH += $$PWD - - SOURCES += \ -diff --git a/app/cutemarkdownhighlighter.h b/app/cutemarkdownhighlighter.h -index c99ab56..78f2be6 100644 ---- a/app/cutemarkdownhighlighter.h -+++ b/app/cutemarkdownhighlighter.h -@@ -19,7 +19,7 @@ - - #include - --#include "../3rdparty/qmarkdowntextedit/markdownhighlighter.h" -+#include - - namespace hunspell { - class SpellChecker; --- -2.36.1 - diff --git a/pkgs/applications/office/cutemarked-ng/0002-use-pkgcofig-to-find-libraries.patch b/pkgs/applications/office/cutemarked-ng/0002-use-pkgcofig-to-find-libraries.patch deleted file mode 100644 index 89b5441738c5..000000000000 --- a/pkgs/applications/office/cutemarked-ng/0002-use-pkgcofig-to-find-libraries.patch +++ /dev/null @@ -1,25 +0,0 @@ -From bdc66eace846edc8a7b435f7ca9f324427243ce4 Mon Sep 17 00:00:00 2001 -From: rewine -Date: Thu, 21 Jul 2022 17:30:22 +0800 -Subject: [PATCH 2/2] use pkgcofig to find libraries - ---- - app/app.pro | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/app/app.pro b/app/app.pro -index ab961cf..475487d 100644 ---- a/app/app.pro -+++ b/app/app.pro -@@ -13,6 +13,8 @@ win32: QT += winextras - TARGET = cutemarked - TEMPLATE = app - CONFIG += c++11 -+CONFIG += link_pkgconfig -+PKGCONFIG += QMarkdownTextedit hunspell md4c-html - - unix:!macx { - CONFIG += link_pkgconfig --- -2.36.1 - diff --git a/pkgs/applications/office/cutemarked-ng/default.nix b/pkgs/applications/office/cutemarked-ng/default.nix deleted file mode 100644 index 021259dd4004..000000000000 --- a/pkgs/applications/office/cutemarked-ng/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - qmake, - pkg-config, - qttools, - qtwebengine, - wrapQtAppsHook, - qmarkdowntextedit, - md4c, - hunspell, -}: - -stdenv.mkDerivation rec { - pname = "CuteMarkEd-NG"; - version = "unstable-2021-07-29"; - - src = fetchFromGitHub { - owner = "Waqar144"; - repo = pname; - rev = "9431ac603cef23d6f29e51e18f1eeee156f5bfb3"; - sha256 = "sha256-w/D4C2ZYgI/7ZCDamTQlhrJ9vtvAMThgM/fopkdKWYc"; - }; - - patches = [ - ./0001-remove-dependency-on-vendored-library.patch - ./0002-use-pkgcofig-to-find-libraries.patch - ]; - - postPatch = '' - substituteInPlace app/app.pro \ - --replace '$$[QT_INSTALL_BINS]/lrelease' "lrelease" - ''; - - nativeBuildInputs = [ - qmake - qttools - pkg-config - wrapQtAppsHook - ]; - - buildInputs = [ - md4c - qtwebengine - qmarkdowntextedit - hunspell.dev - ]; - - meta = with lib; { - description = "Qt-based, free and open source markdown editor"; - mainProgram = "cutemarked"; - homepage = "https://github.com/Waqar144/CuteMarkEd-NG"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ rewine ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/office/qnotero/default.nix b/pkgs/applications/office/qnotero/default.nix index 028c5bad8aea..e8ad77bca307 100644 --- a/pkgs/applications/office/qnotero/default.nix +++ b/pkgs/applications/office/qnotero/default.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "ealbiter"; repo = pname; - rev = "refs/tags/v${version}"; + tag = "v${version}"; sha256 = "sha256-Rym7neluRbYCpuezRQyLc6gSl3xbVR9fvhOxxW5+Nzo="; }; diff --git a/pkgs/applications/radio/btlejack/default.nix b/pkgs/applications/radio/btlejack/default.nix index 86a9c52dbb29..b4e6e30961bb 100644 --- a/pkgs/applications/radio/btlejack/default.nix +++ b/pkgs/applications/radio/btlejack/default.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "virtualabs"; repo = "btlejack"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; sha256 = "sha256-Q6y9murV1o2i1sluqTVB5+X3B7ywFsI0ZvlJjHrHSpo="; }; diff --git a/pkgs/applications/science/astronomy/calcmysky/default.nix b/pkgs/applications/science/astronomy/calcmysky/default.nix index b3bd3ed4ae9f..659462ffebf8 100644 --- a/pkgs/applications/science/astronomy/calcmysky/default.nix +++ b/pkgs/applications/science/astronomy/calcmysky/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "10110111"; repo = "CalcMySky"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-18ZNnLK2zMT7P0MDXS6Z38LffE8EqXKBH89TPPxVWlo="; }; diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index e970cfc16b34..1c41f924b898 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -28,20 +28,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "stellarium"; - version = "24.3"; + version = "24.4"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${finalAttrs.version}"; - hash = "sha256-shDp2tCOynMiEuTSx4TEK8V9h3EsMDq+kkZFhldrinM="; + hash = "sha256-/xF9hXlPKhmpvpx9t1IgSqpvvqrGnd0xaf0QMvu+9IA="; }; patches = [ - # Compatibility with INDI 2.0 series from https://github.com/Stellarium/stellarium/pull/3269 + # Fix indi headers from https://github.com/Stellarium/stellarium/pull/4025 (fetchpatch { - url = "https://github.com/Stellarium/stellarium/commit/31fd7bebf33fa710ce53ac8375238a24758312bc.patch"; - hash = "sha256-eJEqqitZgtV6noeCi8pDBYMVTFIVWXZU1fiEvoilX8o="; + url = "https://github.com/Stellarium/stellarium/commit/9669d64fb4104830412c6c6c2b45811075a92300.patch"; + hash = "sha256-CXeghxxRIV7Filveg+3pNAWymUpUuGnylvt4e8THJ8A="; }) ]; @@ -123,5 +123,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ kilianar ]; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index 6316458e1c28..fabcfbd708dd 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ANTsX"; repo = "ANTs"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-7df9RcZZwfSkokG8dMQg65bCOk2atDGkJpPo8SrRrfY="; }; diff --git a/pkgs/applications/science/biology/mrtrix/default.nix b/pkgs/applications/science/biology/mrtrix/default.nix index 7b107029dd20..ba268b46faad 100644 --- a/pkgs/applications/science/biology/mrtrix/default.nix +++ b/pkgs/applications/science/biology/mrtrix/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "MRtrix3"; repo = "mrtrix3"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-87zBAoBLWQPccGS37XyQ8H0GhL01k8GQFgcLL6IwbcM="; fetchSubmodules = true; }; diff --git a/pkgs/applications/science/chemistry/autodock-vina/default.nix b/pkgs/applications/science/chemistry/autodock-vina/default.nix index 1a0549ea68a3..f29069bed2fa 100644 --- a/pkgs/applications/science/chemistry/autodock-vina/default.nix +++ b/pkgs/applications/science/chemistry/autodock-vina/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ccsb-scripps"; repo = "autodock-vina"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-yguUMEX0tn75wKrPKyqlCYbBFaEwC5b1s3k9xept1Fw="; }; diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index 1b84dcbb8108..c7f0403cf90a 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -25,14 +25,14 @@ let }; in stdenv.mkDerivation rec { - version = "16.3.5"; + version = "16.3.7"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - hash = "sha256-6fjVVjNnJZMyOZnQQms8NsgzQa7+GLRQwaUw2WHpD98="; + hash = "sha256-SQuIjwafPipQy9C2yJQ2CIFV/lSAnHkp1jYnPK1BWcQ="; }; patchPhase = '' diff --git a/pkgs/applications/science/computer-architecture/qtrvsim/default.nix b/pkgs/applications/science/computer-architecture/qtrvsim/default.nix index cfe7606cbbb0..19e76f532765 100644 --- a/pkgs/applications/science/computer-architecture/qtrvsim/default.nix +++ b/pkgs/applications/science/computer-architecture/qtrvsim/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "cvut"; repo = "qtrvsim"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; sha256 = "sha256-+EpPDA2+mBTdQjq6i9TN11yeXqvJA28JtmdNihM1a/U="; }; diff --git a/pkgs/applications/science/electronics/degate/default.nix b/pkgs/applications/science/electronics/degate/default.nix index 478e1b78ab25..5e328890d48d 100644 --- a/pkgs/applications/science/electronics/degate/default.nix +++ b/pkgs/applications/science/electronics/degate/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "DegateCommunity"; repo = "Degate"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-INoA3Z6ya03ZMn6E+nOCkXZLoxoo2WgPDw9v5miI09A="; }; diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index 1821ac63a4eb..f0d98e7a823c 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -21,33 +21,33 @@ let # SHA256 of the fritzing-parts HEAD on the master branch, # which contains the latest stable parts definitions - partsSha = "015626e6cafb1fc7831c2e536d97ca2275a83d32"; + partsSha = "76235099ed556e52003de63522fdd74e61d53a36"; parts = fetchFromGitHub { owner = "fritzing"; repo = "fritzing-parts"; rev = partsSha; - hash = "sha256-5jw56cqxpT/8bf1q551WG53J6Lw5pH0HEtRUoNNMc+A="; + hash = "sha256-1QVcPbRBOSYnNFsp7B2OyPXYuPaINRv9yEqGZFd662Y="; }; # Header-only library svgpp = fetchFromGitHub { owner = "svgpp"; repo = "svgpp"; - rev = "v1.3.0"; - hash = "sha256-kJEVnMYnDF7bThDB60bGXalYgpn9c5/JCZkRSK5GoE4="; + tag = "v1.3.1"; + hash = "sha256-nW0ns06XWfUi22nOKZzFKgAOHVIlQqChW8HxUDOFMh4="; }; in stdenv.mkDerivation { pname = "fritzing"; - version = "1.0.2"; + version = "1.0.4"; src = fetchFromGitHub { owner = "fritzing"; repo = "fritzing-app"; - rev = "dbdbe34c843677df721c7b3fc3e32c0f737e7e95"; - hash = "sha256-Xi5sPU2RGkqh7T+EOvwxJJKKYDhJfccyEZ8LBBTb2s4="; + rev = "a8c6ef7cf66f7a42b9b233d6137f1b70a9573a25"; + hash = "sha256-a/bWAUeDPj3g8BECOlXuqyCi4JgGLLs1605m380Drt0="; }; nativeBuildInputs = [ @@ -56,6 +56,7 @@ stdenv.mkDerivation { qttools wrapQtAppsHook ]; + buildInputs = [ qtbase @@ -90,12 +91,14 @@ stdenv.mkDerivation { cp -a ${parts}/* parts/ ''; - env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [ - "-I${lib.getDev quazip}/include/QuaZip-Qt${lib.versions.major qtbase.version}-${quazip.version}" - "-I${svgpp}/include" - "-I${clipper}/include/polyclipping" - ]; - env.NIX_LDFLAGS = "-lquazip1-qt${lib.versions.major qtbase.version}"; + env = { + NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [ + "-I${lib.getDev quazip}/include/QuaZip-Qt${lib.versions.major qtbase.version}-${quazip.version}" + "-I${svgpp}/include" + "-I${clipper}/include/polyclipping" + ]; + NIX_LDFLAGS = "-lquazip1-qt${lib.versions.major qtbase.version}"; + }; qmakeFlags = [ "phoenix.pro" @@ -116,18 +119,18 @@ stdenv.mkDerivation { -folder "$out/share/fritzing" ''; - meta = with lib; { + meta = { description = "Open source prototyping tool for Arduino-based projects"; - homepage = "https://fritzing.org/"; - license = with licenses; [ + homepage = "https://fritzing.org"; + license = with lib.licenses; [ gpl3 cc-by-sa-30 ]; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ robberer muscaln ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; mainProgram = "Fritzing"; }; } diff --git a/pkgs/applications/science/electronics/geda/default.nix b/pkgs/applications/science/electronics/geda/default.nix index 8ed37c9b4b3c..8efcbd3bae83 100644 --- a/pkgs/applications/science/electronics/geda/default.nix +++ b/pkgs/applications/science/electronics/geda/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Full GPL'd suite of Electronic Design Automation tools"; - homepage = "http://www.geda-project.org/"; + homepage = "https://geda.sourceforge.net/"; maintainers = with maintainers; [ pjones ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/applications/science/electronics/gerbv/default.nix b/pkgs/applications/science/electronics/gerbv/default.nix index cf0dfe7e43f9..66e7a5cdbeee 100644 --- a/pkgs/applications/science/electronics/gerbv/default.nix +++ b/pkgs/applications/science/electronics/gerbv/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "gerbv"; repo = pname; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-sr48RGLYcMKuyH9p+5BhnR6QpKBvNOqqtRryw3+pbBk="; }; diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix index 9d1c447c9c84..1f42d5ae2a62 100644 --- a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix +++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix @@ -55,6 +55,8 @@ stdenv.mkDerivation rec { shopt -s extglob rm -rf deps/!(abc|sanitizers-cmake|subprocess)/* shopt -u extglob + # https://github.com/emsec/hal/issues/602 + sed -i 1i'#include ' include/hal_core/utilities/utils.h ''; nativeBuildInputs = [ diff --git a/pkgs/applications/science/electronics/kicad/addons/kikit.nix b/pkgs/applications/science/electronics/kicad/addons/kikit.nix index b6d3cf3e7205..9dbf40c26f5b 100644 --- a/pkgs/applications/science/electronics/kicad/addons/kikit.nix +++ b/pkgs/applications/science/electronics/kicad/addons/kikit.nix @@ -1,11 +1,12 @@ # For building the multiple addons that are in the kikit repo. -{ stdenv -, bc -, kikit -, zip -, python3 -, addonName -, addonPath +{ + stdenv, + bc, + kikit, + zip, + python3, + addonName, + addonPath, }: let # This python is only used when building the package, it's not the python @@ -30,10 +31,14 @@ let targetSpec = targetSpecs.${addonName}; in stdenv.mkDerivation { - name = "kicadaddon-${addonName}"; + pname = "kicadaddon-${addonName}"; inherit (kikit-module) src version; - nativeBuildInputs = [ python bc zip ]; + nativeBuildInputs = [ + python + bc + zip + ]; propagatedBuildInputs = [ kikit-module ]; buildPhase = '' diff --git a/pkgs/applications/science/electronics/openroad/default.nix b/pkgs/applications/science/electronics/openroad/default.nix index e86b68202ceb..e6278d57f160 100644 --- a/pkgs/applications/science/electronics/openroad/default.nix +++ b/pkgs/applications/science/electronics/openroad/default.nix @@ -9,12 +9,13 @@ git, python3, swig, - boost180, + boost, cbc, # for clp cimg, clp, # for or-tools cudd, eigen, + gtest, glpk, lcov, lemon-graph, @@ -43,28 +44,33 @@ let in mkDerivation rec { pname = "openroad"; - version = "2.0-unstable-2024-12-22"; + version = "2.0-unstable-2024-12-31"; src = fetchFromGitHub { owner = "The-OpenROAD-Project"; repo = "OpenROAD"; - rev = "51302eb80b11576a01171d33452c362301d55143"; + rev = "21cf29eda317e0c7777fbfaa3f384ec9fab1a0f9"; fetchSubmodules = true; - hash = "sha256-xFeZo6GjKKee7fTrzN4TNNL8eeTDJXyQGPkIKU/WvIc="; + hash = "sha256-cRETSW8cG/Q0hgxaFJjtnBqsIU0r6/kCRy1+5gJfC9o="; }; + patches = [ + ./swig43-compat.patch # https://github.com/The-OpenROAD-Project/OpenROAD/issues/6451 + ]; + nativeBuildInputs = [ bison cmake doxygen flex git + gtest pkg-config swig ]; buildInputs = [ - boost180 + boost cbc cimg clp @@ -95,15 +101,13 @@ mkDerivation rec { patchShebangs --build etc/find_messages.py ''; - # Enable output images from the placer. cmakeFlags = [ - # Tries to download gtest 1.13 as part of the build. We currently rely on - # the regression tests so we can get by without building unit tests. - "-DENABLE_TESTS=OFF" + "-DENABLE_TESTS=ON" "-DUSE_SYSTEM_BOOST=ON" "-DUSE_SYSTEM_ABC=OFF" "-DUSE_SYSTEM_OPENSTA=OFF" - "-DOPENROAD_VERSION=${src.rev}" + "-DOPENROAD_VERSION=${version}_${src.rev}" + "-DCMAKE_RULE_MESSAGES=OFF" "-DTCL_LIBRARY=${tcl}/lib/libtcl.so" "-DTCL_HEADER=${tcl}/include/tcl.h" ]; @@ -115,6 +119,9 @@ mkDerivation rec { # to see if there are any breaking changes in unstable that should be vendored as well. doCheck = true; checkPhase = '' + # Disable two tests that are failing curently. + sed 's/^.*partition_gcd/# \0/g' -i src/par/test/CTestTestfile.cmake + make test ../test/regression ''; diff --git a/pkgs/applications/science/electronics/openroad/swig43-compat.patch b/pkgs/applications/science/electronics/openroad/swig43-compat.patch new file mode 100644 index 000000000000..9bc49991e8e6 --- /dev/null +++ b/pkgs/applications/science/electronics/openroad/swig43-compat.patch @@ -0,0 +1,28 @@ +--- a/src/odb/src/swig/python/dbtypes.i ++++ b/src/odb/src/swig/python/dbtypes.i +@@ -271,7 +271,7 @@ WRAP_OBJECT_RETURN_REF(odb::dbViaParams, params_return) + swig_type_info *tf = SWIG_TypeQuery("odb::dbShape" "*"); + for(std::vector::iterator it = $1->begin(); it != $1->end(); it++) { + PyObject *o = SWIG_NewInstanceObj(&(*it), tf, 0); +- $result = SWIG_Python_AppendOutput($result, o); ++ $result = SWIG_AppendOutput($result, o); + } + } + +@@ -283,14 +283,14 @@ WRAP_OBJECT_RETURN_REF(odb::dbViaParams, params_return) + auto layer = it->second; + PyObject *layer_swig = SWIG_NewInstanceObj(layer, tf, 0); + PyObject *tuple = PyTuple_Pack(2, PyFloat_FromDouble(value), layer_swig); +- $result = SWIG_Python_AppendOutput($result, tuple); ++ $result = SWIG_AppendOutput($result, tuple); + } + } + + %typemap(argout) std::vector &OUTPUT { + for(auto it = $1->begin(); it != $1->end(); it++) { + PyObject *obj = PyInt_FromLong((long)*it); +- $result = SWIG_Python_AppendOutput($result, obj); ++ $result = SWIG_AppendOutput($result, obj); + } + } + diff --git a/pkgs/applications/science/machine-learning/openbugs/default.nix b/pkgs/applications/science/machine-learning/openbugs/default.nix index 926188b41815..52055a7b32e3 100644 --- a/pkgs/applications/science/machine-learning/openbugs/default.nix +++ b/pkgs/applications/science/machine-learning/openbugs/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Software package for performing Bayesian analysis and simulation using Markov Chain Monte Carlo"; - homepage = "https://www.mrc-bsu.cam.ac.uk/software/bugs/openbugs/"; + homepage = "https://github.com/jsta/openbugs/"; changelog = "https://github.com/jsta/openbugs/blob/master/ChangeLog"; platforms = [ "i686-linux" "x86_64-linux" ]; license = licenses.gpl3Only; diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 33ea13322db6..5f2ad1b74b96 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -15,13 +15,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation (finalAttrs: { pname = "R"; - version = "4.4.1"; + version = "4.4.2"; src = let inherit (finalAttrs) pname version; in fetchurl { url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-tMtnXequtymdOyZdIYzeQ/GSlRzluJt7saUUijay2U0="; + sha256 = "sha256-FXjNYD6NhmtYdD5J2L+ZxWnoEHm2pgzzPN973/64F+w="; }; outputs = [ "out" "tex" ]; diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix index 33468a311162..2c49536d993d 100644 --- a/pkgs/applications/science/misc/gplates/default.nix +++ b/pkgs/applications/science/misc/gplates/default.nix @@ -7,7 +7,7 @@ doxygen, graphviz, boost, - cgal_5, + cgal, gdal, glew, gmp, @@ -32,7 +32,7 @@ let enablePython = true; inherit python; }; - cgal = cgal_5.override { + cgal' = cgal.override { boost = boost'; }; in @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ boost' - cgal + cgal' gdal glew gmp diff --git a/pkgs/applications/science/misc/nextinspace/default.nix b/pkgs/applications/science/misc/nextinspace/default.nix index 4298c889c74f..b6e27482ee59 100644 --- a/pkgs/applications/science/misc/nextinspace/default.nix +++ b/pkgs/applications/science/misc/nextinspace/default.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "not-stirred"; repo = pname; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-CrhzCvIA3YAFsWvdemvK1RLMacsM5RtgMjLeiqz5MwY="; }; diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index bca0c81a7b70..ff3cee1e5f59 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -22,7 +22,7 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "ArduPilot"; repo = pname; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-A7tqV1kBCSuWHJUTdUZGcPY/r7X1edGZs6xDctpMbMI="; }; diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index b06a83dab70b..3085d9920bf9 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -31,7 +31,7 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-8Jm6DE3B7OQkaNwX/KwXMNZHUyvPtln8mJYaD6yzJRM="; }; diff --git a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix index 5386ae950e34..ee47e968d8b0 100644 --- a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix +++ b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix @@ -18,7 +18,7 @@ mkDerivation rec { src = fetchFromGitHub { owner = "Swordfish90"; repo = "cool-retro-term"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-PewHLVmo+RTBHIQ/y2FBkgXsIvujYd7u56JdFC10B4c="; }; diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index dee1115cb404..8e788f270867 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -41,7 +41,7 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-0M4Bvhh3j9vPedE/d+8zaiZdET4mXcrSNUgLllhaPJw="; }; diff --git a/pkgs/applications/terminal-emulators/wezterm/Cargo.lock b/pkgs/applications/terminal-emulators/wezterm/Cargo.lock deleted file mode 100644 index 4d31d10c502f..000000000000 --- a/pkgs/applications/terminal-emulators/wezterm/Cargo.lock +++ /dev/null @@ -1,7446 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "adler32" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" - -[[package]] -name = "ahash" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "ahash" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" -dependencies = [ - "cfg-if", - "getrandom", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" -dependencies = [ - "memchr", -] - -[[package]] -name = "allocator-api2" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anes" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" - -[[package]] -name = "anstream" -version = "0.6.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2faccea4cc4ab4a667ce676a30e8ec13922a692c99bb8f5b11f1502c72e04220" - -[[package]] -name = "anstyle-parse" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" -dependencies = [ - "anstyle", - "windows-sys 0.52.0", -] - -[[package]] -name = "anyhow" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" - -[[package]] -name = "arrayref" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - -[[package]] -name = "as-raw-xcb-connection" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" - -[[package]] -name = "ash" -version = "0.37.3+1.3.251" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" -dependencies = [ - "libloading 0.7.4", -] - -[[package]] -name = "assert_fs" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cd762e110c8ed629b11b6cde59458cc1c71de78ebbcc30099fc8e0403a2a2ec" -dependencies = [ - "anstyle", - "doc-comment", - "globwalk", - "predicates", - "predicates-core", - "predicates-tree", - "tempfile", -] - -[[package]] -name = "async-broadcast" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" -dependencies = [ - "event-listener 2.5.3", - "futures-core", -] - -[[package]] -name = "async-channel" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" -dependencies = [ - "concurrent-queue", - "event-listener 2.5.3", - "futures-core", -] - -[[package]] -name = "async-channel" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" -dependencies = [ - "concurrent-queue", - "event-listener 4.0.3", - "event-listener-strategy", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-executor" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" -dependencies = [ - "async-lock 3.3.0", - "async-task", - "concurrent-queue", - "fastrand 2.0.1", - "futures-lite 2.2.0", - "slab", -] - -[[package]] -name = "async-fs" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" -dependencies = [ - "async-lock 2.8.0", - "autocfg", - "blocking", - "futures-lite 1.13.0", -] - -[[package]] -name = "async-io" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock 2.8.0", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite 1.13.0", - "log", - "parking", - "polling 2.8.0", - "rustix 0.37.27", - "slab", - "socket2 0.4.10", - "waker-fn", -] - -[[package]] -name = "async-io" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f97ab0c5b00a7cdbe5a371b9a782ee7be1316095885c8a4ea1daf490eb0ef65" -dependencies = [ - "async-lock 3.3.0", - "cfg-if", - "concurrent-queue", - "futures-io", - "futures-lite 2.2.0", - "parking", - "polling 3.3.2", - "rustix 0.38.30", - "slab", - "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "async-lock" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" -dependencies = [ - "event-listener 2.5.3", -] - -[[package]] -name = "async-lock" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" -dependencies = [ - "event-listener 4.0.3", - "event-listener-strategy", - "pin-project-lite", -] - -[[package]] -name = "async-net" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0434b1ed18ce1cf5769b8ac540e33f01fa9471058b5e89da9e06f3c882a8c12f" -dependencies = [ - "async-io 1.13.0", - "blocking", - "futures-lite 1.13.0", -] - -[[package]] -name = "async-process" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" -dependencies = [ - "async-io 1.13.0", - "async-lock 2.8.0", - "async-signal", - "blocking", - "cfg-if", - "event-listener 3.1.0", - "futures-lite 1.13.0", - "rustix 0.38.30", - "windows-sys 0.48.0", -] - -[[package]] -name = "async-recursion" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "async-signal" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" -dependencies = [ - "async-io 2.3.1", - "async-lock 2.8.0", - "atomic-waker", - "cfg-if", - "futures-core", - "futures-io", - "rustix 0.38.30", - "signal-hook-registry", - "slab", - "windows-sys 0.48.0", -] - -[[package]] -name = "async-task" -version = "4.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" - -[[package]] -name = "async-trait" -version = "0.1.77" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "async_ossl" -version = "0.1.0" -dependencies = [ - "openssl", -] - -[[package]] -name = "atomic" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" - -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "az" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" - -[[package]] -name = "backtrace" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide 0.7.1", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "base91" -version = "0.1.0" - -[[package]] -name = "battery" -version = "0.1.0" -dependencies = [ - "anyhow", - "config", - "luahelper", - "starship-battery", - "wezterm-dynamic", -] - -[[package]] -name = "benchmarking" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32842502e72b27b30b2681692d16bf47a8a375c5a2795613f0dc699bed9a48bb" - -[[package]] -name = "bintree" -version = "0.1.0" - -[[package]] -name = "bit-set" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - -[[package]] -name = "bit_field" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" -dependencies = [ - "serde", -] - -[[package]] -name = "block" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "blocking" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" -dependencies = [ - "async-channel 2.1.1", - "async-lock 3.3.0", - "async-task", - "fastrand 2.0.1", - "futures-io", - "futures-lite 2.2.0", - "piper", - "tracing", -] - -[[package]] -name = "bstr" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59604ece62a407dc9164732e5adea02467898954c3a5811fd2dc140af14ef15b" -dependencies = [ - "lazy_static", - "memchr", - "regex-automata 0.1.10", -] - -[[package]] -name = "bstr" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" -dependencies = [ - "memchr", - "regex-automata 0.4.5", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" - -[[package]] -name = "bytemuck" -version = "1.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed2490600f404f2b94c167e31d3ed1d5f3c225a0f3b80230053b3e0b7b962bd9" -dependencies = [ - "bytemuck_derive", -] - -[[package]] -name = "bytemuck_derive" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" - -[[package]] -name = "cairo-rs" -version = "0.18.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2" -dependencies = [ - "bitflags 2.4.2", - "cairo-sys-rs", - "libc", - "once_cell", - "thiserror", -] - -[[package]] -name = "cairo-sys-rs" -version = "0.18.0" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "camino" -version = "1.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" - -[[package]] -name = "cassowary" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" - -[[package]] -name = "cast" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "jobserver", - "libc", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "cgl" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ced0551234e87afee12411d535648dd89d2e7f34c78b753395567aff3d447ff" -dependencies = [ - "libc", -] - -[[package]] -name = "chrono" -version = "0.4.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "num-traits", - "pure-rust-locales", - "serde", - "windows-targets 0.52.0", -] - -[[package]] -name = "ciborium" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" -dependencies = [ - "ciborium-io", - "ciborium-ll", - "serde", -] - -[[package]] -name = "ciborium-io" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" - -[[package]] -name = "ciborium-ll" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" -dependencies = [ - "ciborium-io", - "half 2.3.1", -] - -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "bitflags 1.3.2", - "textwrap 0.11.0", - "unicode-width", -] - -[[package]] -name = "clap" -version = "3.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" -dependencies = [ - "bitflags 1.3.2", - "clap_lex 0.2.4", - "indexmap 1.9.3", - "textwrap 0.16.0", -] - -[[package]] -name = "clap" -version = "4.4.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.4.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" -dependencies = [ - "anstream", - "anstyle", - "clap_lex 0.6.0", - "strsim", - "terminal_size 0.3.0", -] - -[[package]] -name = "clap_complete" -version = "4.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df631ae429f6613fcd3a7c1adbdb65f637271e561b03680adaa6573015dfb106" -dependencies = [ - "clap 4.4.18", -] - -[[package]] -name = "clap_complete_fig" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87e571d70e22ec91d34e1c5317c8308035a2280d925167646bf094fc5de1737c" -dependencies = [ - "clap 4.4.18", - "clap_complete", -] - -[[package]] -name = "clap_derive" -version = "4.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "clap_lex" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" - -[[package]] -name = "clipboard-win" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3a093d6fed558e5fe24c3dfc85a68bb68f1c824f440d3ba5aca189e2998786b" -dependencies = [ - "winapi", -] - -[[package]] -name = "cocoa" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c49e86fc36d5704151f5996b7b3795385f50ce09e3be0f47a0cfde869681cf8" -dependencies = [ - "bitflags 1.3.2", - "block", - "core-foundation 0.7.0", - "core-graphics 0.19.2", - "foreign-types 0.3.2", - "libc", - "objc", -] - -[[package]] -name = "cocoa" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" -dependencies = [ - "bitflags 1.3.2", - "block", - "cocoa-foundation", - "core-foundation 0.9.4", - "core-graphics 0.23.1", - "foreign-types 0.5.0", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" -dependencies = [ - "bitflags 1.3.2", - "block", - "core-foundation 0.9.4", - "core-graphics-types", - "libc", - "objc", -] - -[[package]] -name = "codec" -version = "0.1.0" -dependencies = [ - "anyhow", - "base91", - "config", - "leb128", - "log", - "metrics", - "mux", - "portable-pty", - "rangeset", - "serde", - "smol", - "termwiz", - "thiserror", - "varbincode", - "wezterm-term", - "zstd", -] - -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - -[[package]] -name = "color-funcs" -version = "0.1.0" -dependencies = [ - "anyhow", - "config", - "csscolorparser", - "deltae", - "image", - "lazy_static", - "log", - "lru", - "luahelper", - "plist", - "serde", - "serde_json", - "serde_yaml", - "wezterm-dynamic", - "wezterm-term", -] - -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "colored" -version = "1.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f741c91823341bebf717d4c71bda820630ce065443b58bd1b7451af008355" -dependencies = [ - "is-terminal", - "lazy_static", - "winapi", -] - -[[package]] -name = "colored" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" -dependencies = [ - "lazy_static", - "windows-sys 0.48.0", -] - -[[package]] -name = "colorgrad" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a5f405d474b9d05e0a093d3120e77e9bf26461b57a84b40aa2a221ac5617fb6" -dependencies = [ - "csscolorparser", -] - -[[package]] -name = "com-rs" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642" - -[[package]] -name = "concurrent-queue" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "config" -version = "0.1.0" -dependencies = [ - "anyhow", - "bitflags 1.3.2", - "colorgrad", - "dirs-next", - "enum-display-derive", - "env_logger 0.11.1", - "hostname", - "lazy_static", - "libc", - "log", - "luahelper", - "mlua", - "nix 0.26.4", - "notify", - "once_cell", - "ordered-float", - "portable-pty", - "promise", - "serde", - "serde_json", - "shlex", - "smol", - "termwiz", - "toml 0.8.8", - "umask", - "wezterm-bidi", - "wezterm-config-derive", - "wezterm-dynamic", - "wezterm-input-types", - "wezterm-ssh", - "wezterm-term", - "winapi", -] - -[[package]] -name = "core-foundation" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" -dependencies = [ - "core-foundation-sys 0.7.0", - "libc", -] - -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys 0.8.6", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" - -[[package]] -name = "core-foundation-sys" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" - -[[package]] -name = "core-graphics" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3889374e6ea6ab25dba90bb5d96202f61108058361f6dc72e8b03e6f8bbe923" -dependencies = [ - "bitflags 1.3.2", - "core-foundation 0.7.0", - "foreign-types 0.3.2", - "libc", -] - -[[package]] -name = "core-graphics" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" -dependencies = [ - "bitflags 1.3.2", - "core-foundation 0.9.4", - "core-graphics-types", - "foreign-types 0.5.0", - "libc", -] - -[[package]] -name = "core-graphics-types" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" -dependencies = [ - "bitflags 1.3.2", - "core-foundation 0.9.4", - "libc", -] - -[[package]] -name = "core-text" -version = "20.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9d2790b5c08465d49f8dc05c8bcae9fea467855947db39b0f8145c091aaced5" -dependencies = [ - "core-foundation 0.9.4", - "core-graphics 0.23.1", - "foreign-types 0.5.0", - "libc", -] - -[[package]] -name = "core2" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505" -dependencies = [ - "memchr", -] - -[[package]] -name = "cpufeatures" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "criterion" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f" -dependencies = [ - "atty", - "cast", - "clap 2.34.0", - "criterion-plot 0.4.5", - "csv", - "itertools", - "lazy_static", - "num-traits", - "oorandom", - "plotters", - "rayon", - "regex", - "serde", - "serde_cbor", - "serde_derive", - "serde_json", - "tinytemplate", - "walkdir", -] - -[[package]] -name = "criterion" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb" -dependencies = [ - "anes", - "atty", - "cast", - "ciborium", - "clap 3.2.25", - "criterion-plot 0.5.0", - "itertools", - "lazy_static", - "num-traits", - "oorandom", - "plotters", - "rayon", - "regex", - "serde", - "serde_derive", - "serde_json", - "tinytemplate", - "walkdir", -] - -[[package]] -name = "criterion-plot" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876" -dependencies = [ - "cast", - "itertools", -] - -[[package]] -name = "criterion-plot" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" -dependencies = [ - "cast", - "itertools", -] - -[[package]] -name = "crossbeam" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-epoch", - "crossbeam-queue", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-queue" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "csscolorparser" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf" -dependencies = [ - "lab", - "phf", -] - -[[package]] -name = "csv" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" -dependencies = [ - "csv-core", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "csv-core" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" -dependencies = [ - "memchr", -] - -[[package]] -name = "d3d12" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20" -dependencies = [ - "bitflags 2.4.2", - "libloading 0.8.1", - "winapi", -] - -[[package]] -name = "darling" -version = "0.20.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 2.0.48", -] - -[[package]] -name = "darling_macro" -version = "0.20.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" -dependencies = [ - "darling_core", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "dary_heap" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7762d17f1241643615821a8455a0b2c3e803784b058693d990b11f2dce25a0ca" - -[[package]] -name = "data-encoding" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" - -[[package]] -name = "deltae" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5729f5117e208430e437df2f4843f5e5952997175992d1414f94c57d61e270b4" - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", - "serde", -] - -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "dhat" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f2aaf837aaf456f6706cb46386ba8dffd4013a757e36f4ea05c20dd46b209a3" -dependencies = [ - "backtrace", - "lazy_static", - "mintex", - "parking_lot 0.12.1", - "rustc-hash", - "serde", - "serde_json", - "thousands", -] - -[[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - -[[package]] -name = "difflib" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", -] - -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "dlib" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" -dependencies = [ - "libloading 0.8.1", -] - -[[package]] -name = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - -[[package]] -name = "downcast-rs" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" - -[[package]] -name = "dwrote" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b" -dependencies = [ - "lazy_static", - "libc", - "serde", - "serde_derive", - "winapi", - "wio", -] - -[[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - -[[package]] -name = "embed-resource" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e62abb876c07e4754fae5c14cafa77937841f01740637e17d78dc04352f32a5e" -dependencies = [ - "cc", - "rustc_version", - "toml 0.5.11", - "vswhom", - "winreg 0.10.1", -] - -[[package]] -name = "emojis" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee61eb945bff65ee7d19d157d39c67c33290ff0742907413fd5eefd29edc979" -dependencies = [ - "phf", -] - -[[package]] -name = "encoding_rs" -version = "0.8.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "enum-display-derive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f16ef37b2a9b242295d61a154ee91ae884afff6b8b933b486b12481cc58310ca" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "enumflags2" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" -dependencies = [ - "enumflags2_derive", - "serde", -] - -[[package]] -name = "enumflags2_derive" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "env-bootstrap" -version = "0.1.0" -dependencies = [ - "backtrace", - "battery", - "chrono", - "cocoa 0.20.2", - "color-funcs", - "config", - "dirs-next", - "env_logger 0.10.2", - "filesystem", - "json", - "lazy_static", - "libc", - "log", - "logging", - "mux-lua", - "objc", - "plugin", - "procinfo-funcs", - "share-data", - "spawn-funcs", - "ssh-funcs", - "termwiz", - "termwiz-funcs", - "time-funcs", - "url-funcs", - "wezterm-version", - "winapi", -] - -[[package]] -name = "env_filter" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" -dependencies = [ - "log", - "regex", -] - -[[package]] -name = "env_logger" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" -dependencies = [ - "humantime", - "is-terminal", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "env_logger" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05e7cf40684ae96ade6232ed84582f40ce0a66efcd43a5117aef610534f8e0b8" -dependencies = [ - "anstream", - "anstyle", - "env_filter", - "humantime", - "log", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "euclid" -version = "0.22.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787" -dependencies = [ - "num-traits", -] - -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "event-listener" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" -dependencies = [ - "event-listener 4.0.3", - "pin-project-lite", -] - -[[package]] -name = "exr" -version = "1.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279d3efcc55e19917fff7ab3ddd6c14afb6a90881a0078465196fe2f99d08c56" -dependencies = [ - "bit_field", - "flume 0.10.14", - "half 2.3.1", - "lebe", - "miniz_oxide 0.7.1", - "rayon-core", - "smallvec", - "zune-inflate", -] - -[[package]] -name = "fallible-iterator" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" - -[[package]] -name = "fallible-streaming-iterator" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" - -[[package]] -name = "fancy-regex" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2" -dependencies = [ - "bit-set", - "regex", -] - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - -[[package]] -name = "fdeflate" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" -dependencies = [ - "simd-adler32", -] - -[[package]] -name = "filedescriptor" -version = "0.8.3" -dependencies = [ - "libc", - "thiserror", - "winapi", -] - -[[package]] -name = "filenamegen" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2da6e8ef70499318bc50abd003fd66dbf6d8a46c23f9e90158f388a788976a" -dependencies = [ - "anyhow", - "bstr 0.1.4", - "regex", - "walkdir", -] - -[[package]] -name = "filesystem" -version = "0.1.0" -dependencies = [ - "anyhow", - "config", - "filenamegen", - "luahelper", - "smol", -] - -[[package]] -name = "filetime" -version = "0.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", -] - -[[package]] -name = "finl_unicode" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" - -[[package]] -name = "fixed" -version = "1.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c69ce7e7c0f17aa18fdd9d0de39727adb9c6281f2ad12f57cbe54ae6e76e7d" -dependencies = [ - "az", - "bytemuck", - "half 2.3.1", - "typenum", -] - -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - -[[package]] -name = "flate2" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" -dependencies = [ - "crc32fast", - "miniz_oxide 0.7.1", -] - -[[package]] -name = "float-cmp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" -dependencies = [ - "num-traits", -] - -[[package]] -name = "flume" -version = "0.10.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" -dependencies = [ - "futures-core", - "futures-sink", - "nanorand", - "pin-project", - "spin", -] - -[[package]] -name = "flume" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" -dependencies = [ - "futures-core", - "futures-sink", - "nanorand", - "spin", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "fontconfig" -version = "0.1.0" -dependencies = [ - "libc", - "pkg-config", -] - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared 0.1.1", -] - -[[package]] -name = "foreign-types" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" -dependencies = [ - "foreign-types-macros", - "foreign-types-shared 0.3.1", -] - -[[package]] -name = "foreign-types-macros" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "foreign-types-shared" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "frecency" -version = "0.1.0" -dependencies = [ - "chrono", - "serde", - "serde_json", - "serde_with", -] - -[[package]] -name = "freetype" -version = "0.1.0" -dependencies = [ - "cc", - "fixed", -] - -[[package]] -name = "fsevent-sys" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" -dependencies = [ - "libc", -] - -[[package]] -name = "futures" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" - -[[package]] -name = "futures-executor" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" - -[[package]] -name = "futures-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-lite" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" -dependencies = [ - "fastrand 2.0.1", - "futures-core", - "futures-io", - "parking", - "pin-project-lite", -] - -[[package]] -name = "futures-macro" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "futures-sink" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" - -[[package]] -name = "futures-task" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" - -[[package]] -name = "futures-timer" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" - -[[package]] -name = "futures-util" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "fuzzy-matcher" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94" -dependencies = [ - "thread_local", -] - -[[package]] -name = "generate-bidi" -version = "0.1.0" -dependencies = [ - "anyhow", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "gethostname" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" -dependencies = [ - "libc", - "windows-targets 0.48.5", -] - -[[package]] -name = "getopts" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "getrandom" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi", - "wasm-bindgen", -] - -[[package]] -name = "gif" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" -dependencies = [ - "color_quant", - "weezl", -] - -[[package]] -name = "gimli" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - -[[package]] -name = "git2" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf7f68c2995f392c49fffb4f95ae2c873297830eb25c6bc4c114ce8f4562acc" -dependencies = [ - "bitflags 1.3.2", - "libc", - "libgit2-sys", - "log", - "openssl-probe", - "openssl-sys", - "url", -] - -[[package]] -name = "gl_generator" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" -dependencies = [ - "khronos_api", - "log", - "xml-rs", -] - -[[package]] -name = "glium" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab4f09b43d8ee427a700cb9ed3b20e0e858d62a509edded1a98ca5707d68e19" -dependencies = [ - "backtrace", - "fnv", - "gl_generator", - "lazy_static", - "memoffset 0.6.5", - "smallvec", - "takeable-option", -] - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "globset" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" -dependencies = [ - "aho-corasick", - "bstr 1.9.0", - "log", - "regex-automata 0.4.5", - "regex-syntax", -] - -[[package]] -name = "globwalk" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757" -dependencies = [ - "bitflags 2.4.2", - "ignore", - "walkdir", -] - -[[package]] -name = "glow" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" -dependencies = [ - "js-sys", - "slotmap", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "glutin_wgl_sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" -dependencies = [ - "gl_generator", -] - -[[package]] -name = "governor" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c390a940a5d157878dd057c78680a33ce3415bcd05b4799509ea44210914b4d5" -dependencies = [ - "cfg-if", - "futures", - "futures-timer", - "no-std-compat", - "nonzero_ext", - "parking_lot 0.12.1", - "smallvec", -] - -[[package]] -name = "gpu-alloc" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" -dependencies = [ - "bitflags 2.4.2", - "gpu-alloc-types", -] - -[[package]] -name = "gpu-alloc-types" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" -dependencies = [ - "bitflags 2.4.2", -] - -[[package]] -name = "gpu-allocator" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40fe17c8a05d60c38c0a4e5a3c802f2f1ceb66b76c67d96ffb34bef0475a7fad" -dependencies = [ - "backtrace", - "log", - "presser", - "thiserror", - "winapi", - "windows 0.51.1", -] - -[[package]] -name = "gpu-descriptor" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" -dependencies = [ - "bitflags 2.4.2", - "gpu-descriptor-types", - "hashbrown 0.14.3", -] - -[[package]] -name = "gpu-descriptor-types" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" -dependencies = [ - "bitflags 2.4.2", -] - -[[package]] -name = "guillotiere" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782" -dependencies = [ - "euclid", - "svg_fmt", -] - -[[package]] -name = "h2" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap 2.2.1", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "half" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" - -[[package]] -name = "half" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" -dependencies = [ - "cfg-if", - "crunchy", -] - -[[package]] -name = "harfbuzz" -version = "0.1.0" -dependencies = [ - "cc", - "freetype", -] - -[[package]] -name = "hashbrown" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" -dependencies = [ - "ahash 0.7.7", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.7", -] - -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash 0.8.7", -] - -[[package]] -name = "hashbrown" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" -dependencies = [ - "ahash 0.8.7", - "allocator-api2", -] - -[[package]] -name = "hashlink" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7249a3129cbc1ffccd74857f81464a323a152173cdb134e0fd81bc803b29facf" -dependencies = [ - "hashbrown 0.11.2", -] - -[[package]] -name = "hassle-rs" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0" -dependencies = [ - "bitflags 1.3.2", - "com-rs", - "libc", - "libloading 0.7.4", - "thiserror", - "widestring", - "winapi", -] - -[[package]] -name = "hdrhistogram" -version = "7.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d" -dependencies = [ - "base64 0.21.7", - "byteorder", - "crossbeam-channel", - "flate2", - "nom", - "num-traits", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hexf-parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" - -[[package]] -name = "home" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "hostname" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" -dependencies = [ - "libc", - "match_cfg", - "winapi", -] - -[[package]] -name = "http" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" -dependencies = [ - "bytes", - "http", - "pin-project-lite", -] - -[[package]] -name = "http_req" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90394b01e9de1f7eca6ca0664cc64bd92add9603c1aa4f961813f23789035e10" -dependencies = [ - "native-tls", - "unicase", -] - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[package]] -name = "humansize" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cb51c9a029ddc91b07a787f1d86b53ccfa49b0e86688c946ebe8d3555685dd7" -dependencies = [ - "libm", -] - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "hyper" -version = "0.14.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2 0.5.5", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.59" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" -dependencies = [ - "android_system_properties", - "core-foundation-sys 0.8.6", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core 0.52.0", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "ignore" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" -dependencies = [ - "crossbeam-deque", - "globset", - "log", - "memchr", - "regex-automata 0.4.5", - "same-file", - "walkdir", - "winapi-util", -] - -[[package]] -name = "image" -version = "0.24.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034bbe799d1909622a74d1193aa50147769440040ff36cb2baa947609b0a4e23" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "exr", - "gif", - "jpeg-decoder", - "num-traits", - "png", - "qoi", - "tiff", -] - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", - "serde", -] - -[[package]] -name = "indexmap" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433de089bd45971eecf4668ee0ee8f4cec17db4f8bd8f7bc3197a6ce37aa7d9b" -dependencies = [ - "equivalent", - "hashbrown 0.14.3", -] - -[[package]] -name = "inotify" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" -dependencies = [ - "bitflags 1.3.2", - "inotify-sys", - "libc", -] - -[[package]] -name = "inotify-sys" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" -dependencies = [ - "libc", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "intrusive-collections" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b694dc9f70c3bda874626d2aed13b780f137aab435f4e9814121955cf706122e" -dependencies = [ - "memoffset 0.9.0", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.4", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "ioctl-rs" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7970510895cee30b3e9128319f2cefd4bde883a39f38baa279567ba3a7eb97d" -dependencies = [ - "libc", -] - -[[package]] -name = "ipnet" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" - -[[package]] -name = "is-terminal" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" -dependencies = [ - "hermit-abi 0.3.4", - "rustix 0.38.30", - "windows-sys 0.52.0", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" - -[[package]] -name = "jobserver" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" -dependencies = [ - "libc", -] - -[[package]] -name = "jpeg-decoder" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" -dependencies = [ - "rayon", -] - -[[package]] -name = "js-sys" -version = "0.3.67" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "json" -version = "0.1.0" -dependencies = [ - "anyhow", - "config", - "luahelper", - "serde_json", - "wezterm-dynamic", -] - -[[package]] -name = "k9" -version = "0.11.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ddb58b0079a063218472916af599f2753ccb40942cdaba9d1f3fefccef17a9" -dependencies = [ - "anyhow", - "colored 1.9.4", - "diff", - "lazy_static", - "libc", - "proc-macro2", - "regex", - "syn 1.0.109", - "term_size", -] - -[[package]] -name = "k9" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "088bcebb5b68b1b14b64d7f05b0f802719250b97fdc0338ec42529ea777ed614" -dependencies = [ - "anyhow", - "colored 2.1.0", - "diff", - "lazy_static", - "libc", - "proc-macro2", - "regex", - "syn 2.0.48", - "terminal_size 0.2.6", -] - -[[package]] -name = "khronos-egl" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" -dependencies = [ - "libc", - "libloading 0.8.1", - "pkg-config", -] - -[[package]] -name = "khronos_api" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" - -[[package]] -name = "kqueue" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" -dependencies = [ - "kqueue-sys", - "libc", -] - -[[package]] -name = "kqueue-sys" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" -dependencies = [ - "bitflags 1.3.2", - "libc", -] - -[[package]] -name = "lab" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf36173d4167ed999940f804952e6b08197cae5ad5d572eb4db150ce8ad5d58f" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "leb128" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" - -[[package]] -name = "lebe" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" - -[[package]] -name = "lfucache" -version = "0.1.0" -dependencies = [ - "ahash 0.8.7", - "config", - "fnv", - "intrusive-collections", - "k9 0.11.6", - "metrics", -] - -[[package]] -name = "libc" -version = "0.2.152" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" - -[[package]] -name = "libflate" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7d5654ae1795afc7ff76f4365c2c8791b0feb18e8996a96adad8ffd7c3b2bf" -dependencies = [ - "adler32", - "core2", - "crc32fast", - "dary_heap", - "libflate_lz77", -] - -[[package]] -name = "libflate_lz77" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be5f52fb8c451576ec6b79d3f4deb327398bc05bbdbd99021a6e77a4c855d524" -dependencies = [ - "core2", - "hashbrown 0.13.2", - "rle-decode-fast", -] - -[[package]] -name = "libgit2-sys" -version = "0.14.2+1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4" -dependencies = [ - "cc", - "libc", - "libz-sys", - "openssl-sys", - "pkg-config", -] - -[[package]] -name = "libloading" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883" -dependencies = [ - "cfg-if", - "winapi", -] - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - -[[package]] -name = "libloading" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "libm" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[package]] -name = "libredox" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" -dependencies = [ - "bitflags 2.4.2", - "libc", - "redox_syscall 0.4.1", -] - -[[package]] -name = "libsqlite3-sys" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "898745e570c7d0453cc1fbc4a701eb6c662ed54e8fec8b7d14be137ebeeb9d14" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "libssh-rs" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3fe324fb06b71d28abb81382ac547f25b4895e853a9968482dc5002fb3db08" -dependencies = [ - "bitflags 1.3.2", - "libssh-rs-sys", - "openssl-sys", - "thiserror", -] - -[[package]] -name = "libssh-rs-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3af07827858d82a7b74d6f935ad4201ff764fb1de8efcc26aeaa33e5f9c89ca2" -dependencies = [ - "cc", - "libz-sys", - "openssl-sys", - "pkg-config", -] - -[[package]] -name = "libssh2-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee" -dependencies = [ - "cc", - "libc", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "libz-sys" -version = "1.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037731f5d3aaa87a5675e895b63ddff1a87624bc29f77004ea829809654e48f6" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "line-wrap" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" -dependencies = [ - "safemem", -] - -[[package]] -name = "line_drawing" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15cb10f27ad3eac84fdb70f0ea6dfe3bc33f7d6f3aa575f32d1ced3a342049a1" -dependencies = [ - "num-traits", -] - -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" - -[[package]] -name = "lock_api" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[package]] -name = "logging" -version = "0.1.0" -dependencies = [ - "anyhow", - "config", - "log", - "luahelper", -] - -[[package]] -name = "lru" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" -dependencies = [ - "hashbrown 0.12.3", -] - -[[package]] -name = "lua-src" -version = "546.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da0daa7eee611a4c30c8f5ee31af55266e26e573971ba9336d2993e2da129b2" -dependencies = [ - "cc", -] - -[[package]] -name = "luahelper" -version = "0.1.0" -dependencies = [ - "bstr 1.9.0", - "log", - "mlua", - "wezterm-dynamic", -] - -[[package]] -name = "luajit-src" -version = "210.5.5+f2336c4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8bcba9790f4e3b1c1467d75cdd011a63bbe6bc75da95af5d2cb4e3631f939c4" -dependencies = [ - "cc", - "which", -] - -[[package]] -name = "mac_address" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4863ee94f19ed315bf3bc00299338d857d4b5bc856af375cc97d237382ad3856" -dependencies = [ - "nix 0.23.2", - "winapi", -] - -[[package]] -name = "mach" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" -dependencies = [ - "libc", -] - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "maplit" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" - -[[package]] -name = "match_cfg" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" - -[[package]] -name = "memchr" -version = "2.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" - -[[package]] -name = "memmap2" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "723e3ebdcdc5c023db1df315364573789f8857c11b631a2fdfad7c00f5c046b4" -dependencies = [ - "libc", -] - -[[package]] -name = "memmap2" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" -dependencies = [ - "libc", -] - -[[package]] -name = "memmap2" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed" -dependencies = [ - "libc", -] - -[[package]] -name = "memmem" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a64a92489e2744ce060c349162be1c5f33c6969234104dbd99ddb5feb08b8c15" - -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "metal" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" -dependencies = [ - "bitflags 2.4.2", - "block", - "core-graphics-types", - "foreign-types 0.5.0", - "log", - "objc", - "paste", -] - -[[package]] -name = "metrics" -version = "0.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55586aa936c35f34ba8aa5d97356d554311206e1ce1f9e68fe7b07288e5ad827" -dependencies = [ - "ahash 0.7.7", - "metrics-macros", -] - -[[package]] -name = "metrics-macros" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0daa0ab3a0ae956d0e2c1f42511422850e577d36a255357d1a7d08d45ee3a2f1" -dependencies = [ - "lazy_static", - "proc-macro2", - "quote", - "regex", - "syn 1.0.109", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" -dependencies = [ - "adler", - "autocfg", -] - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", - "simd-adler32", -] - -[[package]] -name = "mintex" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bec4598fddb13cc7b528819e697852653252b760f1228b7642679bf2ff2cd07" - -[[package]] -name = "mio" -version = "0.8.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" -dependencies = [ - "libc", - "log", - "wasi", - "windows-sys 0.48.0", -] - -[[package]] -name = "mlua" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d3561f79659ff3afad7b25e2bf2ec21507fe601ebecb7f81088669ec4bfd51e" -dependencies = [ - "bstr 1.9.0", - "futures-util", - "mlua-sys", - "num-traits", - "once_cell", - "rustc-hash", -] - -[[package]] -name = "mlua-sys" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2847b42764435201d8cbee1f517edb79c4cca4181877b90047587c89e1b7bce4" -dependencies = [ - "cc", - "cfg-if", - "lua-src", - "luajit-src", - "pkg-config", -] - -[[package]] -name = "mux" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "base64 0.21.7", - "bintree", - "bitflags 1.3.2", - "chrono", - "config", - "crossbeam", - "downcast-rs", - "fancy-regex", - "filedescriptor", - "finl_unicode", - "flume 0.10.14", - "hostname", - "k9 0.11.6", - "lazy_static", - "libc", - "log", - "luahelper", - "metrics", - "mlua", - "names", - "nix 0.25.1", - "ntapi", - "parking_lot 0.12.1", - "percent-encoding", - "portable-pty", - "procinfo", - "promise", - "rangeset", - "serde", - "serial", - "shell-words", - "smol", - "terminfo", - "termwiz", - "termwiz-funcs", - "textwrap 0.16.0", - "thiserror", - "url", - "wezterm-dynamic", - "wezterm-ssh", - "wezterm-term", - "winapi", -] - -[[package]] -name = "mux-lua" -version = "0.1.0" -dependencies = [ - "anyhow", - "config", - "libc", - "log", - "luahelper", - "mux", - "parking_lot 0.12.1", - "portable-pty", - "smol", - "termwiz", - "termwiz-funcs", - "url-funcs", - "wezterm-dynamic", - "wezterm-term", -] - -[[package]] -name = "naga" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae585df4b6514cf8842ac0f1ab4992edc975892704835b549cf818dc0191249e" -dependencies = [ - "bit-set", - "bitflags 2.4.2", - "codespan-reporting", - "hexf-parse", - "indexmap 2.2.1", - "log", - "num-traits", - "rustc-hash", - "spirv", - "termcolor", - "thiserror", - "unicode-xid", -] - -[[package]] -name = "names" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a8690bf09abf659851e58cd666c3d37ac6af07c2bd7a9e332cfba471715775" -dependencies = [ - "rand", -] - -[[package]] -name = "nanorand" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" -dependencies = [ - "getrandom", -] - -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "nix" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" -dependencies = [ - "bitflags 1.3.2", - "cc", - "cfg-if", - "libc", - "memoffset 0.6.5", -] - -[[package]] -name = "nix" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.6.5", -] - -[[package]] -name = "nix" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.6.5", - "pin-utils", -] - -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.7.1", - "pin-utils", -] - -[[package]] -name = "no-std-compat" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "nonzero_ext" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" - -[[package]] -name = "normalize-line-endings" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" - -[[package]] -name = "notify" -version = "5.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "729f63e1ca555a43fe3efa4f3efdf4801c479da85b432242a7b726f353c88486" -dependencies = [ - "bitflags 1.3.2", - "crossbeam-channel", - "filetime", - "fsevent-sys", - "inotify", - "kqueue", - "libc", - "mio", - "walkdir", - "windows-sys 0.45.0", -] - -[[package]] -name = "ntapi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" -dependencies = [ - "winapi", -] - -[[package]] -name = "num" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b7a8e9be5e039e2ff869df49155f1c06bd01ade2117ec783e56ab0932b67a8f" -dependencies = [ - "num-bigint", - "num-complex", - "num-integer", - "num-iter", - "num-rational", - "num-traits", -] - -[[package]] -name = "num-bigint" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6f7833f2cbf2360a6cfd58cd41a53aa7a90bd4c202f5b1c7dd2ed73c57b2c3" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-complex" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747d632c0c558b87dbabbe6a82f3b4ae03720d0646ac5b7b4dae89394be5f2c5" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] -name = "num-derive" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" -dependencies = [ - "autocfg", - "num-bigint", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi 0.3.4", - "libc", -] - -[[package]] -name = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", - "objc_exception", -] - -[[package]] -name = "objc_exception" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" -dependencies = [ - "cc", -] - -[[package]] -name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "oorandom" -version = "11.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" - -[[package]] -name = "openssl" -version = "0.10.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8" -dependencies = [ - "bitflags 2.4.2", - "cfg-if", - "foreign-types 0.3.2", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-src" -version = "300.2.1+3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fe476c29791a5ca0d1273c697e96085bbabbbea2ef7afd5617e78a4b40332d3" -dependencies = [ - "cc", -] - -[[package]] -name = "openssl-sys" -version = "0.9.99" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae" -dependencies = [ - "cc", - "libc", - "openssl-src", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "ordered-float" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e" -dependencies = [ - "num-traits", - "rand", - "serde", -] - -[[package]] -name = "ordered-stream" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" -dependencies = [ - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "os_str_bytes" -version = "6.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" - -[[package]] -name = "parking" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" - -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core 0.9.9", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.4.1", - "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "pem" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310" -dependencies = [ - "base64 0.21.7", - "serde", -] - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "pest" -version = "2.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f200d8d83c44a45b21764d1916299752ca035d15ecd46faca3e9a2a2bf6ad06" -dependencies = [ - "memchr", - "thiserror", - "ucd-trie", -] - -[[package]] -name = "pest_derive" -version = "2.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcd6ab1236bbdb3a49027e920e693192ebfe8913f6d60e294de57463a493cfde" -dependencies = [ - "pest", - "pest_generator", -] - -[[package]] -name = "pest_generator" -version = "2.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a31940305ffc96863a735bef7c7994a00b325a7138fdbc5bda0f1a0476d3275" -dependencies = [ - "pest", - "pest_meta", - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "pest_meta" -version = "2.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7ff62f5259e53b78d1af898941cdcdccfae7385cf7d793a6e55de5d05bb4b7d" -dependencies = [ - "once_cell", - "pest", - "sha2", -] - -[[package]] -name = "phf" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" -dependencies = [ - "phf_macros", - "phf_shared", -] - -[[package]] -name = "phf_codegen" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" -dependencies = [ - "phf_generator", - "phf_shared", -] - -[[package]] -name = "phf_generator" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" -dependencies = [ - "phf_shared", - "rand", -] - -[[package]] -name = "phf_macros" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" -dependencies = [ - "phf_generator", - "phf_shared", - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pin-project" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "piper" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" -dependencies = [ - "atomic-waker", - "fastrand 2.0.1", - "futures-io", -] - -[[package]] -name = "pkg-config" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" - -[[package]] -name = "plist" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" -dependencies = [ - "base64 0.21.7", - "indexmap 2.2.1", - "line-wrap", - "quick-xml 0.31.0", - "serde", - "time", -] - -[[package]] -name = "plotters" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" -dependencies = [ - "num-traits", - "plotters-backend", - "plotters-svg", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "plotters-backend" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" - -[[package]] -name = "plotters-svg" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" -dependencies = [ - "plotters-backend", -] - -[[package]] -name = "plugin" -version = "0.1.0" -dependencies = [ - "anyhow", - "config", - "git2", - "log", - "luahelper", - "tempfile", - "wezterm-dynamic", -] - -[[package]] -name = "png" -version = "0.17.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f6c3c3e617595665b8ea2ff95a86066be38fb121ff920a9c0eb282abcd1da5a" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide 0.7.1", -] - -[[package]] -name = "polling" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.48.0", -] - -[[package]] -name = "polling" -version = "3.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545c980a3880efd47b2e262f6a4bb6daad6555cf3367aa9c4e52895f69537a41" -dependencies = [ - "cfg-if", - "concurrent-queue", - "pin-project-lite", - "rustix 0.38.30", - "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "portable-pty" -version = "0.8.1" -dependencies = [ - "anyhow", - "bitflags 1.3.2", - "downcast-rs", - "filedescriptor", - "futures", - "lazy_static", - "libc", - "log", - "nix 0.25.1", - "serde", - "serde_derive", - "serial", - "shared_library", - "shell-words", - "smol", - "winapi", - "winreg 0.10.1", -] - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "predicates" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8" -dependencies = [ - "anstyle", - "difflib", - "float-cmp", - "normalize-line-endings", - "predicates-core", - "regex", -] - -[[package]] -name = "predicates-core" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" - -[[package]] -name = "predicates-tree" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" -dependencies = [ - "predicates-core", - "termtree", -] - -[[package]] -name = "presser" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" - -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - -[[package]] -name = "proc-macro2" -version = "1.0.78" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "procinfo" -version = "0.1.0" -dependencies = [ - "libc", - "log", - "luahelper", - "ntapi", - "wezterm-dynamic", - "winapi", -] - -[[package]] -name = "procinfo-funcs" -version = "0.1.0" -dependencies = [ - "anyhow", - "config", - "libc", - "luahelper", - "procinfo", - "wezterm-dynamic", -] - -[[package]] -name = "profiling" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d135ede8821cf6376eb7a64148901e1690b788c11ae94dc297ae917dbc91dc0e" - -[[package]] -name = "promise" -version = "0.2.0" -dependencies = [ - "anyhow", - "async-executor", - "async-io 1.13.0", - "async-task", - "flume 0.10.14", - "lazy_static", - "thiserror", -] - -[[package]] -name = "pulldown-cmark" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" -dependencies = [ - "bitflags 2.4.2", - "getopts", - "memchr", - "unicase", -] - -[[package]] -name = "pure-rust-locales" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed02a829e62dc2715ceb8afb4f80e298148e1345749ceb369540fe0eb3368432" - -[[package]] -name = "qoi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "quick-xml" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" -dependencies = [ - "memchr", -] - -[[package]] -name = "quick-xml" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" -dependencies = [ - "memchr", -] - -[[package]] -name = "quote" -version = "1.0.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", - "serde", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", - "serde", -] - -[[package]] -name = "range-alloc" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" - -[[package]] -name = "rangeset" -version = "0.1.0" -dependencies = [ - "criterion 0.3.6", - "num", -] - -[[package]] -name = "ratelim" -version = "0.1.0" -dependencies = [ - "config", - "governor", -] - -[[package]] -name = "raw-window-handle" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" - -[[package]] -name = "rayon" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] -name = "rcgen" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48406db8ac1f3cbc7dcdb56ec355343817958a356ff430259bb07baf7607e1e1" -dependencies = [ - "pem", - "ring", - "time", - "yasna", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_users" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" -dependencies = [ - "getrandom", - "libredox", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata 0.4.5", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" - -[[package]] -name = "regex-automata" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" - -[[package]] -name = "relative-path" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e898588f33fdd5b9420719948f9f2a32c922a246964576f71ba7f24f80610fbc" - -[[package]] -name = "renderdoc-sys" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b" - -[[package]] -name = "reqwest" -version = "0.11.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" -dependencies = [ - "base64 0.21.7", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-tls", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "serde", - "serde_json", - "serde_urlencoded", - "system-configuration", - "tokio", - "tokio-native-tls", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg 0.50.0", -] - -[[package]] -name = "resize" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2a08c42ea86684dc00256494c4eb8b54707890ddac50c05060a717f29669029" -dependencies = [ - "rgb", -] - -[[package]] -name = "rgb" -version = "0.8.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "ring" -version = "0.17.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" -dependencies = [ - "cc", - "getrandom", - "libc", - "spin", - "untrusted", - "windows-sys 0.48.0", -] - -[[package]] -name = "rle-decode-fast" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" - -[[package]] -name = "rstest" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97eeab2f3c0a199bc4be135c36c924b6590b88c377d416494288c14f2db30199" -dependencies = [ - "futures", - "futures-timer", - "rstest_macros", - "rustc_version", -] - -[[package]] -name = "rstest_macros" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d428f8247852f894ee1be110b375111b586d4fa431f6c46e64ba5a0dcccbe605" -dependencies = [ - "cfg-if", - "glob", - "proc-macro2", - "quote", - "regex", - "relative-path", - "rustc_version", - "syn 2.0.48", - "unicode-ident", -] - -[[package]] -name = "rusqlite" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85127183a999f7db96d1a976a309eebbfb6ea3b0b400ddd8340190129de6eb7a" -dependencies = [ - "bitflags 1.3.2", - "fallible-iterator", - "fallible-streaming-iterator", - "hashlink", - "libsqlite3-sys", - "memchr", - "smallvec", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver 1.0.21", -] - -[[package]] -name = "rustix" -version = "0.37.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustix" -version = "0.38.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" -dependencies = [ - "bitflags 2.4.2", - "errno", - "libc", - "linux-raw-sys 0.4.13", - "windows-sys 0.52.0", -] - -[[package]] -name = "ryu" -version = "1.0.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" - -[[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "schannel" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "security-framework" -version = "2.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" -dependencies = [ - "bitflags 1.3.2", - "core-foundation 0.9.4", - "core-foundation-sys 0.8.6", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" -dependencies = [ - "core-foundation-sys 0.8.6", - "libc", -] - -[[package]] -name = "semver" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver" -version = "1.0.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" - -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] - -[[package]] -name = "serde" -version = "1.0.196" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_cbor" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" -dependencies = [ - "half 1.8.2", - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.196" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "serde_json" -version = "1.0.113" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_repr" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "serde_spanned" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_with" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" -dependencies = [ - "base64 0.13.1", - "chrono", - "hex", - "indexmap 1.9.3", - "serde", - "serde_json", - "serde_with_macros", - "time", -] - -[[package]] -name = "serde_with_macros" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "serde_yaml" -version = "0.9.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adf8a49373e98a4c5f0ceb5d05aa7c648d75f63774981ed95b7c7443bbd50c6e" -dependencies = [ - "indexmap 2.2.1", - "itoa", - "ryu", - "serde", - "unsafe-libyaml", -] - -[[package]] -name = "serial" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1237a96570fc377c13baa1b88c7589ab66edced652e43ffb17088f003db3e86" -dependencies = [ - "serial-core", - "serial-unix", - "serial-windows", -] - -[[package]] -name = "serial-core" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f46209b345401737ae2125fe5b19a77acce90cd53e1658cda928e4fe9a64581" -dependencies = [ - "libc", -] - -[[package]] -name = "serial-unix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f03fbca4c9d866e24a459cbca71283f545a37f8e3e002ad8c70593871453cab7" -dependencies = [ - "ioctl-rs", - "libc", - "serial-core", - "termios 0.2.2", -] - -[[package]] -name = "serial-windows" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c6d3b776267a75d31bbdfd5d36c0ca051251caafc285827052bc53bcdc8162" -dependencies = [ - "libc", - "serial-core", -] - -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "share-data" -version = "0.1.0" -dependencies = [ - "anyhow", - "config", - "lazy_static", - "luahelper", - "ordered-float", - "wezterm-dynamic", -] - -[[package]] -name = "shared_library" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9e7e0f2bfae24d8a5b5a66c5b257a83c7412304311512a0c054cd5e619da11" -dependencies = [ - "lazy_static", - "libc", -] - -[[package]] -name = "shell-words" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "signal-hook" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "simd-adler32" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" - -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "slotmap" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" -dependencies = [ - "version_check", -] - -[[package]] -name = "smallvec" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" - -[[package]] -name = "smawk" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" - -[[package]] -name = "smithay-client-toolkit" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870427e30b8f2cbe64bf43ec4b86e88fe39b0a84b3f15efd9c9c2d020bc86eb9" -dependencies = [ - "bitflags 1.3.2", - "dlib", - "lazy_static", - "log", - "memmap2 0.5.10", - "nix 0.24.3", - "pkg-config", - "wayland-client", - "wayland-cursor", - "wayland-protocols", -] - -[[package]] -name = "smol" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13f2b548cd8447f8de0fdf1c592929f70f4fc7039a05e47404b0d096ec6987a1" -dependencies = [ - "async-channel 1.9.0", - "async-executor", - "async-fs", - "async-io 1.13.0", - "async-lock 2.8.0", - "async-net", - "async-process", - "blocking", - "futures-lite 1.13.0", -] - -[[package]] -name = "smol-potat" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "894ffa61af5c0fab697c8c29b1ab10cb6ec4978a1ccac4a81b5b312df1ffd88e" -dependencies = [ - "async-io 1.13.0", - "smol-potat-macro", -] - -[[package]] -name = "smol-potat-macro" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b7cd8129a18069385b4eadaa81182b1451fab312ad6f58d1d99253082bf3932" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" -dependencies = [ - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "spa" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab074195b3f78a133cd7b7998142cf39dfaac71f6e990eaeecd14f5524db009a" -dependencies = [ - "chrono", -] - -[[package]] -name = "spawn-funcs" -version = "0.1.0" -dependencies = [ - "anyhow", - "bstr 1.9.0", - "config", - "log", - "luahelper", - "smol", - "wezterm-dynamic", - "wezterm-open-url", - "winapi", -] - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] - -[[package]] -name = "spirv" -version = "0.2.0+1.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" -dependencies = [ - "bitflags 1.3.2", - "num-traits", -] - -[[package]] -name = "sqlite-cache" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "012429babedb75518d1b6935abcee30852d1650c05c6eaf4e29ae335ae6e173b" -dependencies = [ - "data-encoding", - "futures", - "rusqlite", - "tracing", -] - -[[package]] -name = "ssh-funcs" -version = "0.1.0" -dependencies = [ - "anyhow", - "config", - "luahelper", - "wezterm-ssh", -] - -[[package]] -name = "ssh2" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7fe461910559f6d5604c3731d00d2aafc4a83d1665922e280f42f9a168d5455" -dependencies = [ - "bitflags 1.3.2", - "libc", - "libssh2-sys", - "parking_lot 0.11.2", -] - -[[package]] -name = "starship-battery" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3336198ad004af4447ae69be4f4e562c26814570f8f0c1e37858405a294e015d" -dependencies = [ - "cfg-if", - "core-foundation 0.7.0", - "lazycell", - "libc", - "mach", - "nix 0.23.2", - "num-traits", - "uom", - "winapi", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strict-num" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" - -[[package]] -name = "strip-ansi-escapes" -version = "0.1.0" -dependencies = [ - "clap 4.4.18", - "termwiz", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "svg_fmt" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sync-color-schemes" -version = "0.1.0" -dependencies = [ - "anyhow", - "color-funcs", - "config", - "env_logger 0.11.1", - "futures", - "lazy_static", - "libflate", - "log", - "reqwest", - "rusqlite", - "serde", - "serde_json", - "sqlite-cache", - "tar", - "tempfile", - "tokio", - "toml 0.8.8", - "wezterm-dynamic", - "yaml-rust", -] - -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation 0.9.4", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys 0.8.6", - "libc", -] - -[[package]] -name = "tabout" -version = "0.3.0" -dependencies = [ - "termwiz", -] - -[[package]] -name = "takeable-option" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36ae8932fcfea38b7d3883ae2ab357b0d57a02caaa18ebb4f5ece08beaec4aa0" - -[[package]] -name = "tar" -version = "0.4.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" -dependencies = [ - "filetime", - "libc", - "xattr", -] - -[[package]] -name = "tempfile" -version = "3.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" -dependencies = [ - "cfg-if", - "fastrand 2.0.1", - "redox_syscall 0.4.1", - "rustix 0.38.30", - "windows-sys 0.52.0", -] - -[[package]] -name = "term_size" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "terminal_size" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" -dependencies = [ - "rustix 0.37.27", - "windows-sys 0.48.0", -] - -[[package]] -name = "terminal_size" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" -dependencies = [ - "rustix 0.38.30", - "windows-sys 0.48.0", -] - -[[package]] -name = "terminfo" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "666cd3a6681775d22b200409aad3b089c5b99fb11ecdd8a204d9d62f8148498f" -dependencies = [ - "dirs", - "fnv", - "nom", - "phf", - "phf_codegen", -] - -[[package]] -name = "termios" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5d9cf598a6d7ce700a4e6a9199da127e6819a61e64b68609683cc9a01b5683a" -dependencies = [ - "libc", -] - -[[package]] -name = "termios" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "411c5bf740737c7918b8b1fe232dca4dc9f8e754b8ad5e20966814001ed0ac6b" -dependencies = [ - "libc", -] - -[[package]] -name = "termtree" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" - -[[package]] -name = "termwiz" -version = "0.22.0" -dependencies = [ - "anyhow", - "base64 0.21.7", - "bitflags 2.4.2", - "cassowary", - "criterion 0.4.0", - "env_logger 0.11.1", - "fancy-regex", - "filedescriptor", - "finl_unicode", - "fixedbitset", - "fnv", - "hex", - "image", - "k9 0.11.6", - "lazy_static", - "libc", - "log", - "memmem", - "nix 0.26.4", - "num-derive", - "num-traits", - "ordered-float", - "pest", - "pest_derive", - "phf", - "semver 0.11.0", - "serde", - "sha2", - "signal-hook", - "siphasher", - "tempfile", - "terminfo", - "termios 0.3.3", - "thiserror", - "ucd-trie", - "unicode-segmentation", - "varbincode", - "vtparse", - "wezterm-bidi", - "wezterm-blob-leases", - "wezterm-color-types", - "wezterm-dynamic", - "wezterm-input-types", - "winapi", -] - -[[package]] -name = "termwiz-funcs" -version = "0.1.0" -dependencies = [ - "anyhow", - "config", - "finl_unicode", - "lazy_static", - "luahelper", - "terminfo", - "termwiz", - "wezterm-dynamic", - "wezterm-input-types", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" -dependencies = [ - "smawk", - "unicode-linebreak", - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "thousands" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820" - -[[package]] -name = "thread_local" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "tiff" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" -dependencies = [ - "flate2", - "jpeg-decoder", - "weezl", -] - -[[package]] -name = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -dependencies = [ - "deranged", - "itoa", - "num-conv", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-funcs" -version = "0.1.0" -dependencies = [ - "anyhow", - "chrono", - "config", - "lazy_static", - "luahelper", - "promise", - "smol", - "spa", - "wezterm-dynamic", -] - -[[package]] -name = "time-macros" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -dependencies = [ - "num-conv", - "time-core", -] - -[[package]] -name = "tiny-skia" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6a067b809476893fce6a254cf285850ff69c847e6cfbade6a20b655b6c7e80d" -dependencies = [ - "arrayref", - "arrayvec", - "bytemuck", - "cfg-if", - "log", - "png", - "tiny-skia-path", -] - -[[package]] -name = "tiny-skia-path" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de35e8a90052baaaf61f171680ac2f8e925a1e43ea9d2e3a00514772250e541" -dependencies = [ - "arrayref", - "bytemuck", - "strict-num", -] - -[[package]] -name = "tinytemplate" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "1.35.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "num_cpus", - "pin-project-lite", - "socket2 0.5.5", - "tokio-macros", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-macros" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - -[[package]] -name = "toml" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.21.0", -] - -[[package]] -name = "toml_datetime" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap 2.2.1", - "toml_datetime", - "winnow", -] - -[[package]] -name = "toml_edit" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" -dependencies = [ - "indexmap 2.2.1", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", -] - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "ucd-trie" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" - -[[package]] -name = "uds_windows" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" -dependencies = [ - "memoffset 0.9.0", - "tempfile", - "winapi", -] - -[[package]] -name = "umask" -version = "0.1.0" -dependencies = [ - "lazy_static", - "libc", -] - -[[package]] -name = "unicase" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-linebreak" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - -[[package]] -name = "unicode-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "unsafe-libyaml" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "uom" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e76503e636584f1e10b9b3b9498538279561adcef5412927ba00c2b32c4ce5ed" -dependencies = [ - "num-traits", - "typenum", -] - -[[package]] -name = "url" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "url-funcs" -version = "0.1.0" -dependencies = [ - "anyhow", - "config", - "luahelper", - "percent-encoding", - "url", - "wezterm-dynamic", -] - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "uuid" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" -dependencies = [ - "atomic", - "getrandom", - "serde", -] - -[[package]] -name = "varbincode" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b712fa900b441e2d5226a094ca37ca70c0d26d26b79822a5cf34a853a9e26f9f" -dependencies = [ - "byteorder", - "leb128", - "serde", -] - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "vswhom" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" -dependencies = [ - "libc", - "vswhom-sys", -] - -[[package]] -name = "vswhom-sys" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "vtparse" -version = "0.6.2" -dependencies = [ - "k9 0.11.6", - "utf8parse", -] - -[[package]] -name = "waker-fn" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" - -[[package]] -name = "walkdir" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.48", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" - -[[package]] -name = "wayland-client" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" -dependencies = [ - "bitflags 1.3.2", - "downcast-rs", - "libc", - "nix 0.24.3", - "scoped-tls", - "wayland-commons", - "wayland-scanner", - "wayland-sys", -] - -[[package]] -name = "wayland-commons" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902" -dependencies = [ - "nix 0.24.3", - "once_cell", - "smallvec", - "wayland-sys", -] - -[[package]] -name = "wayland-cursor" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661" -dependencies = [ - "nix 0.24.3", - "wayland-client", - "xcursor", -] - -[[package]] -name = "wayland-egl" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "402de949f81a012926d821a2d659f930694257e76dd92b6e0042ceb27be4107d" -dependencies = [ - "wayland-client", - "wayland-sys", -] - -[[package]] -name = "wayland-protocols" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" -dependencies = [ - "bitflags 1.3.2", - "wayland-client", - "wayland-commons", - "wayland-scanner", -] - -[[package]] -name = "wayland-scanner" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53" -dependencies = [ - "proc-macro2", - "quote", - "xml-rs", -] - -[[package]] -name = "wayland-sys" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4" -dependencies = [ - "dlib", - "pkg-config", -] - -[[package]] -name = "web-sys" -version = "0.3.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "weezl" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" - -[[package]] -name = "wezterm" -version = "0.1.0" -dependencies = [ - "anyhow", - "cc", - "chrono", - "clap 4.4.18", - "clap_complete", - "clap_complete_fig", - "codec", - "config", - "embed-resource", - "env-bootstrap", - "filedescriptor", - "hostname", - "image", - "libc", - "log", - "mux", - "portable-pty", - "promise", - "serde", - "serde_json", - "shell-words", - "smol", - "tabout", - "tempfile", - "termios 0.3.3", - "termwiz", - "termwiz-funcs", - "textwrap 0.16.0", - "umask", - "url", - "wezterm-client", - "wezterm-gui-subcommands", - "wezterm-term", - "winapi", -] - -[[package]] -name = "wezterm-bidi" -version = "0.2.3" -dependencies = [ - "env_logger 0.11.1", - "k9 0.12.0", - "log", - "wezterm-dynamic", -] - -[[package]] -name = "wezterm-blob-leases" -version = "0.1.0" -dependencies = [ - "getrandom", - "mac_address", - "once_cell", - "serde", - "sha2", - "tempfile", - "thiserror", - "uuid", -] - -[[package]] -name = "wezterm-client" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "async_ossl", - "codec", - "config", - "filedescriptor", - "futures", - "lazy_static", - "libc", - "log", - "lru", - "metrics", - "mux", - "openssl", - "parking_lot 0.12.1", - "portable-pty", - "promise", - "rangeset", - "ratelim", - "smol", - "termwiz", - "textwrap 0.16.0", - "thiserror", - "uds_windows", - "umask", - "url", - "wezterm-dynamic", - "wezterm-ssh", - "wezterm-term", - "winapi", -] - -[[package]] -name = "wezterm-color-types" -version = "0.3.0" -dependencies = [ - "csscolorparser", - "deltae", - "lazy_static", - "serde", - "wezterm-dynamic", -] - -[[package]] -name = "wezterm-config-derive" -version = "0.1.0" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "wezterm-dynamic" -version = "0.2.0" -dependencies = [ - "log", - "maplit", - "ordered-float", - "strsim", - "thiserror", - "wezterm-dynamic-derive", -] - -[[package]] -name = "wezterm-dynamic-derive" -version = "0.1.0" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "wezterm-font" -version = "0.1.0" -dependencies = [ - "anyhow", - "cairo-rs", - "cocoa 0.25.0", - "config", - "core-foundation 0.9.4", - "core-text", - "dwrote", - "encoding_rs", - "enum-display-derive", - "env_logger 0.11.1", - "euclid", - "finl_unicode", - "fontconfig", - "freetype", - "harfbuzz", - "image", - "k9 0.11.6", - "lazy_static", - "lfucache", - "log", - "memmap2 0.2.3", - "metrics", - "objc", - "ordered-float", - "rangeset", - "termwiz", - "thiserror", - "walkdir", - "wezterm-bidi", - "wezterm-color-types", - "wezterm-input-types", - "wezterm-term", - "wezterm-toast-notification", - "winapi", -] - -[[package]] -name = "wezterm-gui" -version = "0.1.0" -dependencies = [ - "anyhow", - "benchmarking", - "bitflags 1.3.2", - "bytemuck", - "cc", - "chrono", - "clap 4.4.18", - "codec", - "colorgrad", - "config", - "dhat", - "dirs-next", - "downcast-rs", - "embed-resource", - "emojis", - "env-bootstrap", - "env_logger 0.11.1", - "euclid", - "fastrand 2.0.1", - "filedescriptor", - "finl_unicode", - "frecency", - "futures", - "fuzzy-matcher", - "hdrhistogram", - "http_req", - "image", - "k9 0.12.0", - "lazy_static", - "lfucache", - "libc", - "log", - "luahelper", - "metrics", - "mlua", - "mux", - "mux-lua", - "once_cell", - "ordered-float", - "parking_lot 0.12.1", - "portable-pty", - "promise", - "pulldown-cmark", - "rangeset", - "ratelim", - "rayon", - "regex", - "serde", - "serde_json", - "shared_library", - "shlex", - "smol", - "tabout", - "tempfile", - "terminfo", - "termwiz", - "termwiz-funcs", - "textwrap 0.16.0", - "thiserror", - "tiny-skia", - "uds_windows", - "umask", - "unicode-normalization", - "unicode-segmentation", - "unicode-width", - "url", - "url-funcs", - "walkdir", - "wezterm-bidi", - "wezterm-blob-leases", - "wezterm-client", - "wezterm-dynamic", - "wezterm-font", - "wezterm-gui-subcommands", - "wezterm-mux-server-impl", - "wezterm-open-url", - "wezterm-ssh", - "wezterm-term", - "wezterm-toast-notification", - "wgpu", - "winapi", - "window", - "window-funcs", - "windows 0.33.0", -] - -[[package]] -name = "wezterm-gui-subcommands" -version = "0.1.0" -dependencies = [ - "anyhow", - "clap 4.4.18", - "config", -] - -[[package]] -name = "wezterm-input-types" -version = "0.1.0" -dependencies = [ - "bitflags 1.3.2", - "euclid", - "lazy_static", - "serde", - "wezterm-dynamic", -] - -[[package]] -name = "wezterm-mux-server" -version = "0.1.0" -dependencies = [ - "anyhow", - "async_ossl", - "cc", - "clap 4.4.18", - "config", - "embed-resource", - "env-bootstrap", - "libc", - "log", - "mlua", - "mux", - "openssl", - "portable-pty", - "promise", - "umask", - "wezterm-blob-leases", - "wezterm-gui-subcommands", - "wezterm-mux-server-impl", - "wezterm-term", - "winapi", -] - -[[package]] -name = "wezterm-mux-server-impl" -version = "0.1.0" -dependencies = [ - "anyhow", - "async_ossl", - "codec", - "config", - "futures", - "hostname", - "lazy_static", - "log", - "mux", - "portable-pty", - "promise", - "rangeset", - "rcgen", - "smol", - "termwiz", - "uds_windows", - "url", - "wezterm-client", - "wezterm-term", - "winapi", -] - -[[package]] -name = "wezterm-open-url" -version = "0.1.0" -dependencies = [ - "winapi", -] - -[[package]] -name = "wezterm-ssh" -version = "0.4.0" -dependencies = [ - "anyhow", - "assert_fs", - "async_ossl", - "base64 0.21.7", - "bitflags 1.3.2", - "camino", - "clap 4.4.18", - "dirs-next", - "env_logger 0.11.1", - "filedescriptor", - "filenamegen", - "gethostname", - "k9 0.12.0", - "libc", - "libssh-rs", - "log", - "once_cell", - "portable-pty", - "predicates", - "regex", - "rstest", - "shell-words", - "smol", - "smol-potat", - "socket2 0.5.5", - "ssh2", - "termwiz", - "thiserror", - "whoami", -] - -[[package]] -name = "wezterm-term" -version = "0.1.0" -dependencies = [ - "anyhow", - "bitflags 1.3.2", - "csscolorparser", - "downcast-rs", - "env_logger 0.11.1", - "finl_unicode", - "hex", - "humansize", - "image", - "k9 0.11.6", - "lazy_static", - "log", - "lru", - "miniz_oxide 0.4.4", - "num-traits", - "ordered-float", - "serde", - "terminfo", - "termwiz", - "unicode-normalization", - "url", - "wezterm-bidi", - "wezterm-dynamic", -] - -[[package]] -name = "wezterm-toast-notification" -version = "0.1.0" -dependencies = [ - "async-io 1.13.0", - "cocoa 0.20.2", - "core-foundation 0.7.0", - "futures-util", - "log", - "objc", - "serde", - "wezterm-open-url", - "windows 0.33.0", - "xml-rs", - "zbus", - "zvariant", -] - -[[package]] -name = "wezterm-version" -version = "0.1.0" -dependencies = [ - "git2", -] - -[[package]] -name = "wgpu" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e7d227c9f961f2061c26f4cb0fbd4df0ef37e056edd0931783599d6c94ef24" -dependencies = [ - "arrayvec", - "cfg-if", - "flume 0.11.0", - "js-sys", - "log", - "naga", - "parking_lot 0.12.1", - "profiling", - "raw-window-handle", - "smallvec", - "static_assertions", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "wgpu-core", - "wgpu-hal", - "wgpu-types", -] - -[[package]] -name = "wgpu-core" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef91c1d62d1e9e81c79e600131a258edf75c9531cbdbde09c44a011a47312726" -dependencies = [ - "arrayvec", - "bit-vec", - "bitflags 2.4.2", - "codespan-reporting", - "log", - "naga", - "parking_lot 0.12.1", - "profiling", - "raw-window-handle", - "rustc-hash", - "smallvec", - "thiserror", - "web-sys", - "wgpu-hal", - "wgpu-types", -] - -[[package]] -name = "wgpu-hal" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84ecc802da3eb67b4cf3dd9ea6fe45bbb47ef13e6c49c5c3240868a9cc6cdd9" -dependencies = [ - "android_system_properties", - "arrayvec", - "ash", - "bit-set", - "bitflags 2.4.2", - "block", - "core-graphics-types", - "d3d12", - "glow", - "glutin_wgl_sys", - "gpu-alloc", - "gpu-allocator", - "gpu-descriptor", - "hassle-rs", - "js-sys", - "khronos-egl", - "libc", - "libloading 0.8.1", - "log", - "metal", - "naga", - "objc", - "once_cell", - "parking_lot 0.12.1", - "profiling", - "range-alloc", - "raw-window-handle", - "renderdoc-sys", - "rustc-hash", - "smallvec", - "thiserror", - "wasm-bindgen", - "web-sys", - "wgpu-types", - "winapi", -] - -[[package]] -name = "wgpu-types" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d5ed5f0edf0de351fe311c53304986315ce866f394a2e6df0c4b3c70774bcdd" -dependencies = [ - "bitflags 2.4.2", - "js-sys", - "web-sys", -] - -[[package]] -name = "which" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bf3ea8596f3a0dd5980b46430f2058dfe2c36a27ccfbb1845d6fbfcd9ba6e14" -dependencies = [ - "either", - "home", - "once_cell", - "rustix 0.38.30", - "windows-sys 0.48.0", -] - -[[package]] -name = "whoami" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" -dependencies = [ - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "widestring" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "window" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-channel 1.9.0", - "async-io 1.13.0", - "async-task", - "async-trait", - "bitflags 1.3.2", - "bytes", - "cgl", - "clipboard-win", - "cocoa 0.25.0", - "config", - "core-foundation 0.7.0", - "core-graphics 0.19.2", - "dirs-next", - "downcast-rs", - "euclid", - "filedescriptor", - "futures-lite 1.13.0", - "futures-util", - "gl_generator", - "glium", - "guillotiere", - "k9 0.11.6", - "lazy_static", - "libc", - "libloading 0.6.7", - "line_drawing", - "log", - "metrics", - "mio", - "objc", - "plist", - "promise", - "raw-window-handle", - "resize", - "serde", - "shared_library", - "shlex", - "smithay-client-toolkit", - "thiserror", - "tiny-skia", - "url", - "wayland-client", - "wayland-egl", - "wayland-protocols", - "wezterm-bidi", - "wezterm-color-types", - "wezterm-font", - "wezterm-input-types", - "winapi", - "windows 0.33.0", - "winreg 0.10.1", - "x11", - "xcb", - "xcb-imdkit", - "xkbcommon", - "zbus", - "zvariant", -] - -[[package]] -name = "window-funcs" -version = "0.1.0" -dependencies = [ - "anyhow", - "config", - "luahelper", - "wezterm-dynamic", - "window", -] - -[[package]] -name = "windows" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0128fa8e65e0616e45033d68dc0b7fbd521080b7844e5cad3a4a4d201c4b2bd2" -dependencies = [ - "windows_aarch64_msvc 0.33.0", - "windows_i686_gnu 0.33.0", - "windows_i686_msvc 0.33.0", - "windows_x86_64_gnu 0.33.0", - "windows_x86_64_msvc 0.33.0", -] - -[[package]] -name = "windows" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" -dependencies = [ - "windows-core 0.51.1", - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-core" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets 0.52.0", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.0", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" -dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd761fd3eb9ab8cc1ed81e56e567f02dd82c4c837e48ac3b2181b9ffc5060807" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" - -[[package]] -name = "windows_i686_gnu" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab0cf703a96bab2dc0c02c0fa748491294bf9b7feb27e1f4f96340f208ada0e" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" - -[[package]] -name = "windows_i686_msvc" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cfdbe89cc9ad7ce618ba34abc34bbb6c36d99e96cae2245b7943cd75ee773d0" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4dd9b0c0e9ece7bb22e84d70d01b71c6d6248b81a3c60d11869451b4cb24784" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1e4aa646495048ec7f3ffddc411e1d829c026a2ec62b39da15c1055e406eaa" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" - -[[package]] -name = "winnow" -version = "0.5.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1931d78a9c73861da0134f453bb1f790ce49b2e30eba8410b4b79bac72b46a2d" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi", -] - -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "wio" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5" -dependencies = [ - "winapi", -] - -[[package]] -name = "x11" -version = "2.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e" -dependencies = [ - "libc", - "pkg-config", -] - -[[package]] -name = "xattr" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" -dependencies = [ - "libc", - "linux-raw-sys 0.4.13", - "rustix 0.38.30", -] - -[[package]] -name = "xcb" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d27b37e69b8c05bfadcd968eb1a4fe27c9c52565b727f88512f43b89567e262" -dependencies = [ - "as-raw-xcb-connection", - "bitflags 1.3.2", - "libc", - "quick-xml 0.30.0", - "x11", -] - -[[package]] -name = "xcb-imdkit" -version = "0.3.0" -source = "git+https://github.com/wez/xcb-imdkit-rs.git?rev=215ce4b08ac9c4822e541efd4f4ffb1062806051#215ce4b08ac9c4822e541efd4f4ffb1062806051" -dependencies = [ - "bitflags 1.3.2", - "cc", - "lazy_static", - "pkg-config", - "xcb", -] - -[[package]] -name = "xcursor" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" - -[[package]] -name = "xdg-home" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" -dependencies = [ - "nix 0.26.4", - "winapi", -] - -[[package]] -name = "xkbcommon" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13867d259930edc7091a6c41b4ce6eee464328c6ff9659b7e4c668ca20d4c91e" -dependencies = [ - "as-raw-xcb-connection", - "libc", - "memmap2 0.8.0", - "xkeysym", -] - -[[package]] -name = "xkeysym" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" - -[[package]] -name = "xml-rs" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" - -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] - -[[package]] -name = "yasna" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" -dependencies = [ - "time", -] - -[[package]] -name = "zbus" -version = "3.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" -dependencies = [ - "async-broadcast", - "async-executor", - "async-fs", - "async-io 1.13.0", - "async-lock 2.8.0", - "async-process", - "async-recursion", - "async-task", - "async-trait", - "blocking", - "byteorder", - "derivative", - "enumflags2", - "event-listener 2.5.3", - "futures-core", - "futures-sink", - "futures-util", - "hex", - "nix 0.26.4", - "once_cell", - "ordered-stream", - "rand", - "serde", - "serde_repr", - "sha1", - "static_assertions", - "tracing", - "uds_windows", - "winapi", - "xdg-home", - "zbus_macros", - "zbus_names", - "zvariant", -] - -[[package]] -name = "zbus_macros" -version = "3.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "regex", - "syn 1.0.109", - "zvariant_utils", -] - -[[package]] -name = "zbus_names" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" -dependencies = [ - "serde", - "static_assertions", - "zvariant", -] - -[[package]] -name = "zerocopy" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "zstd" -version = "0.11.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" -dependencies = [ - "libc", - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.9+zstd.1.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" -dependencies = [ - "cc", - "pkg-config", -] - -[[package]] -name = "zune-inflate" -version = "0.2.54" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" -dependencies = [ - "simd-adler32", -] - -[[package]] -name = "zvariant" -version = "3.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" -dependencies = [ - "byteorder", - "enumflags2", - "libc", - "serde", - "static_assertions", - "zvariant_derive", -] - -[[package]] -name = "zvariant_derive" -version = "3.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.109", - "zvariant_utils", -] - -[[package]] -name = "zvariant_utils" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] diff --git a/pkgs/applications/terminal-emulators/wezterm/zlib-fdopen.patch b/pkgs/applications/terminal-emulators/wezterm/zlib-fdopen.patch deleted file mode 100644 index c4f78035e01d..000000000000 --- a/pkgs/applications/terminal-emulators/wezterm/zlib-fdopen.patch +++ /dev/null @@ -1,24 +0,0 @@ -Submodule deps/freetype/zlib contains modified content -diff --git a/deps/freetype/zlib/zutil.h b/deps/freetype/zlib/zutil.h -index b079ea6..4e94f2f 100644 ---- a/deps/freetype/zlib/zutil.h -+++ b/deps/freetype/zlib/zutil.h -@@ -130,17 +130,8 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ - # endif - #endif - --#if defined(MACOS) || defined(TARGET_OS_MAC) -+#if defined(MACOS) - # define OS_CODE 7 --# ifndef Z_SOLO --# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os --# include /* for fdopen */ --# else --# ifndef fdopen --# define fdopen(fd,mode) NULL /* No fdopen() */ --# endif --# endif --# endif - #endif - - #ifdef __acorn diff --git a/pkgs/applications/version-management/fnc/default.nix b/pkgs/applications/version-management/fnc/default.nix index af9088d8a068..515f8a193311 100644 --- a/pkgs/applications/version-management/fnc/default.nix +++ b/pkgs/applications/version-management/fnc/default.nix @@ -5,8 +5,6 @@ zlib, ncurses, libiconv, - apple-sdk_11, - darwinMinVersionHook, }: stdenv.mkDerivation (finalAttrs: { @@ -22,8 +20,6 @@ stdenv.mkDerivation (finalAttrs: { libiconv ncurses zlib - apple-sdk_11 - (darwinMinVersionHook "11.0") ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/version-management/git-absorb/default.nix b/pkgs/applications/version-management/git-absorb/default.nix index a8cbf03ac3f2..3c112daea5a1 100644 --- a/pkgs/applications/version-management/git-absorb/default.nix +++ b/pkgs/applications/version-management/git-absorb/default.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage rec { pname = "git-absorb"; - version = "0.6.15"; + version = "0.6.16"; src = fetchFromGitHub { owner = "tummychow"; repo = "git-absorb"; - rev = "refs/tags/${version}"; - hash = "sha256-7Y/gEym+29lTwJ7FbuvOqzbiMSzrY9f5IPhtvIJUKbU="; + tag = version; + hash = "sha256-5ZCCrq/mc9FAjl7AMbuQyRak5sL1dG3qWnrdNzUu4Ss="; }; nativeBuildInputs = [ installShellFiles ]; - cargoHash = "sha256-Y/0In33y4mVTaE9yoBZ/3tRWcsSKgGjTCSHdjScNEj0="; + cargoHash = "sha256-CzZgAjAIJryhFEJve3E62rg4QGRPSvBMuFZJzHGf09w="; postInstall = '' @@ -36,7 +36,10 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/tummychow/git-absorb"; description = "git commit --fixup, but automatic"; license = [ licenses.bsd3 ]; - maintainers = with maintainers; [ tomfitzhenry ]; + maintainers = with maintainers; [ + tomfitzhenry + matthiasbeyer + ]; mainProgram = "git-absorb"; }; } diff --git a/pkgs/applications/version-management/git-annex-metadata-gui/default.nix b/pkgs/applications/version-management/git-annex-metadata-gui/default.nix index 3622bf842a3c..08f8e17eae1f 100644 --- a/pkgs/applications/version-management/git-annex-metadata-gui/default.nix +++ b/pkgs/applications/version-management/git-annex-metadata-gui/default.nix @@ -37,7 +37,10 @@ buildPythonApplication rec { homepage = "https://github.com/alpernebbi/git-annex-metadata-gui"; description = "Graphical interface for git-annex metadata commands"; mainProgram = "git-annex-metadata-gui"; - maintainers = with maintainers; [ dotlambda ]; + maintainers = with maintainers; [ + dotlambda + matthiasbeyer + ]; license = licenses.gpl3Plus; platforms = with platforms; linux; }; diff --git a/pkgs/applications/version-management/git-annex-remote-dbx/default.nix b/pkgs/applications/version-management/git-annex-remote-dbx/default.nix index bee106e434e0..c969087e39be 100644 --- a/pkgs/applications/version-management/git-annex-remote-dbx/default.nix +++ b/pkgs/applications/version-management/git-annex-remote-dbx/default.nix @@ -27,5 +27,6 @@ buildPythonApplication rec { homepage = "https://pypi.org/project/git-annex-remote-dbx/"; license = licenses.mit; mainProgram = "git-annex-remote-dbx"; + maintainers = with maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/applications/version-management/git-cliff/default.nix b/pkgs/applications/version-management/git-cliff/default.nix index f818cd5399de..889a67312200 100644 --- a/pkgs/applications/version-management/git-cliff/default.nix +++ b/pkgs/applications/version-management/git-cliff/default.nix @@ -43,7 +43,10 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/orhun/git-cliff"; changelog = "https://github.com/orhun/git-cliff/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Only; - maintainers = with maintainers; [ siraben ]; + maintainers = with maintainers; [ + siraben + matthiasbeyer + ]; mainProgram = "git-cliff"; }; } diff --git a/pkgs/applications/version-management/git-fame/default.nix b/pkgs/applications/version-management/git-fame/default.nix index 08009920b61a..92ce90465b83 100644 --- a/pkgs/applications/version-management/git-fame/default.nix +++ b/pkgs/applications/version-management/git-fame/default.nix @@ -20,7 +20,10 @@ bundlerEnv { ''; homepage = "http://oleander.io/git-fame-rb"; license = licenses.mit; - maintainers = with maintainers; [ nicknovitski ]; + maintainers = with maintainers; [ + nicknovitski + matthiasbeyer + ]; platforms = platforms.unix; mainProgram = "git-fame"; }; diff --git a/pkgs/applications/version-management/git-gone/default.nix b/pkgs/applications/version-management/git-gone/default.nix index fe29587a05df..6211b3f080f2 100644 --- a/pkgs/applications/version-management/git-gone/default.nix +++ b/pkgs/applications/version-management/git-gone/default.nix @@ -33,7 +33,10 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/swsnr/git-gone"; changelog = "https://github.com/swsnr/git-gone/raw/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ cafkafk ]; + maintainers = with maintainers; [ + cafkafk + matthiasbeyer + ]; mainProgram = "git-gone"; }; } diff --git a/pkgs/applications/version-management/git-quickfix/default.nix b/pkgs/applications/version-management/git-quickfix/default.nix index c1b65a3d7318..f30c06c7bf6c 100644 --- a/pkgs/applications/version-management/git-quickfix/default.nix +++ b/pkgs/applications/version-management/git-quickfix/default.nix @@ -39,7 +39,10 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/siedentop/git-quickfix"; license = licenses.gpl3; platforms = platforms.all; - maintainers = with maintainers; [ cafkafk ]; + maintainers = with maintainers; [ + cafkafk + matthiasbeyer + ]; mainProgram = "git-quickfix"; }; } diff --git a/pkgs/applications/version-management/gitlint/default.nix b/pkgs/applications/version-management/gitlint/default.nix index 7bfe3658af53..ec27bc6ecf34 100644 --- a/pkgs/applications/version-management/gitlint/default.nix +++ b/pkgs/applications/version-management/gitlint/default.nix @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "jorisroovers"; repo = "gitlint"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-4SGkkC4LjZXTDXwK6jMOIKXR1qX76CasOwSqv8XUrjs="; }; @@ -50,6 +50,7 @@ python3.pkgs.buildPythonApplication rec { maintainers = with maintainers; [ ethancedwards8 fab + matthiasbeyer ]; mainProgram = "gitlint"; }; diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index 61b8cfdf68c5..35680d240ae6 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -5,7 +5,6 @@ cmake, pkg-config, stdenv, - apple-sdk_11, curl, openssl, buildPackages, @@ -36,7 +35,7 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = [ curl ] ++ (if stdenv.hostPlatform.isDarwin then [ apple-sdk_11 ] else [ openssl ]); + buildInputs = [ curl ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ]; preFixup = lib.optionalString canRunCmd '' installShellCompletion --cmd gix \ diff --git a/pkgs/applications/version-management/pass-git-helper/default.nix b/pkgs/applications/version-management/pass-git-helper/default.nix index 8f96bc2b58b8..9d4ab973c19d 100644 --- a/pkgs/applications/version-management/pass-git-helper/default.nix +++ b/pkgs/applications/version-management/pass-git-helper/default.nix @@ -17,7 +17,7 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "languitar"; repo = "pass-git-helper"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; sha256 = "sha256-DLH3l4wYfBlrc49swLgyHeZXebJ5JSzU7cHjD7Hmw0g="; }; diff --git a/pkgs/applications/video/go2tv/default.nix b/pkgs/applications/video/go2tv/default.nix index f62d1cfef798..d203d8b62400 100644 --- a/pkgs/applications/video/go2tv/default.nix +++ b/pkgs/applications/video/go2tv/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "alexballas"; repo = "go2tv"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-NCfr6FXxHFFTe9l7K68MkKU71Hu/vWQFZcJXFAB94q8="; }; diff --git a/pkgs/applications/video/gpu-screen-recorder/default.nix b/pkgs/applications/video/gpu-screen-recorder/default.nix index 93603de2d829..2c9a7c2edbe8 100644 --- a/pkgs/applications/video/gpu-screen-recorder/default.nix +++ b/pkgs/applications/video/gpu-screen-recorder/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gpu-screen-recorder"; - version = "4.2.3"; + version = "5.0.0"; src = fetchurl { url = "https://dec05eba.com/snapshot/gpu-screen-recorder.git.${finalAttrs.version}.tar.gz"; - hash = "sha256-M2bk1WwLlbwspEoPIRMix17ihi72UuRWwiKBdPfim2M="; + hash = "sha256-w1dtFLSY71UileoF4b1QLKIHYWPE5c2KmsHyRPtn+sA="; }; sourceRoot = "."; diff --git a/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix b/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix index 92863147becf..b399f39fefd8 100644 --- a/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix +++ b/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gpu-screen-recorder-gtk"; - version = "4.2.3"; + version = "5.0.0"; src = fetchurl { url = "https://dec05eba.com/snapshot/gpu-screen-recorder-gtk.git.${finalAttrs.version}.tar.gz"; - hash = "sha256-pMUjglgRM51hjPbt6VP0aqM0oo7IiyPXTY/kLwwdR/k="; + hash = "sha256-uXbiuA1XPWZVwQGLh47rKzCZSEUEPWqYALqMuCGA7do="; }; sourceRoot = "."; diff --git a/pkgs/applications/video/kodi/addons/formula1/default.nix b/pkgs/applications/video/kodi/addons/formula1/default.nix index 9dc809c571c2..ce7733db7f55 100644 --- a/pkgs/applications/video/kodi/addons/formula1/default.nix +++ b/pkgs/applications/video/kodi/addons/formula1/default.nix @@ -10,11 +10,11 @@ buildKodiAddon rec { pname = "formula1"; namespace = "plugin.video.formula1"; - version = "2.0.2"; + version = "2.0.3"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; - sha256 = "sha256-aClAgkJKvixeKzrwgEsfDhPXiFv9+ULLmb8c9QTaUgM="; + sha256 = "sha256-T2q7/bbzarjbqmLQR5g5lBnO0mdrwrWX5/c5GZ48nKM="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index 1ae2ddc9724f..2eca00244349 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -18,6 +18,8 @@ obs-backgroundremoval = callPackage ./obs-backgroundremoval { }; + obs-color-monitor = qt6Packages.callPackage ./obs-color-monitor.nix { }; + obs-command-source = callPackage ./obs-command-source.nix { }; obs-composite-blur = callPackage ./obs-composite-blur.nix { }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix b/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix new file mode 100644 index 000000000000..10156ce3af6c --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix @@ -0,0 +1,43 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + obs-studio, + qtbase, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "obs-color-monitor"; + version = "0.8.2"; + + src = fetchFromGitHub { + owner = "norihiro"; + repo = "obs-color-monitor"; + tag = finalAttrs.version; + hash = "sha256-cVMpmkcw8GzNGyd80g1oKmyiEYGMcRtWtDj9MC7RYf8="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ + obs-studio + qtbase + ]; + + postInstall = '' + mkdir $out/lib $out/share + mv $out/obs-plugins/64bit $out/lib/obs-plugins + mv $out/data $out/share/obs + rm -rf $out/obs-plugins + ''; + + dontWrapQtApps = true; + + meta = { + description = "Color Monitor plugin for OBS Studio"; + homepage = "https://github.com/norihiro/obs-color-monitor"; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ hlad ]; + }; +}) diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index fe1b77937e00..cb2a57bfb609 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -21,7 +21,7 @@ let src = fetchFromGitHub { owner = "OpenShot"; repo = "openshot-qt"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-zZZ7C/1+Qh7KS1WJ8YWkhFgw0+UHJhjk+145u9/TBcI="; }; in diff --git a/pkgs/applications/video/plex-mpv-shim/default.nix b/pkgs/applications/video/plex-mpv-shim/default.nix index 3b82e4621add..2dae6a3d221e 100644 --- a/pkgs/applications/video/plex-mpv-shim/default.nix +++ b/pkgs/applications/video/plex-mpv-shim/default.nix @@ -21,7 +21,7 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "iwalton3"; repo = pname; - rev = "refs/tags/v${version}"; + tag = "v${version}"; sha256 = "sha256-hUGKOJEDZMK5uhHoevFt1ay6QQEcoN4F8cPxln5uMRo="; }; diff --git a/pkgs/applications/video/qctools/default.nix b/pkgs/applications/video/qctools/default.nix index 2d80efcc6487..a2a6d6658367 100644 --- a/pkgs/applications/video/qctools/default.nix +++ b/pkgs/applications/video/qctools/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "qctools"; - version = "1.3.1"; + version = "1.4"; src = fetchurl { url = "https://mediaarea.net/download/source/${pname}/${version}/${pname}_${version}.tar.xz"; - hash = "sha256-ClF8KiVjV2JTCjz/ueioojhiHZf8UW9WONaJrIx4Npo="; + hash = "sha256-1WqCP/4PV8hQT8ubPxHGTwZrRnOPm+msEPBGR4gkWhA="; }; sourceRoot = "${pname}/Project/QtCreator"; diff --git a/pkgs/applications/video/rtabmap/default.nix b/pkgs/applications/video/rtabmap/default.nix index 45818f48166e..fc22d8988eae 100644 --- a/pkgs/applications/video/rtabmap/default.nix +++ b/pkgs/applications/video/rtabmap/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "introlab"; repo = "rtabmap"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-y/p1uFSxVQNXO383DLGCg4eWW7iu1esqpWlyPMF3huk="; }; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index e734319a7a19..be348027945a 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -14,6 +14,7 @@ xorgproto, libXext, libXcursor, + libXfixes, libXmu, libIDL, SDL2, @@ -204,6 +205,9 @@ stdenv.mkDerivation (finalAttrs: { grep 'libdbus-1\.so\.3' src include -rI --files-with-match | xargs sed -i -e ' s@"libdbus-1\.so\.3"@"${dbus.lib}/lib/libdbus-1.so.3"@g' + grep 'libXfixes\.so\.3' src include -rI --files-with-match | xargs sed -i -e ' + s@"libXfixes\.so\.3"@"${libXfixes.out}/lib/libXfixes.so.3"@g' + grep 'libasound\.so\.2' src include -rI --files-with-match | xargs sed -i -e ' s@"libasound\.so\.2"@"${alsa-lib.out}/lib/libasound.so.2"@g' diff --git a/pkgs/applications/window-managers/cage/default.nix b/pkgs/applications/window-managers/cage/default.nix index 7459a96393f9..adfa29198ed4 100644 --- a/pkgs/applications/window-managers/cage/default.nix +++ b/pkgs/applications/window-managers/cage/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "cage-kiosk"; repo = "cage"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-2SFtz62z0EF8cpFTC6wGi125MD4a5mkXqP/C+7fH+3g="; }; diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index 5448906937f8..c7509ae6e973 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -32,13 +32,13 @@ in rustPlatform.buildRustPackage rec { pname = "dwm-status"; - version = "1.8.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "Gerschtli"; repo = pname; rev = version; - sha256 = "sha256-GkTPEmsnHFLUvbasAOXOQjFKs1Y9aaG87uyPvnQaT8Y="; + sha256 = "sha256-OFwI4evwbXLO4ufjrh5SZia79bwbAKVoSm/IPCDku68="; }; nativeBuildInputs = [ @@ -52,7 +52,7 @@ rustPlatform.buildRustPackage rec { xorg.libX11 ]; - cargoHash = "sha256-eRfXUnyzOfVSEiwjLCaNbETUPXVU2Ed2VUNM9FjS5YE="; + cargoHash = "sha256-CNhRMJZJMMKh5L308a93YL0kJLkt6DdlmILMVPQV90Q="; postInstall = lib.optionalString (bins != [ ]) '' wrapProgram $out/bin/dwm-status --prefix "PATH" : "${lib.makeBinPath bins}" diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprfocus.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprfocus.nix index a3f80eb83607..befba9e11a3d 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprfocus.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprfocus.nix @@ -3,12 +3,13 @@ mkHyprlandPlugin, hyprland, fetchFromGitHub, + fetchpatch2, nix-update-script, }: mkHyprlandPlugin hyprland { pluginName = "hyprfocus"; - version = "0-unstable-2024-10-09"; + version = "0-unstable-2024-11-09"; src = fetchFromGitHub { owner = "pyt0xic"; @@ -17,6 +18,13 @@ mkHyprlandPlugin hyprland { hash = "sha256-qIl7opF7fA1ZmC91TGQ7D12tB7kHc6Sn9DrfUN6sbBY="; }; + patches = [ + (fetchpatch2 { + url = "https://github.com/pyt0xic/hyprfocus/commit/e7d9ee3c470b194fe16179ff2f16fc4233e928ef.patch"; + hash = "sha256-iETrtvoIZfcaD3TcKIIwFL8Rua0dFEqboml9AgQ/RZ0="; + }) + ]; + installPhase = '' runHook preInstall diff --git a/pkgs/applications/window-managers/hyprwm/hyprshade/default.nix b/pkgs/applications/window-managers/hyprwm/hyprshade/default.nix index 02f72471e876..8eaaadb3a86e 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprshade/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprshade/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "loqusion"; repo = "hyprshade"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-MlbNE9n//Qb6OJc3DMkOpnPtoodfV8JlG/I5rOfWMtQ="; }; diff --git a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix index 09ff2fdc42a5..9da0df03294b 100644 --- a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix +++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix @@ -32,7 +32,7 @@ gcc14Stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "hyprwm"; repo = "xdg-desktop-portal-hyprland"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-sAObJHBZjJHzYR62g+BLNBNq19cqb5LTw73H8m57K0w="; }; diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index e9d44fae06a0..fdb0eb33f94a 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "i3"; repo = "i3"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-2tuhfB/SMN+osCBfZtw/yDPhNNEhBH4Qo6dexpqVWYk="; }; diff --git a/pkgs/applications/window-managers/ion-3/default.nix b/pkgs/applications/window-managers/ion-3/default.nix index 3ab12933a18b..451e243b163b 100644 --- a/pkgs/applications/window-managers/ion-3/default.nix +++ b/pkgs/applications/window-managers/ion-3/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tiling tabbed window manager designed with keyboard users in mind"; - homepage = "https://modeemi.fi/~tuomov/ion"; + homepage = "https://tuomov.iki.fi/software/ion/"; platforms = with platforms; linux; license = licenses.lgpl21; maintainers = [ ]; diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix index 3a340c4766c4..12881e4a0bac 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix @@ -124,6 +124,8 @@ let "ssl/certs" "ca-certificates" "pki" + # Custom dconf profiles + "dconf" ]; in map (path: "/etc/${path}") files; diff --git a/pkgs/build-support/build-graalvm-native-image/default.nix b/pkgs/build-support/build-graalvm-native-image/default.nix index 45680a42e9ed..e1e4df52f02a 100644 --- a/pkgs/build-support/build-graalvm-native-image/default.nix +++ b/pkgs/build-support/build-graalvm-native-image/default.nix @@ -1,8 +1,6 @@ { lib, stdenv, - apple-sdk_11, - darwinMinVersionHook, glibcLocales, # The GraalVM derivation to use graalvmDrv, @@ -35,8 +33,6 @@ let extraArgs = builtins.removeAttrs args [ "lib" "stdenv" - "apple-sdk_11" - "darwinMinVersionHook" "glibcLocales" "jar" "dontUnpack" @@ -60,11 +56,6 @@ stdenv.mkDerivation ( removeReferencesTo ]; - buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin) [ - apple-sdk_11 - (darwinMinVersionHook "11.0") - ]; - nativeImageBuildArgs = nativeImageBuildArgs ++ extraNativeImageBuildArgs ++ [ graalvmXmx ]; buildPhase = diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index d9174df31a2a..8558a9f3d8d2 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -639,7 +639,7 @@ stdenvNoCC.mkDerivation { # no `/usr/include`, there’s essentially no risk to dropping # the flag there. See discussion in NixOS/nixpkgs#191152. # - + optionalString ((cc.isClang or false) && !targetPlatform.isDarwin) '' + + optionalString ((cc.isClang or false) && !(cc.isROCm or false) && !targetPlatform.isDarwin) '' echo " -nostdlibinc" >> $out/nix-support/cc-cflags '' diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index f2b4726fef09..fd267fe34de8 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -120,6 +120,7 @@ stdenvNoCC.mkDerivation { passthru = { gitRepoUrl = url; + inherit tag; }; } )) diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix index ed24a6239449..6d580b2e0656 100644 --- a/pkgs/build-support/fetchgithub/default.nix +++ b/pkgs/build-support/fetchgithub/default.nix @@ -59,12 +59,14 @@ let gitRepoUrl = "${baseUrl}.git"; + revWithTag = if tag != null then "refs/tags/${tag}" else rev; + fetcherArgs = (if useFetchGit then { inherit tag rev deepClone fetchSubmodules sparseCheckout fetchLFS; url = gitRepoUrl; } // lib.optionalAttrs (leaveDotGit != null) { inherit leaveDotGit; } else { - url = "${baseUrl}/archive/${if tag != null then "refs/tags/${tag}" else rev}.tar.gz"; + url = "${baseUrl}/archive/${revWithTag}.tar.gz"; passthru = { inherit gitRepoUrl; @@ -73,5 +75,5 @@ let ) // privateAttrs // passthruAttrs // { inherit name; }; in -fetcher fetcherArgs // { meta = newMeta; inherit rev owner repo tag; } +fetcher fetcherArgs // { meta = newMeta; inherit owner repo tag; rev = revWithTag; } ) diff --git a/pkgs/build-support/fetchgitlab/default.nix b/pkgs/build-support/fetchgitlab/default.nix index aef76270d5ec..c060352d1a9f 100644 --- a/pkgs/build-support/fetchgitlab/default.nix +++ b/pkgs/build-support/fetchgitlab/default.nix @@ -37,10 +37,9 @@ lib.makeOverridable ( repo ] ); + revWithTag = if tag != null then "refs/tags/" + tag else rev; escapedSlug = lib.replaceStrings [ "." "/" ] [ "%2E" "%2F" ] slug; - escapedRev = lib.replaceStrings [ "+" "%" "/" ] [ "%2B" "%25" "%2F" ] ( - if tag != null then "refs/tags/" + tag else rev - ); + escapedRevWithTag = lib.replaceStrings [ "+" "%" "/" ] [ "%2B" "%25" "%2F" ] revWithTag; passthruAttrs = removeAttrs args [ "protocol" "domain" @@ -77,7 +76,7 @@ lib.makeOverridable ( } else { - url = "${protocol}://${domain}/api/v4/projects/${escapedSlug}/repository/archive.tar.gz?sha=${escapedRev}"; + url = "${protocol}://${domain}/api/v4/projects/${escapedSlug}/repository/archive.tar.gz?sha=${escapedRevWithTag}"; passthru = { inherit gitRepoUrl; @@ -95,9 +94,9 @@ lib.makeOverridable ( meta.homepage = "${protocol}://${domain}/${slug}/"; inherit tag - rev owner repo ; + rev = revWithTag; } ) diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix index 7063cada77d9..58cfbb15babe 100644 --- a/pkgs/build-support/go/module.nix +++ b/pkgs/build-support/go/module.nix @@ -117,7 +117,7 @@ in export GIT_SSL_CAINFO=$NIX_SSL_CERT_FILE ${if finalAttrs.proxyVendor then '' - mkdir -p "''${GOPATH}/pkg/mod/cache/download" + mkdir -p "$GOPATH/pkg/mod/cache/download" go mod download '' else '' if (( "''${NIX_DEBUG:-0}" >= 1 )); then @@ -135,8 +135,8 @@ in runHook preInstall ${if finalAttrs.proxyVendor then '' - rm -rf "''${GOPATH}/pkg/mod/cache/download/sumdb" - cp -r --reflink=auto "''${GOPATH}/pkg/mod/cache/download" $out + rm -rf "$GOPATH/pkg/mod/cache/download/sumdb" + cp -r --reflink=auto "$GOPATH/pkg/mod/cache/download" $out '' else '' cp -r --reflink=auto vendor $out ''} diff --git a/pkgs/by-name/_1/_1oom/package.nix b/pkgs/by-name/_1/_1oom/package.nix index 97b1ccc6595e..6d82fe749013 100644 --- a/pkgs/by-name/_1/_1oom/package.nix +++ b/pkgs/by-name/_1/_1oom/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "1oom-fork"; repo = "1oom"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-xEHFuCOyuWmee6kgOc0WUk1iWWFqfFb42F7shGZmutQ="; }; diff --git a/pkgs/by-name/_2/_2ship2harkinian/package.nix b/pkgs/by-name/_2/_2ship2harkinian/package.nix index 90899330ea3d..dc3fc2e45384 100644 --- a/pkgs/by-name/_2/_2ship2harkinian/package.nix +++ b/pkgs/by-name/_2/_2ship2harkinian/package.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "HarbourMasters"; repo = "2ship2harkinian"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-1iSFzroKxwFpsIGNMetSlQKTKRWCy7QtgCTepFdSeY8="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/aa/aactivator/package.nix b/pkgs/by-name/aa/aactivator/package.nix index 776b9e2d6dd6..7755f43e2fd1 100644 --- a/pkgs/by-name/aa/aactivator/package.nix +++ b/pkgs/by-name/aa/aactivator/package.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "Yelp"; repo = "aactivator"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-vnBDtLEvU1jHbb5/MXAulXaBaugdCZdLQSP2b8P6SiQ="; }; diff --git a/pkgs/by-name/ab/abcmidi/package.nix b/pkgs/by-name/ab/abcmidi/package.nix index 3aa646dced06..4577c477e8d6 100644 --- a/pkgs/by-name/ab/abcmidi/package.nix +++ b/pkgs/by-name/ab/abcmidi/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "sshlien"; repo = "abcmidi"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-8kzgojLwVVFjpWiQ1/0S3GCVU8oEpoFItjtRDByauDg="; }; diff --git a/pkgs/by-name/ab/abctl/package.nix b/pkgs/by-name/ab/abctl/package.nix index 4b11e5c8bd12..f078176f0529 100644 --- a/pkgs/by-name/ab/abctl/package.nix +++ b/pkgs/by-name/ab/abctl/package.nix @@ -13,7 +13,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "airbytehq"; repo = "abctl"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-O+ABjageccJudXtO5wUYLIT/kI04f68RLW0B7d//jdw="; }; diff --git a/pkgs/by-name/ab/above/package.nix b/pkgs/by-name/ab/above/package.nix index 3fe3dbe49237..d48a50417090 100644 --- a/pkgs/by-name/ab/above/package.nix +++ b/pkgs/by-name/ab/above/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "casterbyte"; repo = "Above"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-tOSAci9aIALNCL3nLui96EdvqjNxnnuj2/dMdWLY9yI="; }; diff --git a/pkgs/by-name/ab/abpoa/package.nix b/pkgs/by-name/ab/abpoa/package.nix index cecdcbc923a0..8cef3f0efb35 100644 --- a/pkgs/by-name/ab/abpoa/package.nix +++ b/pkgs/by-name/ab/abpoa/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "yangao07"; repo = "abPOA"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-90mkXp4cC0Omnx0C7ab7NNs/M2oedIcICTUJl3qhcyo="; }; @@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "SIMD-based C library for fast partial order alignment using adaptive band"; homepage = "https://github.com/yangao07/abPOA"; - changelog = "https://github.com/yangao07/abPOA/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}"; + changelog = "https://github.com/yangao07/abPOA/releases/tag/v${finalAttrs.version}"; license = licenses.mit; maintainers = with maintainers; [ natsukium ]; mainProgram = "abpoa"; diff --git a/pkgs/by-name/ab/abracadabra/package.nix b/pkgs/by-name/ab/abracadabra/package.nix index c5d1d649fdb6..30f14f074c94 100644 --- a/pkgs/by-name/ab/abracadabra/package.nix +++ b/pkgs/by-name/ab/abracadabra/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "abracadabra"; - version = "2.8.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "KejPi"; repo = "AbracaDABra"; rev = "v${version}"; - hash = "sha256-bzRXGxSWoiBqvx8r2coNVPQKilOAKFoqBcB4F0uAV8g="; + hash = "sha256-PPG71W5HeLr4R8je88K4VXPiSbJn5T7dP3M05C+bkv0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ac/ac-library/package.nix b/pkgs/by-name/ac/ac-library/package.nix index 6e3cebd0becd..45e8b2e771fd 100644 --- a/pkgs/by-name/ac/ac-library/package.nix +++ b/pkgs/by-name/ac/ac-library/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "atcoder"; repo = "ac-library"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-AIqG98c1tcxxhYcX+NSf6Rw3onw61T5NTZtqQzT9jls="; }; diff --git a/pkgs/by-name/ac/acme-sh/package.nix b/pkgs/by-name/ac/acme-sh/package.nix index 35224cd62bff..7281467bdbd5 100644 --- a/pkgs/by-name/ac/acme-sh/package.nix +++ b/pkgs/by-name/ac/acme-sh/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "acmesh-official"; repo = "acme.sh"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-BPZ+5xvKqEaz+tkccVL0hEDAxLkICW5O+qPf73bOqRU="; }; diff --git a/pkgs/by-name/ac/acpica-tools/package.nix b/pkgs/by-name/ac/acpica-tools/package.nix index dccf6f5122b9..7211b45c70ee 100644 --- a/pkgs/by-name/ac/acpica-tools/package.nix +++ b/pkgs/by-name/ac/acpica-tools/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "acpica"; repo = "acpica"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-vxiWYUAEk54F1M0WrrMTHZ4DNJxxT/GaXetd5LjE808="; }; diff --git a/pkgs/by-name/ac/acr-cli/package.nix b/pkgs/by-name/ac/acr-cli/package.nix index 51df14afc5a9..cd5e5121e5a4 100644 --- a/pkgs/by-name/ac/acr-cli/package.nix +++ b/pkgs/by-name/ac/acr-cli/package.nix @@ -13,7 +13,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "Azure"; repo = "acr-cli"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-h4vRtxAu/ggEu5HuzaiEoLslOyAXP1rMI1/ua9YARug="; }; diff --git a/pkgs/by-name/ac/act/package.nix b/pkgs/by-name/ac/act/package.nix index 7b85786b43c7..c1fc73369299 100644 --- a/pkgs/by-name/ac/act/package.nix +++ b/pkgs/by-name/ac/act/package.nix @@ -8,7 +8,7 @@ }: let - version = "0.2.70"; + version = "0.2.71"; in buildGoModule { pname = "act"; @@ -17,11 +17,11 @@ buildGoModule { src = fetchFromGitHub { owner = "nektos"; repo = "act"; - rev = "refs/tags/v${version}"; - hash = "sha256-7e2ehUM3d5hcFtaahW/hrhVkpy74ufMdYwdnbsUA+WM="; + tag = "v${version}"; + hash = "sha256-ykZ6n9v56G5PZNTYdkGp8xveA7gzYhICkBoCCx3s0ew="; }; - vendorHash = "sha256-2fHNiquFg6I0JefqXfXRrnXxKPkNQOtQB7fznldO3GE="; + vendorHash = "sha256-zCiqIl08s00U/DQkUhbb/qrjWof9xzBf4EznuvE4rlE="; doCheck = false; diff --git a/pkgs/by-name/ad/ad/package.nix b/pkgs/by-name/ad/ad/package.nix index f3a7b23f313e..a1af89096e34 100644 --- a/pkgs/by-name/ad/ad/package.nix +++ b/pkgs/by-name/ad/ad/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "sminez"; repo = "ad"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-c2oSQ81qCZbwUl4TqovDWm8TUqI6RdrQPvoP/FaTI/A="; }; diff --git a/pkgs/by-name/ad/adafruit-nrfutil/package.nix b/pkgs/by-name/ad/adafruit-nrfutil/package.nix index 00d0d8052ab0..ef5abcf85152 100644 --- a/pkgs/by-name/ad/adafruit-nrfutil/package.nix +++ b/pkgs/by-name/ad/adafruit-nrfutil/package.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "adafruit"; repo = "Adafruit_nRF52_nrfutil"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-mHHKOQE9AGBX8RAyaPOy+JS3fTs98+AFdq9qsVy7go4="; }; diff --git a/pkgs/by-name/ad/adalanche/package.nix b/pkgs/by-name/ad/adalanche/package.nix index 7b81c370f22c..b3d87bf15945 100644 --- a/pkgs/by-name/ad/adalanche/package.nix +++ b/pkgs/by-name/ad/adalanche/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "lkarlslund"; repo = "adalanche"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-SJa2PQCXTYdv5jMucpJOD2gC7Qk2dNdINHW4ZvLXSLw="; }; diff --git a/pkgs/by-name/ad/addwater/package.nix b/pkgs/by-name/ad/addwater/package.nix index 90e6173d5e58..98c4c687fd24 100644 --- a/pkgs/by-name/ad/addwater/package.nix +++ b/pkgs/by-name/ad/addwater/package.nix @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "largestgithubuseronearth"; repo = "addwater"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-5iuSRA18TWj6naw5MraGZ1Y9OUWEVg2oKqQtkC8rMWw="; }; diff --git a/pkgs/by-name/ad/adminer-pematon/package.nix b/pkgs/by-name/ad/adminer-pematon/package.nix index cc9936831ce2..2529fc4cf338 100644 --- a/pkgs/by-name/ad/adminer-pematon/package.nix +++ b/pkgs/by-name/ad/adminer-pematon/package.nix @@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "pematon"; repo = "adminer"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ExCHEsZ+VFmrom3632/1OOjb3zbZgiaZJDapBkBGUnQ="; }; diff --git a/pkgs/by-name/ad/adolc/package.nix b/pkgs/by-name/ad/adolc/package.nix index 96ac820471a2..d74245b104e7 100644 --- a/pkgs/by-name/ad/adolc/package.nix +++ b/pkgs/by-name/ad/adolc/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "coin-or"; repo = "ADOL-C"; - rev = "refs/tags/releases/${finalAttrs.version}"; + tag = "releases/${finalAttrs.version}"; hash = "sha256-oU229SuOl/gHoRT8kiWfd5XFiByjeypgdVWFLMYFHfA="; }; diff --git a/pkgs/by-name/ad/adw-gtk3/package.nix b/pkgs/by-name/ad/adw-gtk3/package.nix index c8676942c34e..ef748bc77dae 100644 --- a/pkgs/by-name/ad/adw-gtk3/package.nix +++ b/pkgs/by-name/ad/adw-gtk3/package.nix @@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "lassekongo83"; repo = "adw-gtk3"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-S/H6JGXwEgiqmcH1W+ZyHYOkk0gQtKG9Q3BiI2IjnEM="; }; diff --git a/pkgs/by-name/ad/adwsteamgtk/package.nix b/pkgs/by-name/ad/adwsteamgtk/package.nix index 2baa58d3c93b..2818f3843078 100644 --- a/pkgs/by-name/ad/adwsteamgtk/package.nix +++ b/pkgs/by-name/ad/adwsteamgtk/package.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "Foldex"; repo = "AdwSteamGtk"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-DI5WK8CtoyH8hSogQx5/oDCrGoLxE06cy63ubU+e3bQ="; }; diff --git a/pkgs/by-name/ae/aeacus/package.nix b/pkgs/by-name/ae/aeacus/package.nix index 07a75a2d3a3c..b1264a51eb4b 100644 --- a/pkgs/by-name/ae/aeacus/package.nix +++ b/pkgs/by-name/ae/aeacus/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "elysium-suite"; repo = "aeacus"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-LMsfogcz3CoShQDqyshMshb+iz2r0k5I7NDLXevMakI="; }; diff --git a/pkgs/by-name/ae/aegisub/package.nix b/pkgs/by-name/ae/aegisub/package.nix index ea5a703e4f18..bef7a2097963 100644 --- a/pkgs/by-name/ae/aegisub/package.nix +++ b/pkgs/by-name/ae/aegisub/package.nix @@ -2,7 +2,6 @@ lib, alsa-lib, boost, - curl, meson, config, expat, @@ -42,13 +41,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "aegisub"; - version = "3.4.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "TypesettingTools"; repo = "aegisub"; tag = "v${finalAttrs.version}"; - hash = "sha256-HvBbHUWKUFpne7Dj8CB2V9agBSBbB24BXnnYWUjHSDI="; + hash = "sha256-3yWtBuCwr1OPOg/nh2s8SFg62vt8zuBMMp0gfOZrjqk="; }; nativeBuildInputs = [ @@ -63,7 +62,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ boost - curl expat ffmpeg ffms @@ -115,10 +113,6 @@ stdenv.mkDerivation (finalAttrs: { # system version? substituteInPlace meson.build \ --replace-fail "subdir('tests')" "# subdir('tests')" - - # https://github.com/TypesettingTools/Aegisub/issues/191 - substituteInPlace src/dialog_colorpicker.cpp \ - --replace-fail "NSUInteger" "size_t" ''; # Inject the version, per the AUR package: diff --git a/pkgs/by-name/ae/aerogramme/package.nix b/pkgs/by-name/ae/aerogramme/package.nix index a8643ba1b6cf..b28ebe1eb61c 100644 --- a/pkgs/by-name/ae/aerogramme/package.nix +++ b/pkgs/by-name/ae/aerogramme/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { src = fetchgit { url = "https://git.deuxfleurs.fr/Deuxfleurs/aerogramme/"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-ER+P/XGqNzTLwDLK5EBZq/Dl29ZZKl2FdxDb+oLEJ8Y="; }; @@ -20,16 +20,8 @@ rustPlatform.buildRustPackage rec { ./0001-update-time-rs.patch ]; - # must use our own Cargo.lock due to git dependencies - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "imap-codec-2.0.0" = "sha256-o64Q74Q84xLRfU4K4JtcjyS0J8mfoApvUs9siscd0RA="; - "imap-flow-0.1.0" = "sha256-IopxybuVt5OW6vFiw/4MxojzaNZrKu2xyfaX6F8IYlA="; - "k2v-client-0.0.4" = "sha256-V71FCIsgK3VStFOzVntm8P0vXRobF5rQ74qar+cKyik="; - "smtp-message-0.1.0" = "sha256-FoSakm3D1xg1vefLf/zkyvzsij1G0QstK3CRo+LbByE="; - }; - }; + useFetchCargoVendor = true; + cargoHash = "sha256-GPj8qhfKgfAadQD9DJafN4ec8L6oY62PS/w/ljkPHpw="; # disable network tests as Nix sandbox breaks them doCheck = false; @@ -50,6 +42,5 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ supinie ]; mainProgram = "aerogramme"; platforms = lib.platforms.linux; - broken = true; # https://github.com/rust-lang/rust/issues/129811 }; } diff --git a/pkgs/by-name/ag/age-plugin-yubikey/package.nix b/pkgs/by-name/ag/age-plugin-yubikey/package.nix index 4c0446e586fd..986e7b0a31e1 100644 --- a/pkgs/by-name/ag/age-plugin-yubikey/package.nix +++ b/pkgs/by-name/ag/age-plugin-yubikey/package.nix @@ -6,7 +6,6 @@ pkg-config, openssl, pcsclite, - apple-sdk_11, }: rustPlatform.buildRustPackage rec { @@ -31,12 +30,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ pcsclite ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pcsclite ]; meta = with lib; { description = "YubiKey plugin for age"; diff --git a/pkgs/by-name/ai/aichat/package.nix b/pkgs/by-name/ai/aichat/package.nix index 1b5849a07ccd..bb971c677d45 100644 --- a/pkgs/by-name/ai/aichat/package.nix +++ b/pkgs/by-name/ai/aichat/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "aichat"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "sigoden"; repo = "aichat"; rev = "v${version}"; - hash = "sha256-tjKgZg8bjRHuifhq0ZEC+Vv3yyUwCoy2X4PNEIYzLfk="; + hash = "sha256-Hqrwko/HZTHlKzXuqm835fpygOO9wsQx1XkJddH/EUc="; }; - cargoHash = "sha256-Q/k6h9ceEbG3TLMuoXJgNz4ofR0j7YXPvhgmbp4dE2I="; + cargoHash = "sha256-4CcwzaPIO+upISizpXHGYfKh9YD4foJAqx7TGgLCHZI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ai/aider-chat/package.nix b/pkgs/by-name/ai/aider-chat/package.nix index e073d569ea2f..1a9deb7e2120 100644 --- a/pkgs/by-name/ai/aider-chat/package.nix +++ b/pkgs/by-name/ai/aider-chat/package.nix @@ -21,7 +21,7 @@ let src = fetchFromGitHub { owner = "Aider-AI"; repo = "aider"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-wGm6JV9ISRi/p1lA3JyzOdHQKFHFxEhfr+NdShUxm0M="; }; diff --git a/pkgs/by-name/ai/aiodnsbrute/package.nix b/pkgs/by-name/ai/aiodnsbrute/package.nix index ce66080a27b1..bee53975d4ab 100644 --- a/pkgs/by-name/ai/aiodnsbrute/package.nix +++ b/pkgs/by-name/ai/aiodnsbrute/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "blark"; repo = pname; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-cEpk71VoQJZfKeAZummkk7yjtXKSMndgo0VleYiMlWE="; }; diff --git a/pkgs/by-name/ai/airgeddon/package.nix b/pkgs/by-name/ai/airgeddon/package.nix index cea1d37fd493..d64fb45373fa 100644 --- a/pkgs/by-name/ai/airgeddon/package.nix +++ b/pkgs/by-name/ai/airgeddon/package.nix @@ -120,7 +120,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "v1s1t0r1sh3r3"; repo = "airgeddon"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-3Rx1tMRIpSk+IEJGOs+t+kDlvGHYOx1IOSi+663uzrw="; }; diff --git a/pkgs/by-name/ai/airgorah/package.nix b/pkgs/by-name/ai/airgorah/package.nix index f063495c72a9..87beccf94e9d 100644 --- a/pkgs/by-name/ai/airgorah/package.nix +++ b/pkgs/by-name/ai/airgorah/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "martin-olivier"; repo = "airgorah"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-cIb40TKkk3gfy4dTP8WyZqQkRGj5nItaQ3NSfexCUOA="; }; diff --git a/pkgs/by-name/ai/airscan/package.nix b/pkgs/by-name/ai/airscan/package.nix index bdc11a126770..fe1027fb7c55 100644 --- a/pkgs/by-name/ai/airscan/package.nix +++ b/pkgs/by-name/ai/airscan/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "stapelberg"; repo = "airscan"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-gk0soDzrsFBh+SrWcfO/quW6JweX6MthOigTHcaq1oE="; }; diff --git a/pkgs/by-name/al/alacritty/package.nix b/pkgs/by-name/al/alacritty/package.nix index 5376c79a4072..67f349bf7ef3 100644 --- a/pkgs/by-name/al/alacritty/package.nix +++ b/pkgs/by-name/al/alacritty/package.nix @@ -22,7 +22,6 @@ wayland, xdg-utils, - apple-sdk_11, }: let rpathLibs = @@ -49,7 +48,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "alacritty"; repo = pname; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-ZhkuuxTx2y8vOfxfpDpJAyNyDdRWab0pqyDdbOCQ2XE="; }; @@ -65,11 +64,7 @@ rustPlatform.buildRustPackage rec { scdoc ]; - buildInputs = - rpathLibs - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - ]; + buildInputs = rpathLibs; outputs = [ "out" diff --git a/pkgs/by-name/al/albedo/package.nix b/pkgs/by-name/al/albedo/package.nix index 7b63f9e7040f..da0c2ffb7648 100644 --- a/pkgs/by-name/al/albedo/package.nix +++ b/pkgs/by-name/al/albedo/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "coreruleset"; repo = "albedo"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-HMW0SIcPDCy2QNfxpMke+/d1XCNpyx6RL6RCZAmU+WE="; }; diff --git a/pkgs/by-name/al/albert/package.nix b/pkgs/by-name/al/albert/package.nix index 977e730991bf..c1fe2144e67d 100644 --- a/pkgs/by-name/al/albert/package.nix +++ b/pkgs/by-name/al/albert/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "albert"; - version = "0.26.10"; + version = "0.26.11"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; rev = "v${finalAttrs.version}"; - hash = "sha256-GVYRcrSXz4EXb3isoUN3x/68CAfr0wMgnvv+CzW/yZY="; + hash = "sha256-rPQ6nxUT7qiuOgmmQKCrYHl4kKJODe+nw4VNGjF+n/g="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/al/alcom/package.nix b/pkgs/by-name/al/alcom/package.nix index 11120d87ade3..35336e223729 100644 --- a/pkgs/by-name/al/alcom/package.nix +++ b/pkgs/by-name/al/alcom/package.nix @@ -24,7 +24,7 @@ let src = fetchFromGitHub { owner = "vrc-get"; repo = "vrc-get"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; fetchSubmodules = true; hash = "sha256-jkhjJTb/U2dXj/vyaip+gWoqIOdfFKSExeDl0T11DE4="; }; diff --git a/pkgs/by-name/al/alexandria/package.nix b/pkgs/by-name/al/alexandria/package.nix index 7acc0ca83b85..05f6a01aea7a 100644 --- a/pkgs/by-name/al/alexandria/package.nix +++ b/pkgs/by-name/al/alexandria/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "btpf"; repo = "Alexandria"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-18i3/HLTfhBSa9/c55dCOfFal+V40wcHcLoYt1dU+d0="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/al/ali/package.nix b/pkgs/by-name/al/ali/package.nix index effa23aaafca..b95e1382960b 100644 --- a/pkgs/by-name/al/ali/package.nix +++ b/pkgs/by-name/al/ali/package.nix @@ -11,7 +11,7 @@ buildGo122Module rec { src = fetchFromGitHub { owner = "nakabonne"; repo = "ali"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-/pdHlI20IzSTX2pnsbxPiJiWmOCbp13eJWLi0Tcsueg="; }; diff --git a/pkgs/by-name/al/aliae/package.nix b/pkgs/by-name/al/aliae/package.nix index c6f762de988e..386958b88836 100644 --- a/pkgs/by-name/al/aliae/package.nix +++ b/pkgs/by-name/al/aliae/package.nix @@ -13,7 +13,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "jandedobbeleer"; repo = "aliae"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-HccUA4+es9M7PZUTqWvIb3xNxmOeyI2iw5bG316RgLE="; }; diff --git a/pkgs/by-name/al/alioth/package.nix b/pkgs/by-name/al/alioth/package.nix index 30fd5d09df9d..fa0fcad30e8e 100644 --- a/pkgs/by-name/al/alioth/package.nix +++ b/pkgs/by-name/al/alioth/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "google"; repo = "alioth"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-CQYh/F7eGk94dsXP7j3udhhBReYBvV6D8nzK/3VicwU="; }; diff --git a/pkgs/by-name/al/alist/package.nix b/pkgs/by-name/al/alist/package.nix index 13028533d773..e2ba073fa636 100644 --- a/pkgs/by-name/al/alist/package.nix +++ b/pkgs/by-name/al/alist/package.nix @@ -16,7 +16,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "AlistGo"; repo = "alist"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-DzqSkcyDRyiHM0yh7A+dZj7TnjhDVQoHHgV5piVcu1g="; # 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. diff --git a/pkgs/by-name/al/almo/package.nix b/pkgs/by-name/al/almo/package.nix index 706492caa853..6c7e2c516ff1 100644 --- a/pkgs/by-name/al/almo/package.nix +++ b/pkgs/by-name/al/almo/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "abap34"; repo = "almo"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; sha256 = "sha256-Cz+XDJmdp+utzwm1c7ThTNS6kfNF6r4B16tnGQSCVMc="; }; diff --git a/pkgs/by-name/al/alock/package.nix b/pkgs/by-name/al/alock/package.nix index cf331fe6f3a1..e00ef5e9c2ad 100644 --- a/pkgs/by-name/al/alock/package.nix +++ b/pkgs/by-name/al/alock/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Arkq"; repo = "alock"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-xfPhsXZrTlEqea75SvacDfjM9o21MTudrqfNN9xtdcg="; }; diff --git a/pkgs/by-name/al/alot/package.nix b/pkgs/by-name/al/alot/package.nix index 90ceff591aba..c720e0b8374e 100644 --- a/pkgs/by-name/al/alot/package.nix +++ b/pkgs/by-name/al/alot/package.nix @@ -29,7 +29,7 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "pazz"; repo = "alot"; - rev = "refs/tags/${version}"; + tag = version; sha256 = "sha256-mXaRzl7260uxio/BQ36BCBxgKhl1r0Rc6PwFZA8qNqc="; }; diff --git a/pkgs/by-name/al/alpaca/package.nix b/pkgs/by-name/al/alpaca/package.nix index eb2462d6c9b1..83065ff554ed 100644 --- a/pkgs/by-name/al/alpaca/package.nix +++ b/pkgs/by-name/al/alpaca/package.nix @@ -18,14 +18,14 @@ python3Packages.buildPythonApplication rec { pname = "alpaca"; - version = "3.1.0"; + version = "3.2.0"; pyproject = false; # Built with meson src = fetchFromGitHub { owner = "Jeffser"; repo = "Alpaca"; tag = version; - hash = "sha256-KPab5TU+Ra1o0FWpD5pkhtP7ylno903GQTqqWlir26s="; + hash = "sha256-Mh+LYslVmb4l+ZCB1Si7hxugzHPz/mULUMBNeJI12r0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/al/alsaequal/package.nix b/pkgs/by-name/al/alsaequal/package.nix index d90c73845f6e..924e9ca0b47d 100644 --- a/pkgs/by-name/al/alsaequal/package.nix +++ b/pkgs/by-name/al/alsaequal/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "bassdr"; repo = "alsaequal"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-jI+w/jCFslQSNeIS7mwb+LZSawU4XjbSNNgpvuShH1g="; }; diff --git a/pkgs/by-name/al/alterx/package.nix b/pkgs/by-name/al/alterx/package.nix index 08acb62ad0b3..035db050cbf3 100644 --- a/pkgs/by-name/al/alterx/package.nix +++ b/pkgs/by-name/al/alterx/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "projectdiscovery"; repo = "alterx"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-A01XROFB2NkArfFtRMv/r9Nu5QoKMTOVzVIUnFoVe78="; }; diff --git a/pkgs/by-name/al/alttpr-opentracker/deps.json b/pkgs/by-name/al/alttpr-opentracker/deps.json index f9dbc7f4f0fa..b488799ce141 100644 --- a/pkgs/by-name/al/alttpr-opentracker/deps.json +++ b/pkgs/by-name/al/alttpr-opentracker/deps.json @@ -1,1052 +1,1022 @@ [ { "pname": "Autofac", - "version": "6.3.0", - "sha256": "0zg0lsqzb8hh7l97mfd2z3fxdab86sbmxkaprzi41v0hs1x3jd9b" + "version": "7.1.0", + "hash": "sha256-9UJoNg/6AV0I2xieMevylwfPu8A0qcpIWPJZFgzT6wA=" }, { "pname": "Avalonia", - "version": "0.10.12", - "sha256": "1hb6v8sm7gd8aswdv0slnk8cvvxs5ac82knc3pzvxj0js2n4lnv2" + "version": "0.10.22", + "hash": "sha256-5EY2FMhtry/RJGXuHzMvdiGEnnDN5OP+M3cEdxR/n7c=" }, { "pname": "Avalonia.Angle.Windows.Natives", "version": "2.1.0.2020091801", - "sha256": "04jm83cz7vkhhr6n2c9hya2k8i2462xbf6np4bidk55as0jdq43a" + "hash": "sha256-ahDcJNCqlNniItcat7owREQ0hfIwMWFNhnDu89lAVRI=" + }, + { + "pname": "Avalonia.BuildServices", + "version": "0.0.29", + "hash": "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY=" }, { "pname": "Avalonia.Controls.DataGrid", - "version": "0.10.12", - "sha256": "1r8qi0kgd9rqbacnriy5sa684d12vxi45a6n2a4w7ydxr97zv5nm" + "version": "0.10.22", + "hash": "sha256-8p4qWuy8BeXaUVM6H8hWJ2ajl7tgbBAWN3EoiKPmphM=" }, { "pname": "Avalonia.Desktop", - "version": "0.10.12", - "sha256": "17ng7vvmynnmll7fb8zkjlhcn0ksg7p4v6kw207yq72acgvyn96g" + "version": "0.10.22", + "hash": "sha256-p4fEyykjYwaOgTSBNtK0+v+VvIypg818R4mBWnGzmHI=" }, { "pname": "Avalonia.Diagnostics", - "version": "0.10.12", - "sha256": "17skzs05iv5ljgnqm36zrbhrh3x20xf5hgni543i02zffj2015ki" + "version": "0.10.22", + "hash": "sha256-CIS6A47DmbNt/AQGoDWfBs/+7/0busUFCdvX0Su+m9Y=" }, { "pname": "Avalonia.FreeDesktop", - "version": "0.10.12", - "sha256": "00920pdiv8wlpym0s80nz8lfmw515ikrr5f2a6sr4kmjwfd9cffj" + "version": "0.10.22", + "hash": "sha256-IAyKCqAUMLpm1r39AI7KzeC36dNe87oJwkk7gxJj5Y0=" }, { "pname": "Avalonia.Markup.Xaml.Loader", - "version": "0.10.12", - "sha256": "18glwqn4a8p3rz5zsp1xyrm5xwv853056nykf7mdcv1lglh74fsm" + "version": "0.10.22", + "hash": "sha256-XRl10uLLt57zNxXL9CXWWTlcXEtX2znOVg5VqfyngZc=" }, { "pname": "Avalonia.Native", - "version": "0.10.12", - "sha256": "1j6gxg0n55923rbw2p7z6yh27i81xrzpqarb268d3hd6hgjycwc1" + "version": "0.10.22", + "hash": "sha256-I+4YCsFXcXOYccSWwO9nxFsk4wITafkSkj/55uO5rSo=" }, { "pname": "Avalonia.ReactiveUI", - "version": "0.10.12", - "sha256": "04ga7f8bmz3bqp4dsc4fzrphfq61zf62hlz4nbazf1igx0jzdygy" + "version": "0.10.22", + "hash": "sha256-czEyKZml1wJSLWULT124pPOKkJr5gCMT9eu4qaCJl9A=" }, { "pname": "Avalonia.Remote.Protocol", - "version": "0.10.12", - "sha256": "0ghrb8yf4qahwlpa2appk7q0m0n01q0s65nx1xj1plpi4jr6vvw2" + "version": "0.10.22", + "hash": "sha256-dEZCLrgO5ogFJ+yAu030NDAWLs98KrLpMcMx2AX8+ig=" }, { "pname": "Avalonia.Skia", - "version": "0.10.12", - "sha256": "1qj0sw4780za3p6hbwvx1p3b6px3s5vp3ml3vvyak1bajvifz969" + "version": "0.10.22", + "hash": "sha256-4ty55BXtpeytJtGCnCyD4PBXk/fQPVmwXvr1S3MBseI=" }, { "pname": "Avalonia.Win32", - "version": "0.10.12", - "sha256": "1af174qca95gxf04zhxm716mi1dazfz7k3995i1nyaz7hygs3p04" + "version": "0.10.22", + "hash": "sha256-AHUqjeqvJkHKuRSvHma+MbfgnNs1/YmVZkyFHoU7SQQ=" }, { "pname": "Avalonia.X11", - "version": "0.10.12", - "sha256": "1jjg4lhg0a95laffwm7imgs92q06whrfkaszm7svgfv1ryazv71q" + "version": "0.10.22", + "hash": "sha256-PIvSUg01ggYr8w8IONoYo0cgnqwze2v+t0WvVMOEe8o=" }, { "pname": "Avalonia.Xaml.Behaviors", - "version": "0.10.12", - "sha256": "0j897knwxpl6sss8v2wrhy4bw4nw4jqc04n8b8d4s76jaqcr3z2h" + "version": "0.10.19", + "hash": "sha256-I4qs8Rl9pyRVGvsh5n0V+H+CTdg/sqOSomFL5z7BoXY=" }, { "pname": "Avalonia.Xaml.Interactions", - "version": "0.10.12", - "sha256": "0nyqg66sg7garc2k729k3dqixbb3asvsjd2kxympfx9q6xyz6vrh" + "version": "0.10.19", + "hash": "sha256-XLM3Ov0f3S78K1RIZv6tNPpl/ai5yi34Z78zwgGNzgE=" }, { "pname": "Avalonia.Xaml.Interactivity", - "version": "0.10.12", - "sha256": "13qbmz39bf29wvq82b1irci8y50fjhhj563cdwd235nm633sixqb" + "version": "0.10.19", + "hash": "sha256-ZxX8FIGg2+H70c/81hnILW2RVhSNSUXIZhZcWpQE3FE=" }, { "pname": "Castle.Core", - "version": "4.4.1", - "sha256": "13dja1jxl5zwhi0ghkgvgmqdrixn57f9hk52jy5vpaaakzr550r7" - }, - { - "pname": "Citrus.Avalonia", - "version": "1.6.1", - "sha256": "1hl98dmgmm6ml5gl70v7vg577n7vn6bjxaq82sgnql5g623pg18x" + "version": "5.1.1", + "hash": "sha256-oVkQB+ON7S6Q27OhXrTLaxTL0kWB58HZaFFuiw4iTrE=" }, { "pname": "DotNet.Bundle", "version": "0.9.13", - "sha256": "0awzvk62hgszm9b8ar87y862aj8nlm77d7hgfmp84mxny0ag03jl" + "hash": "sha256-VA7wFPC2V4JudQ+edk6lFkklDPIHZYVWql8/KMzcnys=" }, { "pname": "DynamicData", - "version": "7.4.11", - "sha256": "1vrrwkmqrdzr4ncjihfzik5ykmy1234iyp2q5qk8spz6y0gwq2h8" + "version": "7.1.1", + "hash": "sha256-cFskEA5n9Q6wS+nt4nR1jaiC+TzirBu8pHL9g/jErJM=" }, { "pname": "DynamicData", - "version": "7.4.9", - "sha256": "0ssgh42fi5m6xyw36f4km04ls9nq4w8cpbck8gh7g8n3ixz05rrw" + "version": "7.14.2", + "hash": "sha256-UyCC3hPCEm8RoK+d66vqagY4Yi0GzRwO1qoKcAhPZx4=" }, { "pname": "ExpectedObjects", "version": "3.5.4", - "sha256": "1mklg6dx8biaaf9jxp09rddsw66l42r4fpsgnmm6szn6fj2n888k" + "hash": "sha256-EyFkhXTGfm1qtU9fR7Ig1BiuW8sJ3C6TUyou1Jt5dNY=" + }, + { + "pname": "FluentAssertions", + "version": "6.12.0", + "hash": "sha256-LGlPe+G7lBwj5u3ttQZiKX2+C195ddRAHPuDkY6x0BE=" + }, + { + "pname": "Fody", + "version": "6.8.0", + "hash": "sha256-2laYscz0i0LalGTAup7dsh6XlYRZSojYpp8XOwZJJfg=" }, { "pname": "HarfBuzzSharp", - "version": "2.8.2-preview.178", - "sha256": "1p5nwzl7jpypsd6df7hgcf47r977anjlyv21wacmalsj6lvdgnvn" + "version": "2.8.2.1-preview.108", + "hash": "sha256-H2C71GTwKMoTNq2GrNbusLUS7+ca53MYfWYV70i/RHc=" }, { "pname": "HarfBuzzSharp.NativeAssets.Linux", - "version": "2.8.2-preview.178", - "sha256": "1402ylkxbgcnagcarqlfvg4gppy2pqs3bmin4n5mphva1g7bqb2p" + "version": "2.8.2.1-preview.108", + "hash": "sha256-ROYaZH1MZVKZ+6ToHq+GCf3FC5rz9Z7RWOEJlf1+m5s=" }, { "pname": "HarfBuzzSharp.NativeAssets.macOS", - "version": "2.8.2-preview.178", - "sha256": "0p8miaclnbfpacc1jaqxwfg0yfx9byagi4j4k91d9621vd19i8b2" + "version": "2.8.2.1-preview.108", + "hash": "sha256-WgIgnHLOJw52XKccDwmsptTBjTcWgT7dL064yHmmZ5s=" }, { "pname": "HarfBuzzSharp.NativeAssets.WebAssembly", - "version": "2.8.2-preview.178", - "sha256": "1n9jay9sji04xly6n8bzz4591fgy8i65p21a8mv5ip9lsyj1c320" + "version": "2.8.2.1-preview.108", + "hash": "sha256-pXSDS81Y185RZVqA5ALPGsuOcB1GSTn+VpdbPcpYeJY=" }, { "pname": "HarfBuzzSharp.NativeAssets.Win32", - "version": "2.8.2-preview.178", - "sha256": "1r5syii96wv8q558cvsqw3lr10cdw6677lyiy82p6i3if51v3mr7" + "version": "2.8.2.1-preview.108", + "hash": "sha256-YZaC40YqLKiOrVECbKivJsEqkydZgQfLrENXLJOt3lg=" }, { "pname": "JetBrains.Annotations", - "version": "2021.3.0", - "sha256": "01ssylllbwpana2w3iybi533zlvcsbhzjc8kr0g4kg307kjbfn8v" + "version": "2023.2.0", + "hash": "sha256-Um10fSmO+21I7f+lbzzVq5e8GBijJ9amTvOlt362p1s=" }, { "pname": "Microsoft.CodeAnalysis.Analyzers", - "version": "3.3.3", - "sha256": "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6" + "version": "3.3.4", + "hash": "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE=" }, { "pname": "Microsoft.CodeAnalysis.Common", - "version": "4.0.1", - "sha256": "0axjv1nhk1z9d4c51d9yxdp09l8yqqnqaifhqcwnxnv0r4y5cka9" + "version": "4.7.0", + "hash": "sha256-nDDpCy8WQADxo7LzWkDupuxs0GCjvuhX8EeKpjTnRP4=" }, { "pname": "Microsoft.CodeAnalysis.CSharp", - "version": "4.0.1", - "sha256": "1h6jfifg7pw2vacpdds4v4jqnaydg9b108irf315wzx6rh8yv9cb" + "version": "4.7.0", + "hash": "sha256-0FoP+zHqbhLhyjTPx8I7MCfHqCbmhwE8aRCVe4eC49M=" }, { "pname": "Microsoft.CodeAnalysis.CSharp.Scripting", - "version": "4.0.1", - "sha256": "0ncbld51ja7hp6p2cabw0dx4km2syiz0z58al62h21cpbjfnls5p" + "version": "4.7.0", + "hash": "sha256-528s2qnDVHswC9DvE1+Rp9Jx83n3Y5RJvtA20x3pZgA=" }, { "pname": "Microsoft.CodeAnalysis.NetAnalyzers", - "version": "6.0.0", - "sha256": "06zy947m5lrbwb684g42ijb07r5jsqycvfnphc6cqfdrfnzqv6k9" + "version": "8.0.0", + "hash": "sha256-Z6MIb9lJskYOEiBZR36pwFI5wWekajx5WJvVA2a/f9Y=" }, { "pname": "Microsoft.CodeAnalysis.Scripting.Common", - "version": "4.0.1", - "sha256": "0zhrlk30js7dp6i76zd7zilaxq26gwsl3pk85p919039786sqs9p" + "version": "4.7.0", + "hash": "sha256-eESDYyoGmGB6fbgDJvCaFPbwB2Cq9SFpP5nhYxK9bEw=" }, { "pname": "Microsoft.CodeCoverage", - "version": "17.0.0", - "sha256": "18gdbsqf6i79ld4ikqr4jhx9ndsggm865b5xj1xmnmgg12ydp19a" - }, - { - "pname": "Microsoft.CSharp", - "version": "4.0.1", - "sha256": "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj" + "version": "17.7.2", + "hash": "sha256-FfKMhyVEAiRd3VDkotnFHnSmlYGQTh4ZqkEF2+8sriY=" }, { "pname": "Microsoft.CSharp", "version": "4.7.0", - "sha256": "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j" + "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0=" }, { "pname": "Microsoft.NET.Test.Sdk", - "version": "17.0.0", - "sha256": "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r" - }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "1.0.1", - "sha256": "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr" + "version": "17.7.2", + "hash": "sha256-EMtV5zcucAcJMGIb/KSqIQnK7PA6aJCgZSobc+5t6SE=" }, { "pname": "Microsoft.NETCore.Platforms", "version": "1.1.0", - "sha256": "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm" - }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "6.0.1", - "sha256": "13v33cm88px9wymlxidzgy2ljaq33h1xna3lgdggmy7w4bbdkddh" - }, - { - "pname": "Microsoft.NETCore.Targets", - "version": "1.0.1", - "sha256": "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p" + "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" }, { "pname": "Microsoft.NETCore.Targets", "version": "1.1.0", - "sha256": "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh" - }, - { - "pname": "Microsoft.NETCore.Targets", - "version": "5.0.0", - "sha256": "0z3qyv7qal5irvabc8lmkh58zsl42mrzd1i0sssvzhv4q4kl3cg6" + "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" }, { "pname": "Microsoft.TestPlatform.ObjectModel", - "version": "17.0.0", - "sha256": "1bh5scbvl6ndldqv20sl34h4y257irm9ziv2wyfc3hka6912fhn7" + "version": "17.7.2", + "hash": "sha256-uOe3ELE7iAusTBgxhsx78d4lBw28eDTew13ZnW2bsnU=" }, { "pname": "Microsoft.TestPlatform.TestHost", - "version": "17.0.0", - "sha256": "06mn31cgpp7d8lwdyjanh89prc66j37dchn74vrd9s588rq0y70r" + "version": "17.7.2", + "hash": "sha256-pox8kez5tgXX4mAiu9qybrlI7oURzPm7YsCd42N4+us=" }, { "pname": "Microsoft.Win32.Primitives", "version": "4.3.0", - "sha256": "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq" + "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg=" }, { "pname": "Microsoft.Win32.SystemEvents", - "version": "6.0.0", - "sha256": "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p" + "version": "7.0.0", + "hash": "sha256-i6JojctqrqfJ4Wa+BDtaKZEol26jYq5DTQHar2M9B64=" }, { "pname": "NETStandard.Library", "version": "1.6.1", - "sha256": "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8" + "hash": "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw=" }, { "pname": "Newtonsoft.Json", "version": "13.0.1", - "sha256": "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb" + "hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo=" }, { "pname": "Newtonsoft.Json", - "version": "9.0.1", - "sha256": "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r" + "version": "13.0.3", + "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc=" }, { "pname": "NSubstitute", - "version": "4.3.0", - "sha256": "026kx6fab9r1a0m8p9hlznp73qhh44k4i0352szvchsis6vlj9gm" + "version": "5.1.0", + "hash": "sha256-ORpubFd6VoRjA9ZeyZdJPY/xnQXM90O6McMswt8VVG4=" }, { "pname": "NuGet.Frameworks", - "version": "5.0.0", - "sha256": "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr" + "version": "6.5.0", + "hash": "sha256-ElqfN4CcKxT3hP2qvxxObb4mnBlYG89IMxO0Sm5oZ2g=" }, { "pname": "Packaging.Targets", "version": "0.1.220", - "sha256": "0ci4jkkqk70vwzf2sgc44a8dap70afp6yhvj967shy7anffxb511" + "hash": "sha256-IZTVnbPqeKiPSXJDb65T4FzVkCKEPS3c5xucieeUJDI=" + }, + { + "pname": "ReactiveMarbles.ObservableEvents.SourceGenerator", + "version": "1.2.3", + "hash": "sha256-tR/LT14DaLrNsTxSX+9XwH572cigRV22+uB6JSmdt7M=" + }, + { + "pname": "ReactiveProperty", + "version": "9.3.1", + "hash": "sha256-2gCpFE9rMDbDlyNi1Fncbr5Bb3u5GDM8VUECrX4PId4=" + }, + { + "pname": "ReactiveProperty.Core", + "version": "9.3.1", + "hash": "sha256-dYZ1daWZVVKWHpprLtiJo6n8DRCsORgNHswFy2D39SU=" }, { "pname": "ReactiveUI", "version": "13.2.10", - "sha256": "0x4pk45wipzsjzkv23as8l0sdds665l9404gaix8c0z2n24s76gg" + "hash": "sha256-75mjibDiA4Z6VI8AkmgxRremAUVaDbHnl/rfyAuZl3Q=" }, { "pname": "ReactiveUI", - "version": "17.1.17", - "sha256": "1v0w88mk8bh68lcj968q61zyx6l07himild605c2xi5lb6a42z71" + "version": "19.4.1", + "hash": "sha256-cN00n2bjSc8p1mpYxF3S9KopdU0XrLVI0g8pAjehHfw=" + }, + { + "pname": "ReactiveUI.Fody", + "version": "19.4.1", + "hash": "sha256-SYqDw5ghH0wddNJOa1Dc/haE0NSOMa8I4d1EKjoVgsg=" + }, + { + "pname": "runtime.any.System.Collections", + "version": "4.3.0", + "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8=" + }, + { + "pname": "runtime.any.System.Diagnostics.Tools", + "version": "4.3.0", + "hash": "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I=" + }, + { + "pname": "runtime.any.System.Diagnostics.Tracing", + "version": "4.3.0", + "hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI=" + }, + { + "pname": "runtime.any.System.Globalization", + "version": "4.3.0", + "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU=" + }, + { + "pname": "runtime.any.System.Globalization.Calendars", + "version": "4.3.0", + "hash": "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4=" + }, + { + "pname": "runtime.any.System.IO", + "version": "4.3.0", + "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=" + }, + { + "pname": "runtime.any.System.Reflection", + "version": "4.3.0", + "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" + }, + { + "pname": "runtime.any.System.Reflection.Extensions", + "version": "4.3.0", + "hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8=" + }, + { + "pname": "runtime.any.System.Reflection.Primitives", + "version": "4.3.0", + "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=" + }, + { + "pname": "runtime.any.System.Resources.ResourceManager", + "version": "4.3.0", + "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4=" + }, + { + "pname": "runtime.any.System.Runtime", + "version": "4.3.0", + "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=" + }, + { + "pname": "runtime.any.System.Runtime.Handles", + "version": "4.3.0", + "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4=" + }, + { + "pname": "runtime.any.System.Runtime.InteropServices", + "version": "4.3.0", + "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA=" + }, + { + "pname": "runtime.any.System.Text.Encoding", + "version": "4.3.0", + "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=" + }, + { + "pname": "runtime.any.System.Text.Encoding.Extensions", + "version": "4.3.0", + "hash": "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM=" + }, + { + "pname": "runtime.any.System.Threading.Tasks", + "version": "4.3.0", + "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" + }, + { + "pname": "runtime.any.System.Threading.Timer", + "version": "4.3.0", + "hash": "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs=" }, { "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d" + "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps=" }, { "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59" + "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I=" }, { "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa" + "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA=" }, { "pname": "runtime.native.System", "version": "4.3.0", - "sha256": "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4" + "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" }, { "pname": "runtime.native.System.IO.Compression", "version": "4.3.0", - "sha256": "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d" + "hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8=" }, { "pname": "runtime.native.System.Net.Http", "version": "4.3.0", - "sha256": "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk" + "hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg=" }, { "pname": "runtime.native.System.Security.Cryptography.Apple", "version": "4.3.0", - "sha256": "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q" + "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw=" }, { "pname": "runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97" + "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I=" }, { "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3" + "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM=" }, { "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf" + "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4=" }, { "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple", "version": "4.3.0", - "sha256": "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi" + "hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM=" }, { "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3" + "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0=" }, { "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn" + "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4=" }, { "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3" + "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g=" }, { "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy" + "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc=" }, { "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5" + "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw=" + }, + { + "pname": "runtime.unix.Microsoft.Win32.Primitives", + "version": "4.3.0", + "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg=" + }, + { + "pname": "runtime.unix.System.Console", + "version": "4.3.0", + "hash": "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190=" + }, + { + "pname": "runtime.unix.System.Diagnostics.Debug", + "version": "4.3.0", + "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI=" + }, + { + "pname": "runtime.unix.System.IO.FileSystem", + "version": "4.3.0", + "hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I=" + }, + { + "pname": "runtime.unix.System.Net.Primitives", + "version": "4.3.0", + "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0=" + }, + { + "pname": "runtime.unix.System.Net.Sockets", + "version": "4.3.0", + "hash": "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4=" + }, + { + "pname": "runtime.unix.System.Private.Uri", + "version": "4.3.0", + "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=" + }, + { + "pname": "runtime.unix.System.Runtime.Extensions", + "version": "4.3.0", + "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=" }, { "pname": "Serilog", "version": "2.10.0", - "sha256": "08bih205i632ywryn3zxkhb15dwgyaxbhmm1z3b5nmby9fb25k7v" + "hash": "sha256-+8wilkt+VVvW+KFWuLryj7cSFpz9D+sz92KYWICAcSE=" + }, + { + "pname": "Serilog", + "version": "3.0.1", + "hash": "sha256-cfcZXT2eQ4K6RQ0twDYPN5jkDpG9dYqpmHJX4zWrL+o=" }, { "pname": "Serilog.Sinks.Debug", "version": "2.0.0", - "sha256": "1i7j870l47gan3gpnnlzkccn5lbm7518cnkp25a3g5gp9l0dbwpw" + "hash": "sha256-/PLVAE33lTdUEXdahkI5ddFiGZufWnvfsOodQsFB8sQ=" }, { "pname": "Serilog.Sinks.File", "version": "5.0.0", - "sha256": "097rngmgcrdfy7jy8j7dq3xaq2qky8ijwg0ws6bfv5lx0f3vvb0q" + "hash": "sha256-GKy9hwOdlu2W0Rw8LiPyEwus+sDtSOTl8a5l9uqz+SQ=" }, { "pname": "SkiaSharp", - "version": "2.88.0-preview.178", - "sha256": "062g14s6b2bixanpwihj3asm3jwvfw15mhvzqv6901afrlgzx4nk" + "version": "2.88.1-preview.108", + "hash": "sha256-5r0MDLe804yedcgOgCDsZ6PvsLA9gZqimo/V16AZVQc=" }, { "pname": "SkiaSharp.NativeAssets.Linux", - "version": "2.88.0-preview.178", - "sha256": "07kga1j51l3l302nvf537zg5clf6rflinjy0xd6i06cmhpkf3ksw" + "version": "2.88.1-preview.108", + "hash": "sha256-10t3pmhdfwRnpabAXIBAnjhZkhKxOTb6XfxqgZkUTqY=" }, { "pname": "SkiaSharp.NativeAssets.macOS", - "version": "2.88.0-preview.178", - "sha256": "14p95nxccs6yq4rn2h9zbb60k0232k6349zdpy31jcfr6gc99cgi" + "version": "2.88.1-preview.108", + "hash": "sha256-JTiKU3h2UMjQBEOYOq3rIRsjwqynXab0S0tAqk/Dl+0=" }, { "pname": "SkiaSharp.NativeAssets.WebAssembly", - "version": "2.88.0-preview.178", - "sha256": "09jmcg5k1vpsal8jfs90mwv0isf2y5wq3h4hd77rv6vffn5ic4sm" + "version": "2.88.1-preview.108", + "hash": "sha256-rZ1Snmz+0daTtt4uPavCYRriRnWg+QlyVidNxCV+CSk=" }, { "pname": "SkiaSharp.NativeAssets.Win32", - "version": "2.88.0-preview.178", - "sha256": "0ficil702lv3fvwpngbqh5l85i05l5jafzyh4jprzshr2qbnd8nl" + "version": "2.88.1-preview.108", + "hash": "sha256-9noqwRicVwd920EvHzGVcDvgU5j6Zaj54LoWnC9d6RU=" }, { "pname": "Splat", "version": "10.0.1", - "sha256": "18fzrn7xwjzxj4v3drs8djd3yf14bnq5n9n8vdnwfa1zk5jqpsb9" + "hash": "sha256-aemLZZk/KMdt28gmW7BdJDg/mmxI5zY2kf1L3o/N36E=" }, { "pname": "Splat", - "version": "14.1.17", - "sha256": "1akhj04sbxhhfj6zdlr5c0sh696747b0x46g3ayv4yl15kwq6pz5" + "version": "14.6.37", + "hash": "sha256-UPRwJetwHR31Z7sw7c0dojnvlFAmDNQEF7RXssiMQuY=" + }, + { + "pname": "Splat", + "version": "14.7.1", + "hash": "sha256-RzNQU8tTstC1MBZL6D11Ivq69pmPvl+A9eT9zXhdSOc=" + }, + { + "pname": "Splat.Autofac", + "version": "14.7.1", + "hash": "sha256-6Lg4C24wDMddJn5HrC9uyFuWrE12gPzayrcxyqvvI0w=" }, { "pname": "System.AppContext", "version": "4.3.0", - "sha256": "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya" + "hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg=" }, { "pname": "System.Buffers", "version": "4.3.0", - "sha256": "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy" + "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=" }, { "pname": "System.Buffers", "version": "4.5.1", - "sha256": "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3" - }, - { - "pname": "System.Collections", - "version": "4.0.11", - "sha256": "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6" + "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI=" }, { "pname": "System.Collections", "version": "4.3.0", - "sha256": "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9" + "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=" }, { "pname": "System.Collections.Concurrent", "version": "4.3.0", - "sha256": "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8" + "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI=" }, { "pname": "System.Collections.Immutable", - "version": "5.0.0", - "sha256": "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r" - }, - { - "pname": "System.Collections.NonGeneric", - "version": "4.3.0", - "sha256": "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k" - }, - { - "pname": "System.Collections.Specialized", - "version": "4.3.0", - "sha256": "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20" - }, - { - "pname": "System.ComponentModel", - "version": "4.3.0", - "sha256": "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb" + "version": "7.0.0", + "hash": "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk=" }, { "pname": "System.ComponentModel.Annotations", "version": "4.5.0", - "sha256": "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p" + "hash": "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso=" }, { "pname": "System.ComponentModel.Annotations", "version": "5.0.0", - "sha256": "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j" + "hash": "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg=" }, { - "pname": "System.ComponentModel.Primitives", - "version": "4.3.0", - "sha256": "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0" - }, - { - "pname": "System.ComponentModel.TypeConverter", - "version": "4.3.0", - "sha256": "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x" + "pname": "System.Configuration.ConfigurationManager", + "version": "4.4.0", + "hash": "sha256-+8wGYllXnIxRzy9dLhZFB88GoPj8ivYXS0KUfcivT8I=" }, { "pname": "System.Console", "version": "4.3.0", - "sha256": "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay" - }, - { - "pname": "System.Diagnostics.Debug", - "version": "4.0.11", - "sha256": "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz" + "hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo=" }, { "pname": "System.Diagnostics.Debug", "version": "4.3.0", - "sha256": "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y" + "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=" }, { "pname": "System.Diagnostics.DiagnosticSource", "version": "4.3.0", - "sha256": "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq" + "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw=" }, { "pname": "System.Diagnostics.DiagnosticSource", + "version": "4.7.1", + "hash": "sha256-l2TM1pfyRF70Xmzoz1dAqWkB8+/K6b8t5Tj7aF1UO9Y=" + }, + { + "pname": "System.Diagnostics.EventLog", "version": "6.0.0", - "sha256": "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5" - }, - { - "pname": "System.Diagnostics.Tools", - "version": "4.0.1", - "sha256": "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x" + "hash": "sha256-zUXIQtAFKbiUMKCrXzO4mOTD5EUphZzghBYKXprowSM=" }, { "pname": "System.Diagnostics.Tools", "version": "4.3.0", - "sha256": "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1" - }, - { - "pname": "System.Diagnostics.TraceSource", - "version": "4.3.0", - "sha256": "1kyw4d7dpjczhw6634nrmg7yyyzq72k75x38y0l0nwhigdlp1766" + "hash": "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y=" }, { "pname": "System.Diagnostics.Tracing", "version": "4.3.0", - "sha256": "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4" + "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q=" }, { "pname": "System.Drawing.Common", - "version": "6.0.0", - "sha256": "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz" - }, - { - "pname": "System.Dynamic.Runtime", - "version": "4.0.11", - "sha256": "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9" - }, - { - "pname": "System.Dynamic.Runtime", - "version": "4.3.0", - "sha256": "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk" - }, - { - "pname": "System.Globalization", - "version": "4.0.11", - "sha256": "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d" + "version": "7.0.0", + "hash": "sha256-t4FBgTMhuOA5FA23fg0WQOGuH0njV7hJXST/Ln/Znks=" }, { "pname": "System.Globalization", "version": "4.3.0", - "sha256": "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki" + "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=" }, { "pname": "System.Globalization.Calendars", "version": "4.3.0", - "sha256": "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq" + "hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc=" }, { "pname": "System.Globalization.Extensions", "version": "4.3.0", - "sha256": "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls" - }, - { - "pname": "System.IO", - "version": "4.1.0", - "sha256": "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp" + "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk=" }, { "pname": "System.IO", "version": "4.3.0", - "sha256": "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f" + "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=" }, { "pname": "System.IO.Compression", "version": "4.3.0", - "sha256": "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz" + "hash": "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA=" }, { "pname": "System.IO.Compression.ZipFile", "version": "4.3.0", - "sha256": "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar" - }, - { - "pname": "System.IO.FileSystem", - "version": "4.0.1", - "sha256": "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1" + "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs=" }, { "pname": "System.IO.FileSystem", "version": "4.3.0", - "sha256": "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw" - }, - { - "pname": "System.IO.FileSystem.Primitives", - "version": "4.0.1", - "sha256": "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612" + "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw=" }, { "pname": "System.IO.FileSystem.Primitives", "version": "4.3.0", - "sha256": "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c" - }, - { - "pname": "System.Linq", - "version": "4.1.0", - "sha256": "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5" + "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg=" }, { "pname": "System.Linq", "version": "4.3.0", - "sha256": "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7" - }, - { - "pname": "System.Linq.Expressions", - "version": "4.1.0", - "sha256": "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg" + "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A=" }, { "pname": "System.Linq.Expressions", "version": "4.3.0", - "sha256": "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv" + "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8=" }, { "pname": "System.Memory", "version": "4.5.3", - "sha256": "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a" - }, - { - "pname": "System.Memory", - "version": "4.5.4", - "sha256": "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y" + "hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk=" }, { "pname": "System.Net.Http", "version": "4.3.0", - "sha256": "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j" + "hash": "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q=" + }, + { + "pname": "System.Net.NameResolution", + "version": "4.3.0", + "hash": "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c=" }, { "pname": "System.Net.Primitives", "version": "4.3.0", - "sha256": "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii" + "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE=" }, { "pname": "System.Net.Sockets", "version": "4.3.0", - "sha256": "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla" + "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus=" }, { "pname": "System.Numerics.Vectors", "version": "4.5.0", - "sha256": "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59" - }, - { - "pname": "System.ObjectModel", - "version": "4.0.12", - "sha256": "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj" + "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8=" }, { "pname": "System.ObjectModel", "version": "4.3.0", - "sha256": "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2" + "hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q=" + }, + { + "pname": "System.Private.Uri", + "version": "4.3.0", + "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=" }, { "pname": "System.Reactive", "version": "5.0.0", - "sha256": "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik" + "hash": "sha256-M5Z8pw8rVb8ilbnTdaOptzk5VFd5DlKa7zzCpuytTtE=" }, { - "pname": "System.Reflection", - "version": "4.1.0", - "sha256": "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9" + "pname": "System.Reactive", + "version": "6.0.0", + "hash": "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y=" }, { "pname": "System.Reflection", "version": "4.3.0", - "sha256": "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m" - }, - { - "pname": "System.Reflection.Emit", - "version": "4.0.1", - "sha256": "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp" + "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" }, { "pname": "System.Reflection.Emit", "version": "4.3.0", - "sha256": "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74" + "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU=" }, { "pname": "System.Reflection.Emit", "version": "4.7.0", - "sha256": "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp" - }, - { - "pname": "System.Reflection.Emit.ILGeneration", - "version": "4.0.1", - "sha256": "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0" + "hash": "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg=" }, { "pname": "System.Reflection.Emit.ILGeneration", "version": "4.3.0", - "sha256": "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q" - }, - { - "pname": "System.Reflection.Emit.Lightweight", - "version": "4.0.1", - "sha256": "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr" + "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA=" }, { "pname": "System.Reflection.Emit.Lightweight", "version": "4.3.0", - "sha256": "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c" - }, - { - "pname": "System.Reflection.Extensions", - "version": "4.0.1", - "sha256": "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn" + "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I=" }, { "pname": "System.Reflection.Extensions", "version": "4.3.0", - "sha256": "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq" + "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk=" }, { "pname": "System.Reflection.Metadata", "version": "1.6.0", - "sha256": "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4" + "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E=" }, { "pname": "System.Reflection.Metadata", - "version": "5.0.0", - "sha256": "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss" - }, - { - "pname": "System.Reflection.Primitives", - "version": "4.0.1", - "sha256": "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28" + "version": "7.0.0", + "hash": "sha256-GwAKQhkhPBYTqmRdG9c9taqrKSKDwyUgOEhWLKxWNPI=" }, { "pname": "System.Reflection.Primitives", "version": "4.3.0", - "sha256": "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276" - }, - { - "pname": "System.Reflection.TypeExtensions", - "version": "4.1.0", - "sha256": "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7" + "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" }, { "pname": "System.Reflection.TypeExtensions", "version": "4.3.0", - "sha256": "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1" - }, - { - "pname": "System.Resources.ResourceManager", - "version": "4.0.1", - "sha256": "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi" + "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng=" }, { "pname": "System.Resources.ResourceManager", "version": "4.3.0", - "sha256": "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49" - }, - { - "pname": "System.Runtime", - "version": "4.1.0", - "sha256": "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m" + "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=" }, { "pname": "System.Runtime", "version": "4.3.0", - "sha256": "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7" - }, - { - "pname": "System.Runtime", - "version": "4.3.1", - "sha256": "03ch4d2acf6q037a4njxpll2kkx3dwzlg07yxr4z5m6j1kqgmm27" + "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" }, { "pname": "System.Runtime.CompilerServices.Unsafe", "version": "4.6.0", - "sha256": "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m" - }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "5.0.0", - "sha256": "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x" + "hash": "sha256-FTjQeMuvqnKxpoVsVh/OlQ21NMaZiFtOdv7VdZ+Iv3Y=" }, { "pname": "System.Runtime.CompilerServices.Unsafe", "version": "6.0.0", - "sha256": "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc" - }, - { - "pname": "System.Runtime.Extensions", - "version": "4.1.0", - "sha256": "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z" + "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" }, { "pname": "System.Runtime.Extensions", "version": "4.3.0", - "sha256": "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60" - }, - { - "pname": "System.Runtime.Handles", - "version": "4.0.1", - "sha256": "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g" + "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=" }, { "pname": "System.Runtime.Handles", "version": "4.3.0", - "sha256": "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8" - }, - { - "pname": "System.Runtime.InteropServices", - "version": "4.1.0", - "sha256": "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1" + "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=" }, { "pname": "System.Runtime.InteropServices", "version": "4.3.0", - "sha256": "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j" + "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=" }, { "pname": "System.Runtime.InteropServices.RuntimeInformation", "version": "4.3.0", - "sha256": "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii" + "hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA=" }, { "pname": "System.Runtime.Numerics", "version": "4.3.0", - "sha256": "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z" - }, - { - "pname": "System.Runtime.Serialization.Primitives", - "version": "4.1.1", - "sha256": "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k" + "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc=" }, { "pname": "System.Runtime.Serialization.Primitives", "version": "4.3.0", - "sha256": "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf" + "hash": "sha256-zu5m1M9usend+i9sbuD6Xbizdo8Z6N5PEF9DAtEVewc=" + }, + { + "pname": "System.Security.Claims", + "version": "4.3.0", + "hash": "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks=" }, { "pname": "System.Security.Cryptography.Algorithms", "version": "4.3.0", - "sha256": "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml" + "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8=" }, { "pname": "System.Security.Cryptography.Cng", "version": "4.3.0", - "sha256": "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv" + "hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw=" }, { "pname": "System.Security.Cryptography.Csp", "version": "4.3.0", - "sha256": "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1" + "hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ=" }, { "pname": "System.Security.Cryptography.Encoding", "version": "4.3.0", - "sha256": "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32" + "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss=" }, { "pname": "System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc" + "hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4=" }, { "pname": "System.Security.Cryptography.Primitives", "version": "4.3.0", - "sha256": "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby" + "hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318=" + }, + { + "pname": "System.Security.Cryptography.ProtectedData", + "version": "4.4.0", + "hash": "sha256-Ri53QmFX8I8UH0x4PikQ1ZA07ZSnBUXStd5rBfGWFOE=" }, { "pname": "System.Security.Cryptography.X509Certificates", "version": "4.3.0", - "sha256": "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h" + "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0=" + }, + { + "pname": "System.Security.Principal", + "version": "4.3.0", + "hash": "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk=" }, { "pname": "System.Security.Principal.Windows", - "version": "5.0.0", - "sha256": "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8" + "version": "4.3.0", + "hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE=" }, { - "pname": "System.Text.Encoding", - "version": "4.0.11", - "sha256": "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw" + "pname": "System.Security.Principal.Windows", + "version": "4.7.0", + "hash": "sha256-rWBM2U8Kq3rEdaa1MPZSYOOkbtMGgWyB8iPrpIqmpqg=" }, { "pname": "System.Text.Encoding", "version": "4.3.0", - "sha256": "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr" - }, - { - "pname": "System.Text.Encoding.CodePages", - "version": "6.0.0", - "sha256": "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww" - }, - { - "pname": "System.Text.Encoding.Extensions", - "version": "4.0.11", - "sha256": "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs" + "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" }, { "pname": "System.Text.Encoding.Extensions", "version": "4.3.0", - "sha256": "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy" - }, - { - "pname": "System.Text.RegularExpressions", - "version": "4.1.0", - "sha256": "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7" + "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc=" }, { "pname": "System.Text.RegularExpressions", "version": "4.3.0", - "sha256": "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l" - }, - { - "pname": "System.Threading", - "version": "4.0.11", - "sha256": "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls" + "hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0=" }, { "pname": "System.Threading", "version": "4.3.0", - "sha256": "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34" - }, - { - "pname": "System.Threading.Tasks", - "version": "4.0.11", - "sha256": "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5" + "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=" }, { "pname": "System.Threading.Tasks", "version": "4.3.0", - "sha256": "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7" - }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.0.0", - "sha256": "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr" + "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" }, { "pname": "System.Threading.Tasks.Extensions", "version": "4.3.0", - "sha256": "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z" + "hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc=" }, { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.5.4", - "sha256": "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153" + "pname": "System.Threading.ThreadPool", + "version": "4.3.0", + "hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg=" }, { "pname": "System.Threading.Timer", "version": "4.3.0", - "sha256": "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56" + "hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s=" }, { "pname": "System.ValueTuple", "version": "4.5.0", - "sha256": "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy" - }, - { - "pname": "System.Xml.ReaderWriter", - "version": "4.0.11", - "sha256": "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5" + "hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI=" }, { "pname": "System.Xml.ReaderWriter", "version": "4.3.0", - "sha256": "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1" - }, - { - "pname": "System.Xml.XDocument", - "version": "4.0.11", - "sha256": "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18" + "hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA=" }, { "pname": "System.Xml.XDocument", "version": "4.3.0", - "sha256": "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd" - }, - { - "pname": "System.Xml.XmlDocument", - "version": "4.3.0", - "sha256": "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi" + "hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI=" }, { "pname": "ThemeEditor.Controls.ColorPicker", - "version": "0.10.12", - "sha256": "17kh28fkywqmz5yams8wzr50ihkv52y24gk8bz9fxl6kfzmgk0ky" + "version": "0.10.17", + "hash": "sha256-SoamofgQCfZFGJjTyD7KL8a+cIFzTmaDCIbHlfbz/qw=" }, { "pname": "Tmds.DBus", - "version": "0.10.1", - "sha256": "1wafa009cjj1rziias2n00ap0g8kdg2iig5sjlrxj2kld24lgbli" + "version": "0.9.0", + "hash": "sha256-w332WVsJrdAOnlSUtgvatSTtnoC81C3LG6J2ip42fW8=" }, { "pname": "WebSocketSharp-netstandard", "version": "1.0.1", - "sha256": "0q89wiqpli72333zsa04d1vzq9xj0583hn5mih9sdd84myksz5b0" + "hash": "sha256-YJWvp68EtaYTjLVYOFABsif8d2gEKP3HGOJEenHkCWE=" }, { "pname": "xunit", - "version": "2.4.1", - "sha256": "0xf3kaywpg15flqaqfgywqyychzk15kz0kz34j21rcv78q9ywq20" + "version": "2.5.1", + "hash": "sha256-SxDG/dFHk+7F4x4PYXRyw8PwuqcmH7Mhz9PHA2sVuYg=" }, { "pname": "xunit.abstractions", "version": "2.0.3", - "sha256": "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh" + "hash": "sha256-0D1y/C34iARI96gb3bAOG8tcGPMjx+fMabTPpydGlAM=" }, { "pname": "xunit.analyzers", - "version": "0.10.0", - "sha256": "15n02q3akyqbvkp8nq75a8rd66d4ax0rx8fhdcn8j78pi235jm7j" + "version": "1.3.0", + "hash": "sha256-+l50DUYCEdnrHg6cKUfsNx8m0BRwAVdqURCQb0aZLLQ=" }, { "pname": "xunit.assert", - "version": "2.4.1", - "sha256": "1imynzh80wxq2rp9sc4gxs4x1nriil88f72ilhj5q0m44qqmqpc6" + "version": "2.5.1", + "hash": "sha256-2U83B5QOaEgVUXBQ5/juqEqrKxeyo5LKTKQ/JCFUy/E=" }, { "pname": "xunit.core", - "version": "2.4.1", - "sha256": "1nnb3j4kzmycaw1g76ii4rfqkvg6l8gqh18falwp8g28h802019a" + "version": "2.5.1", + "hash": "sha256-igzHINMd6V01nEg6Hc3YpXdL4MT0ZlCY1RwlxQEO5Xg=" }, { "pname": "xunit.extensibility.core", - "version": "2.4.1", - "sha256": "103qsijmnip2pnbhciqyk2jyhdm6snindg5z2s57kqf5pcx9a050" + "version": "2.5.1", + "hash": "sha256-1wAQJZljPyQhhvaKuE0XV6OyFGxxyFtTWMCQd57mctw=" }, { "pname": "xunit.extensibility.execution", - "version": "2.4.1", - "sha256": "1pbilxh1gp2ywm5idfl0klhl4gb16j86ib4x83p8raql1dv88qia" + "version": "2.5.1", + "hash": "sha256-sgje8DfOxpdV4xXcGB5llrzr9rTlPPIQIr/PjP2A0p8=" }, { "pname": "xunit.runner.console", - "version": "2.4.1", - "sha256": "13ykz9anhz72xc4q6byvdfwrp54hlcbl6zsfapwfhnzyvfgb9w13" + "version": "2.5.1", + "hash": "sha256-CLf7tVyeslvtAqlFlp7Mr/lHq+C3p1duLzXGiHdZigM=" }, { "pname": "xunit.runner.visualstudio", - "version": "2.4.3", - "sha256": "0j1d0rbcm7pp6dypi61sjxp8l22sv261252z55b243l39jgv2rp3" + "version": "2.5.1", + "hash": "sha256-HbQNZB/4Kjv7UxP5cWAteiNiRErsqnWhCemcBiQ95Hg=" } ] diff --git a/pkgs/by-name/al/alttpr-opentracker/package.nix b/pkgs/by-name/al/alttpr-opentracker/package.nix index 485f286e173e..3b8406650896 100644 --- a/pkgs/by-name/al/alttpr-opentracker/package.nix +++ b/pkgs/by-name/al/alttpr-opentracker/package.nix @@ -17,29 +17,21 @@ }: buildDotnetModule rec { pname = "opentracker"; - version = "1.8.5"; + version = "1.8.6"; src = fetchFromGitHub { owner = "trippsc2"; - repo = pname; - rev = "refs/tags/${version}"; - hash = "sha512-nWkPgVYdnBJibyJRdLPe3O3RioDPbzumSritRejmr4CeiPb7aUTON7HjivcV/GKor1guEYu+TJ+QxYrqO/eppg=="; + repo = "opentracker"; + tag = version; + hash = "sha256-4EBn3BX5tX+yPUjoNFQSls9CwTCd6MpvcBoUKwRndRo="; }; - patches = [./remove-project.patch]; - - dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0; nugetDeps = ./deps.json; - projectFile = "OpenTracker.sln"; - executables = ["OpenTracker"]; - - doCheck = true; - disabledTests = [ - "OpenTracker.UnitTests.Models.Nodes.Factories.SLightWorldConnectionFactoryTests.GetNodeConnections_ShouldReturnExpectedValue" - "OpenTracker.UnitTests.Models.Sections.Factories.ItemSectionFactoryTests.GetItemSection_ShouldReturnExpected" - ]; + projectFile = "src/OpenTracker/OpenTracker.csproj"; + executables = [ "OpenTracker" ]; nativeBuildInputs = [ autoPatchelfHook @@ -86,6 +78,6 @@ buildDotnetModule rec { license = licenses.mit; maintainers = [ ]; mainProgram = "OpenTracker"; - platforms = ["x86_64-linux"]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/by-name/al/alttpr-opentracker/remove-project.patch b/pkgs/by-name/al/alttpr-opentracker/remove-project.patch deleted file mode 100644 index 22a2068512e0..000000000000 --- a/pkgs/by-name/al/alttpr-opentracker/remove-project.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/OpenTracker.sln b/OpenTracker.sln -index 0a8c438..77124e1 100644 ---- a/OpenTracker.sln -+++ b/OpenTracker.sln -@@ -4,9 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 - VisualStudioVersion = 16.0.29806.167 - MinimumVisualStudioVersion = 10.0.40219.1 - Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTracker", "OpenTracker\OpenTracker.csproj", "{9D32A24F-7FF0-4632-B663-5AD2D64A6C87}" -- ProjectSection(ProjectDependencies) = postProject -- {732A9A56-32B4-4149-B3A5-F2A4F48293D3} = {732A9A56-32B4-4149-B3A5-F2A4F48293D3} -- EndProjectSection - EndProject - Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTracker.Models", "OpenTracker.Models\OpenTracker.Models.csproj", "{5DB05A1F-56E3-4035-8898-5CFB22DB3568}" - EndProject diff --git a/pkgs/by-name/al/alvr/package.nix b/pkgs/by-name/al/alvr/package.nix index 8110d66e4d06..61186040a144 100644 --- a/pkgs/by-name/al/alvr/package.nix +++ b/pkgs/by-name/al/alvr/package.nix @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "alvr-org"; repo = "ALVR"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; fetchSubmodules = true; #TODO devendor openvr hash = "sha256-d4KldPii8W1HcfnMSD8Fn+IGO/a3r8747APPjRCnbe8="; }; diff --git a/pkgs/by-name/am/am2rlauncher/deps.json b/pkgs/by-name/am/am2rlauncher/deps.json index 5f81582e1b87..af9c725d3fc7 100644 --- a/pkgs/by-name/am/am2rlauncher/deps.json +++ b/pkgs/by-name/am/am2rlauncher/deps.json @@ -2,191 +2,151 @@ { "pname": "AtkSharp", "version": "3.24.24.34", - "sha256": "1jn1vgi9xm0jp7769k6sbdi8d273kigjrsh93i6s4c03hqxv7cqs" + "hash": "sha256-GrOzO4YDMKJNHAnqLF+c44iGYlvazGTOuRLUnuLbwco=" }, { "pname": "CairoSharp", "version": "3.24.24.34", - "sha256": "0pydn1k0cam1gclg9sc1sbnmbyzh28qlc5qanyxcylwghink3kgz" + "hash": "sha256-/80xbYSPU8+6twoXRjES8PtV7dKB6fQoe6EqBmawzV8=" }, { "pname": "Eto.Forms", "version": "2.7.1", - "sha256": "1hzbdnmn5znycfi0mvqa5k5mz9gasy58qzwa7fjmlkwj8ab87l9r" + "hash": "sha256-OdGDlkKST1qlO4p/jIrX6qVfyywK7wqiY97+Yqtt68M=" }, { "pname": "Eto.Platform.Gtk", "version": "2.7.1", - "sha256": "09iz85s728jy5qg7y30qvqw5rpsr3yxffrchk1avryk87ky1ysys" + "hash": "sha256-2msf/Dxo+rxVmJBl57ofWd9cON4YDH8eLl4icXRBPyY=" }, { "pname": "GdkSharp", "version": "3.24.24.34", - "sha256": "0r0x0yib7chwsyrbpvicrfwldwqx5lyqq4p86zaxpmzd6zdaj0x5" + "hash": "sha256-pQOp2jft19vVN+gSjD0tHfNGucss7ruy1xyys6IHHWQ=" }, { "pname": "GioSharp", "version": "3.24.24.34", - "sha256": "02hxvgjd4w9jpzbkk7qf9q9bkvyp5hfzwxfqp10vg5lpl9yl3xpx" + "hash": "sha256-/fZBfaKXlrdBuNh1/h0s1++5Ek4OnznXvzJx0uTbHQo=" }, { "pname": "GLibSharp", "version": "3.24.24.34", - "sha256": "0kvp033fgdwc8p2abfp5z9pzq66cvwbnjfvr4v4bkpy5s5h181kq" + "hash": "sha256-eAYUYNHF37nIJnk7aRffzBj8b/rluqXERYy358YAd08=" }, { "pname": "GtkSharp", "version": "3.24.24.34", - "sha256": "0028hzmmqyfx87qqmaf9cgb5psn7gkbmqvixcid67x1d6mzxjicb" + "hash": "sha256-i0XZfzUt9GNaZD1uXNd8x+pb1mPJqYrxQd15XOuHSAA=" }, { "pname": "LibGit2Sharp", "version": "0.27.0", - "sha256": "0n8crafpp4jq74km45wlm3jm0h96ggvqxy26wrz55azgjpk6p1gz" + "hash": "sha256-/4Vr5pXvq1J+5kb4jvd7JkFQ5aiUF1InOViSe53KDFk=" }, { "pname": "LibGit2Sharp.NativeBinaries", "version": "2.0.319", - "sha256": "0xm6np8y182v5246imnkw1fj2sx8x2nl3568kkm3razcgb0y5xlf" + "hash": "sha256-jvbiwXrsqzzqnMiUQa3oqGshXeDT1miIKFug4NG1pnY=" }, { "pname": "log4net", "version": "2.0.15", - "sha256": "1iq1rd0z0m15ln247jjrimj3avq50vh6njvw4x158r5v6nz093nb" + "hash": "sha256-y44EvjW7ZFRCJ3xLa+AGBW81ZI1ZykOEpSVU8EHLAcc=" }, { "pname": "Microsoft.NETCore.Platforms", - "version": "1.1.0", - "sha256": "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm" + "version": "2.0.0", + "hash": "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro=" }, { "pname": "Microsoft.NETCore.Platforms", "version": "5.0.0", - "sha256": "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc" + "hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c=" }, { "pname": "Microsoft.Win32.Registry", "version": "5.0.0", - "sha256": "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n" + "hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA=" }, { "pname": "Microsoft.Win32.SystemEvents", "version": "6.0.0", - "sha256": "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p" - }, - { - "pname": "NETStandard.Library", - "version": "2.0.3", - "sha256": "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y" + "hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA=" }, { "pname": "PangoSharp", "version": "3.24.24.34", - "sha256": "1r0h14cklglfpv1lhv93cxmzi2w7d5s03gzpq3j5dmrz43flg9zw" - }, - { - "pname": "System.Buffers", - "version": "4.4.0", - "sha256": "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19" - }, - { - "pname": "System.Buffers", - "version": "4.5.1", - "sha256": "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3" + "hash": "sha256-/KdH3SA/11bkwPe/AXRph4v4a2cjbUjDvo4+OhkJEOQ=" }, { "pname": "System.ComponentModel.Annotations", "version": "5.0.0", - "sha256": "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j" + "hash": "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg=" }, { "pname": "System.Configuration.ConfigurationManager", "version": "4.5.0", - "sha256": "1frpy24mn6q7hgwayj98kkx89z861f5dmia4j6zc0a2ydgx8x02c" + "hash": "sha256-TICO+mteKMC+kUTF2ooLBv2E+pwoSa/4gwcbW4nwN7s=" }, { "pname": "System.Configuration.ConfigurationManager", "version": "6.0.0", - "sha256": "0sqapr697jbb4ljkq46msg0xx1qpmc31ivva6llyz2wzq3mpmxbw" + "hash": "sha256-fPV668Cfi+8pNWrvGAarF4fewdPVEDwlJWvJk0y+Cms=" }, { "pname": "System.Drawing.Common", "version": "6.0.0", - "sha256": "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz" - }, - { - "pname": "System.Memory", - "version": "4.5.0", - "sha256": "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30" - }, - { - "pname": "System.Memory", - "version": "4.5.4", - "sha256": "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y" - }, - { - "pname": "System.Numerics.Vectors", - "version": "4.4.0", - "sha256": "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba" - }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "4.5.0", - "sha256": "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43" - }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "4.5.3", - "sha256": "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln" + "hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo=" }, { "pname": "System.Security.AccessControl", "version": "4.5.0", - "sha256": "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0" + "hash": "sha256-AFsKPb/nTk2/mqH/PYpaoI8PLsiKKimaXf+7Mb5VfPM=" }, { "pname": "System.Security.AccessControl", "version": "5.0.0", - "sha256": "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r" + "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54=" }, { "pname": "System.Security.AccessControl", "version": "6.0.0", - "sha256": "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58" + "hash": "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg=" }, { "pname": "System.Security.Cryptography.ProtectedData", "version": "4.5.0", - "sha256": "11qlc8q6b7xlspayv07718ibzvlj6ddqqxkvcbxv5b24d5kzbrb7" + "hash": "sha256-Z+X1Z2lErLL7Ynt2jFszku6/IgrngO3V1bSfZTBiFIc=" }, { "pname": "System.Security.Cryptography.ProtectedData", "version": "6.0.0", - "sha256": "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss" + "hash": "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY=" }, { "pname": "System.Security.Permissions", "version": "4.5.0", - "sha256": "192ww5rm3c9mirxgl1nzyrwd18am3izqls0hzm0fvcdjl5grvbhm" + "hash": "sha256-Fa6dX6Gyse1A/RBoin8cVaHQePbfBvp6jjWxUXPhXKQ=" }, { "pname": "System.Security.Permissions", "version": "6.0.0", - "sha256": "0jsl4xdrkqi11iwmisi1r2f2qn5pbvl79mzq877gndw6ans2zhzw" + "hash": "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs=" }, { "pname": "System.Security.Principal.Windows", "version": "4.5.0", - "sha256": "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86" + "hash": "sha256-BkUYNguz0e4NJp1kkW7aJBn3dyH9STwB5N8XqnlCsmY=" }, { "pname": "System.Security.Principal.Windows", "version": "5.0.0", - "sha256": "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8" + "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y=" }, { "pname": "System.Windows.Extensions", "version": "6.0.0", - "sha256": "1wy9pq9vn1bqg5qnv53iqrbx04yzdmjw4x5yyi09y3459vaa1sip" + "hash": "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM=" } ] diff --git a/pkgs/by-name/am/am2rlauncher/dotnet-8-upgrade.patch b/pkgs/by-name/am/am2rlauncher/dotnet-8-upgrade.patch new file mode 100644 index 000000000000..aa57704e697a --- /dev/null +++ b/pkgs/by-name/am/am2rlauncher/dotnet-8-upgrade.patch @@ -0,0 +1,52 @@ +diff --git a/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj b/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj +index e5e6191..ab9f228 100644 +--- a/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj ++++ b/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj +@@ -2,7 +2,7 @@ + + + WinExe +- net6.0 ++ net8.0 + icon64.ico + LatestMajor + latest +diff --git a/AM2RLauncher/AM2RLauncher.Mac/AM2RLauncher.Mac.csproj b/AM2RLauncher/AM2RLauncher.Mac/AM2RLauncher.Mac.csproj +index 2af5688..a91bb25 100644 +--- a/AM2RLauncher/AM2RLauncher.Mac/AM2RLauncher.Mac.csproj ++++ b/AM2RLauncher/AM2RLauncher.Mac/AM2RLauncher.Mac.csproj +@@ -2,7 +2,7 @@ + + + Exe +- net6.0-macos ++ net8.0-macos + osx-x64;osx-arm64 + 10.14 + LatestMajor +diff --git a/AM2RLauncher/AM2RLauncher/AM2RLauncher.csproj b/AM2RLauncher/AM2RLauncher/AM2RLauncher.csproj +index be49446..34a842f 100644 +--- a/AM2RLauncher/AM2RLauncher/AM2RLauncher.csproj ++++ b/AM2RLauncher/AM2RLauncher/AM2RLauncher.csproj +@@ -1,7 +1,7 @@ +  + + +- netstandard2.0 ++ net8.0 + latest + Resources\LauncherIcon.ico + Lojemiru, Miepee +diff --git a/AM2RLauncher/AM2RLauncherLib/AM2RLauncherLib.csproj b/AM2RLauncher/AM2RLauncherLib/AM2RLauncherLib.csproj +index 673ab7a..da3a019 100644 +--- a/AM2RLauncher/AM2RLauncherLib/AM2RLauncherLib.csproj ++++ b/AM2RLauncher/AM2RLauncherLib/AM2RLauncherLib.csproj +@@ -1,7 +1,7 @@ + + + +- netstandard2.0 ++ net8.0 + default + Debug;Release + AnyCPU diff --git a/pkgs/by-name/am/am2rlauncher/package.nix b/pkgs/by-name/am/am2rlauncher/package.nix index fb8d60d225f8..5e3b02984760 100644 --- a/pkgs/by-name/am/am2rlauncher/package.nix +++ b/pkgs/by-name/am/am2rlauncher/package.nix @@ -1,24 +1,25 @@ -{ lib -, buildDotnetModule -, writeShellScript -, glibc -, gtk3 -, libappindicator -, webkitgtk_4_0 -, e2fsprogs -, libnotify -, libgit2 -, openssl -, xdelta -, file -, openjdk -, patchelf -, fetchFromGitHub -, buildFHSEnv -, glib-networking -, wrapGAppsHook3 -, gsettings-desktop-schemas -, dotnetCorePackages +{ + lib, + buildDotnetModule, + writeShellScript, + glibc, + gtk3, + libappindicator, + webkitgtk_4_0, + e2fsprogs, + libnotify, + libgit2, + openssl, + xdelta, + file, + openjdk, + patchelf, + fetchFromGitHub, + buildFHSEnv, + glib-networking, + wrapGAppsHook3, + gsettings-desktop-schemas, + dotnetCorePackages, }: let am2r-run = buildFHSEnv { @@ -26,7 +27,8 @@ let multiArch = true; - multiPkgs = pkgs: with pkgs; [ + multiPkgs = + pkgs: with pkgs; [ (lib.getLib stdenv.cc.cc) xorg.libX11 xorg.libXext @@ -55,7 +57,7 @@ buildDotnetModule { hash = "sha256-/nHqo8jh3sOUngbpqdfiQjUWO/8Uzpc5jtW7Ep4q6Wg="; }; - dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0; projectFile = "AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj"; nugetDeps = ./deps.json; @@ -74,16 +76,37 @@ buildDotnetModule { nativeBuildInputs = [ wrapGAppsHook3 ]; - buildInputs = [ gtk3 gsettings-desktop-schemas glib-networking ]; + buildInputs = [ + gtk3 + gsettings-desktop-schemas + glib-networking + ]; - patches = [ ./am2r-run-binary.patch ]; + patches = [ + ./am2r-run-binary.patch + ./dotnet-8-upgrade.patch + ]; - dotnetFlags = [ ''-p:DefineConstants="NOAPPIMAGE;NOAUTOUPDATE;PATCHOPENSSL"'' ]; + dotnetFlags = [ + ''-p:DefineConstants="NOAPPIMAGE;NOAUTOUPDATE;PATCHOPENSSL"'' + ]; + + makeWrapperArgs = [ + "--prefix" + "PATH" + ":" + (lib.escapeShellArg ( + lib.makeBinPath [ + am2r-run + xdelta + file + openjdk + patchelf + ] + )) + ]; postFixup = '' - wrapProgram $out/bin/AM2RLauncher.Gtk \ - --prefix PATH : ${lib.makeBinPath [ am2r-run xdelta file openjdk patchelf ]} \ - mkdir -p $out/share/icons install -Dm644 $src/AM2RLauncher/distribution/linux/AM2RLauncher.png $out/share/icons/AM2RLauncher.png install -Dm644 $src/AM2RLauncher/distribution/linux/AM2RLauncher.desktop $out/share/applications/AM2RLauncher.desktop diff --git a/pkgs/by-name/am/amass/package.nix b/pkgs/by-name/am/amass/package.nix index bd2809791596..e7aa091c3bff 100644 --- a/pkgs/by-name/am/amass/package.nix +++ b/pkgs/by-name/am/amass/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-lhvU2fUnjQ+D+EZDRircNg/np4Ynk+HzOBgxT1L8BaQ="; }; diff --git a/pkgs/by-name/am/amazon-ec2-utils/package.nix b/pkgs/by-name/am/amazon-ec2-utils/package.nix index 27fdef05c1a8..889a7f8280ba 100644 --- a/pkgs/by-name/am/amazon-ec2-utils/package.nix +++ b/pkgs/by-name/am/amazon-ec2-utils/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "amazonlinux"; repo = "amazon-ec2-utils"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-plTBh2LAXkYVSxN0IZJQuPr7QxD7+OAqHl/Zl8JPCmg="; }; diff --git a/pkgs/by-name/am/amazon-ssm-agent/package.nix b/pkgs/by-name/am/amazon-ssm-agent/package.nix index e8327b415654..0f9544044be8 100644 --- a/pkgs/by-name/am/amazon-ssm-agent/package.nix +++ b/pkgs/by-name/am/amazon-ssm-agent/package.nix @@ -47,7 +47,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "aws"; repo = "amazon-ssm-agent"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-6MGb6P3PYfnoztLdLhOm/smCjyWuV7ZGJtK40l4yFB0="; }; diff --git a/pkgs/by-name/am/ameba/package.nix b/pkgs/by-name/am/ameba/package.nix index 07aa2de99711..fc6e5a6f3570 100644 --- a/pkgs/by-name/am/ameba/package.nix +++ b/pkgs/by-name/am/ameba/package.nix @@ -11,7 +11,7 @@ crystal.buildCrystalPackage rec { src = fetchFromGitHub { owner = "crystal-ameba"; repo = "ameba"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-NwmsNz9YfHDk0hVwVb5zczuzvErrwPhd3rs75t/Fj+I="; }; diff --git a/pkgs/by-name/am/amiberry/package.nix b/pkgs/by-name/am/amiberry/package.nix index 82c9c2a8aac6..bfbf88632bcf 100644 --- a/pkgs/by-name/am/amiberry/package.nix +++ b/pkgs/by-name/am/amiberry/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "BlitterStudio"; repo = "amiberry"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-EOoVJYefX2pQ2Zz9bLD1RS47u/+7ZWTMwZYha0juF64="; }; diff --git a/pkgs/by-name/am/amneziawg-tools/package.nix b/pkgs/by-name/am/amneziawg-tools/package.nix index a21bb621b123..c9551fbc92bb 100644 --- a/pkgs/by-name/am/amneziawg-tools/package.nix +++ b/pkgs/by-name/am/amneziawg-tools/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "amnezia-vpn"; repo = "amneziawg-tools"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-y6xkOLT9KVD6ACCH60Myk2iA1S8/+tGXEQbOYnu+dPI="; }; diff --git a/pkgs/by-name/an/andi/package.nix b/pkgs/by-name/an/andi/package.nix index 85b9cbdf5a13..06efb791d54e 100644 --- a/pkgs/by-name/an/andi/package.nix +++ b/pkgs/by-name/an/andi/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "evolbioinf"; repo = "andi"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-tjQ9exFyqu/xnbUGpF6k0kE5C1D93kISjRErwHfjW9E="; }; diff --git a/pkgs/by-name/an/ani-skip/package.nix b/pkgs/by-name/an/ani-skip/package.nix index 6302ec58ec2e..a42bac4297a8 100644 --- a/pkgs/by-name/an/ani-skip/package.nix +++ b/pkgs/by-name/an/ani-skip/package.nix @@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "synacktraa"; repo = "ani-skip"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-VEEG3d6rwTAS7/+gBKHFKIg9zFfBu5eBOu6Z23621gM="; }; diff --git a/pkgs/data/fonts/ankacoder/condensed.nix b/pkgs/by-name/an/ankacoder-condensed/package.nix similarity index 100% rename from pkgs/data/fonts/ankacoder/condensed.nix rename to pkgs/by-name/an/ankacoder-condensed/package.nix diff --git a/pkgs/data/fonts/ankacoder/default.nix b/pkgs/by-name/an/ankacoder/package.nix similarity index 100% rename from pkgs/data/fonts/ankacoder/default.nix rename to pkgs/by-name/an/ankacoder/package.nix diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix index e334e7e9e890..8899d6efbbcc 100644 --- a/pkgs/by-name/an/ansel/package.nix +++ b/pkgs/by-name/an/ansel/package.nix @@ -78,13 +78,13 @@ let in stdenv.mkDerivation { pname = "ansel"; - version = "0-unstable-2024-10-28"; + version = "0-unstable-2024-12-19"; src = fetchFromGitHub { owner = "aurelienpierreeng"; repo = "ansel"; - rev = "7f23d9d38630629e559e76073ec4dbe71733c225"; - hash = "sha256-2AEQlt75nnVD8ZFpVUEvgxRV94NtWDK0R+zVd/ytXuU="; + rev = "854924f0cefd485ede726eb060b765712c0d393c"; + hash = "sha256-G8+A4c2d6OFfYo7T5sk8JsDw5RrNnH5Bmmo8YkCsbsA="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/an/ansible-language-server/package.nix b/pkgs/by-name/an/ansible-language-server/package.nix index 246ba733302f..d5cb48dce265 100644 --- a/pkgs/by-name/an/ansible-language-server/package.nix +++ b/pkgs/by-name/an/ansible-language-server/package.nix @@ -12,7 +12,7 @@ buildNpmPackage rec { src = fetchFromGitHub { owner = "ansible"; repo = pname; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-e6cOWoryOxWnl8q62rlGmSgwLVnoxLMwNFoGlUZw2bQ="; }; diff --git a/pkgs/by-name/an/antares/package.nix b/pkgs/by-name/an/antares/package.nix index 5c23c18588a8..a83b1f09bede 100644 --- a/pkgs/by-name/an/antares/package.nix +++ b/pkgs/by-name/an/antares/package.nix @@ -16,7 +16,7 @@ buildNpmPackage rec { src = fetchFromGitHub { owner = "antares-sql"; repo = "antares"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-3zgr3Eefx3WDUW9/1NOaneUbFy3GTnJ3tGgivtW1K/g="; }; diff --git a/pkgs/by-name/an/antiprism/package.nix b/pkgs/by-name/an/antiprism/package.nix index 63a0993084e2..b9e16e48b40f 100644 --- a/pkgs/by-name/an/antiprism/package.nix +++ b/pkgs/by-name/an/antiprism/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "antiprism"; repo = "antiprism"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-0FkaIsZixYHP45H0gytnzlpRvNd8mMYjW22w15z3RH8="; }; diff --git a/pkgs/by-name/an/antora-lunr-extension/package.nix b/pkgs/by-name/an/antora-lunr-extension/package.nix index c4eb14a9996f..35948b865d8f 100644 --- a/pkgs/by-name/an/antora-lunr-extension/package.nix +++ b/pkgs/by-name/an/antora-lunr-extension/package.nix @@ -10,10 +10,10 @@ buildNpmPackage rec { version = "1.0.0-alpha.8"; src = fetchFromGitLab { - hash = "sha256-GplCwhUl8jurD4FfO6/T3Vo1WFjg+rtAjWeIh35unk4="; owner = "antora"; repo = pname; rev = "v${version}"; + hash = "sha256-GplCwhUl8jurD4FfO6/T3Vo1WFjg+rtAjWeIh35unk4="; }; npmDepsHash = "sha256-EtjZL6U/uSGSYSqtuatCkdWP0NHxRuht13D9OaM4x00="; diff --git a/pkgs/by-name/an/antora-ui-default/package.nix b/pkgs/by-name/an/antora-ui-default/package.nix index 329841bd4d43..7da104702a55 100644 --- a/pkgs/by-name/an/antora-ui-default/package.nix +++ b/pkgs/by-name/an/antora-ui-default/package.nix @@ -5,10 +5,10 @@ }: let srcFetchFromGitLab = { - hash = "sha256-q2FwkwzjanxTIxjMpCyMpzPt782uYZiWVdZ7Eev79oM="; owner = "trueNAHO"; repo = "antora-ui-default"; rev = "11f563294248e9b64124b9289d639e349f2e9f5f"; + hash = "sha256-gUQLLjnWZ1OsAe005IOPIfoM0qmjoevcUuGBRD3oHXA="; }; in stdenvNoCC.mkDerivation { diff --git a/pkgs/by-name/an/anvil-editor/package.nix b/pkgs/by-name/an/anvil-editor/package.nix index 97a547f25bb0..2466eb283aa0 100644 --- a/pkgs/by-name/an/anvil-editor/package.nix +++ b/pkgs/by-name/an/anvil-editor/package.nix @@ -4,12 +4,9 @@ buildGoModule, fetchzip, pkg-config, - libicns, copyDesktopItems, makeDesktopItem, desktopToDarwinBundle, - apple-sdk_11, - darwinMinVersionHook, wayland, libxkbcommon, vulkan-headers, @@ -44,23 +41,15 @@ buildGoModule rec { desktopToDarwinBundle ]; - buildInputs = - if stdenv.hostPlatform.isDarwin then - [ - apple-sdk_11 - # metal dependencies require 10.13 or newer - (darwinMinVersionHook "10.13") - ] - else - [ - wayland - libxkbcommon - vulkan-headers - libGL - xorg.libX11 - xorg.libXcursor - xorg.libXfixes - ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ + wayland + libxkbcommon + vulkan-headers + libGL + xorg.libX11 + xorg.libXcursor + xorg.libXfixes + ]; # Got different result in utf8 char length? checkFlags = [ "-skip=^TestClearAfter$" ]; diff --git a/pkgs/by-name/an/anyrun/package.nix b/pkgs/by-name/an/anyrun/package.nix index 5153009bde93..645cc1d42784 100644 --- a/pkgs/by-name/an/anyrun/package.nix +++ b/pkgs/by-name/an/anyrun/package.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage { pname = "anyrun"; - version = "0-unstable-2024-11-08"; + version = "0-unstable-2024-12-27"; src = fetchFromGitHub { owner = "kirottu"; repo = "anyrun"; - rev = "d2017f224b2bfd7e33573c7070e7c3e2960c7dcc"; - hash = "sha256-L1hLXf4IDZ0KoXbFiSNNZJ7IrReEr/J+CLt6Rl4Ea3M="; + rev = "06017e753c8886d5296768dca80745ee09402a2d"; + hash = "sha256-jU88Q9tP4vuvWYGQcmOdFwI9e2uMPVYJHbXdiklIH9o="; }; - cargoHash = "sha256-DgUNSRr2Hs+GeYeR2ex8WiwotmT12G1cjSvQVK2py3c="; + cargoHash = "sha256-DtU5Jtx46M+aP1oSdZt+aJH5jqNdNU9G7klzwsVjcZU="; strictDeps = true; enableParallelBuilding = true; diff --git a/pkgs/by-name/ap/apache-answer/package.nix b/pkgs/by-name/ap/apache-answer/package.nix index 20c446c38ba4..2a39d54a2494 100644 --- a/pkgs/by-name/ap/apache-answer/package.nix +++ b/pkgs/by-name/ap/apache-answer/package.nix @@ -15,7 +15,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "apache"; repo = "incubator-answer"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-nS3ZDwY221axzo1HAz369f5jWZ/mpCn4r3OPPqjiohI="; }; diff --git a/pkgs/by-name/ap/apachetomcatscanner/package.nix b/pkgs/by-name/ap/apachetomcatscanner/package.nix index 31e5546fd02b..9abec5a1ea22 100644 --- a/pkgs/by-name/ap/apachetomcatscanner/package.nix +++ b/pkgs/by-name/ap/apachetomcatscanner/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "p0dalirius"; repo = "ApacheTomcatScanner"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-mzpJq0er13wcekTac3j4cnRokHh6Q0seM8vwZsM2tN8="; }; diff --git a/pkgs/by-name/ap/apfsprogs/package.nix b/pkgs/by-name/ap/apfsprogs/package.nix index 53b374f77975..a8f5c2c89f47 100644 --- a/pkgs/by-name/ap/apfsprogs/package.nix +++ b/pkgs/by-name/ap/apfsprogs/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "linux-apfs"; repo = "apfsprogs"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-rolbBLdE98jqlKC06fTo6eJU3abKzgB3QIlaw4bza9U="; }; diff --git a/pkgs/by-name/ap/apgdiff/package.nix b/pkgs/by-name/ap/apgdiff/package.nix index 0e09c9bb92bd..23f2213939e3 100644 --- a/pkgs/by-name/ap/apgdiff/package.nix +++ b/pkgs/by-name/ap/apgdiff/package.nix @@ -13,7 +13,7 @@ maven.buildMavenPackage rec { sparseCheckout = [ "src" ]; owner = "fordfrog"; repo = "apgdiff"; - rev = "refs/tags/release_${version}"; + tag = "release_${version}"; hash = "sha256-2m+9QNwQV2tJwOabTXE2xjRB5gDrSwyL6zL2op+wmkM="; }; diff --git a/pkgs/by-name/ap/aphorme/package.nix b/pkgs/by-name/ap/aphorme/package.nix index 2a379da52aaf..865f714265c3 100644 --- a/pkgs/by-name/ap/aphorme/package.nix +++ b/pkgs/by-name/ap/aphorme/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "Iaphetes"; repo = "aphorme_launcher"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-p1ZIMMDyQWVzoeyHb3sbeV6XQwbIDoQwJU8ynI8hGUI="; }; diff --git a/pkgs/by-name/ap/apkid/package.nix b/pkgs/by-name/ap/apkid/package.nix index b77a81bc56ea..eb496bf43ad3 100644 --- a/pkgs/by-name/ap/apkid/package.nix +++ b/pkgs/by-name/ap/apkid/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "rednaga"; repo = "APKiD"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-yO3k2kT043/KkiCjDnNUlqxX86kQqMZ+CghD+yon3r4="; }; diff --git a/pkgs/by-name/ap/apkleaks/package.nix b/pkgs/by-name/ap/apkleaks/package.nix index 17677755409d..b83d71c0c380 100644 --- a/pkgs/by-name/ap/apkleaks/package.nix +++ b/pkgs/by-name/ap/apkleaks/package.nix @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "dwisiswant0"; repo = "apkleaks"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-8P4LZsyq0mSVdE6QhnW3QaaA3UAg4UDBS3jSg7Kg/oY="; }; diff --git a/pkgs/by-name/ap/apksigcopier/package.nix b/pkgs/by-name/ap/apksigcopier/package.nix index a63b6b7145ab..693205e6e2a7 100644 --- a/pkgs/by-name/ap/apksigcopier/package.nix +++ b/pkgs/by-name/ap/apksigcopier/package.nix @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "obfusk"; repo = "apksigcopier"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; sha256 = "sha256-VuwSaoTv5qq1jKwgBTKd1y9RKUzz89n86Z4UBv7Q51o="; }; diff --git a/pkgs/by-name/ap/application-title-bar/package.nix b/pkgs/by-name/ap/application-title-bar/package.nix index d9690aa9bdc5..20397508cc5b 100644 --- a/pkgs/by-name/ap/application-title-bar/package.nix +++ b/pkgs/by-name/ap/application-title-bar/package.nix @@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "antroids"; repo = "application-title-bar"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-K4wbEWmeXDxVkVSHCPU8u49A211ZXR1As1k47/ibj/c="; }; diff --git a/pkgs/by-name/ap/apvlv/package.nix b/pkgs/by-name/ap/apvlv/package.nix index 1f45f4fb1094..fe9836b41717 100644 --- a/pkgs/by-name/ap/apvlv/package.nix +++ b/pkgs/by-name/ap/apvlv/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "naihe2010"; repo = "apvlv"; - rev = "refs/tags/v0.5.0-final"; + tag = "v0.5.0-final"; hash = "sha256-5Wbv3dXieymhhPmEKQu8X/38WsDA1T/IBPoMXdpzcaA="; }; diff --git a/pkgs/by-name/ar/archimede/package.nix b/pkgs/by-name/ar/archimede/package.nix index 4db745f62caa..07116fc4be5a 100644 --- a/pkgs/by-name/ar/archimede/package.nix +++ b/pkgs/by-name/ar/archimede/package.nix @@ -14,7 +14,7 @@ buildGoModule { src = fetchFromGitHub { owner = "gennaro-tedesco"; repo = "archimede"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-7P7PtzYlcNYG2+KW9zvcaRlTW+vHw8jeLD2dEQXmrzc="; }; diff --git a/pkgs/by-name/ar/arduino-language-server/package.nix b/pkgs/by-name/ar/arduino-language-server/package.nix index 1ff285ebbe7e..b291aa28eb1f 100644 --- a/pkgs/by-name/ar/arduino-language-server/package.nix +++ b/pkgs/by-name/ar/arduino-language-server/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "arduino"; repo = "arduino-language-server"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-PmPGhbB1HqxZRK+f28SdZNh4HhE0oseYsdJuEAAk90I="; }; diff --git a/pkgs/by-name/ar/ares-rs/package.nix b/pkgs/by-name/ar/ares-rs/package.nix index b23f13de05ef..a40dfacb5abc 100644 --- a/pkgs/by-name/ar/ares-rs/package.nix +++ b/pkgs/by-name/ar/ares-rs/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "bee-san"; repo = "ares"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-F+uBGRL1G8kiNZUCsiPbISBfId5BPwShenusqkcsHug="; }; diff --git a/pkgs/by-name/ar/ares/package.nix b/pkgs/by-name/ar/ares/package.nix index 6af1cb6d4e50..5e24c6d8f8fd 100644 --- a/pkgs/by-name/ar/ares/package.nix +++ b/pkgs/by-name/ar/ares/package.nix @@ -2,7 +2,6 @@ lib, SDL2, alsa-lib, - apple-sdk_11, autoPatchelfHook, fetchFromGitHub, gtk3, @@ -67,9 +66,6 @@ stdenv.mkDerivation (finalAttrs: { libpulseaudio openal udev - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 ]; appendRunpaths = [ (lib.makeLibraryPath [ vulkan-loader ]) ]; diff --git a/pkgs/by-name/ar/argo/package.nix b/pkgs/by-name/ar/argo/package.nix index f3888770286a..6947234dc673 100644 --- a/pkgs/by-name/ar/argo/package.nix +++ b/pkgs/by-name/ar/argo/package.nix @@ -39,7 +39,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-GRs6xF9/vZi5LdkDA4RkBR6ElvWi0uji/05h0Y7P2eU="; }; diff --git a/pkgs/by-name/ar/argocd/package.nix b/pkgs/by-name/ar/argocd/package.nix index 29e174cf8549..cda2ad7e9c2c 100644 --- a/pkgs/by-name/ar/argocd/package.nix +++ b/pkgs/by-name/ar/argocd/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "argocd"; - version = "2.13.2"; + version = "2.13.3"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - hash = "sha256-G74chKEh/zXfImvmXAWIf+Ny7obJ+YiXpNVVs3uJRoU="; + hash = "sha256-1z3tTXHVJ3e3g+DAoEGb8P6e4iEe1tiaM+7IPyuQp7U="; }; proxyVendor = true; # darwin/linux hash mismatch diff --git a/pkgs/by-name/ar/argon/package.nix b/pkgs/by-name/ar/argon/package.nix index 46c6364dc70f..1219fc4fc2d3 100644 --- a/pkgs/by-name/ar/argon/package.nix +++ b/pkgs/by-name/ar/argon/package.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "argon-rbx"; repo = "argon"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-msKrPLB+38PU7LEw92xEqFy6JxwMjttBaobIOhU7eWw="; }; diff --git a/pkgs/by-name/ar/arjun/package.nix b/pkgs/by-name/ar/arjun/package.nix index 4c9ffe2fd9cc..b24de04dfaa8 100644 --- a/pkgs/by-name/ar/arjun/package.nix +++ b/pkgs/by-name/ar/arjun/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "s0md3v"; repo = "Arjun"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-odVUFs517RSp66MymniSeTKTntQtXomjC68Hhdsglf0="; }; diff --git a/pkgs/by-name/ar/ark-pixel-font/package.nix b/pkgs/by-name/ar/ark-pixel-font/package.nix index 7da2639a8e21..7d0313f9f23e 100644 --- a/pkgs/by-name/ar/ark-pixel-font/package.nix +++ b/pkgs/by-name/ar/ark-pixel-font/package.nix @@ -23,7 +23,7 @@ python312Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "TakWolf"; repo = "ark-pixel-font"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-PGhhKWHDpvOqa3vaI40wuIsAEdWGb62cN7QJeHQqiss="; }; diff --git a/pkgs/by-name/ar/arpack/package.nix b/pkgs/by-name/ar/arpack/package.nix index d8da13ac5680..4e059b3ea95c 100644 --- a/pkgs/by-name/ar/arpack/package.nix +++ b/pkgs/by-name/ar/arpack/package.nix @@ -1,14 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, cmake, ninja , gfortran, blas, lapack, eigen , useMpi ? false , mpi , openssh , igraph +, useAccel ? false #use Accelerate framework on darwin }: # MPI version can only be built with LP64 interface. # See https://github.com/opencollab/arpack-ng#readme assert useMpi -> !blas.isILP64; +assert useAccel -> stdenv.hostPlatform.isDarwin; stdenv.mkDerivation rec { pname = "arpack"; @@ -21,35 +23,39 @@ stdenv.mkDerivation rec { sha256 = "sha256-HCvapLba8oLqx9I5+KDAU0s/dTmdWOEilS75i4gyfC0="; }; - nativeBuildInputs = [ cmake gfortran ]; - buildInputs = assert (blas.isILP64 == lapack.isILP64); [ - blas - lapack + nativeBuildInputs = [ cmake gfortran ninja ]; + buildInputs = [ eigen - ] ++ lib.optional useMpi mpi; + ] ++ lib.optionals (!useAccel) (assert (blas.isILP64 == lapack.isILP64); [ + blas lapack + ]) ++ lib.optional useMpi mpi; nativeCheckInputs = lib.optional useMpi openssh; + # a couple tests fail when run in parallel doCheck = true; + enableParallelChecking = false; + + env = lib.optionalAttrs useAccel { + # Without these flags some tests will fail / segfault when using Accelerate + # framework. They were pulled from the CI Workflow + # https://github.com/opencollab/arpack-ng/blob/804fa3149a0f773064198a8e883bd021832157ca/.github/workflows/jobs.yml#L184-L192 + FFLAGS = "-ff2c -fno-second-underscore"; + }; cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - "-DINTERFACE64=${if blas.isILP64 then "1" else "0"}" - "-DMPI=${if useMpi then "ON" else "OFF"}" - "-DICB=ON" + (lib.cmakeBool "BUILD_SHARED_LIBS" stdenv.hostPlatform.hasSharedLibraries) + (lib.cmakeBool "EIGEN" true) + (lib.cmakeBool "EXAMPLES" true) + (lib.cmakeBool "ICB" true) + (lib.cmakeBool "INTERFACE64" (!useAccel && blas.isILP64)) + (lib.cmakeBool "MPI" useMpi) + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "-DBLA_VENDOR=${if useAccel then "Apple" else "Generic"}" ]; - preCheck = '' - # Prevent tests from using all cores - export OMP_NUM_THREADS=2 - ''; - - postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' - install_name_tool -change libblas.dylib ${blas}/lib/libblas.dylib $out/lib/libarpack.dylib - ''; - passthru = { - inherit (blas) isILP64; + isILP64 = !useAccel && blas.isILP64; tests = { inherit igraph; }; diff --git a/pkgs/by-name/ar/arphic-ukai/package.nix b/pkgs/by-name/ar/arphic-ukai/package.nix new file mode 100644 index 000000000000..6df92965f5ef --- /dev/null +++ b/pkgs/by-name/ar/arphic-ukai/package.nix @@ -0,0 +1,42 @@ +{ + lib, + stdenvNoCC, + fetchurl, + mkfontdir, + mkfontscale, +}: + +stdenvNoCC.mkDerivation rec { + pname = "arphic-ukai"; + version = "0.2.20080216.2"; + + src = fetchurl { + url = "mirror://ubuntu/pool/main/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.bz2"; + hash = "sha256-tJaNc1GfT4dH6FVI+4XSG2Zdob8bqQCnxJmXbmqK49I="; + }; + + nativeBuildInputs = [ + mkfontscale + mkfontdir + ]; + + installPhase = '' + runHook preInstall + + install -D -v ukai.ttc $out/share/fonts/truetype/arphic-ukai.ttc + cd $out/share/fonts + mkfontdir + mkfontscale + + runHook postInstall + ''; + + meta = with lib; { + description = "CJK Unicode font Kai style"; + homepage = "https://www.freedesktop.org/wiki/Software/CJKUnifonts/"; + + license = licenses.arphicpl; + maintainers = [ maintainers.changlinli ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/ar/arphic-uming/package.nix b/pkgs/by-name/ar/arphic-uming/package.nix new file mode 100644 index 000000000000..3d23d2e3c1ce --- /dev/null +++ b/pkgs/by-name/ar/arphic-uming/package.nix @@ -0,0 +1,42 @@ +{ + lib, + stdenvNoCC, + fetchurl, + mkfontdir, + mkfontscale, +}: + +stdenvNoCC.mkDerivation rec { + pname = "arphic-uming"; + version = "0.2.20080216.2"; + + src = fetchurl { + url = "mirror://ubuntu/pool/main/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.bz2"; + hash = "sha256-48GeBOp6VltKz/bx5CSAhNLhB1LjBb991sdugIYNwds="; + }; + + nativeBuildInputs = [ + mkfontscale + mkfontdir + ]; + + installPhase = '' + runHook preInstall + + install -D -v uming.ttc $out/share/fonts/truetype/arphic-uming.ttc + cd $out/share/fonts + mkfontdir + mkfontscale + + runHook postInstall + ''; + + meta = with lib; { + description = "CJK Unicode font Ming style"; + homepage = "https://www.freedesktop.org/wiki/Software/CJKUnifonts/"; + + license = licenses.arphicpl; + maintainers = [ maintainers.changlinli ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/ar/arxiv-latex-cleaner/package.nix b/pkgs/by-name/ar/arxiv-latex-cleaner/package.nix index b9dbbb9f9a1f..88619edad297 100644 --- a/pkgs/by-name/ar/arxiv-latex-cleaner/package.nix +++ b/pkgs/by-name/ar/arxiv-latex-cleaner/package.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "google-research"; repo = "arxiv-latex-cleaner"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-CQb1u1j+/px+vNqA3iXZ2oe6/0ZWeMjWrUQL9elRDEI="; }; diff --git a/pkgs/by-name/as/asak/package.nix b/pkgs/by-name/as/asak/package.nix index fdfce87a92f9..4270ee0a7034 100644 --- a/pkgs/by-name/as/asak/package.nix +++ b/pkgs/by-name/as/asak/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "asak"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "chaosprint"; repo = "asak"; tag = "v${version}"; - hash = "sha256-Kq1WdVcTRdz6vJxUDd0bqb2bfrNGCl611upwYploR7w="; + hash = "sha256-7r05sVIHqBBOKwye2fr0pspo/uDqaYGjt5CpxqgqKzI="; }; - cargoHash = "sha256-SS4BDhORiTV/HZhL3F9zwF8oBu/VFVYhF5Jzp2j0QFI="; + cargoHash = "sha256-lMqInjFnOfr/GPSfIf1yp2vQjdk9UYdkWA616P8p0FE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/as/ascii-draw/package.nix b/pkgs/by-name/as/ascii-draw/package.nix index b33e4fa1df7c..ad17218131a4 100644 --- a/pkgs/by-name/as/ascii-draw/package.nix +++ b/pkgs/by-name/as/ascii-draw/package.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "Nokse22"; repo = "ascii-draw"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-+K9th1LbESVzAiJqIplWpj2QHt7zDidENs7jHOuJ2S0="; }; diff --git a/pkgs/by-name/as/asn/package.nix b/pkgs/by-name/as/asn/package.nix index 5d917507f9cd..88f05bb5d41a 100644 --- a/pkgs/by-name/as/asn/package.nix +++ b/pkgs/by-name/as/asn/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "nitefood"; repo = "asn"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-pXPc6cAPqvbECvP3v3Z1Og8jhIhh5zvXomZrxNX6KVI="; }; diff --git a/pkgs/by-name/as/asnmap/package.nix b/pkgs/by-name/as/asnmap/package.nix index e4b474100593..7246edd85187 100644 --- a/pkgs/by-name/as/asnmap/package.nix +++ b/pkgs/by-name/as/asnmap/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "projectdiscovery"; repo = "asnmap"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-dGSWUuM4Zcz9QYjYaHur3RYryxe1wJycx/wUL5yqCpM="; }; diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix index a25bb7ef0a4c..1310bf9ab1ff 100644 --- a/pkgs/by-name/as/ast-grep/package.nix +++ b/pkgs/by-name/as/ast-grep/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ast-grep"; - version = "0.32.2"; + version = "0.32.3"; src = fetchFromGitHub { owner = "ast-grep"; repo = "ast-grep"; rev = version; - hash = "sha256-es/CnKtB1oUoYFOWR1xVzAo1Vwm5eb9VVmZWPZAAAaA="; + hash = "sha256-DJrcXykSYArG5cP3Nm3JEeBpu9a4Mbben4/DApIKZN4="; }; - cargoHash = "sha256-tFFx7nPY1eSdHWp+EovqCaybfVVgHt6ZF2KNaGSovyg="; + cargoHash = "sha256-frAoaoKOoFRfb9qtjPehtUSqKU25+pbMff4iRPXS/Qo="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/at/atuin/package.nix b/pkgs/by-name/at/atuin/package.nix index d5835283ee76..266ae4b0d5b0 100644 --- a/pkgs/by-name/at/atuin/package.nix +++ b/pkgs/by-name/at/atuin/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, installShellFiles, rustPlatform, - apple-sdk_11, nixosTests, }: @@ -39,10 +38,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - ]; - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd atuin \ --bash <($out/bin/atuin gen-completions -s bash) \ @@ -67,11 +62,11 @@ rustPlatform.buildRustPackage rec { "--skip=build_aliases" ]; - meta = with lib; { + meta = { description = "Replacement for a shell history which records additional commands context with optional encrypted synchronization between machines"; homepage = "https://github.com/atuinsh/atuin"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ SuperSandro2000 sciencentistguy _0x4A6F diff --git a/pkgs/by-name/au/audacity/package.nix b/pkgs/by-name/au/audacity/package.nix index e68a8bcf111b..061aea770cda 100644 --- a/pkgs/by-name/au/audacity/package.nix +++ b/pkgs/by-name/au/audacity/package.nix @@ -52,7 +52,6 @@ wavpack, wxGTK32, gtk3, - apple-sdk_11, libpng, libjpeg, }: @@ -144,7 +143,6 @@ stdenv.mkDerivation (finalAttrs: { util-linux ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 libpng libjpeg ]; diff --git a/pkgs/by-name/au/audible-cli/package.nix b/pkgs/by-name/au/audible-cli/package.nix index 926a9ac27d45..88a8bfd55c0d 100644 --- a/pkgs/by-name/au/audible-cli/package.nix +++ b/pkgs/by-name/au/audible-cli/package.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "mkb79"; repo = "audible-cli"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-AYL7lcYYY7gK12Id94aHRWRlCiznnF4r+lpI5VFpAWY="; }; diff --git a/pkgs/by-name/au/audiness/package.nix b/pkgs/by-name/au/audiness/package.nix index 61380450349a..dd4235aac3a0 100644 --- a/pkgs/by-name/au/audiness/package.nix +++ b/pkgs/by-name/au/audiness/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "audiusGmbH"; repo = "audiness"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-+5NDea4p/JWEk305EhAtab3to36a74KR50eosw6c5qI="; }; diff --git a/pkgs/by-name/au/audiobookshelf/package.nix b/pkgs/by-name/au/audiobookshelf/package.nix index e5b2e8b5b17e..f7ec693a8fb4 100644 --- a/pkgs/by-name/au/audiobookshelf/package.nix +++ b/pkgs/by-name/au/audiobookshelf/package.nix @@ -22,7 +22,7 @@ let src = fetchFromGitHub { owner = "advplyr"; repo = "audiobookshelf"; - rev = "refs/tags/v${source.version}"; + tag = "v${source.version}"; inherit (source) hash; }; diff --git a/pkgs/by-name/au/audiobookshelf/source.json b/pkgs/by-name/au/audiobookshelf/source.json index 71053763cc20..ac2ed8e3a0b8 100644 --- a/pkgs/by-name/au/audiobookshelf/source.json +++ b/pkgs/by-name/au/audiobookshelf/source.json @@ -1,9 +1,9 @@ { "owner": "advplyr", "repo": "audiobookshelf", - "rev": "190a1000d9b5909b5bcd953f32f39fa8f261ecb9", - "hash": "sha256-92Or9AHqSqp0nWB37B18EkTKhAfYeIfZ4Z5ctaFElXU=", - "version": "2.17.5", - "depsHash": "sha256-18c8reQjCo914MDfZqoQCeMsGvd38lPKrdLu9NHl0Y8=", - "clientDepsHash": "sha256-XslWtmvX8FExkdSgDHs10wzJFC4dFuAf034Jf53Twk0=" + "rev": "de8b0abc3af740148bddde462fe809f03159d678", + "hash": "sha256-lLCG6xw1qWbIOxHbD8ONH7iYzayJ8OhMy+WgaXExcFQ=", + "version": "2.17.7", + "depsHash": "sha256-1uDCbgZNmx8e+LrsOHTfM29SZhS1TLDHmTg48XMbwkg=", + "clientDepsHash": "sha256-cDT45OtLbFDF0TXO4zVVj9+UOJhkb9TjCajtSWq4H8U=" } diff --git a/pkgs/by-name/au/audion/package.nix b/pkgs/by-name/au/audion/package.nix index 304016a12830..abb8be20f472 100644 --- a/pkgs/by-name/au/audion/package.nix +++ b/pkgs/by-name/au/audion/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "audiusGmbH"; repo = "audion"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-NtAzh7n5bJXMt73L+FJU3vuNoNgga3wYXdZ2TY8AjIA="; }; diff --git a/pkgs/by-name/au/augustus/package.nix b/pkgs/by-name/au/augustus/package.nix index c2b116f269f2..e2aa70b1694f 100644 --- a/pkgs/by-name/au/augustus/package.nix +++ b/pkgs/by-name/au/augustus/package.nix @@ -7,7 +7,6 @@ SDL2_mixer, libpng, darwin, - apple-sdk_11, libicns, imagemagick, }: @@ -37,7 +36,7 @@ stdenv.mkDerivation rec { SDL2 SDL2_mixer libpng - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; + ]; installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' runHook preInstall diff --git a/pkgs/by-name/au/auth0-cli/package.nix b/pkgs/by-name/au/auth0-cli/package.nix index fb7e20b6e92b..63901fb56f16 100644 --- a/pkgs/by-name/au/auth0-cli/package.nix +++ b/pkgs/by-name/au/auth0-cli/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "auth0-cli"; - version = "1.6.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "auth0"; repo = "auth0-cli"; - rev = "refs/tags/v${version}"; - hash = "sha256-IuL/x7gcZj7RVRI3RhnsYgFo1XJ0CRF7sNvgMlLsPd0="; + tag = "v${version}"; + hash = "sha256-9/Jjsg6E8+gkN5eGZsxmTBwVoD/eO7euidY6ds7skpA="; }; - vendorHash = "sha256-Yxjpc/DBt8TQF92RcfMa0IPDlWT9K2fw2cPEfsMOVfw="; + vendorHash = "sha256-XXCmIASYQD21h1h8HOcAl8HK5QUvgfqRpauq93tUNZ8="; ldflags = [ "-s" diff --git a/pkgs/by-name/au/auto-cpufreq/package.nix b/pkgs/by-name/au/auto-cpufreq/package.nix index fe9e2ca49ae8..354b5ebfd4c5 100644 --- a/pkgs/by-name/au/auto-cpufreq/package.nix +++ b/pkgs/by-name/au/auto-cpufreq/package.nix @@ -7,6 +7,7 @@ wrapGAppsHook3, gtk3, getent, + nixosTests, }: python3Packages.buildPythonPackage rec { pname = "auto-cpufreq"; @@ -16,7 +17,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "AdnanHodzic"; repo = "auto-cpufreq"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-Xsh3d7rQY7RKzZ7J0swrgxZEyITb7B3oX5F/tcBGjfk="; }; @@ -92,6 +93,10 @@ python3Packages.buildPythonPackage rec { cp scripts/org.auto-cpufreq.pkexec.policy $out/share/polkit-1/actions ''; + passthru.tests = { + inherit (nixosTests) auto-cpufreq; + }; + meta = { mainProgram = "auto-cpufreq"; homepage = "https://github.com/AdnanHodzic/auto-cpufreq"; diff --git a/pkgs/by-name/au/auto-editor/package.nix b/pkgs/by-name/au/auto-editor/package.nix index 4bfc9ccaabe0..a517327148c8 100644 --- a/pkgs/by-name/au/auto-editor/package.nix +++ b/pkgs/by-name/au/auto-editor/package.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "WyattBlue"; repo = "auto-editor"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-2/6IqwMlaWobOlDr/h2WV2OqkxqVmUI65XsyBphTbpA="; }; diff --git a/pkgs/by-name/au/auto-epp/package.nix b/pkgs/by-name/au/auto-epp/package.nix index edddaba68e31..48655147f8e1 100644 --- a/pkgs/by-name/au/auto-epp/package.nix +++ b/pkgs/by-name/au/auto-epp/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "jothi-prasath"; repo = "auto-epp"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-7sI8K+7ZAdzBN/XOzYQQZ1f9t+fFo6fcXYzX6abNyQ8="; }; diff --git a/pkgs/by-name/au/autobloody/package.nix b/pkgs/by-name/au/autobloody/package.nix index c583324a88da..a07870e2c239 100644 --- a/pkgs/by-name/au/autobloody/package.nix +++ b/pkgs/by-name/au/autobloody/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "CravateRouge"; repo = "autobloody"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-0MwhdT9GYLcrdZSqszx1DC9lyz8K61lJZZCzeFfWB0E="; }; diff --git a/pkgs/by-name/au/autofs5/package.nix b/pkgs/by-name/au/autofs5/package.nix index f570fcdb32f3..3b053f0d0165 100644 --- a/pkgs/by-name/au/autofs5/package.nix +++ b/pkgs/by-name/au/autofs5/package.nix @@ -44,6 +44,10 @@ stdenv.mkDerivation rec { url = "mirror://kernel/linux/daemons/autofs/v5/patches-5.2.0/autofs-5.1.9-fix-crash-in-make_options_string.patch"; hash = "sha256-YjTdJ50iNhJ2UjFdrKYEFNt04z0PfmElbFa4GuSskLA="; }) + (fetchpatch { + url = "mirror://kernel/linux/daemons/autofs/v5/patches-5.2.0/autofs-5.1.9-Fix-incompatible-function-pointer-types-in-cyrus-sasl-module.patch"; + hash = "sha256-erLlqZtVmYqUOsk3S7S50yA0VB8Gzibsv+X50+gcA58="; + }) ]; preConfigure = '' diff --git a/pkgs/by-name/au/autorandr/package.nix b/pkgs/by-name/au/autorandr/package.nix index cd6d1db71f7e..26e0b1c69618 100644 --- a/pkgs/by-name/au/autorandr/package.nix +++ b/pkgs/by-name/au/autorandr/package.nix @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "phillipberndt"; repo = "autorandr"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-8FMfy3GCN4z/TnfefU2DbKqV3W35I29/SuGGqeOrjNg"; }; diff --git a/pkgs/by-name/au/autosuspend/package.nix b/pkgs/by-name/au/autosuspend/package.nix index 85d691a96637..706c01319773 100644 --- a/pkgs/by-name/au/autosuspend/package.nix +++ b/pkgs/by-name/au/autosuspend/package.nix @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "languitar"; repo = pname; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-ePQiP7NeRBPVHkd8rvbxno/NBX95e9d97F8TIazCUH4="; }; diff --git a/pkgs/by-name/au/autotools-language-server/package.nix b/pkgs/by-name/au/autotools-language-server/package.nix index 5378476905e6..6eed1550b31e 100644 --- a/pkgs/by-name/au/autotools-language-server/package.nix +++ b/pkgs/by-name/au/autotools-language-server/package.nix @@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "Freed-Wu"; repo = "autotools-language-server"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-V0EOV1ZmeC+4svc2fqV6AIiL37dkrxUJAnjywMZcENw="; }; patches = [ diff --git a/pkgs/by-name/au/autotrash/package.nix b/pkgs/by-name/au/autotrash/package.nix index c963703a9514..ff5a97a4cd64 100644 --- a/pkgs/by-name/au/autotrash/package.nix +++ b/pkgs/by-name/au/autotrash/package.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "bneijt"; repo = "autotrash"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-qMU3jjBL5+fd9vKX5BIqES5AM8D/54aBOmdHFiBtfEo="; }; diff --git a/pkgs/by-name/av/av1an-unwrapped/package.nix b/pkgs/by-name/av/av1an-unwrapped/package.nix index e89f7116e118..e7ed15a35725 100644 --- a/pkgs/by-name/av/av1an-unwrapped/package.nix +++ b/pkgs/by-name/av/av1an-unwrapped/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "master-of-zen"; repo = "av1an"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-Mb5I+9IBwpfmK1w4LstNHI/qsJKlCuRxgSUiqpwUqF0="; }; diff --git a/pkgs/by-name/av/avalanchego/package.nix b/pkgs/by-name/av/avalanchego/package.nix index cba41dac089c..9d3d345e81be 100644 --- a/pkgs/by-name/av/avalanchego/package.nix +++ b/pkgs/by-name/av/avalanchego/package.nix @@ -13,7 +13,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "ava-labs"; repo = "avalanchego"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-iedhLVNtwU8wSQIaq0r0fAYGH8fNnCRJW69D7wPdyx0="; }; diff --git a/pkgs/by-name/av/avbroot/package.nix b/pkgs/by-name/av/avbroot/package.nix index 9b245baf8418..9708d95c17e7 100644 --- a/pkgs/by-name/av/avbroot/package.nix +++ b/pkgs/by-name/av/avbroot/package.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "chenxiaolong"; repo = "avbroot"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-gG8pR/D5oaPPqq0e815J6z+dDVxh4VSoHIm1Yl3x2p4="; }; diff --git a/pkgs/by-name/av/avml/package.nix b/pkgs/by-name/av/avml/package.nix index f556430666dc..61f1b9790302 100644 --- a/pkgs/by-name/av/avml/package.nix +++ b/pkgs/by-name/av/avml/package.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "microsoft"; repo = "avml"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-MIqQ5NRWAfXm7AblsKCrUiaYN5IGUo2jWJMJZL+w3V4="; }; diff --git a/pkgs/by-name/aw/aws-assume-role/package.nix b/pkgs/by-name/aw/aws-assume-role/package.nix index f7785c457a32..334b6c1ccbe8 100644 --- a/pkgs/by-name/aw/aws-assume-role/package.nix +++ b/pkgs/by-name/aw/aws-assume-role/package.nix @@ -16,7 +16,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "remind101"; repo = "assume-role"; - rev = "refs/tags/${version}"; + tag = version; sha256 = "sha256-7+9qi9lYzv1YCFhUyla+5Gqs5nBUiiazhFwiqHzMFd4="; }; diff --git a/pkgs/by-name/aw/aws-iam-authenticator/package.nix b/pkgs/by-name/aw/aws-iam-authenticator/package.nix index 07e7d93a326c..d4ea9e617e65 100644 --- a/pkgs/by-name/aw/aws-iam-authenticator/package.nix +++ b/pkgs/by-name/aw/aws-iam-authenticator/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-xjHwnzh22cGv1Q2civdgLz9sFoV5p3exyG8P26u4hi0="; }; diff --git a/pkgs/by-name/aw/aws-sam-cli/package.nix b/pkgs/by-name/aw/aws-sam-cli/package.nix index 4a1fb5ab08d3..7f1e622b7ef9 100644 --- a/pkgs/by-name/aw/aws-sam-cli/package.nix +++ b/pkgs/by-name/aw/aws-sam-cli/package.nix @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "aws"; repo = "aws-sam-cli"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-5h+uACzc4bAIgHoaZw2U/FCPA1ls8JTLqJd608J2uTU="; }; diff --git a/pkgs/by-name/aw/aws-sso-util/package.nix b/pkgs/by-name/aw/aws-sso-util/package.nix new file mode 100644 index 000000000000..c083f6254933 --- /dev/null +++ b/pkgs/by-name/aw/aws-sso-util/package.nix @@ -0,0 +1,43 @@ +{ + lib, + fetchPypi, + python3Packages, +}: + +python3Packages.buildPythonApplication rec { + pname = "aws-sso-util"; + version = "4.33.0"; + pyproject = true; + + src = fetchPypi { + pname = "aws_sso_util"; + inherit version; + hash = "sha256-5I1/WRFENFDSjhrBYT+BuaoVursbIFW0Ux34fbQ6Cd8="; + }; + + build-system = [ + python3Packages.poetry-core + ]; + + dependencies = with python3Packages; [ + aws-error-utils + aws-sso-lib + boto3 + click + jsonschema + python-dateutil + pyyaml + requests + ]; + + meta = { + description = "Utilities to make AWS SSO easier"; + homepage = "https://pypi.org/project/aws-sso-util/"; + downloadPage = "https://pypi.org/project/aws-sso-util/#files"; + changelog = "https://github.com/benkehoe/aws-sso-util/releases"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ cterence ]; + mainProgram = "aws-sso-util"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/aw/awscli2/package.nix b/pkgs/by-name/aw/awscli2/package.nix index 6a4df356ef15..24064b1668e1 100644 --- a/pkgs/by-name/aw/awscli2/package.nix +++ b/pkgs/by-name/aw/awscli2/package.nix @@ -68,7 +68,7 @@ py.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-yrkGfD2EBPsNRLcafdJE4UnYsK7EAfIA7TLa6smmWjY="; }; diff --git a/pkgs/by-name/aw/awsebcli/package.nix b/pkgs/by-name/aw/awsebcli/package.nix index c03f97d07d00..2d0a1e3cb865 100644 --- a/pkgs/by-name/aw/awsebcli/package.nix +++ b/pkgs/by-name/aw/awsebcli/package.nix @@ -31,7 +31,7 @@ python.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "aws"; repo = "aws-elastic-beanstalk-cli"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-VU8bXvS4m4eIamjlgGmHE2qwDXWAXvWTa0QHomXR5ZE="; }; diff --git a/pkgs/by-name/aw/awslimitchecker/package.nix b/pkgs/by-name/aw/awslimitchecker/package.nix index bb122774090d..9a603a5e6024 100644 --- a/pkgs/by-name/aw/awslimitchecker/package.nix +++ b/pkgs/by-name/aw/awslimitchecker/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "jantman"; repo = "awslimitchecker"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-+8F7qOfAFoFNZ6GG5ezTA/LWENpJvbcPdtpQH/8k1tw="; }; diff --git a/pkgs/by-name/ay/ayatana-indicator-bluetooth/package.nix b/pkgs/by-name/ay/ayatana-indicator-bluetooth/package.nix index 7f4eb6cef35a..451aade5bc9d 100644 --- a/pkgs/by-name/ay/ayatana-indicator-bluetooth/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-bluetooth/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "ayatana-indicator-bluetooth"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-EreOhrlWbSZtwazsvwWsPji2iLfQxr2LbjCI13Hrb28="; }; diff --git a/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix b/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix index f280e00b1cb5..90c5fb5a2581 100644 --- a/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "ayatana-indicator-datetime"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-lY49v2uZ7BawQoN/hmN6pbetHlSGjMHbS6S8Wl1bDmQ="; }; diff --git a/pkgs/by-name/ay/ayatana-indicator-display/package.nix b/pkgs/by-name/ay/ayatana-indicator-display/package.nix index a3054c9c25d9..2bc786818554 100644 --- a/pkgs/by-name/ay/ayatana-indicator-display/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-display/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "ayatana-indicator-display"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-ZEmJJtVK1dHIrY0C6pqVu1N5PmQtYqX0K5v5LvzNfFA="; }; diff --git a/pkgs/by-name/ay/ayatana-indicator-messages/package.nix b/pkgs/by-name/ay/ayatana-indicator-messages/package.nix index 6018719f2cab..054390390166 100644 --- a/pkgs/by-name/ay/ayatana-indicator-messages/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-messages/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "ayatana-indicator-messages"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-D1181eD2mAVXEa7RLXXC4b2tVGrxbh0WWgtbC1anHH0="; }; diff --git a/pkgs/by-name/ay/ayatana-indicator-power/package.nix b/pkgs/by-name/ay/ayatana-indicator-power/package.nix index 7226c90daa37..1b9b16d5bc3b 100644 --- a/pkgs/by-name/ay/ayatana-indicator-power/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-power/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "ayatana-indicator-power"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-M7BzyQRPKyXMEY0FTMBXsCemC3+w8upjTHApWkRf71I="; }; diff --git a/pkgs/by-name/ay/ayatana-indicator-session/package.nix b/pkgs/by-name/ay/ayatana-indicator-session/package.nix index 0ee7f5228624..e6a2c4737bd4 100644 --- a/pkgs/by-name/ay/ayatana-indicator-session/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-session/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "ayatana-indicator-session"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-p4nu7ZgnEjnnxNqyZIg//YcssnQcCY7GFDbpGIu1dz0="; }; diff --git a/pkgs/by-name/ay/ayatana-indicator-sound/package.nix b/pkgs/by-name/ay/ayatana-indicator-sound/package.nix index 8b911c40de09..039d88bb2b35 100644 --- a/pkgs/by-name/ay/ayatana-indicator-sound/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-sound/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "ayatana-indicator-sound"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-icHX/uZQIkS08RByjvlcX7whXtUYc+osBMbqngKqmGU="; }; diff --git a/pkgs/by-name/ay/ayatana-webmail/package.nix b/pkgs/by-name/ay/ayatana-webmail/package.nix index 1c99ef0427e3..14665fb0e4e4 100644 --- a/pkgs/by-name/ay/ayatana-webmail/package.nix +++ b/pkgs/by-name/ay/ayatana-webmail/package.nix @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "ayatana-webmail"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-k557FWKGq2MXODVxVzOetC5kkwTNYOoLO8msCOabais="; }; postConfigure = '' diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index b6e9b9477a59..bf4c4b52064d 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -645,10 +645,10 @@ }, "managednetworkfabric": { "pname": "managednetworkfabric", - "version": "6.4.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/managednetworkfabric-6.4.0-py3-none-any.whl", - "hash": "sha256-nUEHjgZUqq42pfDyg/Ud6YzENgWCkgU2VCVG7TTKC8Q=", - "description": "Support for managednetworkfabric commands based on 2023-06-15 API version" + "version": "7.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/managednetworkfabric-7.0.0-py3-none-any.whl", + "hash": "sha256-I+K24xxpm8DoyNsvqjv9Yi1ewVZeCDCVIizYUB7TKW8=", + "description": "Support for managednetworkfabric commands based on 2024-02-15-preview API version" }, "managementpartner": { "pname": "managementpartner", @@ -729,9 +729,9 @@ }, "networkcloud": { "pname": "networkcloud", - "version": "2.0.0b6", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/networkcloud-2.0.0b6-py3-none-any.whl", - "hash": "sha256-1T+IepVTU7DLHQ7CfcEltQG+/lryktzUFB7RY9O9hzM=", + "version": "2.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/networkcloud-2.0.0-py3-none-any.whl", + "hash": "sha256-8ntKTSkGJwdhHJCeClEd7A0cUgRed8sV/l7qP5jAQhQ=", "description": "Support for Azure Operator Nexus network cloud commands based on 2024-07-01 API version" }, "new-relic": { @@ -841,9 +841,9 @@ }, "qumulo": { "pname": "qumulo", - "version": "1.0.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/qumulo-1.0.0-py3-none-any.whl", - "hash": "sha256-mXP1gKP8IMwv5VWKHP3BDd/GVnmC0S83AIu/7Hqvz5s=", + "version": "2.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/qumulo-2.0.0-py3-none-any.whl", + "hash": "sha256-fsUZyd0s+Rv1Sy6Lm2iq2xNMsrv+xU6KLLCOo6DkfmI=", "description": "Microsoft Azure Command-Line Tools Qumulo Extension" }, "quota": { @@ -953,9 +953,9 @@ }, "stack-hci-vm": { "pname": "stack-hci-vm", - "version": "1.4.3", - "url": "https://hciarcvmsstorage.z13.web.core.windows.net/cli-extensions/stack_hci_vm-1.4.3-py3-none-any.whl", - "hash": "sha256-T1ulOOgw3O8ZUUfIunHHObK9SUy7moq1HoMcQLwfMyk=", + "version": "1.5.0", + "url": "https://hciarcvmsstorage.z13.web.core.windows.net/cli-extensions/stack_hci_vm-1.5.0-py3-none-any.whl", + "hash": "sha256-otixJPDbQp0+eugYFcVEzgAjGrFkDCHdqRUwT3WQ+Pg=", "description": "Microsoft Azure Command-Line Tools Stack-HCi-VM Extension" }, "standbypool": { diff --git a/pkgs/by-name/az/azure-storage-azcopy/package.nix b/pkgs/by-name/az/azure-storage-azcopy/package.nix index 3eda1619b870..aa6b36ffabcd 100644 --- a/pkgs/by-name/az/azure-storage-azcopy/package.nix +++ b/pkgs/by-name/az/azure-storage-azcopy/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-h/EiJZMX2vHn/t1FPM1ZkXf9I8LYiqK1GqkSDAlXBYY="; }; diff --git a/pkgs/by-name/az/azurehound/package.nix b/pkgs/by-name/az/azurehound/package.nix index f6b07107b6da..0222f32a3dae 100644 --- a/pkgs/by-name/az/azurehound/package.nix +++ b/pkgs/by-name/az/azurehound/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "SpecterOps"; repo = "AzureHound"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-DqoEtL0uyLsP/2PJdOpAmXryEZQDlyGWPQHThF+3gJA="; }; diff --git a/pkgs/by-name/ba/baboossh/package.nix b/pkgs/by-name/ba/baboossh/package.nix index 1cec997ff3af..26c1182a01a3 100644 --- a/pkgs/by-name/ba/baboossh/package.nix +++ b/pkgs/by-name/ba/baboossh/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "cybiere"; repo = "baboossh"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-E/a6dL6BpQ6D8v010d8/qav/fkxpCYNvSvoPAZsm0Hk="; }; diff --git a/pkgs/by-name/ba/backblaze-b2/package.nix b/pkgs/by-name/ba/backblaze-b2/package.nix index 46b970698418..54c2e9f1ef3d 100644 --- a/pkgs/by-name/ba/backblaze-b2/package.nix +++ b/pkgs/by-name/ba/backblaze-b2/package.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "Backblaze"; repo = "B2_Command_Line_Tool"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-a0XJq8M1yw4GmD5ndIAJtmHFKqS0rYdvYIxK7t7oyZw="; }; diff --git a/pkgs/by-name/ba/backrest/package.nix b/pkgs/by-name/ba/backrest/package.nix index 25cc308ed240..80689fb85e83 100644 --- a/pkgs/by-name/ba/backrest/package.nix +++ b/pkgs/by-name/ba/backrest/package.nix @@ -14,7 +14,7 @@ let src = fetchFromGitHub { owner = "garethgeorge"; repo = "backrest"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-qxEZkRKkwKZ+EZ3y3aGcX2ioKOz19SRdi3+9mjF1LpE="; }; diff --git a/pkgs/by-name/ba/bacon/package.nix b/pkgs/by-name/ba/bacon/package.nix index 9de29879ee74..f71293605050 100644 --- a/pkgs/by-name/ba/bacon/package.nix +++ b/pkgs/by-name/ba/bacon/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "bacon"; - version = "3.6.0"; + version = "3.7.0"; src = fetchFromGitHub { owner = "Canop"; repo = "bacon"; - rev = "refs/tags/v${version}"; - hash = "sha256-L+LVD7ceKUQ+nVyepusrv9Zz4BSGjXucnimsf+abM2k="; + tag = "v${version}"; + hash = "sha256-pw+EfmpDvMCKSHOeHiv06x13/tRuf053Zcj8z0eWnPs="; }; - cargoHash = "sha256-NUCy3DZ1uV1iPanHGbK/TSY6oS3zSQxVpmnw7Aon+pw="; + cargoHash = "sha256-W1bDZSUBjPmb/7bOnE+E5byA0clJZ+qGJ4XYASAjfeU="; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = [ "--version" ]; @@ -34,6 +34,9 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Canop/bacon"; changelog = "https://github.com/Canop/bacon/blob/v${version}/CHANGELOG.md"; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ FlorianFranzen ]; + maintainers = with lib.maintainers; [ + FlorianFranzen + matthiasbeyer + ]; }; } diff --git a/pkgs/by-name/ba/bada-bib/package.nix b/pkgs/by-name/ba/bada-bib/package.nix index 22bf2189d98d..fcc082f28c07 100644 --- a/pkgs/by-name/ba/bada-bib/package.nix +++ b/pkgs/by-name/ba/bada-bib/package.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "RogerCrocker"; repo = "BadaBib"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; sha256 = "sha256-8lpkmQCVh94+qhFJijAIVyYeJRFz2u/OYR1C5E+gtOE="; }; diff --git a/pkgs/by-name/ba/baddns/package.nix b/pkgs/by-name/ba/baddns/package.nix index a2a03370fe81..cedbaec9ee1c 100644 --- a/pkgs/by-name/ba/baddns/package.nix +++ b/pkgs/by-name/ba/baddns/package.nix @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "blacklanternsecurity"; repo = "baddns"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-pF7HYl1l+TSahJHuyVBZtYeET6wPCiSi+Yi7Rg46T44="; }; diff --git a/pkgs/by-name/ba/badkeys/package.nix b/pkgs/by-name/ba/badkeys/package.nix index 8dd4c5a0453c..584d5e57b1f3 100644 --- a/pkgs/by-name/ba/badkeys/package.nix +++ b/pkgs/by-name/ba/badkeys/package.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "badkeys"; repo = "badkeys"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-LFoB/ZHIMRpN/eHg3x8HCxNbMKclf2SJSDPk33OIil8="; }; @@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Tool to find common vulnerabilities in cryptographic public keys"; homepage = "https://badkeys.info/"; - changelog = "https://github.com/badkeys/badkeys/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; + changelog = "https://github.com/badkeys/badkeys/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ getchoo ]; mainProgram = "badkeys"; diff --git a/pkgs/by-name/ba/bamtools/package.nix b/pkgs/by-name/ba/bamtools/package.nix index b85f703bd9de..2c6792c47c88 100644 --- a/pkgs/by-name/ba/bamtools/package.nix +++ b/pkgs/by-name/ba/bamtools/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "pezmaster31"; repo = "bamtools"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-l2DmA4P1kPneTCL9YVACE6LcQHT0F+mufPyM69VkksE="; }; @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { description = "C++ API & command-line toolkit for working with BAM data"; mainProgram = "bamtools"; homepage = "https://github.com/pezmaster31/bamtools"; - changelog = "https://github.com/pezmaster31/bamtools/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}"; + changelog = "https://github.com/pezmaster31/bamtools/releases/tag/v${finalAttrs.version}"; license = licenses.mit; maintainers = with maintainers; [ natsukium ]; platforms = platforms.unix; diff --git a/pkgs/by-name/ba/banana-vera/package.nix b/pkgs/by-name/ba/banana-vera/package.nix index f847f77bc570..cfaa1713635e 100644 --- a/pkgs/by-name/ba/banana-vera/package.nix +++ b/pkgs/by-name/ba/banana-vera/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "Epitech"; repo = "banana-vera"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-sSN3trSySJe3KVyrb/hc5HUGRS4M3c4UX9SLlzBM43c="; }; diff --git a/pkgs/by-name/ba/bark-server/package.nix b/pkgs/by-name/ba/bark-server/package.nix index bb1b66535014..167a709fac5a 100644 --- a/pkgs/by-name/ba/bark-server/package.nix +++ b/pkgs/by-name/ba/bark-server/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "Finb"; repo = "bark-server"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-bZWX47krx9V0qXg6Yl8yQbX1zd5DtsWkIBLi0bDxrpA="; # 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. diff --git a/pkgs/by-name/ba/barman/package.nix b/pkgs/by-name/ba/barman/package.nix index da9cda162fd1..20f31c7eaca4 100644 --- a/pkgs/by-name/ba/barman/package.nix +++ b/pkgs/by-name/ba/barman/package.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "EnterpriseDB"; repo = "barman"; - rev = "refs/tags/release/${version}"; + tag = "release/${version}"; hash = "sha256-X39XOv8HJdSjMjMMnmB7Gxjseg5k/LuKICTxapcHVsU="; }; diff --git a/pkgs/by-name/ba/bash-env-json/package.nix b/pkgs/by-name/ba/bash-env-json/package.nix index 0034f7e0d8bc..ae889291e876 100644 --- a/pkgs/by-name/ba/bash-env-json/package.nix +++ b/pkgs/by-name/ba/bash-env-json/package.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "bash-env-json"; - version = "0.9.2"; + version = "0.10.0"; src = fetchFromGitHub { owner = "tesujimath"; repo = "bash-env-json"; rev = finalAttrs.version; - hash = "sha256-EYro4pMILnQFpXpFjdzSDuudhqC2EvysYMUmIOvesgo="; + hash = "sha256-IHfUIAkpaRyBmzT654bAzpTHUhcrtU643uxkPbveYOM="; }; installPhase = '' diff --git a/pkgs/by-name/ba/bashrun2/package.nix b/pkgs/by-name/ba/bashrun2/package.nix new file mode 100644 index 000000000000..057d1e3894a4 --- /dev/null +++ b/pkgs/by-name/ba/bashrun2/package.nix @@ -0,0 +1,90 @@ +{ + fetchFromGitHub, + lib, + stdenv, + makeWrapper, + xorg, + ncurses, + coreutils, + bashInteractive, + gnused, + gnugrep, + glibc, + xterm, + util-linux, +}: + +stdenv.mkDerivation rec { + pname = "bashrun2"; + version = "0.2.6"; + + src = fetchFromGitHub { + owner = "hbekel"; + repo = "bashrun2"; + tag = "v${version}"; + hash = "sha256-U2ntplhyv8KAkaMd2D6wRsUIYkhJzxdgHo2xsbNRfqM="; + }; + + nativeBuildInputs = [ + makeWrapper + ]; + + buildInputs = [ + xorg.libX11 + ]; + + patches = [ + ./remote-permissions.patch + ]; + + postPatch = '' + substituteInPlace \ + man/bashrun2.1 \ + --replace-fail '/usr/bin/brwctl' "$out/bin/brwctl" + + substituteInPlace \ + src/bindings \ + src/registry \ + src/utils \ + src/bashrun2 \ + src/frontend \ + src/remote \ + src/plugin \ + src/engine \ + src/bookmarks \ + --replace-fail '/bin/rm' '${coreutils}/bin/rm' + + substituteInPlace \ + src/bashrun2 \ + --replace-fail '#!/usr/bin/env bash' '#!${lib.getExe bashInteractive}' + + substituteInPlace \ + src/remote \ + --replace-fail '/bin/cp' '${coreutils}/bin/cp' + ''; + + postFixup = '' + wrapProgram $out/bin/bashrun2 \ + --prefix PATH : "$out/bin:${ + lib.makeBinPath [ + ncurses + coreutils + gnused + gnugrep + glibc + bashInteractive + xterm + util-linux + ] + }" \ + --prefix XDG_CONFIG_DIRS : "$out/etc/xdg" + ''; + + meta = { + maintainers = with lib.maintainers; [ dopplerian ]; + mainProgram = "bashrun2"; + homepage = "http://henning-liebenau.de/bashrun2/"; + license = lib.licenses.gpl2Plus; + description = "Application launcher based on a modified bash session in a small terminal window"; + }; +} diff --git a/pkgs/by-name/ba/bashrun2/remote-permissions.patch b/pkgs/by-name/ba/bashrun2/remote-permissions.patch new file mode 100644 index 000000000000..888280feaa2d --- /dev/null +++ b/pkgs/by-name/ba/bashrun2/remote-permissions.patch @@ -0,0 +1,12 @@ +diff --git a/src/remote b/src/remote +index 07674ca..07a6b25 100644 +--- a/src/remote ++++ b/src/remote +@@ -97,6 +97,7 @@ function §remote.interface.create { + local bookmarks="$bashrun_cache_home/remote-bookmarks.bash" + + /bin/cp "$bashrun_site/interface" "$interface" ++ chmod +w "$interface" + printf '%s\n' "$bashrun_remote_interface" >> "$interface" + + printf '%s\n' "source $bindings" >> "$interface" diff --git a/pkgs/by-name/ba/batmon/package.nix b/pkgs/by-name/ba/batmon/package.nix index 0d51bc0ec83b..131fdd0af162 100644 --- a/pkgs/by-name/ba/batmon/package.nix +++ b/pkgs/by-name/ba/batmon/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "6543"; repo = "batmon"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-+kjDNQKlaoI5fQ5FqYF6IPCKeE92WKxIhVCKafqfE0o="; }; diff --git a/pkgs/by-name/ba/bazarr/package.nix b/pkgs/by-name/ba/bazarr/package.nix index 0e4cc9c4e9c0..dea67d4f22e4 100644 --- a/pkgs/by-name/ba/bazarr/package.nix +++ b/pkgs/by-name/ba/bazarr/package.nix @@ -17,11 +17,11 @@ let in stdenv.mkDerivation rec { pname = "bazarr"; - version = "1.5.0"; + version = "1.5.1"; src = fetchzip { url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip"; - hash = "sha256-Q/KlqvVWhegSxkxHls0WwCClaQwkmLAfuzfi3X4xgAY="; + hash = "sha256-G/vYVBlwFsRbIgCNfsb8sh1a07Ldo3Z0M7XQ/bcbhTw="; stripRoot = false; }; diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix index 532f8be2aae0..680933ef9ec4 100644 --- a/pkgs/by-name/bc/bcachefs-tools/package.nix +++ b/pkgs/by-name/bc/bcachefs-tools/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-w55Fs1RZ4c55vTvb3jArPcmBLij1nuLi2MUHMMXPhng="; }; diff --git a/pkgs/by-name/bc/bcc/package.nix b/pkgs/by-name/bc/bcc/package.nix index ce6b5919291f..b0f511c96b6c 100644 --- a/pkgs/by-name/bc/bcc/package.nix +++ b/pkgs/by-name/bc/bcc/package.nix @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "iovisor"; repo = "bcc"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-urEHDDBBIdopQiT/QI5WtTbIO45pBk6bTNpfs8q/2hA="; }; format = "other"; diff --git a/pkgs/by-name/be/beanprice/package.nix b/pkgs/by-name/be/beanprice/package.nix new file mode 100644 index 000000000000..0b7ba5c1e089 --- /dev/null +++ b/pkgs/by-name/be/beanprice/package.nix @@ -0,0 +1,47 @@ +{ + lib, + fetchFromGitHub, + python3Packages, +}: + +python3Packages.buildPythonApplication rec { + pname = "beanprice"; + version = "1.2.1-unstable-2024-06-19"; + pyproject = true; + + src = fetchFromGitHub { + owner = "beancount"; + repo = "beanprice"; + rev = "e894c9182f4d16f9a46ccb87bdaeca1a7dede040"; + hash = "sha256-l96W77gldE06Za8fj84LADGCqlYeWlHKvWQO+oLy1gI="; + }; + + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ + beancount + python-dateutil + regex + requests + ]; + + nativeCheckInputs = with python3Packages; [ + click + pytestCheckHook + regex + ]; + + pythonImportsCheck = [ "beancount" ]; + + meta = { + homepage = "https://github.com/beancount/beanprice"; + description = "Price quotes fetcher for Beancount"; + longDescription = '' + A script to fetch market data prices from various sources on the internet + and render them for plain text accounting price syntax (and Beancount). + ''; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ alapshin ]; + mainProgram = "bean-price"; + }; +} diff --git a/pkgs/by-name/be/bearer/package.nix b/pkgs/by-name/be/bearer/package.nix index 2c2e8bff30ed..5311f8bb5616 100644 --- a/pkgs/by-name/be/bearer/package.nix +++ b/pkgs/by-name/be/bearer/package.nix @@ -13,7 +13,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "bearer"; repo = "bearer"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-yr5ik+DxOcW3UFK6KiPvheGlDdwSz2s7DKm2vAsSwG0="; }; diff --git a/pkgs/by-name/be/beeper-bridge-manager/package.nix b/pkgs/by-name/be/beeper-bridge-manager/package.nix index f1bbec78e3c8..b8d391ff3a51 100644 --- a/pkgs/by-name/be/beeper-bridge-manager/package.nix +++ b/pkgs/by-name/be/beeper-bridge-manager/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "beeper"; repo = "bridge-manager"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-bNnansZNshWp70LQQsa6+bS+LJxpCzdTkL2pX+ksrP0="; }; diff --git a/pkgs/by-name/be/belle-sip/package.nix b/pkgs/by-name/be/belle-sip/package.nix index dd9d46102dbf..b8b33f175818 100644 --- a/pkgs/by-name/be/belle-sip/package.nix +++ b/pkgs/by-name/be/belle-sip/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://linphone.org/technical-corner/belle-sip"; + homepage = "https://gitlab.linphone.org/BC/public/belle-sip"; description = "Modern library implementing SIP (RFC 3261) transport, transaction and dialog layers. Part of the Linphone project"; mainProgram = "belle_sip_tester"; license = licenses.gpl3Plus; diff --git a/pkgs/by-name/be/beluga/package.nix b/pkgs/by-name/be/beluga/package.nix index 6c97064a52cb..09d31d35607a 100644 --- a/pkgs/by-name/be/beluga/package.nix +++ b/pkgs/by-name/be/beluga/package.nix @@ -11,7 +11,7 @@ ocamlPackages.buildDunePackage rec { src = fetchFromGitHub { owner = "Beluga-lang"; repo = "Beluga"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-QUZ3mmd0gBQ+hnAeo/TbvFsETnThAdAoQyfpz2F//4g="; }; diff --git a/pkgs/by-name/be/bemoji/package.nix b/pkgs/by-name/be/bemoji/package.nix index 976ee9bd3344..a7b4215aceeb 100644 --- a/pkgs/by-name/be/bemoji/package.nix +++ b/pkgs/by-name/be/bemoji/package.nix @@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec { src = fetchFromGitHub { owner = "marty-oehme"; repo = "bemoji"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-HXwho0vRI9ZrUuDMicMH4ZNExY+zJfbrne2LMQmmHww="; }; diff --git a/pkgs/by-name/be/bend/package.nix b/pkgs/by-name/be/bend/package.nix index b337ef53fda0..c1e6470dfdcc 100644 --- a/pkgs/by-name/be/bend/package.nix +++ b/pkgs/by-name/be/bend/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "HigherOrderCO"; repo = "Bend"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-j4YMdeSxIbhp7xT42L42/y0ZncFPKBkxTh0LgO/RjkY="; }; diff --git a/pkgs/by-name/be/benthos/package.nix b/pkgs/by-name/be/benthos/package.nix index dd7bfef69e47..cbc35e7669b6 100644 --- a/pkgs/by-name/be/benthos/package.nix +++ b/pkgs/by-name/be/benthos/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "redpanda-data"; repo = "benthos"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-JLBH3eFhqPaLK5kCqsnUF54Izu+fEFQbP+cehvrHL9Q="; }; diff --git a/pkgs/by-name/be/beszel/package.nix b/pkgs/by-name/be/beszel/package.nix index 8746cda0e594..cd7b74290ad9 100644 --- a/pkgs/by-name/be/beszel/package.nix +++ b/pkgs/by-name/be/beszel/package.nix @@ -14,7 +14,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "henrygd"; repo = "beszel"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-VB3ICoJrBIwP27jZJASQin4xzQ04089VqwFp7hfqZaQ="; }; diff --git a/pkgs/by-name/be/betterdisplay/package.nix b/pkgs/by-name/be/betterdisplay/package.nix new file mode 100644 index 000000000000..cd8b19725270 --- /dev/null +++ b/pkgs/by-name/be/betterdisplay/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenvNoCC, + fetchurl, + undmg, + nix-update-script, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "betterdisplay"; + version = "3.2.1"; + + src = fetchurl { + url = "https://github.com/waydabber/BetterDisplay/releases/download/v${finalAttrs.version}/BetterDisplay-v${finalAttrs.version}.dmg"; + hash = "sha256-UQLVRCeUznTqT6qDR6sZRZ5xMVgs0Th2iRRpnF0pqVI="; + }; + + dontPatch = true; + dontConfigure = true; + dontBuild = true; + dontFixup = true; + + buildInputs = [ undmg ]; + + sourceRoot = "."; + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + mv BetterDisplay.app $out/Applications + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Unlock your displays on your Mac! Flexible HiDPI scaling, XDR/HDR extra brightness, virtual screens, DDC control, extra dimming, PIP/streaming, EDID override and lots more"; + homepage = "https://betterdisplay.pro/"; + changelog = "https://github.com/waydabber/BetterDisplay/releases/tag/v${finalAttrs.version}"; + license = [ lib.licenses.unfree ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + maintainers = with lib.maintainers; [ DimitarNestorov ]; + platforms = lib.platforms.darwin; + }; +}) diff --git a/pkgs/by-name/bi/biblioteca/package.nix b/pkgs/by-name/bi/biblioteca/package.nix index f857d8f7a723..8e04e854367b 100644 --- a/pkgs/by-name/bi/biblioteca/package.nix +++ b/pkgs/by-name/bi/biblioteca/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "workbenchdev"; repo = "Biblioteca"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-zrrI3u4ukGN6eb/eK/aZG4gi/xtXciyRS+JX9Js9KEw="; }; diff --git a/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix b/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix index 94291f9993e8..4e01e22af5e0 100644 --- a/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix +++ b/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "MateusRodCosta"; repo = "bign-handheld-thumbnailer"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-rRKMIkeTBb16GF8DgQ36Vdx/1I6zuzpuL/jusFJ0OZw="; }; diff --git a/pkgs/by-name/bi/bigquery-emulator/package.nix b/pkgs/by-name/bi/bigquery-emulator/package.nix index ef5089102a13..8b569e27bcb9 100644 --- a/pkgs/by-name/bi/bigquery-emulator/package.nix +++ b/pkgs/by-name/bi/bigquery-emulator/package.nix @@ -18,7 +18,7 @@ buildGoModule.override src = fetchFromGitHub { owner = "goccy"; repo = "bigquery-emulator"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-iAVbxbm1G7FIWTB5g6Ff8h2dZjZssONA2MOCGuvK180="; }; diff --git a/pkgs/by-name/bi/binary/package.nix b/pkgs/by-name/bi/binary/package.nix index 615408de74fe..ef5e300418e8 100644 --- a/pkgs/by-name/bi/binary/package.nix +++ b/pkgs/by-name/bi/binary/package.nix @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "fizzyizzy05"; repo = "binary"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-0pVQMPwy/XXJl2fHQ/gIi+e/cJY87CA9G+GPkdYFQBc="; }; diff --git a/pkgs/by-name/bi/bitbox/package.nix b/pkgs/by-name/bi/bitbox/package.nix index b59bad835f55..cb040646f516 100644 --- a/pkgs/by-name/bi/bitbox/package.nix +++ b/pkgs/by-name/bi/bitbox/package.nix @@ -81,9 +81,14 @@ stdenv.mkDerivation rec { meta = { description = "Companion app for the BitBox02 hardware wallet"; homepage = "https://bitbox.swiss/app/"; + downloadPage = "https://github.com/BitBoxSwiss/bitbox-wallet-app"; + changelog = "https://github.com/BitBoxSwiss/bitbox-wallet-app/blob/master/CHANGELOG.md#${ + builtins.replaceStrings [ "." ] [ "" ] version + }"; license = lib.licenses.asl20; - mainProgram = "bitbox"; maintainers = [ lib.maintainers.tensor5 ]; + mainProgram = "bitbox"; + sourceProvenance = [ lib.sourceTypes.fromSource ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/by-name/bl/blesh/package.nix b/pkgs/by-name/bl/blesh/package.nix index 2ae1f5914b66..79fb35dd0701 100644 --- a/pkgs/by-name/bl/blesh/package.nix +++ b/pkgs/by-name/bl/blesh/package.nix @@ -60,7 +60,10 @@ stdenvNoCC.mkDerivation rec { description = "Bash Line Editor -- a full-featured line editor written in pure Bash"; mainProgram = "blesh-share"; license = licenses.bsd3; - maintainers = with maintainers; [ aiotter ]; + maintainers = with maintainers; [ + aiotter + matthiasbeyer + ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/bl/bloat/package.nix b/pkgs/by-name/bl/bloat/package.nix index bfb5b1f13395..e2efe3f83307 100644 --- a/pkgs/by-name/bl/bloat/package.nix +++ b/pkgs/by-name/bl/bloat/package.nix @@ -7,12 +7,12 @@ buildGoModule { pname = "bloat"; - version = "0-unstable-2024-10-28"; + version = "0-unstable-2024-12-27"; src = fetchgit { url = "git://git.freesoftwareextremist.com/bloat"; - rev = "68d7acc2f7266c47001445229ff235546c8c71b4"; - hash = "sha256-VLyL1tnb3/qsDFp8s84XTj1Ohl/ajD+tn7V8iBp3ppY="; + rev = "d171b6c2d50500cdfd2f3308bf82a5f79e22cd8b"; + hash = "sha256-a9nL6NvZLQZLOuoqdDbZTH9dVtQ6guKopkAHughINcg="; }; vendorHash = null; diff --git a/pkgs/by-name/bl/blobdrop/package.nix b/pkgs/by-name/bl/blobdrop/package.nix index 4725edc5f327..12c866b1d963 100644 --- a/pkgs/by-name/bl/blobdrop/package.nix +++ b/pkgs/by-name/bl/blobdrop/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "vimpostor"; repo = "blobdrop"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-o2+qtkyu2qcwXpum3KiogyO8D6aY7bRJ6y4FWQKQY/o="; }; diff --git a/pkgs/by-name/bl/blockbench/package.nix b/pkgs/by-name/bl/blockbench/package.nix index 8895019cf59c..a5efc0611b98 100644 --- a/pkgs/by-name/bl/blockbench/package.nix +++ b/pkgs/by-name/bl/blockbench/package.nix @@ -17,7 +17,7 @@ buildNpmPackage rec { src = fetchFromGitHub { owner = "JannisX11"; repo = "blockbench"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-rUMzn+3j+RL8DY8euS6a4MmdoIAVLXxXu9wvKNmK/TU="; }; diff --git a/pkgs/by-name/bn/bngblaster/package.nix b/pkgs/by-name/bn/bngblaster/package.nix index f7fa9403daee..79b4cbb77105 100644 --- a/pkgs/by-name/bn/bngblaster/package.nix +++ b/pkgs/by-name/bn/bngblaster/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bngblaster"; - version = "0.9.13"; + version = "0.9.14"; src = fetchFromGitHub { owner = "rtbrick"; repo = "bngblaster"; rev = finalAttrs.version; - hash = "sha256-fMaa4UCERsZ/LIXJT4XIeb0TLYAJVzhdFFd+56n6ASA="; + hash = "sha256-vToKrP/T3qVb9UylNyZRvP+kWoizIjjXTbVlNebKG/M="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/bo/boilr/package.nix b/pkgs/by-name/bo/boilr/package.nix index 83a83011c1c9..22d7c5930dd9 100644 --- a/pkgs/by-name/bo/boilr/package.nix +++ b/pkgs/by-name/bo/boilr/package.nix @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { src = fetchFromGitHub { owner = "PhilipK"; repo = "BoilR"; - rev = "refs/tags/v.${version}"; + tag = "v.${version}"; hash = "sha256-bwCTsoZ/9TeO3wyEcOqxKePnj9glsDXWUBCLd3nVT80="; }; diff --git a/pkgs/by-name/bo/bomber-go/package.nix b/pkgs/by-name/bo/bomber-go/package.nix index 97e8d4ce1531..579f0c7d276f 100644 --- a/pkgs/by-name/bo/bomber-go/package.nix +++ b/pkgs/by-name/bo/bomber-go/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "devops-kung-fu"; repo = "bomber"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-q3x3duXc2++BvVul2a5fBTcPHWrOHpPOGHBUXL08syg="; }; diff --git a/pkgs/by-name/bo/bonsai/package.nix b/pkgs/by-name/bo/bonsai/package.nix index 186c77f6c81c..a8cb48e55294 100644 --- a/pkgs/by-name/bo/bonsai/package.nix +++ b/pkgs/by-name/bo/bonsai/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bonsai"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromSourcehut { owner = "~stacyharper"; repo = "bonsai"; rev = "v${finalAttrs.version}"; - hash = "sha256-Ggk+OKaRE+kVa8/ij3znuY3b0dT2F5F1CSse4l0MAA8="; + hash = "sha256-WAne0628lELQanUv2lg8Y9QEikZVAT7Xtkndhs8Ozjw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/bo/boofuzz/package.nix b/pkgs/by-name/bo/boofuzz/package.nix index 05e5dc722633..22a8a0d26859 100644 --- a/pkgs/by-name/bo/boofuzz/package.nix +++ b/pkgs/by-name/bo/boofuzz/package.nix @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "jtpereyda"; repo = "boofuzz"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-ffZVFmfDAJ+Qn3hbeHY/CvYgpDLxB+jaYOiYyZqZ7mo="; }; diff --git a/pkgs/by-name/bo/borgbackup/package.nix b/pkgs/by-name/bo/borgbackup/package.nix index cdff7c1cd067..e2be04cc98f9 100644 --- a/pkgs/by-name/bo/borgbackup/package.nix +++ b/pkgs/by-name/bo/borgbackup/package.nix @@ -26,7 +26,7 @@ python.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "borgbackup"; repo = "borg"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-n1hCM7Sp0t2bOJEzErEd1PS/Xc7c+KDmJ4PjQuuF140="; }; diff --git a/pkgs/by-name/bo/bosh-cli/package.nix b/pkgs/by-name/bo/bosh-cli/package.nix index 5e6d47469772..b5ec1b059286 100644 --- a/pkgs/by-name/bo/bosh-cli/package.nix +++ b/pkgs/by-name/bo/bosh-cli/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "bosh-cli"; - version = "7.8.5"; + version = "7.8.6"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8uxl8h7EAhLo4BMLPbtQdxK5kNe9fv1PbViBELJZXKY="; + sha256 = "sha256-rrYB8W1Zq9rCRgVyAPFZ5i37uEKXvV83hpkLaB7N9zQ="; }; vendorHash = null; diff --git a/pkgs/development/embedded/bossa/arduino.nix b/pkgs/by-name/bo/bossa-arduino/package.nix similarity index 100% rename from pkgs/development/embedded/bossa/arduino.nix rename to pkgs/by-name/bo/bossa-arduino/package.nix diff --git a/pkgs/development/embedded/bossa/bin2c.c b/pkgs/by-name/bo/bossa/bin2c.c similarity index 100% rename from pkgs/development/embedded/bossa/bin2c.c rename to pkgs/by-name/bo/bossa/bin2c.c diff --git a/pkgs/development/embedded/bossa/default.nix b/pkgs/by-name/bo/bossa/package.nix similarity index 89% rename from pkgs/development/embedded/bossa/default.nix rename to pkgs/by-name/bo/bossa/package.nix index 05c2d3faddfc..1a108f0a712d 100644 --- a/pkgs/development/embedded/bossa/default.nix +++ b/pkgs/by-name/bo/bossa/package.nix @@ -5,7 +5,6 @@ wxGTK32, libX11, readline, - darwin, fetchpatch, }: @@ -48,15 +47,11 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ bin2c ]; - buildInputs = - [ - wxGTK32 - libX11 - readline - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - ]; + buildInputs = [ + wxGTK32 + libX11 + readline + ]; makeFlags = [ "WXVERSION=3.2" @@ -65,7 +60,15 @@ stdenv.mkDerivation rec { "bin/bossash" "bin/bossa" ]; - env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + + env.NIX_CFLAGS_COMPILE = toString ( + [ + "-Wno-error=deprecated-declarations" + ] + ++ lib.optionals stdenv.cc.isClang [ + "-Wno-error=vla-cxx-extension" + ] + ); installPhase = '' mkdir -p $out/bin diff --git a/pkgs/by-name/bo/bottom/package.nix b/pkgs/by-name/bo/bottom/package.nix index 33b91c6db5d2..9a19a12e500f 100644 --- a/pkgs/by-name/bo/bottom/package.nix +++ b/pkgs/by-name/bo/bottom/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, autoAddDriverRunpath, installShellFiles, - stdenv, - apple-sdk_11, versionCheckHook, nix-update-script, }: @@ -28,10 +26,6 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - ]; - postInstall = '' installManPage target/tmp/bottom/manpage/btm.1 installShellCompletion \ diff --git a/pkgs/by-name/bo/bowtie2/package.nix b/pkgs/by-name/bo/bowtie2/package.nix index 519913e6ef1b..adc49a98e353 100644 --- a/pkgs/by-name/bo/bowtie2/package.nix +++ b/pkgs/by-name/bo/bowtie2/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "BenLangmead"; repo = "bowtie2"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-ZbmVOItfAgKdsMrvQIXgKiPtoQJZYfGblCGDoNPjvTU="; }; @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Ultrafast and memory-efficient tool for aligning sequencing reads to long reference sequences"; license = licenses.gpl3Plus; homepage = "http://bowtie-bio.sf.net/bowtie2"; - changelog = "https://github.com/BenLangmead/bowtie2/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}"; + changelog = "https://github.com/BenLangmead/bowtie2/releases/tag/v${finalAttrs.version}"; maintainers = with maintainers; [ rybern ]; platforms = platforms.all; mainProgram = "bowtie2"; diff --git a/pkgs/by-name/bp/bpf-linker/package.nix b/pkgs/by-name/bp/bpf-linker/package.nix index 721c910d7833..63c07fe0347d 100644 --- a/pkgs/by-name/bp/bpf-linker/package.nix +++ b/pkgs/by-name/bp/bpf-linker/package.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "aya-rs"; repo = pname; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-CRYp1ktmmY4OS23+LNKOBQJUMkd+GXptBp5LPfbyZAc="; }; diff --git a/pkgs/by-name/bp/bpfmon/package.nix b/pkgs/by-name/bp/bpfmon/package.nix index b1858b012c1b..3671c9bf705b 100644 --- a/pkgs/by-name/bp/bpfmon/package.nix +++ b/pkgs/by-name/bp/bpfmon/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "bbonev"; repo = "bpfmon"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-+W+3RLvgXXtUImzLkJr9mSWExvAUgjMp+lR9sg14VaY="; }; diff --git a/pkgs/by-name/bp/bpftop/package.nix b/pkgs/by-name/bp/bpftop/package.nix index 4f912c09e659..a72478079904 100644 --- a/pkgs/by-name/bp/bpftop/package.nix +++ b/pkgs/by-name/bp/bpftop/package.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } { src = fetchFromGitHub { owner = "Netflix"; repo = "bpftop"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-WH/oCnkBcvoouBbkAcyawfAuNR3VsTl5+ZATLpi9d4w="; }; diff --git a/pkgs/by-name/bp/bpftrace/package.nix b/pkgs/by-name/bp/bpftrace/package.nix index 129f62375eed..abca163aa370 100644 --- a/pkgs/by-name/bp/bpftrace/package.nix +++ b/pkgs/by-name/bp/bpftrace/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "bpftrace"; - version = "0.21.2"; + version = "0.21.3"; src = fetchFromGitHub { owner = "bpftrace"; repo = "bpftrace"; rev = "v${version}"; - hash = "sha256-/2m+5iFE7R+ZEc/VcgWAhkLD/jEK88roUUOUyYODi0U="; + hash = "sha256-cmKm2g1lzl625t4z7ZM04QgqDubBsCMqtibXmg+3y9w="; }; buildInputs = with llvmPackages; [ @@ -52,31 +52,15 @@ stdenv.mkDerivation rec { util-linux ]; - # tests aren't built, due to gtest shenanigans. see: - # - # https://github.com/bpftrace/bpftrace/issues/161#issuecomment-453606728 - # https://github.com/bpftrace/bpftrace/pull/363 - # cmakeFlags = [ - "-DBUILD_TESTING=FALSE" "-DLIBBCC_INCLUDE_DIRS=${bcc}/include" "-DINSTALL_TOOL_DOCS=OFF" "-DSYSTEM_INCLUDE_PATHS=${glibc.dev}/include" ]; - patches = [ - (fetchpatch { - name = "runqlat-bt-no-includes.patch"; - url = "https://github.com/bpftrace/bpftrace/pull/3262.patch"; - hash = "sha256-9yqaZeG1Uf2cC9Aa40c2QUTQRl8n2NO1nq278hf9P4M="; - }) - (fetchpatch { - name = "kheaders-not-found-message-only-on-error.patch"; - url = "https://github.com/bpftrace/bpftrace/pull/3265.patch"; - hash = "sha256-8AICMzwq5Evy9+hmZhFjccw/HmgZ9t+YIoHApjLv6Uc="; - excludes = [ "CHANGELOG.md" ]; - }) - ]; + postPatch = '' + substituteInPlace CMakeLists.txt --replace "set(MAX_LLVM_MAJOR 18)" "set(MAX_LLVM_MAJOR 19)" + ''; # Pull BPF scripts into $PATH (next to their bcc program equivalents), but do # not move them to keep `${pkgs.bpftrace}/share/bpftrace/tools/...` working. @@ -107,6 +91,7 @@ stdenv.mkDerivation rec { thoughtpolice martinetd mfrw + illustris ]; platforms = platforms.linux; }; diff --git a/pkgs/by-name/br/brainflow/package.nix b/pkgs/by-name/br/brainflow/package.nix index f8e4454e0f67..445283cc05a9 100644 --- a/pkgs/by-name/br/brainflow/package.nix +++ b/pkgs/by-name/br/brainflow/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "brainflow-dev"; repo = "brainflow"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-NBdSVYW2xWY5jgXeaeW0yBzIzvSWt5Qp2A9zIn7+0Yw="; }; diff --git a/pkgs/by-name/br/breakpad/package.nix b/pkgs/by-name/br/breakpad/package.nix index 5539543a33ac..a3bdd857bc40 100644 --- a/pkgs/by-name/br/breakpad/package.nix +++ b/pkgs/by-name/br/breakpad/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchgit, + fetchpatch, zlib, }: let @@ -22,6 +23,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-8AkC/8oX4OWAcV21laJ0AeMRB9G04rFc6UJFy7Wus4A="; }; + patches = [ + (fetchpatch { + name = "gcc-14-fixes.patch"; + url = "https://github.com/google/breakpad/commit/898a997855168c0e6a689072fefba89246271a5d.patch"; + hash = "sha256-OxodMx7XfKiD9j6b8oFvloslYagSSpQn7BPdpMVOoDY="; + }) + ]; + buildInputs = [ zlib ]; postUnpack = '' diff --git a/pkgs/by-name/br/broadlink-cli/package.nix b/pkgs/by-name/br/broadlink-cli/package.nix index 6056c5ea3375..ecd5e45c535e 100644 --- a/pkgs/by-name/br/broadlink-cli/package.nix +++ b/pkgs/by-name/br/broadlink-cli/package.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "mjg59"; repo = "python-broadlink"; - rev = "refs/tags/${version}"; + tag = version; sha256 = "sha256-fqhi4K8Ceh8Rs0ExteCfAuVfEamFjMCjCFm6DRAJDmI="; }; diff --git a/pkgs/by-name/br/broot/package.nix b/pkgs/by-name/br/broot/package.nix index df98fa357568..3fc4650292ac 100644 --- a/pkgs/by-name/br/broot/package.nix +++ b/pkgs/by-name/br/broot/package.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.44.3"; + version = "1.44.4"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - hash = "sha256-45QNcnx9sEjm02woIpxxLuir4Kep8SPlSZDdiifZNL8="; + hash = "sha256-tNmhLEB2L+2KFzsVk8hjh6gB6pxAeHqssr3e/9FFAOA="; }; - cargoHash = "sha256-2hqpltfKE8fIFlvXMQfXVT41jPILL/INXQRUHfi1EhY="; + cargoHash = "sha256-sQX282C4rYtkbk7koO3ep9O0hPDpYHNYhVKBlYyXqZw="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/br/browsers/package.nix b/pkgs/by-name/br/browsers/package.nix index 74a3f85694ef..8f15a55686a2 100644 --- a/pkgs/by-name/br/browsers/package.nix +++ b/pkgs/by-name/br/browsers/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "Browsers-software"; repo = "browsers"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-qLqyv5XXG7cpW+/eNCWguqemT3G2BhnolntHi2zZJ0o="; }; diff --git a/pkgs/by-name/br/browsr/package.nix b/pkgs/by-name/br/browsr/package.nix index 2e564787e443..611d7146bae7 100644 --- a/pkgs/by-name/br/browsr/package.nix +++ b/pkgs/by-name/br/browsr/package.nix @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "juftin"; repo = "browsr"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-76OzJOunZRVSGalQiyX+TSukD8rRIFHxA713NqOn3PY="; }; @@ -89,7 +89,7 @@ python3.pkgs.buildPythonApplication rec { description = "File explorer in your terminal"; mainProgram = "browsr"; homepage = "https://juftin.com/browsr"; - changelog = "https://github.com/juftin/browsr/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; + changelog = "https://github.com/juftin/browsr/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; }; diff --git a/pkgs/by-name/br/bruno-cli/package.nix b/pkgs/by-name/br/bruno-cli/package.nix index 51d771e9a3eb..c5203edbfe3a 100644 --- a/pkgs/by-name/br/bruno-cli/package.nix +++ b/pkgs/by-name/br/bruno-cli/package.nix @@ -1,11 +1,9 @@ { lib, - stdenv, buildNpmPackage, bruno, pkg-config, pango, - apple-sdk_11, testers, bruno-cli, }: @@ -28,14 +26,9 @@ buildNpmPackage { pkg-config ]; - buildInputs = - [ - pango - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # fix for: https://github.com/NixOS/nixpkgs/issues/272156 - apple-sdk_11 - ]; + buildInputs = [ + pango + ]; ELECTRON_SKIP_BINARY_DOWNLOAD = 1; diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index e6ffdea18a35..7de25e8cd9c5 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -13,7 +13,6 @@ cairo, pango, npm-lockfile-fix, - apple-sdk_11, }: buildNpmPackage rec { @@ -43,16 +42,11 @@ buildNpmPackage rec { copyDesktopItems ]; - buildInputs = - [ - pixman - cairo - pango - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # fix for: https://github.com/NixOS/nixpkgs/issues/272156 - apple-sdk_11 - ]; + buildInputs = [ + pixman + cairo + pango + ]; desktopItems = [ (makeDesktopItem { diff --git a/pkgs/by-name/bs/bsc/package.nix b/pkgs/by-name/bs/bsc/package.nix index 4b0cea6f5472..9c122cb6b926 100644 --- a/pkgs/by-name/bs/bsc/package.nix +++ b/pkgs/by-name/bs/bsc/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "IlyaGrebnov"; repo = "libbsc"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-reGg5xvoZBbNFFYPPyT2P1LA7oSCUIm9NIDjXyvkP9Q="; }; diff --git a/pkgs/by-name/bs/bsdgames/package.nix b/pkgs/by-name/bs/bsdgames/package.nix index a134b4c8c291..9fca2faa5ffd 100644 --- a/pkgs/by-name/bs/bsdgames/package.nix +++ b/pkgs/by-name/bs/bsdgames/package.nix @@ -8,14 +8,15 @@ bison, less, miscfiles, + fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bsd-games"; version = "2.17"; src = fetchurl { - url = "mirror://ibiblioPubLinux/games/${pname}-${version}.tar.gz"; + url = "mirror://ibiblioPubLinux/games/bsd-games-${finalAttrs.version}.tar.gz"; hash = "sha256-Bm+SSu9sHF6pRvWI428wMCH138CTlEc48CXY7bxv/2A="; }; @@ -27,10 +28,31 @@ stdenv.mkDerivation rec { ]; patches = [ - # Remove UTMPX support on Makefrag file - (fetchurl { + # Follow All patches from http://t2sde.org/packages/bsd-games.html + # May be removed in the next version + (fetchpatch { + url = "http://svn.exactcode.de/t2/trunk/package/games/bsd-games/delay_output-sym.patch"; + hash = "sha256-qbtp2cJVmEuxbTgpXM2gRHSNLE25OCmNxK+aeBBPRBw="; + }) + (fetchpatch { url = "http://svn.exactcode.de/t2/trunk/package/games/bsd-games/dm-noutmpx.patch"; - sha256 = "1k3qp3jj0dksjr4dnppv6dvkwslrgk9c7p2n9vipqildpxgqp7w2"; + hash = "sha256-oioJ5M7DAUVzX8k998p2h/APn8azw9Z8txmBuly2ouw="; + }) + (fetchpatch { + url = "http://svn.exactcode.de/t2/trunk/package/games/bsd-games/hotfix-gcc43.patch"; + hash = "sha256-9pkJmEOmM5vd/5nm3AlsbJNX0oX1kCtFrmciGpStvlA="; + }) + (fetchpatch { + url = "http://svn.exactcode.de/t2/trunk/package/games/bsd-games/hotfix-glibc.patch"; + hash = "sha256-yNL88XORTXl2qSYTlYCYDN2G++TzBxywBpYdK+ufwrA="; + }) + (fetchpatch { + url = "http://svn.exactcode.de/t2/trunk/package/games/bsd-games/hotfix.patch"; + hash = "sha256-UFXvtfVzJLRWvzbv0gaoVdt0vZOUj4UWWqoCZL/BDqE="; + }) + (fetchpatch { + url = "http://svn.exactcode.de/t2/trunk/package/games/bsd-games/postfix-bsd.patch"; + hash = "sha256-Noqq+FpSJb3heejGGHyLYYkHB3fC4qCv/p1XMfEGdx8="; }) ]; @@ -59,7 +81,7 @@ stdenv.mkDerivation rec { bsd_games_cfg_pager=${less} EOF - sed -e s/getline/bsdgames_local_getline/g -i $(grep getline -rl .) + sed -e '/sigpause/d' -i hunt/hunt/otto.c ''; postConfigure = '' @@ -67,6 +89,7 @@ stdenv.mkDerivation rec { -e "s,-o root -g root, ," \ -e "s,-o root -g games, ," \ -e "s,.*chown.*,true," \ + -e 's/install -c -m 2755/install -Dm755/' \ -e 's/INSTALL_VARDATA.*/INSTALL_VARDATA := true/' \ -e 's/INSTALL_HACKDIR.*/INSTALL_HACKDIR := true/' \ -e 's/INSTALL_DM.*/INSTALL_DM := true/' \ @@ -74,6 +97,10 @@ stdenv.mkDerivation rec { Makeconfig install-man ''; + preInstall = '' + mkdir -p $out/bin + ''; + meta = { homepage = "http://www.t2-project.org/packages/bsd-games.html"; description = "Ports of all the games from NetBSD-current that are free"; @@ -81,4 +108,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ viric ]; platforms = with lib.platforms; linux; }; -} +}) diff --git a/pkgs/by-name/bs/bsnes-hd/package.nix b/pkgs/by-name/bs/bsnes-hd/package.nix index bc03d6bbce03..c98b96e2affb 100644 --- a/pkgs/by-name/bs/bsnes-hd/package.nix +++ b/pkgs/by-name/bs/bsnes-hd/package.nix @@ -2,9 +2,7 @@ lib, SDL2, alsa-lib, - apple-sdk_11, fetchFromGitHub, - fetchpatch, gtk3, gtksourceview3, libX11, @@ -69,8 +67,7 @@ stdenv.mkDerivation { alsa-lib openal libpulseaudio - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; + ]; makeFlags = [ diff --git a/pkgs/by-name/bt/btar/package.nix b/pkgs/by-name/bt/btar/package.nix index 9c92464bf481..2109d92ab884 100644 --- a/pkgs/by-name/bt/btar/package.nix +++ b/pkgs/by-name/bt/btar/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "Tar-compatible block-based archiver"; mainProgram = "btar"; license = lib.licenses.gpl3Plus; - homepage = "https://viric.name/cgi-bin/btar"; + homepage = "https://briantracy.xyz/writing/btar.html"; platforms = platforms.all; maintainers = [ ]; }; diff --git a/pkgs/by-name/bt/btdu/dub-lock.json b/pkgs/by-name/bt/btdu/dub-lock.json index 9a7ab79a5e04..24c204b95a8f 100644 --- a/pkgs/by-name/bt/btdu/dub-lock.json +++ b/pkgs/by-name/bt/btdu/dub-lock.json @@ -1,12 +1,12 @@ { "dependencies": { "ae": { - "version": "0.0.3236", - "sha256": "0by9yclvk795nw7ilwhv7wh17j2dd7xk54phs8s5jxrwpqx10x52" + "version": "0.0.3461", + "sha256": "1mk075r3bas8s699y6sc4fxbdyjhc9cm6qxcqqaj0di9ijb71fq1" }, "btrfs": { - "version": "0.0.18", - "sha256": "0m8r4skfiryn2nk4wyb61lpvlga1330crr4y1h0q39g9xl3g6myf" + "version": "0.0.21", + "sha256": "0j7ksngwn8kilbql6p7hh5jvmrxqsr7pniw2n1qlrwdsms6qv72m" }, "ncurses": { "version": "1.0.0", diff --git a/pkgs/by-name/bt/btdu/package.nix b/pkgs/by-name/bt/btdu/package.nix index 2bd50fc95878..6612306aa49e 100644 --- a/pkgs/by-name/bt/btdu/package.nix +++ b/pkgs/by-name/bt/btdu/package.nix @@ -8,13 +8,13 @@ buildDubPackage rec { pname = "btdu"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "CyberShadow"; repo = "btdu"; rev = "v${version}"; - hash = "sha256-3sSZq+5UJH02IO0Y1yL3BLHDb4lk8k6awb5ZysBQciE="; + hash = "sha256-B8ojxdXibeNEZay9S5lzpB6bTKNB2ZI6AQ3XKUHioE0="; }; dubLock = ./dub-lock.json; diff --git a/pkgs/by-name/bt/btrfs-list/package.nix b/pkgs/by-name/bt/btrfs-list/package.nix index cbe4f01a4423..597f326df58e 100644 --- a/pkgs/by-name/bt/btrfs-list/package.nix +++ b/pkgs/by-name/bt/btrfs-list/package.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "btrfs-list"; - version = "2.3"; + version = "2.4"; src = fetchFromGitHub { owner = "speed47"; repo = "btrfs-list"; rev = "v${finalAttrs.version}"; - hash = "sha256-cWzDRop0cyrjVIJzuZxTqELgec66GiPAUJY1xIBr3OY="; + hash = "sha256-K6/xFR4Qmr6ynH5rZfOTN8nkl99iqcJPmKPwtp9FYyc="; }; buildInputs = [ perl ]; diff --git a/pkgs/by-name/bu/buck2/hashes.json b/pkgs/by-name/bu/buck2/hashes.json new file mode 100644 index 000000000000..0daa44cb729b --- /dev/null +++ b/pkgs/by-name/bu/buck2/hashes.json @@ -0,0 +1,7 @@ +{ "_comment": "@generated by pkgs/by-name/bu/buck2/update.sh" +, "_prelude": "sha256-o/YUIu8vuIIk2kfkMaijZNVLqwELwum4mFJ9sbqnDIs=" +, "x86_64-linux": "sha256-kN+nB1PAYIxG52BGM7kOmgUxVDKXhcWzyGyvWQ+CvTo=" +, "x86_64-darwin": "sha256-oRDdUjHwtGB4xBj0tzJEIiAyI6LUVEVQbjNqdEJwu5E=" +, "aarch64-linux": "sha256-9Y5ODzE90sAIKjxtZMA8nEkKPLfrpcQjPw0HPzzh/Hs=" +, "aarch64-darwin": "sha256-kyPtJvkJ/fWCFqwtueqXsiazeu8xcAeXxvwQG+FjQ4M=" +} diff --git a/pkgs/development/tools/build-managers/buck2/default.nix b/pkgs/by-name/bu/buck2/package.nix similarity index 98% rename from pkgs/development/tools/build-managers/buck2/default.nix rename to pkgs/by-name/bu/buck2/package.nix index 1d603c53938f..c0571aa758be 100644 --- a/pkgs/development/tools/build-managers/buck2/default.nix +++ b/pkgs/by-name/bu/buck2/package.nix @@ -44,7 +44,7 @@ let buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json); # our version of buck2; this should be a git tag - version = "2024-10-15"; + version = "2025-01-02"; # the platform-specific, statically linked binary — which is also # zstd-compressed @@ -72,7 +72,7 @@ let # tooling prelude-src = let - prelude-hash = "615f852ad43a901d8a09b2cbbb3aefff61626c52"; + prelude-hash = "d11a72de049a37b9b218a3ab8db33d3f97b9413c"; name = "buck2-prelude-${version}.tar.gz"; hash = buildHashes."_prelude"; url = "https://github.com/facebook/buck2-prelude/archive/${prelude-hash}.tar.gz"; diff --git a/pkgs/development/tools/build-managers/buck2/update.sh b/pkgs/by-name/bu/buck2/update.sh similarity index 88% rename from pkgs/development/tools/build-managers/buck2/update.sh rename to pkgs/by-name/bu/buck2/update.sh index 179ab6f3601d..309c4a610b91 100755 --- a/pkgs/development/tools/build-managers/buck2/update.sh +++ b/pkgs/by-name/bu/buck2/update.sh @@ -22,14 +22,14 @@ ARCHS=( "aarch64-darwin:aarch64-apple-darwin" ) -NFILE=pkgs/development/tools/build-managers/buck2/default.nix -HFILE=pkgs/development/tools/build-managers/buck2/hashes.json +NFILE=pkgs/by-name/bu/buck2/package.nix +HFILE=pkgs/by-name/bu/buck2/hashes.json rm -f "$HFILE" && touch "$HFILE" PRELUDE_SHA256HASH="$(nix-prefetch-url --type sha256 "$PRELUDE_DL_URL")" PRELUDE_SRIHASH="$(nix hash to-sri --type sha256 "$PRELUDE_SHA256HASH")" -printf "{ \"_comment\": \"@generated by pkgs/development/tools/build-managers/buck2/update.sh\"\n" >> "$HFILE" +printf "{ \"_comment\": \"@generated by pkgs/by-name/bu/buck2/update.sh\"\n" >> "$HFILE" printf ", \"_prelude\": \"$PRELUDE_SRIHASH\"\n" >> "$HFILE" for arch in "${ARCHS[@]}"; do diff --git a/pkgs/by-name/bu/budgie-media-player-applet/package.nix b/pkgs/by-name/bu/budgie-media-player-applet/package.nix index 7d7065dcef81..cf44c39eae72 100644 --- a/pkgs/by-name/bu/budgie-media-player-applet/package.nix +++ b/pkgs/by-name/bu/budgie-media-player-applet/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "zalesyc"; repo = "budgie-media-player-applet"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-wmtO4Djs1xXBjimAEV6pvPo7zxDM+XQIOi/WOPRieQ8="; }; diff --git a/pkgs/by-name/bu/buildkite-agent-metrics/package.nix b/pkgs/by-name/bu/buildkite-agent-metrics/package.nix index cc3fbadd1a19..5cb7b706f034 100644 --- a/pkgs/by-name/bu/buildkite-agent-metrics/package.nix +++ b/pkgs/by-name/bu/buildkite-agent-metrics/package.nix @@ -5,7 +5,7 @@ }: buildGoModule rec { pname = "buildkite-agent-metrics"; - version = "5.9.11"; + version = "5.9.12"; outputs = [ "out" @@ -16,10 +16,10 @@ buildGoModule rec { owner = "buildkite"; repo = "buildkite-agent-metrics"; rev = "v${version}"; - hash = "sha256-eAV/2ZflCtgeP5/7RTVBEFuHWYWNiWXzGxBO1fiCdRo="; + hash = "sha256-5k7njo8J96hb/RUdIRcP4KfwEH5Z2S4AyDyazcFlN0s="; }; - vendorHash = "sha256-YefdOc56TBKQZ6Ra4SpQwLTJYTZ2KuxRhRslaXIpucQ="; + vendorHash = "sha256-zb+z1neus1mnJWeuI5DSc73cXMGWme0mz/PU2Z/Zam8="; postInstall = '' mkdir -p $lambda/bin diff --git a/pkgs/by-name/bu/buildkite-cli/package.nix b/pkgs/by-name/bu/buildkite-cli/package.nix index d79dcecb9813..623c7b8ca3a3 100644 --- a/pkgs/by-name/bu/buildkite-cli/package.nix +++ b/pkgs/by-name/bu/buildkite-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "buildkite-cli"; - version = "3.4.1"; + version = "3.4.2"; src = fetchFromGitHub { owner = "buildkite"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-4gg0x0Brw1BQLVZ9S3WRXnvOiwvuedj47OBhfSiRMyQ="; + sha256 = "sha256-Tb9Hyhyf+ib/tLUHc+gUccZ7TuXltxxjaIpCfvnoVkA="; }; - vendorHash = "sha256-xSueBahhzD6sIFyRwvsu5ACgC9kHthDqGJ4qdNTZfPU="; + vendorHash = "sha256-1QXcRykXoNGYCR8+6ut1eU8TVNtx8b2O2MIjmL8rfQk="; doCheck = false; diff --git a/pkgs/by-name/bu/bunbun/package.nix b/pkgs/by-name/bu/bunbun/package.nix index 4bb2f8b0df0b..e6e468db36ea 100644 --- a/pkgs/by-name/bu/bunbun/package.nix +++ b/pkgs/by-name/bu/bunbun/package.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "devraza"; repo = "bunbun"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-3f/G0Vx1uXeH3QMDVUAHWi4Pf/B88/4F+4XywVsp3/4="; }; diff --git a/pkgs/by-name/bu/butterfly/package.nix b/pkgs/by-name/bu/butterfly/package.nix index 4d68d43ce0d0..a4932bc764d8 100644 --- a/pkgs/by-name/bu/butterfly/package.nix +++ b/pkgs/by-name/bu/butterfly/package.nix @@ -8,7 +8,7 @@ let src = fetchFromGitHub { owner = "LinwoodDev"; repo = "Butterfly"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-tq2pBvGHDdZoi2EMgBIgNgsg3Ovh2PLCvET98oB+7Sw="; }; in diff --git a/pkgs/by-name/by/byedpi/package.nix b/pkgs/by-name/by/byedpi/package.nix index 9be662becdd7..674119df83f2 100644 --- a/pkgs/by-name/by/byedpi/package.nix +++ b/pkgs/by-name/by/byedpi/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "hufrea"; repo = "byedpi"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-jsQFfIvWvpJRBewUSS5bhDGocfPTvtG6LiejUxdqk28="; }; diff --git a/pkgs/by-name/by/byzanz/package.nix b/pkgs/by-name/by/byzanz/package.nix index 36e477751c88..c12ea0e7777c 100644 --- a/pkgs/by-name/by/byzanz/package.nix +++ b/pkgs/by-name/by/byzanz/package.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation { env.NIX_CFLAGS_COMPILE = builtins.concatStringsSep " " [ "-Wno-error=deprecated-declarations" "-Wno-error=incompatible-pointer-types" + "-Wno-error=discarded-qualifiers" ]; nativeBuildInputs = [ @@ -61,11 +62,11 @@ stdenv.mkDerivation { wrapGAppsHook3 ]); - meta = with lib; { + meta = { description = "Tool to record a running X desktop to an animation suitable for presentation in a web browser"; homepage = "https://github.com/GNOME/byzanz"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; }; } diff --git a/pkgs/by-name/c3/c3c/package.nix b/pkgs/by-name/c3/c3c/package.nix index 49cf69018931..e12ca87d951f 100644 --- a/pkgs/by-name/c3/c3c/package.nix +++ b/pkgs/by-name/c3/c3c/package.nix @@ -18,7 +18,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "c3lang"; repo = "c3c"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-2OxUHnmFtT/TunfO+fOBOrkaHKlnqpO1wJWs79wkvAY="; }; diff --git a/pkgs/by-name/ca/caddy/package.nix b/pkgs/by-name/ca/caddy/package.nix index 337fda2c0d2e..760ec1d8e7ae 100644 --- a/pkgs/by-name/ca/caddy/package.nix +++ b/pkgs/by-name/ca/caddy/package.nix @@ -1,20 +1,21 @@ -{ lib -, buildGoModule -, callPackage -, fetchFromGitHub -, nixosTests -, caddy -, testers -, installShellFiles -, stdenv +{ + lib, + buildGoModule, + callPackage, + fetchFromGitHub, + nixosTests, + caddy, + testers, + installShellFiles, + stdenv, }: let - version = "2.8.4"; + version = "2.9.0"; dist = fetchFromGitHub { owner = "caddyserver"; repo = "dist"; - rev = "v${version}"; - hash = "sha256-O4s7PhSUTXoNEIi+zYASx8AgClMC5rs7se863G6w+l0="; + tag = "v${version}"; + hash = "sha256-3QcpmPUhZZ8oN/CUbCh/A1D0B59o1RxWPyMbA/WoRcU="; }; in buildGoModule { @@ -24,11 +25,11 @@ buildGoModule { src = fetchFromGitHub { owner = "caddyserver"; repo = "caddy"; - rev = "v${version}"; - hash = "sha256-CBfyqtWp3gYsYwaIxbfXO3AYaBiM7LutLC7uZgYXfkQ="; + tag = "v${version}"; + hash = "sha256-ea1Cch0LOGVGO9CVvS61EHVwJule4HZRizpQYP1QA2w="; }; - vendorHash = "sha256-1Api8bBZJ1/oYk4ZGIiwWCSraLzK9L+hsKXkFtk6iVM="; + vendorHash = "sha256-HEQCNOv4vO5QsbmoT0acRoaJ4sB0dzF1zcR38778nBI="; subPackages = [ "cmd/caddy" ]; @@ -39,29 +40,35 @@ buildGoModule { ]; # matches upstream since v2.8.0 - tags = [ "nobadger" ]; + tags = [ + "nobadger" + "nomysql" + "nopgx" + ]; nativeBuildInputs = [ installShellFiles ]; - postInstall = '' - install -Dm644 ${dist}/init/caddy.service ${dist}/init/caddy-api.service -t $out/lib/systemd/system + postInstall = + '' + install -Dm644 ${dist}/init/caddy.service ${dist}/init/caddy-api.service -t $out/lib/systemd/system - substituteInPlace $out/lib/systemd/system/caddy.service \ - --replace-fail "/usr/bin/caddy" "$out/bin/caddy" - substituteInPlace $out/lib/systemd/system/caddy-api.service \ - --replace-fail "/usr/bin/caddy" "$out/bin/caddy" - '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - # Generating man pages and completions fail on cross-compilation - # https://github.com/NixOS/nixpkgs/issues/308283 + substituteInPlace $out/lib/systemd/system/caddy.service \ + --replace-fail "/usr/bin/caddy" "$out/bin/caddy" + substituteInPlace $out/lib/systemd/system/caddy-api.service \ + --replace-fail "/usr/bin/caddy" "$out/bin/caddy" + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + # Generating man pages and completions fail on cross-compilation + # https://github.com/NixOS/nixpkgs/issues/308283 - $out/bin/caddy manpage --directory manpages - installManPage manpages/* + $out/bin/caddy manpage --directory manpages + installManPage manpages/* - installShellCompletion --cmd caddy \ - --bash <($out/bin/caddy completion bash) \ - --fish <($out/bin/caddy completion fish) \ - --zsh <($out/bin/caddy completion zsh) - ''; + installShellCompletion --cmd caddy \ + --bash <($out/bin/caddy completion bash) \ + --fish <($out/bin/caddy completion fish) \ + --zsh <($out/bin/caddy completion zsh) + ''; passthru = { tests = { @@ -74,11 +81,15 @@ buildGoModule { withPlugins = callPackage ./plugins.nix { inherit caddy; }; }; - meta = with lib; { + meta = { homepage = "https://caddyserver.com"; description = "Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS"; - license = licenses.asl20; + license = lib.licenses.asl20; mainProgram = "caddy"; - maintainers = with maintainers; [ Br1ght0ne techknowlogick ]; + maintainers = with lib.maintainers; [ + Br1ght0ne + stepbrobd + techknowlogick + ]; }; } diff --git a/pkgs/by-name/ca/calcure/package.nix b/pkgs/by-name/ca/calcure/package.nix index 50e5346a70db..e9b4f4745906 100644 --- a/pkgs/by-name/ca/calcure/package.nix +++ b/pkgs/by-name/ca/calcure/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "anufrievroman"; repo = "calcure"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-ufrJbc3WMY88VEsUHlWxQ1m0iupts4zNusvQL8YAqJc="; }; diff --git a/pkgs/by-name/ca/cansina/package.nix b/pkgs/by-name/ca/cansina/package.nix index d0cc43ce38f7..4e6064a1f925 100644 --- a/pkgs/by-name/ca/cansina/package.nix +++ b/pkgs/by-name/ca/cansina/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "deibit"; repo = "cansina"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-vDlYJSRBVFtEdE/1bN8PniFYkpggIKMcEakphHmaTos="; }; diff --git a/pkgs/by-name/ca/cargo-3ds/package.nix b/pkgs/by-name/ca/cargo-3ds/package.nix new file mode 100644 index 000000000000..780a40e3d66b --- /dev/null +++ b/pkgs/by-name/ca/cargo-3ds/package.nix @@ -0,0 +1,35 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, +}: +rustPlatform.buildRustPackage rec { + pname = "cargo-3ds"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "rust3ds"; + repo = "cargo-3ds"; + tag = "v${version}"; + hash = "sha256-G1XSpvE94gcamvyKKzGZgj5QSwkBNbYWYdZ17ScwW90="; + }; + + cargoHash = "sha256-Gt8TJ6VTvpqtpQuD4WYN45/gccfgnw13sKeMqHboTm8="; + + # Integration tests do not run in Nix build environment due to needing to + # create and build Cargo workspaces. + doCheck = false; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Cargo command to work with Nintendo 3DS project binaries"; + homepage = "https://github.com/rust3ds/cargo-3ds"; + license = with lib.licenses; [ + mit + asl20 + ]; + maintainers = with lib.maintainers; [ l1npengtul ]; + }; +} diff --git a/pkgs/by-name/ca/cargo-binstall/package.nix b/pkgs/by-name/ca/cargo-binstall/package.nix index d47fe97efcc0..2579e8e9137c 100644 --- a/pkgs/by-name/ca/cargo-binstall/package.nix +++ b/pkgs/by-name/ca/cargo-binstall/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "1.10.17"; + version = "1.10.18"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-MJMJWP3tISmlO4iUgkQf9veAJfLBCt2nS7LfZTicH/I="; + hash = "sha256-EFDaKxAUDgMwkURKcupL2s9TS/oSYviqA38qa8Jo1Ek="; }; - cargoHash = "sha256-zliUrsRt+ObcpswRl+qKoUxSMpgRqR5ltj905xx54KI="; + cargoHash = "sha256-td47+/LYCJy9ED/2VJDE9P9bXcr+SEgRY1N4LAi2C7s="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-cross/package.nix b/pkgs/by-name/ca/cargo-cross/package.nix index 6e0d246f6146..d62b6aa9c799 100644 --- a/pkgs/by-name/ca/cargo-cross/package.nix +++ b/pkgs/by-name/ca/cargo-cross/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "cross-rs"; repo = "cross"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; sha256 = "sha256-TFPIQno30Vm5m2nZ2b3d0WPu/98UqANLhw3IZiE5a38="; }; diff --git a/pkgs/by-name/ca/cargo-deadlinks/package.nix b/pkgs/by-name/ca/cargo-deadlinks/package.nix index e461c80cd04b..67dda48c1ad5 100644 --- a/pkgs/by-name/ca/cargo-deadlinks/package.nix +++ b/pkgs/by-name/ca/cargo-deadlinks/package.nix @@ -3,7 +3,6 @@ stdenv, rustPlatform, fetchFromGitHub, - apple-sdk_11, }: rustPlatform.buildRustPackage rec { @@ -31,8 +30,6 @@ rustPlatform.buildRustPackage rec { # assumes the target is x86_64-unknown-linux-gnu "--skip simple_project::it_checks_okay_project_correctly"; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; - meta = with lib; { description = "Cargo subcommand to check rust documentation for broken links"; homepage = "https://github.com/deadlinks/cargo-deadlinks"; diff --git a/pkgs/by-name/ca/cargo-expand/package.nix b/pkgs/by-name/ca/cargo-expand/package.nix index 6530954a1ed9..5a3bfaf457f4 100644 --- a/pkgs/by-name/ca/cargo-expand/package.nix +++ b/pkgs/by-name/ca/cargo-expand/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.95"; + version = "1.0.96"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - hash = "sha256-VEjgSmZcy/CZ8EO/mJ2nBOpQviF4A/QQ8SpLLF/9x4c="; + hash = "sha256-uLJ7XD1m4KreIue+p6Duoa8+DYjhaHagDMmPKcvHZ0I="; }; - cargoHash = "sha256-m/F6fI1d8i5lVyURti86FWAs/U14TXpgg/nemLAv4NI="; + cargoHash = "sha256-XAkEcd/QDw1SyrPuuk5ojqlKHiG28DgdipbKtnlWsGg="; meta = with lib; { description = "Cargo subcommand to show result of macro expansion"; diff --git a/pkgs/by-name/ca/cargo-llvm-lines/package.nix b/pkgs/by-name/ca/cargo-llvm-lines/package.nix index 612775f92d1d..abecfad449aa 100644 --- a/pkgs/by-name/ca/cargo-llvm-lines/package.nix +++ b/pkgs/by-name/ca/cargo-llvm-lines/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-llvm-lines"; - version = "0.4.41"; + version = "0.4.42"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - hash = "sha256-ewxdjvo9WFVX4484uuEkerzcJ4fOy2Sm90tiPGNbrV0="; + hash = "sha256-qKdxnISussiyp1ylahS7qOdMfOGwJnlbWrgEHf/L2y0="; }; - cargoHash = "sha256-9jG5VgIlHYv1IFSjPy34dNk8RHjhgXi6daI+R0jgxMc="; + cargoHash = "sha256-IDFCzTAlC/ZYGwUSmmxyRmZy5belxvyfeWpTCPzJQ6o="; meta = with lib; { description = "Count the number of lines of LLVM IR across all instantiations of a generic function"; diff --git a/pkgs/development/tools/rust/cargo-msrv/default.nix b/pkgs/by-name/ca/cargo-msrv/package.nix similarity index 75% rename from pkgs/development/tools/rust/cargo-msrv/default.nix rename to pkgs/by-name/ca/cargo-msrv/package.nix index 4a1ff0908d59..4cd3c6b098fd 100644 --- a/pkgs/development/tools/rust/cargo-msrv/default.nix +++ b/pkgs/by-name/ca/cargo-msrv/package.nix @@ -6,24 +6,22 @@ rustup, openssl, stdenv, - libiconv, - Security, makeWrapper, gitUpdater, }: rustPlatform.buildRustPackage rec { pname = "cargo-msrv"; - version = "0.16.2"; + version = "0.17.1"; src = fetchFromGitHub { owner = "foresterre"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-pgSwyq5KK9PCsmMnquufaw2oW7VSm93xRmozi/uqzNc="; + tag = "v${version}"; + sha256 = "sha256-cRdnx9K+EkVEKtPxQk+gXK6nkgkpWhpYij/5e7pFzMU="; }; - cargoHash = "sha256-4eGoNKv76+3QVRUbTPiqTiLbQoOX6mVouJ3puxN6pMY="; + cargoHash = "sha256-Hs/bdDpJFQ0w+Ds2L5at06Sw3F+5bXu5HU798gR9/9Q="; passthru = { updateScript = gitUpdater { @@ -35,14 +33,7 @@ rustPlatform.buildRustPackage rec { # Integration tests fail doCheck = false; - buildInputs = - if stdenv.hostPlatform.isDarwin then - [ - libiconv - Security - ] - else - [ openssl ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ]; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-release/package.nix b/pkgs/by-name/ca/cargo-release/package.nix index ad9a9d648ee4..b38492c0a6a3 100644 --- a/pkgs/by-name/ca/cargo-release/package.nix +++ b/pkgs/by-name/ca/cargo-release/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "crate-ci"; repo = "cargo-release"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-eMPwbcMIjYxM5gJm3HSdwzxN7WYOOtzj/Wf7rwuJfWs="; }; diff --git a/pkgs/by-name/ca/cargo-spellcheck/package.nix b/pkgs/by-name/ca/cargo-spellcheck/package.nix index f33a0f385b67..c79eefb5086a 100644 --- a/pkgs/by-name/ca/cargo-spellcheck/package.nix +++ b/pkgs/by-name/ca/cargo-spellcheck/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - apple-sdk_11, }: rustPlatform.buildRustPackage rec { @@ -21,8 +19,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ rustPlatform.bindgenHook ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; - preCheck = "HOME=$(mktemp -d)"; checkFlags = [ diff --git a/pkgs/by-name/ca/cargo-tally/package.nix b/pkgs/by-name/ca/cargo-tally/package.nix index c26c414ea0bc..57a9cc9ff5ad 100644 --- a/pkgs/by-name/ca/cargo-tally/package.nix +++ b/pkgs/by-name/ca/cargo-tally/package.nix @@ -8,14 +8,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.56"; + version = "1.0.57"; src = fetchCrate { inherit pname version; - hash = "sha256-IB1OoS9pdFHFewLfeu1cVCffLGtPvCJlVkIBZxtBkm4="; + hash = "sha256-0f+23kQZzmUeAjettZ3iRTATiv73sGpI13TzZFTU150="; }; - cargoHash = "sha256-uPlilomHib10/v2HKBjU/ln0B4QkKpFJPpKf37RO7Oo="; + cargoHash = "sha256-o4S13uvKYLUUmx6tHQpCm7U9AOtmg8P60NxdNsXy9Fc="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk_11_0.frameworks; diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix index aa4fbe069ad1..07832381f70d 100644 --- a/pkgs/by-name/ca/cargo-tauri/package.nix +++ b/pkgs/by-name/ca/cargo-tauri/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "tauri-apps"; repo = "tauri"; - rev = "refs/tags/tauri-v${version}"; + tag = "tauri-v${version}"; hash = "sha256-HPmViOowP1xAjDJ89YS0BTjNnKI1P0L777ywkqAhhc4="; }; diff --git a/pkgs/by-name/ca/cargo-xwin/package.nix b/pkgs/by-name/ca/cargo-xwin/package.nix index 00909c292e28..5c664bf94264 100644 --- a/pkgs/by-name/ca/cargo-xwin/package.nix +++ b/pkgs/by-name/ca/cargo-xwin/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-xwin"; - version = "0.18.2"; + version = "0.18.3"; src = fetchFromGitHub { owner = "rust-cross"; repo = "cargo-xwin"; rev = "v${version}"; - hash = "sha256-bK0bEaJaPTXpwLeDCS4kwf4S0mLP6MrI8BxzOM9ha8M="; + hash = "sha256-JwN0eUtj2qa5Hdl4aeDr9FtEpTB/Y36/q8ValfuvN/A="; }; - cargoHash = "sha256-bDnkSN3rt23j3EZRJdPLtYzltSvRGyYV+rlVAZPzjS4="; + cargoHash = "sha256-pHy5sImtaN5MzkewygFbPK1yFLRmHrzPDa7NOoUoA5M="; meta = with lib; { description = "Cross compile Cargo project to Windows MSVC target with ease"; diff --git a/pkgs/by-name/ca/cargonode/package.nix b/pkgs/by-name/ca/cargonode/package.nix index 2b6b95471fd3..51fda0140d5c 100644 --- a/pkgs/by-name/ca/cargonode/package.nix +++ b/pkgs/by-name/ca/cargonode/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "xosnrdev"; repo = "cargonode"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-xzBLuQRyKmd9k0sbBFV5amtFWwKqXR0CEsRv8SHiJcQ="; }; diff --git a/pkgs/by-name/ca/cariddi/package.nix b/pkgs/by-name/ca/cariddi/package.nix index 681ffadd1c27..443623316b53 100644 --- a/pkgs/by-name/ca/cariddi/package.nix +++ b/pkgs/by-name/ca/cariddi/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "edoardottt"; repo = "cariddi"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-mRrUTRknax3b4hs3frQMzg0GyB3WjMDZJk0RQSAC88U="; }; diff --git a/pkgs/by-name/ca/cartero/package.nix b/pkgs/by-name/ca/cartero/package.nix index 6d2bcb7700ee..e73bf605cb88 100644 --- a/pkgs/by-name/ca/cartero/package.nix +++ b/pkgs/by-name/ca/cartero/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "danirod"; repo = "cartero"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-fXFrxaqHgf7XWX1guySsaP6PxmAPwVxoPaEOTpz4OqY="; }; diff --git a/pkgs/by-name/ca/catboost/package.nix b/pkgs/by-name/ca/catboost/package.nix index 1d0ef404a667..93c229d29f1e 100644 --- a/pkgs/by-name/ca/catboost/package.nix +++ b/pkgs/by-name/ca/catboost/package.nix @@ -12,13 +12,14 @@ ragel, yasm, zlib, + gitUpdater, cudaSupport ? config.cudaSupport, cudaPackages ? { }, llvmPackages_12, pythonSupport ? false, }: let - inherit (llvmPackages) stdenv; + stdenv = if cudaSupport then cudaPackages.backendStdenv else llvmPackages.stdenv; in stdenv.mkDerivation (finalAttrs: { @@ -28,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "catboost"; repo = "catboost"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-I3geFdVQ1Pm61eRXi+ueaxel3QRb8EJV9f4zV2Q7kk4="; }; @@ -68,12 +69,9 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ] - ++ lib.optionals cudaSupport ( - with cudaPackages; - [ - cuda_nvcc - ] - ); + ++ lib.optionals cudaSupport [ + cudaPackages.cuda_nvcc + ]; buildInputs = [ @@ -83,14 +81,11 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ] - ++ lib.optionals cudaSupport ( - with cudaPackages; - [ - cuda_cudart - cuda_cccl - libcublas - ] - ); + ++ lib.optionals cudaSupport [ + cudaPackages.cuda_cudart + cudaPackages.cuda_cccl + cudaPackages.libcublas + ]; env = { PROGRAM_VERSION = finalAttrs.version; @@ -101,6 +96,11 @@ stdenv.mkDerivation (finalAttrs: { CUDAHOSTCXX = lib.optionalString cudaSupport "${llvmPackages_12.stdenv.cc}/bin/cc"; NIX_CFLAGS_LINK = lib.optionalString stdenv.hostPlatform.isLinux "-fuse-ld=lld"; NIX_LDFLAGS = "-lc -lm"; + NIX_CFLAGS_COMPILE = toString ( + lib.optionals stdenv.cc.isClang [ + "-Wno-error=missing-template-arg-list-after-template-kw" + ] + ); }; cmakeFlags = [ @@ -123,7 +123,9 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; { + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + + meta = { description = "High-performance library for gradient boosting on decision trees"; longDescription = '' A fast, scalable, high performance Gradient Boosting on Decision Trees @@ -131,10 +133,10 @@ stdenv.mkDerivation (finalAttrs: { learning tasks for Python, R, Java, C++. Supports computation on CPU and GPU. ''; changelog = "https://github.com/catboost/catboost/releases/tag/v${finalAttrs.version}"; - license = licenses.asl20; - platforms = platforms.unix; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; homepage = "https://catboost.ai"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ PlushBeaver natsukium ]; diff --git a/pkgs/by-name/ca/catppuccin-catwalk/package.nix b/pkgs/by-name/ca/catppuccin-catwalk/package.nix index 981bc6da239a..676345b0b528 100644 --- a/pkgs/by-name/ca/catppuccin-catwalk/package.nix +++ b/pkgs/by-name/ca/catppuccin-catwalk/package.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage { src = fetchFromGitHub { owner = "catppuccin"; repo = "catwalk"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-Yj9xTQJ0eu3Ymi2R9fgYwBJO0V+4bN4MOxXCJGQ8NjU="; }; diff --git a/pkgs/by-name/ca/catppuccin-whiskers/package.nix b/pkgs/by-name/ca/catppuccin-whiskers/package.nix index 2f69b8cd504e..7838d626885a 100644 --- a/pkgs/by-name/ca/catppuccin-whiskers/package.nix +++ b/pkgs/by-name/ca/catppuccin-whiskers/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage { src = fetchFromGitHub { owner = "catppuccin"; repo = "whiskers"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-OLEXy9MCrPQu1KWICsYhe/ayVqxkYIFwyJoJhgiNDz4="; }; diff --git a/pkgs/by-name/ca/cavalcade/package.nix b/pkgs/by-name/ca/cavalcade/package.nix index f5cf8e667152..368c0256b850 100644 --- a/pkgs/by-name/ca/cavalcade/package.nix +++ b/pkgs/by-name/ca/cavalcade/package.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "worron"; repo = "cavalcade"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-VyWOPNidN0+pfuxsgPWq6lI5gXQsiRpmYjQYjZW6i9w="; }; diff --git a/pkgs/by-name/ca/cavalier/package.nix b/pkgs/by-name/ca/cavalier/package.nix index 8fc49f34fa6e..eef902233f00 100644 --- a/pkgs/by-name/ca/cavalier/package.nix +++ b/pkgs/by-name/ca/cavalier/package.nix @@ -21,7 +21,7 @@ buildDotnetModule rec { src = fetchFromGitHub { owner = "NickvisionApps"; repo = "Cavalier"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-SFhEKtYrlnkbLMnxU4Uf4jnFsw0MJHstgZgLLnGC2d8="; }; diff --git a/pkgs/by-name/cb/cbmc/package.nix b/pkgs/by-name/cb/cbmc/package.nix index 0b7200647536..730449c04de2 100644 --- a/pkgs/by-name/cb/cbmc/package.nix +++ b/pkgs/by-name/cb/cbmc/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "diffblue"; repo = "cbmc"; - rev = "refs/tags/cbmc-${finalAttrs.version}"; + tag = "cbmc-${finalAttrs.version}"; hash = "sha256-PZZnseOE3nodE0zwyG+82gm55BO4rsCcP4T+fZq7L6I="; }; diff --git a/pkgs/by-name/cc/ccache/package.nix b/pkgs/by-name/cc/ccache/package.nix index 25753bd55557..1bee50d60c43 100644 --- a/pkgs/by-name/cc/ccache/package.nix +++ b/pkgs/by-name/cc/ccache/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ccache"; repo = "ccache"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; # `git archive` replaces `$Format:%H %D$` in cmake/CcacheVersion.cmake # we need to replace it with something reproducible # see https://github.com/NixOS/nixpkgs/pull/316524 diff --git a/pkgs/by-name/cd/cdecl/package.nix b/pkgs/by-name/cd/cdecl/package.nix index 8819963e50b7..590b928c11f7 100644 --- a/pkgs/by-name/cd/cdecl/package.nix +++ b/pkgs/by-name/cd/cdecl/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "paul-j-lucas"; repo = "cdecl"; - rev = "refs/tags/cdecl-${finalAttrs.version}"; + tag = "cdecl-${finalAttrs.version}"; hash = "sha256-GtNB55zFIpt6yYE3olC3yQr2RLsS9AMewzJKDcb67GM="; }; diff --git a/pkgs/by-name/cd/cdecrypt/package.nix b/pkgs/by-name/cd/cdecrypt/package.nix index 2c2e8dcf4970..e74a63e04b4c 100644 --- a/pkgs/by-name/cd/cdecrypt/package.nix +++ b/pkgs/by-name/cd/cdecrypt/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "VitaSmith"; repo = "cdecrypt"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-PyT60RDyp1/Co/7WHC0+KrsnrDeTJ605x1pt4OmlGYg="; }; diff --git a/pkgs/by-name/cd/cdk-go/package.nix b/pkgs/by-name/cd/cdk-go/package.nix index 02bd3a044538..164f9f857e8f 100644 --- a/pkgs/by-name/cd/cdk-go/package.nix +++ b/pkgs/by-name/cd/cdk-go/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "cdk-team"; repo = "CDK"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-Lpn+VuCzODOzxcgfD1l36eHmssAUz7+HgtN8vZwDNwE="; }; diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix index b18d0625a291..146df1742574 100644 --- a/pkgs/by-name/cd/cdncheck/package.nix +++ b/pkgs/by-name/cd/cdncheck/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "projectdiscovery"; repo = "cdncheck"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-1TYUSWbcWnRsOM8ctY1g9CmFSAXiK9NmN5ZDaKeJIgw="; }; diff --git a/pkgs/by-name/ce/cedar/package.nix b/pkgs/by-name/ce/cedar/package.nix index 16963c41058d..2b3e0708ca1b 100644 --- a/pkgs/by-name/ce/cedar/package.nix +++ b/pkgs/by-name/ce/cedar/package.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "cedar-policy"; repo = "cedar"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-p8idQx3HGO/ikL0pDTPXx5+rD2sRpXANqs/g51BL554="; }; diff --git a/pkgs/by-name/ce/cent/package.nix b/pkgs/by-name/ce/cent/package.nix index 065c666e0a1c..b11bb02e4cf2 100644 --- a/pkgs/by-name/ce/cent/package.nix +++ b/pkgs/by-name/ce/cent/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "xm1k3"; repo = "cent"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-xwGmBZgdpyYJ1AKoNUUPEMbU5/racalE4SLrx/E51wM="; }; diff --git a/pkgs/by-name/ce/ceptre/package.nix b/pkgs/by-name/ce/ceptre/package.nix index f73631ff8d3b..a2623e73757e 100644 --- a/pkgs/by-name/ce/ceptre/package.nix +++ b/pkgs/by-name/ce/ceptre/package.nix @@ -1,29 +1,40 @@ -{ lib, stdenv, fetchFromGitHub, mlton }: +{ + lib, + stdenv, + fetchFromGitHub, + mlton, +}: stdenv.mkDerivation { pname = "ceptre"; - version = "unstable-2016-11-27"; + version = "0-unstable-2024-8-26"; src = fetchFromGitHub { owner = "chrisamaphone"; repo = "interactive-lp"; - rev = "e436fda2ccd44e9c9d226feced9d204311deacf5"; - hash = "sha256-COYrE9O/Y1/ZBNHNakBwrUVklCuk144RF9bjwa3rl5w="; + rev = "22df9ff622f3363824f345089a25016e2a897077"; + hash = "sha256-MKA/289KWIYzHW0RbHC0Q2fMJT45WcABZrNsCWKZr4Y="; fetchSubmodules = true; }; nativeBuildInputs = [ mlton ]; installPhase = '' + runHook preInstall mkdir -p $out/bin cp ceptre $out/bin + runHook postInstall ''; - meta = with lib; { + meta = { description = "Linear logic programming language for modeling generative interactive systems"; mainProgram = "ceptre"; homepage = "https://github.com/chrisamaphone/interactive-lp"; - maintainers = with maintainers; [ pSub ]; - platforms = platforms.unix; + maintainers = with lib.maintainers; [ + NotAShelf + pSub + ]; + platforms = lib.platforms.unix; + license = lib.licenses.unfree; }; } diff --git a/pkgs/by-name/ce/cert-viewer/package.nix b/pkgs/by-name/ce/cert-viewer/package.nix index 85f16a1a419c..ee0f876a77ab 100644 --- a/pkgs/by-name/ce/cert-viewer/package.nix +++ b/pkgs/by-name/ce/cert-viewer/package.nix @@ -14,7 +14,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "mgit-at"; repo = "cert-viewer"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-6IPr2BG3y/7cmc2WkeeFDpQ59GNU1eOhhm49HE2w0cA="; }; diff --git a/pkgs/by-name/ce/certinfo-go/package.nix b/pkgs/by-name/ce/certinfo-go/package.nix index d95f0f6838b8..1a820b587177 100644 --- a/pkgs/by-name/ce/certinfo-go/package.nix +++ b/pkgs/by-name/ce/certinfo-go/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "paepckehh"; repo = "certinfo"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-ySXp5dPdGhBEbo9uvCsINCufhm9j/dIX0Jn+Ou73NjM="; }; diff --git a/pkgs/by-name/cf/cfripper/package.nix b/pkgs/by-name/cf/cfripper/package.nix index f2d0f138aa8d..f06f13e966e4 100644 --- a/pkgs/by-name/cf/cfripper/package.nix +++ b/pkgs/by-name/cf/cfripper/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "Skyscanner"; repo = "cfripper"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-2yOATSCXqv28OE+GdF9F9Dhi3AIkxSe/YJ9ILLnd/nw="; }; diff --git a/pkgs/by-name/cf/cfspeedtest/package.nix b/pkgs/by-name/cf/cfspeedtest/package.nix index b9010abb2567..5ab305fa5072 100644 --- a/pkgs/by-name/cf/cfspeedtest/package.nix +++ b/pkgs/by-name/cf/cfspeedtest/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "code-inflation"; repo = pname; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-7FKUP6ZCIGmP/WX6lUwrUT7QEVo/LGJz46ZmqPeRTW8="; }; diff --git a/pkgs/by-name/ch/chainsaw/package.nix b/pkgs/by-name/ch/chainsaw/package.nix index f345d897c2f5..345d0801242b 100644 --- a/pkgs/by-name/ch/chainsaw/package.nix +++ b/pkgs/by-name/ch/chainsaw/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "WithSecureLabs"; repo = "chainsaw"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-ErDIfLhzCiFm3dZzr6ThjYCplfDKbALAqcu8c0gREH4="; }; diff --git a/pkgs/by-name/ch/chaos/package.nix b/pkgs/by-name/ch/chaos/package.nix index dfbfbb62b73a..534ca61872ef 100644 --- a/pkgs/by-name/ch/chaos/package.nix +++ b/pkgs/by-name/ch/chaos/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "projectdiscovery"; repo = "chaos-client"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-YjwxInBEPgovSk5EZzpeNhp4/FRWf6prZnNqcyyFFJg="; }; diff --git a/pkgs/by-name/ch/charge-lnd/package.nix b/pkgs/by-name/ch/charge-lnd/package.nix index 88817c6e4b02..2defe92c7aa0 100644 --- a/pkgs/by-name/ch/charge-lnd/package.nix +++ b/pkgs/by-name/ch/charge-lnd/package.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "accumulator"; repo = "charge-lnd"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-mNU8bhiZqvYbNUU8vJNk9WbpAVrCTi9Fy3hlIpb06ac="; }; diff --git a/pkgs/by-name/ch/charls/package.nix b/pkgs/by-name/ch/charls/package.nix index 0595b4629aea..4822f0d7644b 100644 --- a/pkgs/by-name/ch/charls/package.nix +++ b/pkgs/by-name/ch/charls/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "team-charls"; repo = pname; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-c1wrk6JLcAH7TFPwjARlggaKXrAsLWyUQF/3WHlqoqg="; }; diff --git a/pkgs/by-name/ch/charmcraft/package.nix b/pkgs/by-name/ch/charmcraft/package.nix index dca969004eb1..83efaa904005 100644 --- a/pkgs/by-name/ch/charmcraft/package.nix +++ b/pkgs/by-name/ch/charmcraft/package.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "canonical"; repo = "charmcraft"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-2MI2cbAohfTgbilxZcFvmxt/iVjR6zJ2o0gequB//hg="; }; diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/by-name/ch/chatterino2/package.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/chatterino2/default.nix rename to pkgs/by-name/ch/chatterino2/package.nix diff --git a/pkgs/by-name/ch/checkip/package.nix b/pkgs/by-name/ch/checkip/package.nix index a7beb3d5d076..10617fb3d6c7 100644 --- a/pkgs/by-name/ch/checkip/package.nix +++ b/pkgs/by-name/ch/checkip/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "jreisinger"; repo = pname; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-bjKRHIY9OIEft//g8VHKHTUrwWn8UU38SPP4IdPbIQE="; }; diff --git a/pkgs/by-name/ch/cherrytree/package.nix b/pkgs/by-name/ch/cherrytree/package.nix index 98f219022afe..08aa96f13bae 100644 --- a/pkgs/by-name/ch/cherrytree/package.nix +++ b/pkgs/by-name/ch/cherrytree/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "giuspen"; repo = "cherrytree"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-JiSGoEVGotaPqEKFHjTagi+sZPgdX+tKI0FIHRmJKHE="; }; diff --git a/pkgs/by-name/ch/chirp/package.nix b/pkgs/by-name/ch/chirp/package.nix index 984d459ec3f0..092ce48b52dc 100644 --- a/pkgs/by-name/ch/chirp/package.nix +++ b/pkgs/by-name/ch/chirp/package.nix @@ -11,14 +11,14 @@ python3Packages.buildPythonApplication { pname = "chirp"; - version = "0.4.0-unstable-2024-12-17"; + version = "0.4.0-unstable-2024-12-26"; pyproject = true; src = fetchFromGitHub { owner = "kk7ds"; repo = "chirp"; - rev = "605037deb68994bbb3114c2a35db7a7a7e4755a6"; - hash = "sha256-5AwoXX5Qa4ROjt5wSdcElLJ7ZVguKK3urn0ygVDJiGQ="; + rev = "43449629fb3c2ae0b71e8b7cb7d49e8e97a00c64"; + hash = "sha256-zn9pInfJ/QbwgvBqkqzdW7txVGZVU1EPDo4I4ZQDdLY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ch/chisel/package.nix b/pkgs/by-name/ch/chisel/package.nix index 8bcd2ccb54cc..081ef937a79d 100644 --- a/pkgs/by-name/ch/chisel/package.nix +++ b/pkgs/by-name/ch/chisel/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "jpillora"; repo = pname; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-b3r4D/P7D3kfIyMd1s/ntciY04qMrvSTru9+HjAOrnA="; }; diff --git a/pkgs/by-name/ch/chocolate-doom/package.nix b/pkgs/by-name/ch/chocolate-doom/package.nix index 677fed32aea1..030f9bc55600 100644 --- a/pkgs/by-name/ch/chocolate-doom/package.nix +++ b/pkgs/by-name/ch/chocolate-doom/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "chocolate-doom"; repo = "chocolate-doom"; - rev = "refs/tags/chocolate-doom-${finalAttrs.version}"; + tag = "chocolate-doom-${finalAttrs.version}"; hash = "sha256-yDPfqCuzRbDhOQisIDAGo2bmmMjT+0lds5xc9C2pqoU="; }; diff --git a/pkgs/by-name/ch/chrony/package.nix b/pkgs/by-name/ch/chrony/package.nix index 22eaf9a13bc5..cfa7806285f3 100644 --- a/pkgs/by-name/ch/chrony/package.nix +++ b/pkgs/by-name/ch/chrony/package.nix @@ -10,8 +10,6 @@ libseccomp, pps-tools, nixosTests, - apple-sdk_11, - darwinMinVersionHook, }: stdenv.mkDerivation rec { @@ -40,10 +38,6 @@ stdenv.mkDerivation rec { libcap libseccomp pps-tools - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - (darwinMinVersionHook "10.13") ]; configureFlags = [ diff --git a/pkgs/by-name/ci/ciel/package.nix b/pkgs/by-name/ci/ciel/package.nix index fa603f3d9f26..d214b6266520 100644 --- a/pkgs/by-name/ci/ciel/package.nix +++ b/pkgs/by-name/ci/ciel/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "AOSC-Dev"; repo = "ciel-rs"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-vV1qZLVVVc6KFZrpF4blKmbfQjf/Ltn+IhmM5Zqb2zU="; }; diff --git a/pkgs/by-name/ci/cilium-cli/package.nix b/pkgs/by-name/ci/cilium-cli/package.nix index f7e09b0fae4d..cd0054e9d4f5 100644 --- a/pkgs/by-name/ci/cilium-cli/package.nix +++ b/pkgs/by-name/ci/cilium-cli/package.nix @@ -14,7 +14,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "cilium"; repo = "cilium-cli"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-P4S+4N9f/m28lNwx7xzYcq99nvXelSvzX01QXDhfGM4="; }; diff --git a/pkgs/by-name/ci/cimg/package.nix b/pkgs/by-name/ci/cimg/package.nix index 3c0b917a81a0..47eaabc6ec0a 100644 --- a/pkgs/by-name/ci/cimg/package.nix +++ b/pkgs/by-name/ci/cimg/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "GreycLab"; repo = "CImg"; - rev = "refs/tags/v.${finalAttrs.version}"; + tag = "v.${finalAttrs.version}"; hash = "sha256-Abe7mSbdj06MossUQXCKZPzzfyvJyRVeLfzINYNPv4g="; }; diff --git a/pkgs/by-name/ci/cinny-desktop/package.nix b/pkgs/by-name/ci/cinny-desktop/package.nix index f1595df7042d..5109a12a6eba 100644 --- a/pkgs/by-name/ci/cinny-desktop/package.nix +++ b/pkgs/by-name/ci/cinny-desktop/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny-desktop"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-yNGzgkZXz/VroGGnZFqo5n2v3cE6/tvpQv5U4p27row="; }; diff --git a/pkgs/by-name/ci/circup/package.nix b/pkgs/by-name/ci/circup/package.nix index cbb952c1035b..0d5e8ff1a47b 100644 --- a/pkgs/by-name/ci/circup/package.nix +++ b/pkgs/by-name/ci/circup/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "adafruit"; repo = "circup"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-Iid6IwPoj7F9X6Yb0ESsuvD9/tZdRQyCceGOVt2R1qw="; }; diff --git a/pkgs/by-name/ci/civo/package.nix b/pkgs/by-name/ci/civo/package.nix index f26722131bcd..d5b5896ccad0 100644 --- a/pkgs/by-name/ci/civo/package.nix +++ b/pkgs/by-name/ci/civo/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "civo"; - version = "1.1.92"; + version = "1.1.93"; src = fetchFromGitHub { owner = "civo"; repo = "cli"; rev = "v${version}"; - hash = "sha256-nsH/6OVvCOU4f9UZNFOm9AtyN9L4tXB285580g3SsxE="; + hash = "sha256-FX2hnqYqvPoD6Fn1363XrK4n0tMd9xkWlIcyIhDJDW4="; }; vendorHash = "sha256-G3ijLi3ZbURVHkjUwylFWwxRyxroppVUFJveKw5qLq8="; diff --git a/pkgs/by-name/ck/ckan/package.nix b/pkgs/by-name/ck/ckan/package.nix index ba33a6737582..d7e846f579a6 100644 --- a/pkgs/by-name/ck/ckan/package.nix +++ b/pkgs/by-name/ck/ckan/package.nix @@ -6,6 +6,9 @@ mono, gtk2, curl, + imagemagick, + copyDesktopItems, + makeDesktopItem, }: stdenv.mkDerivation rec { @@ -17,9 +20,19 @@ stdenv.mkDerivation rec { sha256 = "sha256-SK2eKdH/bm+W+qU8XUHRD9uffmfp5bR4dBvBEUKCm8E="; }; + icon = fetchurl { + url = "https://raw.githubusercontent.com/KSP-CKAN/CKAN/450e2f960e1a3fee4ab7cf74ad56bddc5296fc7e/assets/ckan-256.png"; + hash = "sha256-BJvuOz8NWmzpYzzhveeq6rcuqXIxQqxtBIcRvobx+TY="; + }; + dontUnpack = true; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + copyDesktopItems + imagemagick + makeWrapper + ]; + buildInputs = [ mono ]; libraries = lib.makeLibraryPath [ @@ -30,12 +43,38 @@ stdenv.mkDerivation rec { dontBuild = true; installPhase = '' + runHook preInstall + for size in 16 24 48 64 96 128 256; do + mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps + magick -background none ${icon} -resize "$size"x"$size" $out/share/icons/hicolor/"$size"x"$size"/apps/${pname}.png + done install -m 644 -D $src $out/bin/ckan.exe makeWrapper ${mono}/bin/mono $out/bin/ckan \ --add-flags $out/bin/ckan.exe \ --set LD_LIBRARY_PATH $libraries + runHook postInstall ''; + desktopItems = [ + (makeDesktopItem { + name = "ckan"; + comment = "The Comprehensive Kerbal Archive Network Client"; + desktopName = "CKAN"; + categories = [ + "Game" + "PackageManager" + ]; + exec = "ckan"; + icon = "ckan"; + keywords = [ + "Kerbal Space Program" + "KSP" + "Mod" + ]; + extraConfig.X-GNOME-SingleWindow = "true"; + }) + ]; + meta = with lib; { description = "Mod manager for Kerbal Space Program"; mainProgram = "ckan"; diff --git a/pkgs/by-name/cl/clairvoyance/package.nix b/pkgs/by-name/cl/clairvoyance/package.nix index b89f785c642a..f8bbe77a1402 100644 --- a/pkgs/by-name/cl/clairvoyance/package.nix +++ b/pkgs/by-name/cl/clairvoyance/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "nikitastupin"; repo = pname; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-CVXa2HvX7M0cwqnTeZVETg07j324ATQuMNreEgAC2QA="; }; diff --git a/pkgs/by-name/cl/clanlib/package.nix b/pkgs/by-name/cl/clanlib/package.nix index d3053408815a..00a684eb1398 100644 --- a/pkgs/by-name/cl/clanlib/package.nix +++ b/pkgs/by-name/cl/clanlib/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { repo = "ClanLib"; owner = "sphair"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-sRHRkT8NiKVfa9YgP6DYV9WzCZoH7f0phHpoYMnCk98="; }; diff --git a/pkgs/by-name/cl/clapgrep/package.nix b/pkgs/by-name/cl/clapgrep/package.nix index 06b6ea3f6986..71fbae07627d 100644 --- a/pkgs/by-name/cl/clapgrep/package.nix +++ b/pkgs/by-name/cl/clapgrep/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage { src = fetchFromGitHub { owner = "luleyleo"; repo = "clapgrep"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-MYV8MrCIpa8eqp2iCLTNLZrVQOyGsMEGqlnEF43fyls="; }; diff --git a/pkgs/by-name/cl/clash-rs/package.nix b/pkgs/by-name/cl/clash-rs/package.nix index ec2edfa543b9..3ca00cf9e710 100644 --- a/pkgs/by-name/cl/clash-rs/package.nix +++ b/pkgs/by-name/cl/clash-rs/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "Watfaq"; repo = "clash-rs"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-SJ3NhLiDA0iRgq9pKB/CeltPE2ewbY+z1NBQriebNi0="; }; diff --git a/pkgs/by-name/cl/clash-verge-rev/package.nix b/pkgs/by-name/cl/clash-verge-rev/package.nix index c90218f2f36c..5fccdc27b4af 100644 --- a/pkgs/by-name/cl/clash-verge-rev/package.nix +++ b/pkgs/by-name/cl/clash-verge-rev/package.nix @@ -19,7 +19,7 @@ let src = fetchFromGitHub { owner = "clash-verge-rev"; repo = "clash-verge-rev"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-QLvJO1JFHPFOsVxNi6SCu2QuJQ9hCsO1+WKOjZL944w="; }; diff --git a/pkgs/by-name/cl/clevis/package.nix b/pkgs/by-name/cl/clevis/package.nix index ba093e923b3d..4dc89fa2acd5 100644 --- a/pkgs/by-name/cl/clevis/package.nix +++ b/pkgs/by-name/cl/clevis/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "latchset"; repo = "clevis"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-2vDQP+yvH4v46fLEWG/37r5cYP3OeDfJz71cDHEGiUg="; }; diff --git a/pkgs/by-name/cl/cli-tips/package.nix b/pkgs/by-name/cl/cli-tips/package.nix index 3e8c9dbcaceb..f87fb4a9f1b5 100644 --- a/pkgs/by-name/cl/cli-tips/package.nix +++ b/pkgs/by-name/cl/cli-tips/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation { pname = "cli-tips"; - version = "0-unstable-2024-11-14"; + version = "0-unstable-2024-12-26"; src = fetchFromGitHub { owner = "cli-stuff"; repo = "cli-tips"; - rev = "ebc191a54be7e39accd1948c3de8aded438d0495"; - hash = "sha256-KELgatdL+2M5ktuAHEljIEJ9wqP578dp5tYWYPpP3bg="; + rev = "ddb654baa8ffda13e325e2d48f1089c64025153a"; + hash = "sha256-eRQcYoqDxhsfbOdWGcYABQMcwjwmYQXfAUzTKeKPW8I="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/cl/clickhouse-backup/package.nix b/pkgs/by-name/cl/clickhouse-backup/package.nix index 5f9b04a38e07..51238ea60be2 100644 --- a/pkgs/by-name/cl/clickhouse-backup/package.nix +++ b/pkgs/by-name/cl/clickhouse-backup/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "2.6.4"; + version = "2.6.5"; src = fetchFromGitHub { owner = "Altinity"; repo = "clickhouse-backup"; rev = "v${version}"; - hash = "sha256-e5PeMe4mk91PpEP0f+08Hr+Q97WfVGE7PDN4DI+9Quw="; + hash = "sha256-tRZo2PQYCzryd593MTzrHOzVxM58ONz61A6eekyr1wo="; }; - vendorHash = "sha256-2F3H+Sbrw4Q782Y6gE3KvnXXmiZdSLrJr6AVBHSg9gA="; + vendorHash = "sha256-skL0yF0sVj3yza0LseNLfUn3jxPXuOFS/1FfHg0/H7Q="; ldflags = [ "-X main.version=${version}" diff --git a/pkgs/by-name/cl/clipcat/package.nix b/pkgs/by-name/cl/clipcat/package.nix index 22f828a3f9b0..a9960dfc02b1 100644 --- a/pkgs/by-name/cl/clipcat/package.nix +++ b/pkgs/by-name/cl/clipcat/package.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "xrelkd"; repo = "clipcat"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-94xw/E1Jp+bctVNzRZDdVaxxSMF/R87DNlRAzRT3Uvg="; }; diff --git a/pkgs/by-name/cl/cliphist/package.nix b/pkgs/by-name/cl/cliphist/package.nix index 7c8e6c73a140..9a2f1ceb3ede 100644 --- a/pkgs/by-name/cl/cliphist/package.nix +++ b/pkgs/by-name/cl/cliphist/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "sentriz"; repo = "cliphist"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-tImRbWjYCdIY8wVMibc5g5/qYZGwgT9pl4pWvY7BDlI="; }; diff --git a/pkgs/by-name/cl/cliqr/package.nix b/pkgs/by-name/cl/cliqr/package.nix index 5f2ad0596f3f..865b6bf5b3f3 100644 --- a/pkgs/by-name/cl/cliqr/package.nix +++ b/pkgs/by-name/cl/cliqr/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "paepckehh"; repo = "cliqr"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-iPNI92kCNFXRiV5NV7Yj0gznwNeFoW02yh6QLrkBYO0="; }; diff --git a/pkgs/by-name/cl/cloud-custodian/package.nix b/pkgs/by-name/cl/cloud-custodian/package.nix index 932df60ce487..32c2ce5cba80 100644 --- a/pkgs/by-name/cl/cloud-custodian/package.nix +++ b/pkgs/by-name/cl/cloud-custodian/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "cloud-custodian"; repo = "cloud-custodian"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-jGWPwHiETS4+hk9euLLxs0PBb7mxz2PHCbYYlFfLQUw="; }; diff --git a/pkgs/by-name/cl/cloud-nuke/package.nix b/pkgs/by-name/cl/cloud-nuke/package.nix index 585cf3608c76..560b04ae9a81 100644 --- a/pkgs/by-name/cl/cloud-nuke/package.nix +++ b/pkgs/by-name/cl/cloud-nuke/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-bQPfKIpOh3eq+7cGU7pB+y2a9wsOXNBdmqYbZ0kC6k8="; }; diff --git a/pkgs/by-name/cl/cloud-utils/package.nix b/pkgs/by-name/cl/cloud-utils/package.nix index 9074fc4b319a..c649cdc2396a 100644 --- a/pkgs/by-name/cl/cloud-utils/package.nix +++ b/pkgs/by-name/cl/cloud-utils/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "canonical"; repo = "cloud-utils"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-YqfkmYclPZu6Mc2bFYxtiuH7uvfa3V4YlD0aHuKn1hw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix b/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix index 80a819cc3009..11407ac4735e 100644 --- a/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix +++ b/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix @@ -7,16 +7,16 @@ }: buildGoModule rec { pname = "cloudflare-dynamic-dns"; - version = "4.3.12"; + version = "4.3.13"; src = fetchFromGitHub { owner = "zebradil"; repo = "cloudflare-dynamic-dns"; - rev = "refs/tags/${version}"; - hash = "sha256-28fIxwQmM9Lmu5Ak31+5/zw/syYwBDnQDZ0CYfmMR+U="; + tag = version; + hash = "sha256-MeVLDgr332B9KWvahlhRz7Yf3R/j2KwR9ROhU3eQnwA="; }; - vendorHash = "sha256-ie5/9qChgEWXKPqhbJzOalKPxTBr4UN9exxvfB8/HrQ="; + vendorHash = "sha256-FzEPvLI6tvyQ/nMgCBXPc1RR8YwDU1cC5f/LSZfF3Bc="; subPackages = "."; diff --git a/pkgs/by-name/cl/cloudfox/package.nix b/pkgs/by-name/cl/cloudfox/package.nix index 495d85cf0f32..01e00de947a4 100644 --- a/pkgs/by-name/cl/cloudfox/package.nix +++ b/pkgs/by-name/cl/cloudfox/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "BishopFox"; repo = "cloudfox"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-YLZSrBAEf0SXECAdnF2CQAlEd15DJ1Iv+x+RebM5tw4="; }; diff --git a/pkgs/by-name/cl/cloudhunter/package.nix b/pkgs/by-name/cl/cloudhunter/package.nix index 890527a1b6fe..b6a4c79e17bd 100644 --- a/pkgs/by-name/cl/cloudhunter/package.nix +++ b/pkgs/by-name/cl/cloudhunter/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "belane"; repo = "CloudHunter"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-7iT4vr0kcNXEyJJdBbJsllIcbZRGY3T5t/FjEONkuq0="; }; diff --git a/pkgs/by-name/cl/cloudlist/package.nix b/pkgs/by-name/cl/cloudlist/package.nix index 273189376cf4..18fb694db7e0 100644 --- a/pkgs/by-name/cl/cloudlist/package.nix +++ b/pkgs/by-name/cl/cloudlist/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "projectdiscovery"; repo = "cloudlist"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-HV4qhQgeLKwkyrRFzRQibqjWRyjLBtoWVdliJ+iyyBc="; }; diff --git a/pkgs/by-name/cl/cloudrecon/package.nix b/pkgs/by-name/cl/cloudrecon/package.nix index fda6f1e81c74..5e30337695fe 100644 --- a/pkgs/by-name/cl/cloudrecon/package.nix +++ b/pkgs/by-name/cl/cloudrecon/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "g0ldencybersec"; repo = "CloudRecon"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-SslHkwoMelvszrQZvNX28EokBgwnPDBbTUBA9jdJPro="; }; diff --git a/pkgs/by-name/cl/cloudsmith-cli/package.nix b/pkgs/by-name/cl/cloudsmith-cli/package.nix index 427c85fea926..7eef1ae64902 100644 --- a/pkgs/by-name/cl/cloudsmith-cli/package.nix +++ b/pkgs/by-name/cl/cloudsmith-cli/package.nix @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "cloudsmith-io"; repo = "cloudsmith-cli"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-UzyfOmjJzYEJYA6c4kn5XCvRVIMuiIpiq0kH9UhBwmo="; }; diff --git a/pkgs/by-name/cl/clusterctl/package.nix b/pkgs/by-name/cl/clusterctl/package.nix index 9b6604c8c52c..b4ef1d0e52cd 100644 --- a/pkgs/by-name/cl/clusterctl/package.nix +++ b/pkgs/by-name/cl/clusterctl/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - hash = "sha256-H86EkdGmzvQDGC/a+J6ISB0aYkJabBjE2P6Ab5FRlv4="; + hash = "sha256-au62bMELa27diNeQKTwgaGv9r80eO9pWv68F/WoYfGo="; }; - vendorHash = "sha256-JSWk6FgjWnDcVmp/9+M0x7QsiX08QtIOn5RRifjs2mI="; + vendorHash = "sha256-luq42qdNb9vqNXMNkYQeNH+KeYwrehwtrDkNNx7P9Y8="; subPackages = [ "cmd/clusterctl" ]; diff --git a/pkgs/by-name/cl/clusternet/package.nix b/pkgs/by-name/cl/clusternet/package.nix index 8c2dd22c241d..02e0648ee688 100644 --- a/pkgs/by-name/cl/clusternet/package.nix +++ b/pkgs/by-name/cl/clusternet/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "clusternet"; repo = "clusternet"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-uhRnJyUR7lbJvVxd3YNVxmTSTDksQsVcM5G8ZKO7Xbk="; }; diff --git a/pkgs/by-name/cm/cmake-lint/package.nix b/pkgs/by-name/cm/cmake-lint/package.nix index e58eff674d90..da7c65a8db14 100644 --- a/pkgs/by-name/cm/cmake-lint/package.nix +++ b/pkgs/by-name/cm/cmake-lint/package.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "cmake-lint"; repo = "cmake-lint"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-/OuWwerBlJynEibaYo+jkLpHt4x9GZrqMRJNxgrDBlM="; }; diff --git a/pkgs/by-name/cm/cmdstan/package.nix b/pkgs/by-name/cm/cmdstan/package.nix index 6ddbcaedff10..1a4780cece1b 100644 --- a/pkgs/by-name/cm/cmdstan/package.nix +++ b/pkgs/by-name/cm/cmdstan/package.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { pname = "cmdstan"; - version = "2.35.0"; + version = "2.36.0"; src = fetchFromGitHub { owner = "stan-dev"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-bmzkXbR4KSnpfXjs2MAx8mbNSbNrIWDP/O8S+JGWrcg="; + hash = "sha256-9Dan86C0nxxxkIXaOSKExY0hngAgWTpL4RlI3rTnBZo="; }; postPatch = '' diff --git a/pkgs/by-name/cn/cnijfilter2/package.nix b/pkgs/by-name/cn/cnijfilter2/package.nix index c040987773cd..b3a2e4f8afa6 100644 --- a/pkgs/by-name/cn/cnijfilter2/package.nix +++ b/pkgs/by-name/cn/cnijfilter2/package.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation { patches = [ ./patches/get_protocol.patch + ./patches/add_missing_import.patch ]; # lgmon3's --enable-libdir flag is used soley for specifying in which diff --git a/pkgs/by-name/cn/cnijfilter2/patches/add_missing_import.patch b/pkgs/by-name/cn/cnijfilter2/patches/add_missing_import.patch new file mode 100644 index 000000000000..298416e27706 --- /dev/null +++ b/pkgs/by-name/cn/cnijfilter2/patches/add_missing_import.patch @@ -0,0 +1,12 @@ +diff --git a/lgmon3/src/keytext.c b/lgmon3/src/keytext.c +index 8c15ff8..b80bbe5 100644 +--- a/lgmon3/src/keytext.c ++++ b/lgmon3/src/keytext.c +@@ -37,6 +37,7 @@ + #include + #include /* Ver.2.80 */ + #include ++#include + + #include "keytext.h" + diff --git a/pkgs/by-name/cn/cnquery/package.nix b/pkgs/by-name/cn/cnquery/package.nix index 7b3fa82f5235..c4e672e62b7b 100644 --- a/pkgs/by-name/cn/cnquery/package.nix +++ b/pkgs/by-name/cn/cnquery/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "mondoohq"; repo = "cnquery"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-WBzl3DyjPr5vV9oobqZx1pprs4gkVN9BafOMIMqqb7E="; }; diff --git a/pkgs/by-name/co/cobang/package.nix b/pkgs/by-name/co/cobang/package.nix index 1909421547ef..6d1c76f17c49 100644 --- a/pkgs/by-name/co/cobang/package.nix +++ b/pkgs/by-name/co/cobang/package.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "hongquan"; repo = "CoBang"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-/8JtDoXFQGlM7tlwKd+WRIKpnKCD6OnMmbvElg7LbzU="; }; diff --git a/pkgs/by-name/co/codeberg-pages/package.nix b/pkgs/by-name/co/codeberg-pages/package.nix index 9b424cf6d1b0..fc30528bba88 100644 --- a/pkgs/by-name/co/codeberg-pages/package.nix +++ b/pkgs/by-name/co/codeberg-pages/package.nix @@ -7,17 +7,17 @@ buildGoModule rec { pname = "codeberg-pages"; - version = "6.1"; + version = "6.2"; src = fetchFromGitea { domain = "codeberg.org"; owner = "Codeberg"; repo = "pages-server"; rev = "v${version}"; - hash = "sha256-zG+OicdwtiHm/Ji+xfB61leCq9Ni0ysXkh4pQRju7IA="; + hash = "sha256-VZIrg6Hzn9yP9zdOPGx6HOK64XHeX5xc52hZXwmuMKA="; }; - vendorHash = "sha256-OmrkO++2vnIY7ay4q3oplDYDPWH1d5VSpDCBM6nD4rk="; + vendorHash = "sha256-pBCVkuCuyUxla6+uZM3SWXApBpMv0rFORP4tffXkuF4="; postPatch = '' # disable httptest @@ -27,6 +27,8 @@ buildGoModule rec { ldflags = [ "-s" "-w" + "-X" + "codeberg.org/codeberg/pages/server/version.Version=${version}" ]; tags = [ diff --git a/pkgs/by-name/co/codeblocks/package.nix b/pkgs/by-name/co/codeblocks/package.nix index a62b5d690346..a9cfa5d99d17 100644 --- a/pkgs/by-name/co/codeblocks/package.nix +++ b/pkgs/by-name/co/codeblocks/package.nix @@ -118,6 +118,11 @@ stdenv.mkDerivation rec { url = "https://github.com/arnholm/codeblocks_sfmirror/commit/92cb2239662952e3b59b31e03edd653bb8066e64.patch"; hash = "sha256-XI7JW9Nuueb7muKpaC2icM/CxhrCJtO48cLHK+BVWXI="; }) + (fetchpatch { + name = "fix-build-with-clang-2.patch"; + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/edc6b145bcdcaf2823ef9c7da51a211f65d6f5d0.patch"; + hash = "sha256-GuttBL4gp1IBn3ia2O8wtOR6xOSGrzwCKXwFLI3RO5o="; + }) (fetchpatch { name = "fix-normalize.patch"; url = "https://github.com/archlinux/svntogit-community/raw/458eacb60bc0e71e3d333943cebbc41e75ed0956/trunk/sc_wxtypes-normalize.patch"; diff --git a/pkgs/by-name/co/codebuff/package.nix b/pkgs/by-name/co/codebuff/package.nix index 7d1a900111d3..8251bfce4b85 100644 --- a/pkgs/by-name/co/codebuff/package.nix +++ b/pkgs/by-name/co/codebuff/package.nix @@ -25,7 +25,7 @@ buildNpmPackage rec { meta = { description = "Use natural language to edit your codebase and run commands from your terminal faster"; - homepage = "https://codebuff.ai"; + homepage = "https://www.codebuff.com/"; downloadPage = "https://www.npmjs.com/package/codebuff"; license = lib.licenses.mit; maintainers = [ lib.maintainers.malo ]; diff --git a/pkgs/by-name/co/codecrafters-cli/package.nix b/pkgs/by-name/co/codecrafters-cli/package.nix index ecbcf5440882..9f37ae28361b 100644 --- a/pkgs/by-name/co/codecrafters-cli/package.nix +++ b/pkgs/by-name/co/codecrafters-cli/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "codecrafters-cli"; - version = "34"; + version = "35"; src = fetchFromGitHub { owner = "codecrafters-io"; repo = "cli"; rev = "v${version}"; - hash = "sha256-+daBduhjUt7lrjTdXgm1qpZN1oEHC3Nx+ZiOLoO5+s4="; + hash = "sha256-gCSlXI8DggQts7Em1onD4B5CxrfAlPuwovWRUgpsu/E="; # A shortened git commit hash is part of the version output, and is # needed at build time. Use the `.git` directory to retrieve the # commit SHA, and remove the directory afterwards since it is not needed @@ -25,7 +25,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-TQcxzfiqKeCQZUKLHnPjBa/0WsYJhER3fmr4cRGFknw="; + vendorHash = "sha256-lRDHe/7kCy8T4paA/6FVfM/sjBpvcGWLeW7b+dOnFo0="; ldflags = [ "-s" @@ -38,7 +38,9 @@ buildGoModule rec { ldflags+=" -X github.com/codecrafters-io/cli/internal/utils.Commit=$(cat COMMIT)" ''; - doCheck = true; + # We need to disable tests because the tests for respecting .gitignore + # include setting up a global gitignore which doesn't work. + doCheck = false; nativeBuildInputs = [ git ]; diff --git a/pkgs/by-name/co/codeql/package.nix b/pkgs/by-name/co/codeql/package.nix index 9c3eb34894f3..6a4208c1f72c 100644 --- a/pkgs/by-name/co/codeql/package.nix +++ b/pkgs/by-name/co/codeql/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.19.4"; + version = "2.20.0"; dontConfigure = true; dontBuild = true; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - hash = "sha256-eRRZwtrTOWsebDm5uAj/ABFrlbov39e6Xeb+K7WAIG8="; + hash = "sha256-c9O4rmAuCBuFeM8R2ha6wBCAnGwYRdapNpPhlSvgYjg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/coercer/package.nix b/pkgs/by-name/co/coercer/package.nix index 2c7faee3a34b..c5f63e35efd4 100644 --- a/pkgs/by-name/co/coercer/package.nix +++ b/pkgs/by-name/co/coercer/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "p0dalirius"; repo = "Coercer"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-WeaKToKYIB+jjTNIQvAUQQNb25TsNWALYZwIZuBjkPE="; }; diff --git a/pkgs/by-name/co/coinlive/package.nix b/pkgs/by-name/co/coinlive/package.nix index 96c5fe8e4ef1..148c0ed2ebf5 100644 --- a/pkgs/by-name/co/coinlive/package.nix +++ b/pkgs/by-name/co/coinlive/package.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "mayeranalytics"; repo = "coinlive"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-llw97jjfPsDd4nYi6lb9ug6sApPoD54WlzpJswvdbRs="; }; diff --git a/pkgs/by-name/co/collabora-online/package.nix b/pkgs/by-name/co/collabora-online/package.nix index 489894bd1d84..62c33c455c32 100644 --- a/pkgs/by-name/co/collabora-online/package.nix +++ b/pkgs/by-name/co/collabora-online/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "CollaboraOnline"; repo = "online"; - rev = "refs/tags/cp-${finalAttrs.version}"; + tag = "cp-${finalAttrs.version}"; hash = "sha256-0IvymvXAozsjm+GXJK9AGWo79QMaIACrAfkYfX67fBc="; }; diff --git a/pkgs/by-name/co/collada2gltf/package.nix b/pkgs/by-name/co/collada2gltf/package.nix index 7b32f6781c5b..c3c143419101 100644 --- a/pkgs/by-name/co/collada2gltf/package.nix +++ b/pkgs/by-name/co/collada2gltf/package.nix @@ -11,7 +11,7 @@ gcc10Stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "KhronosGroup"; repo = "COLLADA2GLTF"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-3Eo1qS6S5vlc/d2WB4iDJTjUnwMUrx9+Ln6n8PYU5qA="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/co/colo/package.nix b/pkgs/by-name/co/colo/package.nix new file mode 100644 index 000000000000..cd84c3f1cef8 --- /dev/null +++ b/pkgs/by-name/co/colo/package.nix @@ -0,0 +1,26 @@ +{ + rustPlatform, + fetchFromGitHub, + lib, +}: + +rustPlatform.buildRustPackage rec { + pname = "colo"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "Aloso"; + repo = "colo"; + tag = "v${version}"; + hash = "sha256-ocGzZR4gM2sInXccbHxh7Vf0kcZTZOnVW0KM6zp/pR8="; + }; + + cargoHash = "sha256-HjEYC7FUHpxNWy/nUVO65O3f/RdT9hYZc3TpcqP3SSM="; + + meta = { + description = "Displays colors in various color spaces"; + homepage = "https://aloso.github.io/colo"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ llakala ]; + }; +} diff --git a/pkgs/by-name/co/comet-gog/package.nix b/pkgs/by-name/co/comet-gog/package.nix index 6cb12d620a92..0de956c490f2 100644 --- a/pkgs/by-name/co/comet-gog/package.nix +++ b/pkgs/by-name/co/comet-gog/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "imLinguin"; repo = "comet"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-LAEt2i/SRABrz+y2CTMudrugifLgHNxkMSdC8PXYF0E="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/co/commit/package.nix b/pkgs/by-name/co/commit/package.nix index 0033bf69a3e0..639d9275357d 100644 --- a/pkgs/by-name/co/commit/package.nix +++ b/pkgs/by-name/co/commit/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "sonnyp"; repo = "Commit"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-L8CI8SAGWhhJyTc8aMPV0s+UevEJGE7n1l7fFnTjdPw="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/co/committed/package.nix b/pkgs/by-name/co/committed/package.nix index 1134d60d6f0f..76dffacaac42 100644 --- a/pkgs/by-name/co/committed/package.nix +++ b/pkgs/by-name/co/committed/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage { src = fetchFromGitHub { owner = "crate-ci"; repo = "committed"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-dBNtzKqaaqJrKMNwamUY0DO9VCVqDyf45lT82nOn8UM="; }; cargoHash = "sha256-F+6pTxgr/I3DcDGZsfDjLe0+5wj9Mu7nqghyOzSWlvc="; diff --git a/pkgs/by-name/co/compiledb/package.nix b/pkgs/by-name/co/compiledb/package.nix index 87d07c05852f..47fa3a007ecd 100644 --- a/pkgs/by-name/co/compiledb/package.nix +++ b/pkgs/by-name/co/compiledb/package.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "nickdiego"; repo = "compiledb"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-pN2F0bFT5r8w+8kZOP/tU7Cx1SDN81fzkMfnj19jMWM="; }; diff --git a/pkgs/by-name/co/composer-require-checker/package.nix b/pkgs/by-name/co/composer-require-checker/package.nix index a8da571f0bef..52244d37598b 100644 --- a/pkgs/by-name/co/composer-require-checker/package.nix +++ b/pkgs/by-name/co/composer-require-checker/package.nix @@ -11,7 +11,7 @@ php.buildComposerProject2 (finalAttrs: { # Upstream no longer provides the composer.lock in their release artifact src = fetchgit { url = "https://github.com/maglnet/ComposerRequireChecker"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-dBUDkgbuUBKA3MKB4fxwHhDoT9wYRl49m/2ZCvIcNMM="; }; diff --git a/pkgs/by-name/co/comrak/package.nix b/pkgs/by-name/co/comrak/package.nix index b0fbf044e631..1da4f0558eb7 100644 --- a/pkgs/by-name/co/comrak/package.nix +++ b/pkgs/by-name/co/comrak/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "comrak"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "kivikakk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sRYyInQ2jvtipmGkTL8P7ed0YHLnAQObaMX6N87bFHU="; + sha256 = "sha256-VN8f5r25kfUqekt9q28oMmkzQUE+Ko8DYhRZjpbbDfM="; }; - cargoHash = "sha256-4Tl9MEZn8RAklqc32bLeWg+muVcjqMKRWSrt8BIq9n4="; + cargoHash = "sha256-Hdjit5dpZXT7ENamUX0ygTy+XAyCkcqq94wAJUPd8DY="; meta = with lib; { description = "CommonMark-compatible GitHub Flavored Markdown parser and formatter"; diff --git a/pkgs/by-name/co/conan/package.nix b/pkgs/by-name/co/conan/package.nix index d9fad07293ae..50edea536250 100644 --- a/pkgs/by-name/co/conan/package.nix +++ b/pkgs/by-name/co/conan/package.nix @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "conan-io"; repo = "conan"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-1KKXOvoSAemzafWvBoYFtxqgSObHcXe3GVPgG25VNm0="; }; diff --git a/pkgs/by-name/co/concord/package.nix b/pkgs/by-name/co/concord/package.nix index 97c31704ba36..5f65b6a0258b 100644 --- a/pkgs/by-name/co/concord/package.nix +++ b/pkgs/by-name/co/concord/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "Cogmasters"; repo = "concord"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-yTFGRnhDzxU+dPeZbCWlm52gsmEgD2el+46c8XQBQng="; }; diff --git a/pkgs/by-name/co/concurrently/package.nix b/pkgs/by-name/co/concurrently/package.nix index c53adc26c610..f6b3a6166be0 100644 --- a/pkgs/by-name/co/concurrently/package.nix +++ b/pkgs/by-name/co/concurrently/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "open-cli-tools"; repo = "concurrently"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-VoyVYBOBMguFKnG2VItk1L5BbF72nO7bYJpb7adqICs="; }; diff --git a/pkgs/by-name/co/conftest/package.nix b/pkgs/by-name/co/conftest/package.nix index c0e62aff582e..34b5a95e295d 100644 --- a/pkgs/by-name/co/conftest/package.nix +++ b/pkgs/by-name/co/conftest/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "open-policy-agent"; repo = "conftest"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-7R6qMjwPtlpnsm6xej7jQntv9709//q4VVbatuzLuwk="; }; vendorHash = "sha256-QPFLHP4nyJqB7tVVk00J+V+1YXGSsRvCZ1aLEMg0kfc="; diff --git a/pkgs/by-name/co/connectome-workbench/package.nix b/pkgs/by-name/co/connectome-workbench/package.nix index dd0a3467d1a9..6634f29839a2 100644 --- a/pkgs/by-name/co/connectome-workbench/package.nix +++ b/pkgs/by-name/co/connectome-workbench/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "Washington-University"; repo = "workbench"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-M5iverVDhBI/ijbgwfa6gHrthY4wrUi+/2A/443jBqg="; }; diff --git a/pkgs/by-name/co/conpass/package.nix b/pkgs/by-name/co/conpass/package.nix index d8870a907541..f690bc8c62e1 100644 --- a/pkgs/by-name/co/conpass/package.nix +++ b/pkgs/by-name/co/conpass/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "login-securite"; repo = "conpass"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-7o4aQ6qpaWimWqgFO35Wht7mQsdVezoPTm7hp54FWR8="; }; diff --git a/pkgs/by-name/co/consul/package.nix b/pkgs/by-name/co/consul/package.nix index b3e36fda0517..6ad143e4255a 100644 --- a/pkgs/by-name/co/consul/package.nix +++ b/pkgs/by-name/co/consul/package.nix @@ -21,7 +21,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "hashicorp"; repo = pname; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-nYWrJB98S2zPSBu8ZIHejnLP5OQyPxpJGLdLenGHzHM="; }; diff --git a/pkgs/by-name/co/container2wasm/package.nix b/pkgs/by-name/co/container2wasm/package.nix index 49fd7a0eb42f..47b9d2b944a3 100644 --- a/pkgs/by-name/co/container2wasm/package.nix +++ b/pkgs/by-name/co/container2wasm/package.nix @@ -10,7 +10,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "ktock"; repo = "container2wasm"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-Awk7tC5eyapbra/GlwPPfYx+Jh5UHlK9zo9ZRCVz9S0="; }; diff --git a/pkgs/by-name/co/containerd/package.nix b/pkgs/by-name/co/containerd/package.nix index 55f44253622f..dc27557d108e 100644 --- a/pkgs/by-name/co/containerd/package.nix +++ b/pkgs/by-name/co/containerd/package.nix @@ -26,7 +26,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-gD0XRZThU/T8qxLyyboyE6GsX911ylt7hH59S+rB7vQ="; }; diff --git a/pkgs/by-name/co/contour/package.nix b/pkgs/by-name/co/contour/package.nix index 03f09fab4025..779144322f25 100644 --- a/pkgs/by-name/co/contour/package.nix +++ b/pkgs/by-name/co/contour/package.nix @@ -20,7 +20,6 @@ yaml-cpp, ncurses, file, - apple-sdk_11, libutil, sigtool, nixosTests, @@ -73,7 +72,6 @@ stdenv.mkDerivation (final: { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libutempter ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 libutil ]; diff --git a/pkgs/by-name/co/convbin/package.nix b/pkgs/by-name/co/convbin/package.nix index 0708be15d396..512c0d6b889d 100644 --- a/pkgs/by-name/co/convbin/package.nix +++ b/pkgs/by-name/co/convbin/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "mateoconlechuga"; repo = "convbin"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; sha256 = "sha256-k0hwBdjOweFoAE6jzhlRFZsMOVDDpi4R4LHA7SwO3os="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/co/converseen/package.nix b/pkgs/by-name/co/converseen/package.nix index 94f6ffef5ac5..b1692a571e90 100644 --- a/pkgs/by-name/co/converseen/package.nix +++ b/pkgs/by-name/co/converseen/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "Faster3ck"; repo = "Converseen"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-+AYw0/hCAVMPeD9MigYO5ddfs6o6w901OJH03H8gYlw="; }; diff --git a/pkgs/by-name/co/copacetic/package.nix b/pkgs/by-name/co/copacetic/package.nix index c2820c37c532..04a415919bdc 100644 --- a/pkgs/by-name/co/copacetic/package.nix +++ b/pkgs/by-name/co/copacetic/package.nix @@ -14,7 +14,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "project-copacetic"; repo = "copacetic"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-hvSbjkqrd//thUex2It31Z4Vrj1u07WEAQFAnWiPo6M="; }; diff --git a/pkgs/by-name/co/copier/package.nix b/pkgs/by-name/co/copier/package.nix index f19d567b70ed..cceaf852271c 100644 --- a/pkgs/by-name/co/copier/package.nix +++ b/pkgs/by-name/co/copier/package.nix @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "copier-org"; repo = "copier"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; # Conflict on APFS on darwin postFetch = '' rm $out/tests/demo/doc/ma*ana.txt diff --git a/pkgs/by-name/co/copycat/package.nix b/pkgs/by-name/co/copycat/package.nix index 3771d9067f37..16eec28ab4fd 100644 --- a/pkgs/by-name/co/copycat/package.nix +++ b/pkgs/by-name/co/copycat/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "DeeKahy"; repo = "CopyCat"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-0pqC6fxuvqOPuO10Em63tFguc3VJNnniPCHM6TcFDN0="; }; diff --git a/pkgs/by-name/co/coroot/package.nix b/pkgs/by-name/co/coroot/package.nix index 4f8d651a187f..a59b65ff6101 100644 --- a/pkgs/by-name/co/coroot/package.nix +++ b/pkgs/by-name/co/coroot/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "coroot"; - version = "1.6.7"; + version = "1.6.8"; src = fetchFromGitHub { owner = "coroot"; repo = "coroot"; rev = "v${version}"; - hash = "sha256-Ui+1C1+aPnBly4rMZzeRjALJyw61Fi0nwspv3NIjaNo="; + hash = "sha256-ndzn0ZcuzdmCXnijUr6jq3KSFqSdF2FYd/2qi5Huk5Y="; }; vendorHash = "sha256-wyxNT8g5TUCjlxauL7NmCf4HZ91V2nD64L1L/rYH864="; diff --git a/pkgs/by-name/co/corrscope/package.nix b/pkgs/by-name/co/corrscope/package.nix index 34f72de0c145..a4a2ddd9523e 100644 --- a/pkgs/by-name/co/corrscope/package.nix +++ b/pkgs/by-name/co/corrscope/package.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "corrscope"; repo = "corrscope"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-WSv65jEu/w6iNrL/f5PN147FBjmR0j30H1D39dd+KN8="; }; diff --git a/pkgs/by-name/co/corsix-th/package.nix b/pkgs/by-name/co/corsix-th/package.nix index 9d6a78b361a4..6ae3ea109013 100644 --- a/pkgs/by-name/co/corsix-th/package.nix +++ b/pkgs/by-name/co/corsix-th/package.nix @@ -12,9 +12,6 @@ SDL2, SDL2_mixer, timidity, - # Darwin dependencies - libiconv, - apple-sdk_11, # Update nix-update-script, }: @@ -60,8 +57,7 @@ stdenv.mkDerivation (finalAttrs: { SDL2 SDL2_mixer timidity - ] - ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; + ]; cmakeFlags = [ "-Wno-dev" ]; diff --git a/pkgs/by-name/co/coturn/package.nix b/pkgs/by-name/co/coturn/package.nix index e43adbf78f9e..351796f237c1 100644 --- a/pkgs/by-name/co/coturn/package.nix +++ b/pkgs/by-name/co/coturn/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "coturn"; repo = "coturn"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-GG8aQJoCBV5wolPEzSuZhqNn//ytaTAptjY42YKga4E="; }; diff --git a/pkgs/by-name/co/coursera-dl/package.nix b/pkgs/by-name/co/coursera-dl/package.nix index 63aaf33f7f42..f2fdc53f85fa 100644 --- a/pkgs/by-name/co/coursera-dl/package.nix +++ b/pkgs/by-name/co/coursera-dl/package.nix @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "coursera-dl"; repo = "coursera-dl"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-c+ElGIrd4ZhMfWtsNHrHRO3HaRRtEQuGlCSBrvPnbyo="; }; diff --git a/pkgs/by-name/co/cowsql/package.nix b/pkgs/by-name/co/cowsql/package.nix index 0c790fd5057b..ed182bacb7b8 100644 --- a/pkgs/by-name/co/cowsql/package.nix +++ b/pkgs/by-name/co/cowsql/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "cowsql"; repo = "cowsql"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-cr6AT/n2/6DuGK53JvGLwCkMi4+fS128qxj3X9SJYuw="; }; diff --git a/pkgs/by-name/cp/cp210x-program/package.nix b/pkgs/by-name/cp/cp210x-program/package.nix index 908b92c7cb33..36bd9eb1d503 100644 --- a/pkgs/by-name/cp/cp210x-program/package.nix +++ b/pkgs/by-name/cp/cp210x-program/package.nix @@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "VCTLabs"; repo = "cp210x-program"; - rev = "refs/tags/${version}"; + tag = version; sha256 = "sha256-IjKshP12WfFly9cPm6svD4qZW6cT8C7lOVrGenSqbfY="; }; diff --git a/pkgs/by-name/cp/cppitertools/package.nix b/pkgs/by-name/cp/cppitertools/package.nix index e9ddcdb1b339..e484d70c3294 100644 --- a/pkgs/by-name/cp/cppitertools/package.nix +++ b/pkgs/by-name/cp/cppitertools/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ryanhaining"; repo = "cppitertools"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-mii4xjxF1YC3H/TuO/o4cEz8bx2ko6U0eufqNVw5LNA="; }; diff --git a/pkgs/by-name/cp/cpplint/package.nix b/pkgs/by-name/cp/cpplint/package.nix index e8f7c8ef8cf1..a46c032ec6df 100644 --- a/pkgs/by-name/cp/cpplint/package.nix +++ b/pkgs/by-name/cp/cpplint/package.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "cpplint"; repo = "cpplint"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-076363ZwcriPb+Fn9S5jay8oL+LlBTNh+IqQRCAndRo="; }; diff --git a/pkgs/by-name/cp/cpu-x/package.nix b/pkgs/by-name/cp/cpu-x/package.nix index bbc48a13715a..0ffe7b6a8d4f 100644 --- a/pkgs/by-name/cp/cpu-x/package.nix +++ b/pkgs/by-name/cp/cpu-x/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "X0rg"; repo = "CPU-X"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-4wW8elGsU3EhDDMPxa5di01NlB0dJ8MN8TiaIBo2qxo="; }; diff --git a/pkgs/by-name/cp/cpustat/package.nix b/pkgs/by-name/cp/cpustat/package.nix index 62f5d9d328f0..515f121b3152 100644 --- a/pkgs/by-name/cp/cpustat/package.nix +++ b/pkgs/by-name/cp/cpustat/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ColinIanKing"; repo = "cpustat"; - rev = "refs/tags/V${version}"; + tag = "V${version}"; hash = "sha256-Rxoj2pnQ/tEUzcsFT1F+rU960b4Th3hqZU2YR6YGwZQ="; }; diff --git a/pkgs/by-name/cr/crab-hole/package.nix b/pkgs/by-name/cr/crab-hole/package.nix index 0ad403277bb4..4ac3d3e7c0a6 100644 --- a/pkgs/by-name/cr/crab-hole/package.nix +++ b/pkgs/by-name/cr/crab-hole/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "LuckyTurtleDev"; repo = "crab-hole"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-OyZ+GkWU+OMnS6X7yk7H1e1MzfQQQkhOkoxUmWn6k7I="; }; diff --git a/pkgs/by-name/cr/crates-tui/package.nix b/pkgs/by-name/cr/crates-tui/package.nix index a5552487394d..e3a1a9e2f83a 100644 --- a/pkgs/by-name/cr/crates-tui/package.nix +++ b/pkgs/by-name/cr/crates-tui/package.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage { src = fetchFromGitHub { owner = "ratatui"; repo = "crates-tui"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-yAMVl+3DP9NCjHc9X0qOd6zlJvaY3kcvnVBSS8JHtgU="; }; diff --git a/pkgs/by-name/cr/credhub-cli/package.nix b/pkgs/by-name/cr/credhub-cli/package.nix index 356e8211a0a6..f6a922ff8919 100644 --- a/pkgs/by-name/cr/credhub-cli/package.nix +++ b/pkgs/by-name/cr/credhub-cli/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "credhub-cli"; - version = "2.9.40"; + version = "2.9.41"; src = fetchFromGitHub { owner = "cloudfoundry-incubator"; repo = "credhub-cli"; rev = version; - sha256 = "sha256-9W/rn56RM+ooq18jCH/5m54bxAQWzcDsjx7V6T0J/yU="; + sha256 = "sha256-BALeQbc4RCIh4b7kLZYEWe+dtSvP0WkkbRqoRbGSGZE="; }; # these tests require network access that we're not going to give them diff --git a/pkgs/by-name/cr/creds/package.nix b/pkgs/by-name/cr/creds/package.nix index 9758afeafbfa..5bb3bb793cfd 100644 --- a/pkgs/by-name/cr/creds/package.nix +++ b/pkgs/by-name/cr/creds/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "ihebski"; repo = "DefaultCreds-cheat-sheet"; - rev = "refs/tags/creds-v${version}"; + tag = "creds-v${version}"; hash = "sha256-CtwGSF3EGcPqL49paNRCsB2qxYjKpCLqyRsC67nAyVk="; }; diff --git a/pkgs/by-name/cr/credslayer/package.nix b/pkgs/by-name/cr/credslayer/package.nix index 8f660ca17252..62c16cfdde7e 100644 --- a/pkgs/by-name/cr/credslayer/package.nix +++ b/pkgs/by-name/cr/credslayer/package.nix @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "ShellCode33"; repo = "CredSLayer"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-gryV9MHULY6ZHy6YDFQDIkZsfIX8La0tHT0vrrQJNDQ="; }; diff --git a/pkgs/by-name/cr/crlfsuite/package.nix b/pkgs/by-name/cr/crlfsuite/package.nix index 0a0d68d0b117..dadb9067590f 100644 --- a/pkgs/by-name/cr/crlfsuite/package.nix +++ b/pkgs/by-name/cr/crlfsuite/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "Nefcore"; repo = "CRLFsuite"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; sha256 = "sha256-mK20PbVGhTEjhY5L6coCzSMIrG/PHHmNq30ZoJEs6uI="; }; diff --git a/pkgs/by-name/cr/croc/package.nix b/pkgs/by-name/cr/croc/package.nix index 28f079d32433..2c972beb7939 100644 --- a/pkgs/by-name/cr/croc/package.nix +++ b/pkgs/by-name/cr/croc/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "croc"; - version = "10.1.3"; + version = "10.2.1"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - hash = "sha256-Zem1m2VU0Uc7TkG+BuHcW4hwWHB6FU9e905ZUjjwpK4="; + hash = "sha256-T75RyUjni7pNOxSe90xYW8426g3XjtI7YN0z8WADusQ="; }; - vendorHash = "sha256-lGKuJocZDYj4NSaf1Q0+tQ4ORZEpsdwpuztXPDCfPIA="; + vendorHash = "sha256-IL2nKlxJ08xBCW9mnHlPlOccgjHSeLt6ISpMMiBf7J8="; subPackages = [ "." ]; diff --git a/pkgs/by-name/cr/crowdsec/package.nix b/pkgs/by-name/cr/crowdsec/package.nix index 4a982cf61810..4c3a030b9e34 100644 --- a/pkgs/by-name/cr/crowdsec/package.nix +++ b/pkgs/by-name/cr/crowdsec/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "crowdsecurity"; repo = pname; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-U3YnLjsD+Kl/6HD+RPP0gWa4N96X5wkbdCmIrxas1I8="; }; diff --git a/pkgs/by-name/cs/csvlens/package.nix b/pkgs/by-name/cs/csvlens/package.nix index ea1873f05f0c..6e3c4ae66e2a 100644 --- a/pkgs/by-name/cs/csvlens/package.nix +++ b/pkgs/by-name/cs/csvlens/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "YS-L"; repo = "csvlens"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-JlyDw+VL/vpKTvvBlDIwVIovhKJX2pV4UTY47cLR1IE="; }; diff --git a/pkgs/by-name/cs/csvtk/package.nix b/pkgs/by-name/cs/csvtk/package.nix index 01b447b887eb..327f4bc3ea56 100644 --- a/pkgs/by-name/cs/csvtk/package.nix +++ b/pkgs/by-name/cs/csvtk/package.nix @@ -16,7 +16,7 @@ buildGoModule { src = fetchFromGitHub { owner = "shenwei356"; repo = "csvtk"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-t1juidSPCOEFsApvMWW8F/gF2F6JwK0Ds7O/GSZRg30="; }; diff --git a/pkgs/by-name/ct/ctrtool/package.nix b/pkgs/by-name/ct/ctrtool/package.nix index 0adf9db5087c..cbfed6b84754 100644 --- a/pkgs/by-name/ct/ctrtool/package.nix +++ b/pkgs/by-name/ct/ctrtool/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ctrtool"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "jakcron"; repo = "Project_CTR"; rev = "ctrtool-v${version}"; - sha256 = "wjU/DJHrAHE3MSB7vy+swUDVPzw0Jrv4ymOjhfr0BBk="; + sha256 = "HqqeQCEUof4EBUhuUAdTruMFgYIoXhtAN3yuWW6tD+Y="; }; sourceRoot = "${src.name}/ctrtool"; diff --git a/pkgs/by-name/ct/ctune/package.nix b/pkgs/by-name/ct/ctune/package.nix index c9e38fba90ab..d68db580dd34 100644 --- a/pkgs/by-name/ct/ctune/package.nix +++ b/pkgs/by-name/ct/ctune/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "An7ar35"; repo = "ctune"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-fy7Wb4R6HDa+cLxI5YWq67gxw1XS/iDDN4M3Rn7GYeI="; }; diff --git a/pkgs/by-name/cu/cups-printers/package.nix b/pkgs/by-name/cu/cups-printers/package.nix index be8f8a12cd29..754a8ee4b9c2 100644 --- a/pkgs/by-name/cu/cups-printers/package.nix +++ b/pkgs/by-name/cu/cups-printers/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "audiusGmbH"; repo = "cups-printers"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-HTR9t9ElQmCzJfdWyu+JQ8xBfDNpXl8XtNsJxGSfBXk="; }; diff --git a/pkgs/by-name/cu/curtail/package.nix b/pkgs/by-name/cu/curtail/package.nix index dbe74dee24eb..de6765bb4fec 100644 --- a/pkgs/by-name/cu/curtail/package.nix +++ b/pkgs/by-name/cu/curtail/package.nix @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "Huluti"; repo = "Curtail"; - rev = "refs/tags/${version}"; + tag = version; sha256 = "sha256-IpN1NMIT13icYnflkcZW+aSzw0Nau8UIOP38Kzji3bg="; }; diff --git a/pkgs/by-name/cu/curv/package.nix b/pkgs/by-name/cu/curv/package.nix index 88a270fd6295..71465cb2933a 100644 --- a/pkgs/by-name/cu/curv/package.nix +++ b/pkgs/by-name/cu/curv/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "curv3d"; repo = "curv"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-m4p5uxRk6kEJUilmbQ1zJcQDRvRCV7pkxnqupZJxyjo="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/cv/cve-prioritizer/package.nix b/pkgs/by-name/cv/cve-prioritizer/package.nix new file mode 100644 index 000000000000..705951a13d3c --- /dev/null +++ b/pkgs/by-name/cv/cve-prioritizer/package.nix @@ -0,0 +1,58 @@ +{ + lib, + fetchFromGitHub, + fetchpatch, + python3, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "cve-prioritizer"; + version = "1.8.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "TURROKS"; + repo = "CVE_Prioritizer"; + rev = "refs/tags/v${version}"; + hash = "sha256-ade/gcRrdvVsp5F61ZndsNL3s3gq8TDk/dZvPc55S/8="; + }; + + patches = [ + # Add script, https://github.com/TURROKS/CVE_Prioritizer/pull/33 + (fetchpatch { + name = "add-script.patch"; + url = "https://github.com/TURROKS/CVE_Prioritizer/commit/c29f2332cde7d79e0c9f34c0a1811611a8fb73c9.patch"; + hash = "sha256-/hnS+YKO4zNGVGTG+KsugJH7Bt2OE8Q2F+7ZX+uhFlU="; + }) + ]; + + postPatch = '' + # https://github.com/TURROKS/CVE_Prioritizer/pull/32 + substituteInPlace pyproject.toml \ + --replace-fail "CVE Prioritizer" "cve-prioritizer" + ''; + + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ + click + pandas + python-dotenv + requests + termcolor + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "cve_prioritizer" ]; + + meta = { + description = "Vulnerability patching with CVSS, EPSS, and CISA's Known Exploited Vulnerabilities"; + homepage = "https://github.com/TURROKS/CVE_Prioritizer"; + changelog = "https://github.com/TURROKS/CVE_Prioritizer/releases/tag/v${version}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "cve-prioritizer"; + }; +} diff --git a/pkgs/by-name/cv/cvehound/package.nix b/pkgs/by-name/cv/cvehound/package.nix index 5e86d13d1e23..09d06f93091f 100644 --- a/pkgs/by-name/cv/cvehound/package.nix +++ b/pkgs/by-name/cv/cvehound/package.nix @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "evdenis"; repo = "cvehound"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-UvjmlAm/8B4KfE9grvvgn37Rui+ZRfs2oTLqYYgqcUQ="; }; diff --git a/pkgs/by-name/cv/cvemap/package.nix b/pkgs/by-name/cv/cvemap/package.nix index 0146986657db..1e56aad3321c 100644 --- a/pkgs/by-name/cv/cvemap/package.nix +++ b/pkgs/by-name/cv/cvemap/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "projectdiscovery"; repo = "cvemap"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-Ste08J3KIJmugKZegU82wq6N+B5DaHc8Z0UtqKsUYE8="; }; diff --git a/pkgs/by-name/cw/cwltool/package.nix b/pkgs/by-name/cw/cwltool/package.nix index 70df85bbb630..15f387b7e131 100644 --- a/pkgs/by-name/cw/cwltool/package.nix +++ b/pkgs/by-name/cw/cwltool/package.nix @@ -31,7 +31,7 @@ py.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "common-workflow-language"; repo = "cwltool"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-46x/7ewnt1eTu+1GdmPUExpiFfYE3mN8N8VFMM4r1Vk="; }; diff --git a/pkgs/by-name/cy/cyclonedx-cli/package.nix b/pkgs/by-name/cy/cyclonedx-cli/package.nix index e32b4f8a9544..25a7a451d24d 100644 --- a/pkgs/by-name/cy/cyclonedx-cli/package.nix +++ b/pkgs/by-name/cy/cyclonedx-cli/package.nix @@ -11,7 +11,7 @@ buildDotnetModule rec { src = fetchFromGitHub { owner = "CycloneDX"; repo = "cyclonedx-cli"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-QU/MaT8iIf/9VpOb2mixOfOtG/J+sE7S0mT6BKYQnlI="; }; diff --git a/pkgs/by-name/cy/cyclonedx-python/package.nix b/pkgs/by-name/cy/cyclonedx-python/package.nix index 4e7c16d2e769..a6bbf4778cd7 100644 --- a/pkgs/by-name/cy/cyclonedx-python/package.nix +++ b/pkgs/by-name/cy/cyclonedx-python/package.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "CycloneDX"; repo = "cyclonedx-python"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-EcCxw3SppuGUgN7AIU9NhpRw7dLDhTHHT5emGOgkDFU="; }; diff --git a/pkgs/by-name/cy/cyrus-imapd/package.nix b/pkgs/by-name/cy/cyrus-imapd/package.nix index 1bba318c5531..c2e6ddd804fe 100644 --- a/pkgs/by-name/cy/cyrus-imapd/package.nix +++ b/pkgs/by-name/cy/cyrus-imapd/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "cyrusimap"; repo = "cyrus-imapd"; - rev = "refs/tags/cyrus-imapd-${finalAttrs.version}"; + tag = "cyrus-imapd-${finalAttrs.version}"; hash = "sha256-dyybRqmrVX+ERGpToS5JjGC6S/B0t967dLCWfeUrLKA="; }; diff --git a/pkgs/by-name/cz/cz-cli/package.nix b/pkgs/by-name/cz/cz-cli/package.nix index c3b5f7600ad0..5a40f248b350 100644 --- a/pkgs/by-name/cz/cz-cli/package.nix +++ b/pkgs/by-name/cz/cz-cli/package.nix @@ -11,7 +11,7 @@ buildNpmPackage rec { src = fetchFromGitHub { owner = "commitizen"; repo = "cz-cli"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-4kyGxidE8dzkHL0oPv/XxDxQ3qlEE6TKSgj+1g9uvJM="; }; diff --git a/pkgs/by-name/cz/czkawka/package.nix b/pkgs/by-name/cz/czkawka/package.nix index 0ec3c8d6d00f..ca60c04af919 100644 --- a/pkgs/by-name/cz/czkawka/package.nix +++ b/pkgs/by-name/cz/czkawka/package.nix @@ -32,7 +32,7 @@ let src = fetchFromGitHub { owner = "qarmin"; repo = "czkawka"; - rev = "refs/tags/${self.version}"; + tag = self.version; hash = "sha256-Uxko2TRIjqQvd7n9C+P7oMUrm3YY5j7TVzvijEjDwOM="; }; diff --git a/pkgs/by-name/d2/d2/package.nix b/pkgs/by-name/d2/d2/package.nix index fc41c44b0ea4..9cfebc4669d4 100644 --- a/pkgs/by-name/d2/d2/package.nix +++ b/pkgs/by-name/d2/d2/package.nix @@ -15,7 +15,7 @@ buildGo123Module rec { src = fetchFromGitHub { owner = "terrastruct"; repo = pname; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-Sd4AkXKQVRJIgQTb7BbDNb8DbULyoWX8TuFtiu+Km5Y="; }; diff --git a/pkgs/by-name/da/daed/package.nix b/pkgs/by-name/da/daed/package.nix index 8618a3212fb2..0a04f2eb2a0b 100644 --- a/pkgs/by-name/da/daed/package.nix +++ b/pkgs/by-name/da/daed/package.nix @@ -14,7 +14,7 @@ let src = fetchFromGitHub { owner = "daeuniverse"; repo = "daed"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-h1j91XIumuzuJnMxgkCjhuXYPLXoDuFFsfmDwmzlTEI="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/da/dafny/package.nix b/pkgs/by-name/da/dafny/package.nix index 54f88b7b36c6..6ff063fdc4b5 100644 --- a/pkgs/by-name/da/dafny/package.nix +++ b/pkgs/by-name/da/dafny/package.nix @@ -65,11 +65,18 @@ buildDotnetModule rec { # frameworks, you must specify the framework for the published # application." substituteInPlace Source/DafnyRuntime/DafnyRuntime.csproj \ - --replace-warn TargetFrameworks TargetFramework \ - --replace-warn "netstandard2.0;net452" net6.0 + --replace-fail TargetFrameworks TargetFramework \ + --replace-fail "netstandard2.0;net452" net8.0 + + for f in Source/**/*.csproj ; do + [[ "$f" == "Source/DafnyRuntime/DafnyRuntime.csproj" ]] && continue; + + substituteInPlace $f \ + --replace-fail net6.0 net8.0 + done ''; - dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0; nativeBuildInputs = [ jdk11 ]; nugetDeps = ./deps.json; diff --git a/pkgs/by-name/da/dalfox/package.nix b/pkgs/by-name/da/dalfox/package.nix index 5c0a9d1d4bd0..fe2986db7569 100644 --- a/pkgs/by-name/da/dalfox/package.nix +++ b/pkgs/by-name/da/dalfox/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "hahwul"; repo = "dalfox"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-tg8TXPeGINGDBR3HOWYRXrg7ioBFhX1V7N1wRzHI0/c="; }; diff --git a/pkgs/by-name/da/darkradiant/package.nix b/pkgs/by-name/da/darkradiant/package.nix index 87e1e2d0ad6d..b4b185178d5d 100644 --- a/pkgs/by-name/da/darkradiant/package.nix +++ b/pkgs/by-name/da/darkradiant/package.nix @@ -21,7 +21,6 @@ python3, asciidoctor, libgit2, - apple-sdk_11, wrapGAppsHook3, installShellFiles, buildPlugins ? true, @@ -33,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "codereader"; repo = "DarkRadiant"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-y0VzTnHobW36/25/nTV49OKnUMpnsjImioMdNKoTyYA="; }; @@ -46,28 +45,23 @@ stdenv.mkDerivation (finalAttrs: { installShellFiles ]; - buildInputs = - [ - zlib - libjpeg - wxGTK32 - libxml2 - libsigcxx - libpng - openal - libvorbis - eigen - ftgl - freetype - glew - glib - libgit2 - python3 - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - ]; + buildInputs = [ + zlib + libjpeg + wxGTK32 + libxml2 + libsigcxx + libpng + openal + libvorbis + eigen + ftgl + freetype + glew + glib + libgit2 + python3 + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 ]; doCheck = true; diff --git a/pkgs/by-name/da/darkstat/package.nix b/pkgs/by-name/da/darkstat/package.nix index 1266f308c531..618907b0739e 100644 --- a/pkgs/by-name/da/darkstat/package.nix +++ b/pkgs/by-name/da/darkstat/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "emikulic"; repo = pname; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-kKj4fCgphoe3lojJfARwpITxQh7E6ehUew9FVEW63uQ="; }; diff --git a/pkgs/by-name/da/das/package.nix b/pkgs/by-name/da/das/package.nix index 8806e9181407..df799889b301 100644 --- a/pkgs/by-name/da/das/package.nix +++ b/pkgs/by-name/da/das/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "snovvcrash"; repo = "DivideAndScan"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-WZmWpcBqxsNH96nVWwoepFhsvdxZpYKmAjNd7ghIJMA="; }; diff --git a/pkgs/by-name/da/datafusion-cli/package.nix b/pkgs/by-name/da/datafusion-cli/package.nix index e347b5be35a1..50e114fbd983 100644 --- a/pkgs/by-name/da/datafusion-cli/package.nix +++ b/pkgs/by-name/da/datafusion-cli/package.nix @@ -8,19 +8,19 @@ rustPlatform.buildRustPackage rec { pname = "datafusion-cli"; - version = "43.0.0"; + version = "44.0.0"; src = fetchFromGitHub { name = "datafusion-cli-source"; owner = "apache"; repo = "arrow-datafusion"; rev = version; - sha256 = "sha256-/7qiVjvWwcRrCyXbQfcyzT6TcsLf/NyDVpIEJjzJHEc="; + sha256 = "sha256-235z+dyEt36sPY2UMVMMdakrDe2WWqPCk2/flEX6s4Y="; }; sourceRoot = "${src.name}/datafusion-cli"; - cargoHash = "sha256-oKrfaaBnbCuIkz2p94rnIN71b/GrvYxAji7Eo3bcS14="; + cargoHash = "sha256-jqL/o4vSTJfQEFurtmNoi8pNzCLslhqlNKISm8dp6hs="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/da/datatrove/package.nix b/pkgs/by-name/da/datatrove/package.nix index 61ac911cc8e4..d9c12161ce2d 100644 --- a/pkgs/by-name/da/datatrove/package.nix +++ b/pkgs/by-name/da/datatrove/package.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonPackage { src = fetchFromGitHub { owner = "huggingface"; repo = "datatrove"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-2NJja2yWeHOgo1pCuwHN6SgYnsimuZdK0jE8ucTH4r8="; }; diff --git a/pkgs/by-name/da/datree/package.nix b/pkgs/by-name/da/datree/package.nix index 9d671a0fb734..e1a33be5eca5 100644 --- a/pkgs/by-name/da/datree/package.nix +++ b/pkgs/by-name/da/datree/package.nix @@ -14,7 +14,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "datreeio"; repo = "datree"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-W1eX7eUMdPGbHA/f08xkG2EUeZmaunEAQn7/LRBe2nk="; }; diff --git a/pkgs/by-name/da/davinci-resolve/package.nix b/pkgs/by-name/da/davinci-resolve/package.nix index 15e7d6025586..35ee4312ed45 100644 --- a/pkgs/by-name/da/davinci-resolve/package.nix +++ b/pkgs/by-name/da/davinci-resolve/package.nix @@ -35,7 +35,7 @@ let davinci = ( stdenv.mkDerivation rec { pname = "davinci-resolve${lib.optionalString studioVariant "-studio"}"; - version = "19.1.1"; + version = "19.1.2"; nativeBuildInputs = [ (appimage-run.override { buildFHSEnv = buildFHSEnvChroot; }) @@ -57,9 +57,9 @@ let outputHashAlgo = "sha256"; outputHash = if studioVariant then - "sha256-yDkw7L9iTzE5g2XAw910nqtTyXcgcb6u+kP2sKtNcJ8=" + "sha256-yLlvl/zm/epNs1e4sSDrfHNApcpPQV2fMF3Y09ml7is=" else - "sha256-8oq5Nj8GrdHAmbM6Z5q98a0Lazjymk3dOCITkKiTJvQ="; + "sha256-ssX1ffB7ZSJObETQa2r5R4oHddAccC4GB14jaLs8bGg="; impureEnvVars = lib.fetchers.proxyImpureEnvVars; diff --git a/pkgs/by-name/db/dbip-asn-lite/package.nix b/pkgs/by-name/db/dbip-asn-lite/package.nix index 471f81965a7c..b5ca33f49906 100644 --- a/pkgs/by-name/db/dbip-asn-lite/package.nix +++ b/pkgs/by-name/db/dbip-asn-lite/package.nix @@ -5,11 +5,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-asn-lite"; - version = "2024-12"; + version = "2025-01"; src = fetchurl { url = "https://download.db-ip.com/free/dbip-asn-lite-${finalAttrs.version}.mmdb.gz"; - hash = "sha256-tzeXJzgTG6AB46dCYqtdECqMm2nh9PfPigMvRif2+cM="; + hash = "sha256-cRlhlP5ml+swBZGiLpVH5s7nvPiHUi7qxM2GajoeK+Y="; }; dontUnpack = true; diff --git a/pkgs/by-name/db/dbip-city-lite/package.nix b/pkgs/by-name/db/dbip-city-lite/package.nix index 57665c88c938..521d3cebf20e 100644 --- a/pkgs/by-name/db/dbip-city-lite/package.nix +++ b/pkgs/by-name/db/dbip-city-lite/package.nix @@ -5,11 +5,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-city-lite"; - version = "2024-12"; + version = "2025-01"; src = fetchurl { url = "https://download.db-ip.com/free/dbip-city-lite-${finalAttrs.version}.mmdb.gz"; - hash = "sha256-IkZ6d9CP+AgYXaWmQTfTz2MTHEV7h/f1HiOAGXxBH+g="; + hash = "sha256-fBS2JASkZaLNCjNAadNkrctixTkDvpkTUYP0yUHBXnw="; }; dontUnpack = true; diff --git a/pkgs/by-name/db/dbip-country-lite/package.nix b/pkgs/by-name/db/dbip-country-lite/package.nix index d7642c25bd0a..00f29f3674d7 100644 --- a/pkgs/by-name/db/dbip-country-lite/package.nix +++ b/pkgs/by-name/db/dbip-country-lite/package.nix @@ -5,11 +5,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-country-lite"; - version = "2024-12"; + version = "2025-01"; src = fetchurl { url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz"; - hash = "sha256-58g4ch1N1vPPymYx6M7X3Q6l6Sbr5GkEXv/Vi7K9Ivk="; + hash = "sha256-PVpqo1t6V0kdVqA1aEgU0UqwhzmLLMHYB6gyoMusVv8="; }; dontUnpack = true; diff --git a/pkgs/by-name/db/dbmate/package.nix b/pkgs/by-name/db/dbmate/package.nix index fe13c4fe3501..5cec210701aa 100644 --- a/pkgs/by-name/db/dbmate/package.nix +++ b/pkgs/by-name/db/dbmate/package.nix @@ -10,7 +10,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-xmQS0eBOgll8+AU/kQriClqtwrfIz606/o7jEJlQLV8="; }; diff --git a/pkgs/by-name/db/dbvisualizer/package.nix b/pkgs/by-name/db/dbvisualizer/package.nix index e18ef962aaa8..66afb65afc29 100644 --- a/pkgs/by-name/db/dbvisualizer/package.nix +++ b/pkgs/by-name/db/dbvisualizer/package.nix @@ -13,7 +13,7 @@ let in stdenv.mkDerivation (finalAttrs: { inherit pname; - version = "24.2.4"; + version = "24.3.2"; src = let @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { in fetchurl { url = "https://www.dbvis.com/product_download/dbvis-${finalAttrs.version}/media/dbvis_linux_${underscoreVersion}.tar.gz"; - hash = "sha256-vZm8rLkNpnWbKFrH/Q7yMhVhq+zfb0I00hJNT6JaPrw="; + hash = "sha256-oZxOGudRGFfbVz7n5eeKxr/7lxUhYAHjD0wsHw6G8OI="; }; strictDeps = true; diff --git a/pkgs/by-name/db/dbx/package.nix b/pkgs/by-name/db/dbx/package.nix index b1fcd6f53916..2590c12dd31d 100644 --- a/pkgs/by-name/db/dbx/package.nix +++ b/pkgs/by-name/db/dbx/package.nix @@ -18,7 +18,7 @@ python.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "databrickslabs"; repo = "dbx"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-5qjEABNTSUD9I2uAn49HQ4n+gbAcmfnqS4Z2M9MvFXQ="; }; diff --git a/pkgs/by-name/dc/dcgm/package.nix b/pkgs/by-name/dc/dcgm/package.nix index 382ecad9142b..405fc0a2d5eb 100644 --- a/pkgs/by-name/dc/dcgm/package.nix +++ b/pkgs/by-name/dc/dcgm/package.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "NVIDIA"; repo = "DCGM"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-PysxuN5WT7GB0oOvT5ezYeOau6AMVDDWE5HOAcmqw/Y="; }; diff --git a/pkgs/by-name/dc/dcrd/package.nix b/pkgs/by-name/dc/dcrd/package.nix index 077494f05a7a..ef496df3a7bb 100644 --- a/pkgs/by-name/dc/dcrd/package.nix +++ b/pkgs/by-name/dc/dcrd/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "decred"; repo = "dcrd"; - rev = "refs/tags/release-v${version}"; + tag = "release-v${version}"; hash = "sha256-nSocqwXgJhvfbdElddbb1gGxoygmtVtK6DbiSuMxYew="; }; diff --git a/pkgs/by-name/dd/ddate/package.nix b/pkgs/by-name/dd/ddate/package.nix index fd4b7ab868b7..7e8658b16c23 100644 --- a/pkgs/by-name/dd/ddate/package.nix +++ b/pkgs/by-name/dd/ddate/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "bo0ts"; repo = pname; - rev = "refs/tags/v${version}"; + tag = "v${version}"; sha256 = "1qchxnxvghbma6gp1g78wnjxsri0b72ha9axyk31cplssl7yn73f"; }; diff --git a/pkgs/by-name/dd/ddosify/package.nix b/pkgs/by-name/dd/ddosify/package.nix index 77b29c41d25e..e77ce0e5c8b2 100644 --- a/pkgs/by-name/dd/ddosify/package.nix +++ b/pkgs/by-name/dd/ddosify/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "ddosify"; repo = "ddosify"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-5K/qXtdlDC09dEjRwYvoh9SapGLNmvywDMiNdwZDDTQ="; }; diff --git a/pkgs/by-name/de/debase/package.nix b/pkgs/by-name/de/debase/package.nix index 70be9b81eed6..2468dd302b24 100644 --- a/pkgs/by-name/de/debase/package.nix +++ b/pkgs/by-name/de/debase/package.nix @@ -1,5 +1,4 @@ { - apple-sdk_11, fetchFromGitHub, fetchpatch, # Delete at next version bump. lib, @@ -16,7 +15,7 @@ stdenv.mkDerivation rec { (fetchFromGitHub { owner = "toasterllc"; repo = "debase"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-6AavH8Ag+879ntcxJDbVgsg8V6U4cxwPQYPKvq2PpoQ="; fetchSubmodules = true; }).overrideAttrs @@ -53,7 +52,7 @@ stdenv.mkDerivation rec { buildInputs = [ libgit2 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; + ]; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/de/deck/package.nix b/pkgs/by-name/de/deck/package.nix index 29d1c94b8308..94aef5ecbcb4 100644 --- a/pkgs/by-name/de/deck/package.nix +++ b/pkgs/by-name/de/deck/package.nix @@ -13,7 +13,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "Kong"; repo = "deck"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-+HXTBTE8oEvyEwzwJbM0snVV0sKcKFHFnHB1iJ+4LJc="; }; diff --git a/pkgs/by-name/de/deckmaster/package.nix b/pkgs/by-name/de/deckmaster/package.nix index 70d1d5fb7c44..84e659b6f96e 100644 --- a/pkgs/by-name/de/deckmaster/package.nix +++ b/pkgs/by-name/de/deckmaster/package.nix @@ -13,7 +13,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "muesli"; repo = "deckmaster"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-1hZ7yAKTvkk20ho+QOqFEtspBvFztAtfmITs2uxhdmQ="; }; diff --git a/pkgs/by-name/de/deeptools/package.nix b/pkgs/by-name/de/deeptools/package.nix index 162141847c44..97c76c7f0575 100644 --- a/pkgs/by-name/de/deeptools/package.nix +++ b/pkgs/by-name/de/deeptools/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "deeptools"; repo = "deepTools"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-2kSlL7Y5f/FjVtStnmz+GlTw2oymrtxOCaXlqgbQ7FU="; }; diff --git a/pkgs/by-name/de/deface/package.nix b/pkgs/by-name/de/deface/package.nix index ff66a7f02cfe..dc40f47ecf93 100644 --- a/pkgs/by-name/de/deface/package.nix +++ b/pkgs/by-name/de/deface/package.nix @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "ORB-HD"; repo = "deface"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-/mXWeL6OSgW4BMXtAZD/3UxQUGt7UE5ZvH8CXNCueJo="; }; diff --git a/pkgs/by-name/de/deja-dup/package.nix b/pkgs/by-name/de/deja-dup/package.nix index b45c605a9d92..0c7d6883db31 100644 --- a/pkgs/by-name/de/deja-dup/package.nix +++ b/pkgs/by-name/de/deja-dup/package.nix @@ -11,6 +11,7 @@ itstool, desktop-file-utils, glib, + glib-networking, gtk4, coreutils, libsoup_3, @@ -56,6 +57,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libsoup_3 glib + glib-networking gtk4 libsecret libadwaita diff --git a/pkgs/by-name/de/dell-command-configure/package.nix b/pkgs/by-name/de/dell-command-configure/package.nix index 52e79a25082e..d7df3dcf31ea 100644 --- a/pkgs/by-name/de/dell-command-configure/package.nix +++ b/pkgs/by-name/de/dell-command-configure/package.nix @@ -70,7 +70,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit version; pname = "dell-command-configure"; diff --git a/pkgs/by-name/de/dell-command-configure/wrapper-lib.c b/pkgs/by-name/de/dell-command-configure/wrapper-lib.c index f93bcd58ab75..90ea786f727b 100755 --- a/pkgs/by-name/de/dell-command-configure/wrapper-lib.c +++ b/pkgs/by-name/de/dell-command-configure/wrapper-lib.c @@ -1,5 +1,6 @@ #include #include +#include static const char from[] = "/usr/lib/ext/dell/omreg.cfg"; static const char to[] = "@to@"; diff --git a/pkgs/by-name/de/delta/package.nix b/pkgs/by-name/de/delta/package.nix index 76b4df5c3a23..1275c94df002 100644 --- a/pkgs/by-name/de/delta/package.nix +++ b/pkgs/by-name/de/delta/package.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "dandavison"; repo = "delta"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-fJSKGa935kwLG8WYmT9Ncg2ozpSNMzUJx0WLo1gtVAA="; }; diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix index 100de753161a..5512d0188a88 100644 --- a/pkgs/by-name/de/deno/package.nix +++ b/pkgs/by-name/de/deno/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "denoland"; repo = "deno"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-CUfUYiD1ZVrbH4RowJN0PUCafpIsEWu0sCPzxngz4Ak="; }; diff --git a/pkgs/by-name/de/densify/package.nix b/pkgs/by-name/de/densify/package.nix index b4f2797ba94b..ecc05ae8e25b 100644 --- a/pkgs/by-name/de/densify/package.nix +++ b/pkgs/by-name/de/densify/package.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "hkdb"; repo = "Densify"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-giFFy8HiSmnOqFKLyrPD1kTry8hMQxotEgD/u2FEMRY="; }; diff --git a/pkgs/by-name/de/dep-tree/package.nix b/pkgs/by-name/de/dep-tree/package.nix index 57848ec9d392..51da169f80a6 100644 --- a/pkgs/by-name/de/dep-tree/package.nix +++ b/pkgs/by-name/de/dep-tree/package.nix @@ -32,7 +32,7 @@ let }; }; pname = "dep-tree"; - version = "0.23.1"; + version = "0.23.3"; in buildGoModule { inherit pname version; @@ -41,7 +41,7 @@ buildGoModule { owner = "gabotechs"; repo = pname; rev = "v${version}"; - hash = "sha256-Y+zNx+p8xmM0L4C5IELtepm7TQDhpxOVzgc1HxdFa0w="; + hash = "sha256-xS/8ech4ZhkMMyXbMQmCg+4oKg/jULhqgiNooYf5y8k="; }; vendorHash = "sha256-KoVOjZq+RrJ2gzLnANHPPtbEY1ztC0rIXWD9AXAxqMg="; diff --git a/pkgs/by-name/de/dependency-track-exporter/package.nix b/pkgs/by-name/de/dependency-track-exporter/package.nix index 0cd1ab979def..85c4084984e6 100644 --- a/pkgs/by-name/de/dependency-track-exporter/package.nix +++ b/pkgs/by-name/de/dependency-track-exporter/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "jetstack"; repo = "dependency-track-exporter"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-yvScGxgkyZzEdfeJCXk/tSk3cLW+jyw00XbJVrpU6MY="; }; diff --git a/pkgs/by-name/de/dependency-track/package.nix b/pkgs/by-name/de/dependency-track/package.nix index 5bbc036f77c5..579fb99badf0 100644 --- a/pkgs/by-name/de/dependency-track/package.nix +++ b/pkgs/by-name/de/dependency-track/package.nix @@ -2,6 +2,7 @@ lib, buildNpmPackage, fetchFromGitHub, + nodejs_20, jre_headless, protobuf, cyclonedx-cli, @@ -17,6 +18,9 @@ let pname = "dependency-track-frontend"; inherit version; + # TODO: pinned due to build error on node 22 + nodejs = nodejs_20; + src = fetchFromGitHub { owner = "DependencyTrack"; repo = "frontend"; diff --git a/pkgs/by-name/de/desed/package.nix b/pkgs/by-name/de/desed/package.nix index e7d07164628b..aa7e2b957763 100644 --- a/pkgs/by-name/de/desed/package.nix +++ b/pkgs/by-name/de/desed/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "SoptikHa2"; repo = "desed"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-aKkOs8IhnHjoJkXq9ryGn9fN0AmZyVTHbD/Vano+Erw="; }; diff --git a/pkgs/by-name/de/desk-exec/package.nix b/pkgs/by-name/de/desk-exec/package.nix index 61dfad8939b6..d5b0535f5045 100644 --- a/pkgs/by-name/de/desk-exec/package.nix +++ b/pkgs/by-name/de/desk-exec/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "AxerTheAxe"; repo = "desk-exec"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-bJLdd07IAf+ba++vtS0iSmeQSGygwSVNry2bHTDAgjE="; }; diff --git a/pkgs/by-name/de/desync/package.nix b/pkgs/by-name/de/desync/package.nix index eac341a9a794..954327c155c7 100644 --- a/pkgs/by-name/de/desync/package.nix +++ b/pkgs/by-name/de/desync/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "folbricht"; repo = "desync"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-TwzD9WYi4cdDPKKV2XoqkGWJ9CzIwoxeFll8LqNWf/E="; }; diff --git a/pkgs/by-name/de/dethrace/package.nix b/pkgs/by-name/de/dethrace/package.nix index 7aca04136563..b5d487d9f23f 100644 --- a/pkgs/by-name/de/dethrace/package.nix +++ b/pkgs/by-name/de/dethrace/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "dethrace-labs"; repo = pname; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-Bt2wwF5cquXZwFpFyJ0TDmbFdTHbboQ93W/DvP9bsMo="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/de/devdash/package.nix b/pkgs/by-name/de/devdash/package.nix index 21a605db475f..62d8e4f83ae0 100644 --- a/pkgs/by-name/de/devdash/package.nix +++ b/pkgs/by-name/de/devdash/package.nix @@ -13,7 +13,7 @@ buildGo122Module rec { src = fetchFromGitHub { owner = "Phantas0s"; repo = "devdash"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-RUPpgMVl9Cm8uhztdfKnuQ6KdMn9m9PewlT59NnTSiY="; }; diff --git a/pkgs/by-name/de/devtoolbox/package.nix b/pkgs/by-name/de/devtoolbox/package.nix index 68ac11eb34e4..703bd5187054 100644 --- a/pkgs/by-name/de/devtoolbox/package.nix +++ b/pkgs/by-name/de/devtoolbox/package.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "aleiepure"; repo = "devtoolbox"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-yeOX2ASQWpo3TN9ou25voOVD3pSK4SE0CDXHkrwu+E4="; }; diff --git a/pkgs/by-name/de/dexed/package.nix b/pkgs/by-name/de/dexed/package.nix index 0e2479517cfe..93e607a1f927 100644 --- a/pkgs/by-name/de/dexed/package.nix +++ b/pkgs/by-name/de/dexed/package.nix @@ -13,7 +13,6 @@ freetype, alsa-lib, libjack2, - apple-sdk_11, }: stdenv.mkDerivation (finalAttrs: { @@ -23,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "asb2m10"; repo = "dexed"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-mXr1KGzA+DF2dEgAJE4lpnefPqO8pqfnKa43vyjSJgU="; }; @@ -49,18 +48,16 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - libX11 - libXext - libXcursor - libXinerama - libXrandr - freetype - alsa-lib - libjack2 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + libX11 + libXext + libXcursor + libXinerama + libXrandr + freetype + alsa-lib + libjack2 + ]; # JUCE insists on only dlopen'ing these NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux (toString [ diff --git a/pkgs/by-name/de/dezoomify-rs/package.nix b/pkgs/by-name/de/dezoomify-rs/package.nix index 35fa5f60b20a..f426eeaafc4a 100644 --- a/pkgs/by-name/de/dezoomify-rs/package.nix +++ b/pkgs/by-name/de/dezoomify-rs/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "lovasoa"; repo = "dezoomify-rs"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-uo0QTaAAbNYMidlWBauW+3hdd0snEWH+I5KQL6Vxgug="; }; diff --git a/pkgs/by-name/dh/dhcpdump/package.nix b/pkgs/by-name/dh/dhcpdump/package.nix index a33913220510..e1616f567f68 100644 --- a/pkgs/by-name/dh/dhcpdump/package.nix +++ b/pkgs/by-name/dh/dhcpdump/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "bbonev"; repo = pname; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-ck6DLsLQ00unNqPLBKkxaJLDCaPFjTFJcQjTbKSq0U8="; }; diff --git a/pkgs/by-name/dh/dhcpig/package.nix b/pkgs/by-name/dh/dhcpig/package.nix index 6582556241ae..ac05557b1c5a 100644 --- a/pkgs/by-name/dh/dhcpig/package.nix +++ b/pkgs/by-name/dh/dhcpig/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "kamorin"; repo = "DHCPig"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-MquLChDuJe3DdkxxKV4W0o49IIt7Am+yuhdOqUqexS8="; }; diff --git a/pkgs/by-name/di/diagrams-as-code/package.nix b/pkgs/by-name/di/diagrams-as-code/package.nix index fd748332c230..14ba0abf5a9b 100644 --- a/pkgs/by-name/di/diagrams-as-code/package.nix +++ b/pkgs/by-name/di/diagrams-as-code/package.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "dmytrostriletskyi"; repo = "diagrams-as-code"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-cd602eQvNCUQuCdn/RpcfURcDHjXLZ0gAG+SObB++Q0="; }; diff --git a/pkgs/by-name/di/dialect/package.nix b/pkgs/by-name/di/dialect/package.nix index 65c1a8b29225..a9c95c7f7e08 100644 --- a/pkgs/by-name/di/dialect/package.nix +++ b/pkgs/by-name/di/dialect/package.nix @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "dialect-app"; repo = "dialect"; - rev = "refs/tags/${version}"; + tag = version; fetchSubmodules = true; hash = "sha256-TWXJlzuSBy+Ij3s0KS02bh8vdXP10hQpgdz4QMTLf/Q="; }; diff --git a/pkgs/by-name/di/discover-overlay/package.nix b/pkgs/by-name/di/discover-overlay/package.nix index 4d400b97d4c2..433e6178adac 100644 --- a/pkgs/by-name/di/discover-overlay/package.nix +++ b/pkgs/by-name/di/discover-overlay/package.nix @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "trigg"; repo = "Discover"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-0b0uZDa9Q3pQ6X65C+E31dMpdTPt4vvHDEqFEtRoedg="; }; diff --git a/pkgs/by-name/di/dismember/package.nix b/pkgs/by-name/di/dismember/package.nix index e8f09eb8f89b..589d33adc2f3 100644 --- a/pkgs/by-name/di/dismember/package.nix +++ b/pkgs/by-name/di/dismember/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "liamg"; repo = pname; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-myoBXoi7VqHOLmu/XrvnlfBDlEnXm+0fp8WQec+3EJY="; }; diff --git a/pkgs/by-name/dl/dlib/package.nix b/pkgs/by-name/dl/dlib/package.nix index debaf686da04..8fca85081b32 100644 --- a/pkgs/by-name/dl/dlib/package.nix +++ b/pkgs/by-name/dl/dlib/package.nix @@ -25,7 +25,7 @@ src = fetchFromGitHub { owner = "davisking"; repo = "dlib"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; sha256 = "sha256-BpE7ZrtiiaDqwy1G4IHOQBJMr6sAadFbRxsdObs1SIY="; }; diff --git a/pkgs/by-name/dm/dmarc-metrics-exporter/package.nix b/pkgs/by-name/dm/dmarc-metrics-exporter/package.nix index 0a0cab6b0e9c..369dd3548d36 100644 --- a/pkgs/by-name/dm/dmarc-metrics-exporter/package.nix +++ b/pkgs/by-name/dm/dmarc-metrics-exporter/package.nix @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "jgosmann"; repo = "dmarc-metrics-exporter"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-cIsI4TNYuLK0fpUg9lnbl5KSBtzQoT/pTByI9hiy/7o="; }; diff --git a/pkgs/by-name/dm/dmenu-rs/package.nix b/pkgs/by-name/dm/dmenu-rs/package.nix index d64f5a0cc8cc..20df1141d3df 100644 --- a/pkgs/by-name/dm/dmenu-rs/package.nix +++ b/pkgs/by-name/dm/dmenu-rs/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Shizcow"; repo = "dmenu-rs"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-05Ia+GHeL8PzOwR7H+NEVhKJVMPhlIaQLwGfvwOAl0g="; }; diff --git a/pkgs/by-name/dm/dmg2img/package.nix b/pkgs/by-name/dm/dmg2img/package.nix index 8b1e997ff736..ff93db42d28e 100644 --- a/pkgs/by-name/dm/dmg2img/package.nix +++ b/pkgs/by-name/dm/dmg2img/package.nix @@ -1,33 +1,50 @@ -{ lib, stdenv, fetchurl, zlib, bzip2, openssl, fetchpatch }: +{ + bzip2, + fetchFromGitHub, + lib, + openssl, + stdenv, + unstableGitUpdater, + zlib, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dmg2img"; - version = "1.6.7"; + version = "1.6.7-unstable-2020-12-27"; - src = fetchurl { - url = "http://vu1tur.eu.org/tools/dmg2img-${version}.tar.gz"; - sha256 = "066hqhg7k90xcw5aq86pgr4l7apzvnb4559vj5s010avbk8adbh2"; + src = fetchFromGitHub { + owner = "Lekensteyn"; + repo = "dmg2img"; + rev = "a3e413489ccdd05431401357bf21690536425012"; + hash = "sha256-DewU5jz2lRjIRiT0ebjPRArsoye33xlEGfhzd4xnT4A="; }; - buildInputs = [ zlib bzip2 openssl ]; - - patches = [ - (fetchpatch { - url = "https://raw.githubusercontent.com/Homebrew/formula-patches/85fa66a9/dmg2img/openssl-1.1.diff"; - sha256 = "076sz69hf3ryylplg025vl8sj991cb81g3yazsmrf8anrd7ffmxx"; - }) + buildInputs = [ + bzip2 + openssl + zlib ]; - patchFlags = [ "-p0" ]; - - installPhase = '' - install -D dmg2img $out/bin/dmg2img - install -D vfdecrypt $out/bin/vfdecrypt + preBuild = '' + sed -i "s/1.6.5/${finalAttrs.version}/" dmg2img.c ''; + installPhase = '' + runHook preInstall + + install -Dm755 dmg2img vfdecrypt -t $out/bin + + runHook postInstall + ''; + + passthru.updateScript = unstableGitUpdater { }; + meta = { + description = "Tool which allows converting Apple compressed dmg archives to standard (hfsplus) image disk files"; + homepage = "https://github.com/Lekensteyn/dmg2img"; + license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; - description = "Apple's compressed dmg to standard (hfsplus) image disk file convert tool"; - license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ KSJ2000 ]; + mainProgram = "dmg2img"; }; -} +}) diff --git a/pkgs/by-name/dm/dms/package.nix b/pkgs/by-name/dm/dms/package.nix index eed1e01eb846..2eb2ca2838d1 100644 --- a/pkgs/by-name/dm/dms/package.nix +++ b/pkgs/by-name/dm/dms/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "anacrolix"; repo = "dms"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-dObY2MNrrQqn5i/y2LDlKvd9S04EArmsalIsfXsrth0="; }; diff --git a/pkgs/by-name/dn/dnsdiag/package.nix b/pkgs/by-name/dn/dnsdiag/package.nix index a64f1a32dafb..8ae326177f87 100644 --- a/pkgs/by-name/dn/dnsdiag/package.nix +++ b/pkgs/by-name/dn/dnsdiag/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "farrokhi"; repo = "dnsdiag"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-6TDs+ncbVa7LWtGLlqEXJb9zzXZ+nAhbi4QGyCSu3ho="; }; diff --git a/pkgs/by-name/dn/dnslink-std-go/package.nix b/pkgs/by-name/dn/dnslink-std-go/package.nix index c061c74035a6..54a79a5a867f 100644 --- a/pkgs/by-name/dn/dnslink-std-go/package.nix +++ b/pkgs/by-name/dn/dnslink-std-go/package.nix @@ -10,7 +10,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "dnslink-std"; repo = "go"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-aATnNDUogNS4jBoWxUAFYFMa2ZS0+th3XH+1KWqwfWQ="; }; vendorHash = "sha256-RH55yfIO9jHLbjtEdUF5QpL5ILV5ctX2hBYBJWutmUA="; diff --git a/pkgs/by-name/dn/dnslookup/package.nix b/pkgs/by-name/dn/dnslookup/package.nix index 8491c0597a69..d18d164cffdc 100644 --- a/pkgs/by-name/dn/dnslookup/package.nix +++ b/pkgs/by-name/dn/dnslookup/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "ameshkov"; repo = "dnslookup"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-zgEW4ANIlwF0f6YqTQicGhGgLc9RaL7Xy0wg/ICzOK4="; }; diff --git a/pkgs/by-name/dn/dnsmonster/package.nix b/pkgs/by-name/dn/dnsmonster/package.nix index 782bd8518596..566998865506 100644 --- a/pkgs/by-name/dn/dnsmonster/package.nix +++ b/pkgs/by-name/dn/dnsmonster/package.nix @@ -13,7 +13,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "mosajjal"; repo = "dnsmonster"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-0WHTrqnc3vYQro+nSsQipAPVymR8L4uOwtd9GJHxhVM="; }; diff --git a/pkgs/by-name/dn/dnsproxy/package.nix b/pkgs/by-name/dn/dnsproxy/package.nix index 51a95bb88187..a0d31cb054b1 100644 --- a/pkgs/by-name/dn/dnsproxy/package.nix +++ b/pkgs/by-name/dn/dnsproxy/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.73.5"; + version = "0.74.1"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = "dnsproxy"; rev = "v${version}"; - hash = "sha256-U3OqRfJUtH0rMdVypaoFF3Mi6oBvgt08ufnERPFVjC4="; + hash = "sha256-s6VJXlWzrbHu/kOeng3gnySd5YMJFaUelZy/GoL611c="; }; vendorHash = "sha256-d1WrUfE31Gvgz8tw7cVdPhWf4OHsuuyEHDSn9bETCjI="; diff --git a/pkgs/by-name/dn/dnsrecon/package.nix b/pkgs/by-name/dn/dnsrecon/package.nix index d1992581b2cb..5e51dc1b2fc6 100644 --- a/pkgs/by-name/dn/dnsrecon/package.nix +++ b/pkgs/by-name/dn/dnsrecon/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "darkoperator"; repo = "dnsrecon"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-CW5HM8hATfhyQDbSAV+zSp8Gc/C5uy40yKMJAGawn0k="; }; diff --git a/pkgs/by-name/dn/dnstwist/package.nix b/pkgs/by-name/dn/dnstwist/package.nix index ec35004d476e..ff7468be8699 100644 --- a/pkgs/by-name/dn/dnstwist/package.nix +++ b/pkgs/by-name/dn/dnstwist/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "elceef"; repo = "dnstwist"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-J6MfPKj7iACsiiSUU/2gxQdwtmqw9NKnjDoSdhxKoAw="; }; diff --git a/pkgs/by-name/dn/dnsx/package.nix b/pkgs/by-name/dn/dnsx/package.nix index 20c81aa260ab..e93957700849 100644 --- a/pkgs/by-name/dn/dnsx/package.nix +++ b/pkgs/by-name/dn/dnsx/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "projectdiscovery"; repo = "dnsx"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-scp0CDIO8F2TqpSCgXXfb8I83stvO/GZqSA5/BkN8pE="; }; diff --git a/pkgs/by-name/do/docify/package.nix b/pkgs/by-name/do/docify/package.nix index 5207dce0caa8..fd9602986b24 100644 --- a/pkgs/by-name/do/docify/package.nix +++ b/pkgs/by-name/do/docify/package.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "AThePeanut4"; repo = "docify"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-pENahqprTf6weP6qi9CyeQPdNOqr9c/q7j6GO9Lq3N4="; }; diff --git a/pkgs/by-name/do/docker-credential-gcr/package.nix b/pkgs/by-name/do/docker-credential-gcr/package.nix index e59c92b42294..deedd7c8a72f 100644 --- a/pkgs/by-name/do/docker-credential-gcr/package.nix +++ b/pkgs/by-name/do/docker-credential-gcr/package.nix @@ -14,7 +14,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "docker-credential-gcr"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-4sgUeEXBfP0qaR92ZulqAf1ObQBDbSjEHqhAqa0EV2Q="; }; diff --git a/pkgs/by-name/do/docker-init/package.nix b/pkgs/by-name/do/docker-init/package.nix index 0f2da4e6811b..46b951515d91 100644 --- a/pkgs/by-name/do/docker-init/package.nix +++ b/pkgs/by-name/do/docker-init/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://desktop.docker.com/linux/main/amd64/${finalAttrs.tag}/docker-desktop-x86_64.pkg.tar.zst"; - hash = "sha256-ysZorPBmoUvTJFFKDbZgQxPamONJKcXezmMrpZSVpwY="; + hash = "sha256-pxxlSN2sQqlPUzUPufcK8T+pvdr0cK+9hWTYzwMJv5I="; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Creates Docker-related starter files for your project"; homepage = "https://docs.docker.com/reference/cli/docker/init"; - downloadPage = "https://docs.docker.com/desktop/release-notes/#4320"; + downloadPage = "https://docs.docker.com/desktop/release-notes"; mainProgram = "docker-init"; license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/by-name/do/docopts/package.nix b/pkgs/by-name/do/docopts/package.nix index 24098bca701d..f1f8f4ecffe7 100644 --- a/pkgs/by-name/do/docopts/package.nix +++ b/pkgs/by-name/do/docopts/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "docopt"; repo = "docopts"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-GIBrJ5qexeJ6ul5ek9LJZC4J3cNExsTrnxdzRCfoqn8="; }; diff --git a/pkgs/by-name/do/donpapi/package.nix b/pkgs/by-name/do/donpapi/package.nix index e8c62da2fcae..8a90402c0276 100644 --- a/pkgs/by-name/do/donpapi/package.nix +++ b/pkgs/by-name/do/donpapi/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "login-securite"; repo = "DonPAPI"; - rev = "refs/tags/V${version}"; + tag = "V${version}"; hash = "sha256-60aGnsr36X3mf91nH9ud0xyLBqKgzZ4ALucrLGpAuzQ="; }; diff --git a/pkgs/by-name/do/dontgo403/package.nix b/pkgs/by-name/do/dontgo403/package.nix index 12f81ebbb241..74a4a4859371 100644 --- a/pkgs/by-name/do/dontgo403/package.nix +++ b/pkgs/by-name/do/dontgo403/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "devploit"; repo = "dontgo403"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-qA1i8l2oBQQ5IF8ho3K2k+TAndUTFGwb2NfhyFqfKzU="; }; diff --git a/pkgs/by-name/do/dooit/package.nix b/pkgs/by-name/do/dooit/package.nix index 4dd74adb09b1..57bd173e17c4 100644 --- a/pkgs/by-name/do/dooit/package.nix +++ b/pkgs/by-name/do/dooit/package.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "dooit-org"; repo = "dooit"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-tqSWDW3nj+nMt7t5vgSqWvtx7YA3y2GV29gI1MYFMhc="; }; diff --git a/pkgs/by-name/do/doq/package.nix b/pkgs/by-name/do/doq/package.nix index 4427fe310643..3a490905102b 100644 --- a/pkgs/by-name/do/doq/package.nix +++ b/pkgs/by-name/do/doq/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "heavenshell"; repo = "py-doq"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-iVu+5o8pZ5OhIzNItWbzUzqC3VQ6HCD7nP5gW/PVAMM="; }; @@ -37,7 +37,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Docstring generator for Python"; homepage = "https://github.com/heavenshell/py-doq"; - changelog = "https://github.com/heavenshell/py-doq/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; + changelog = "https://github.com/heavenshell/py-doq/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ natsukium ]; mainProgram = "doq"; diff --git a/pkgs/by-name/do/dotenvx/package.nix b/pkgs/by-name/do/dotenvx/package.nix index 01700acd9fde..bac58c9244d0 100644 --- a/pkgs/by-name/do/dotenvx/package.nix +++ b/pkgs/by-name/do/dotenvx/package.nix @@ -13,7 +13,7 @@ buildNpmPackage rec { src = fetchFromGitHub { owner = "dotenvx"; repo = "dotenvx"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-GOofZ8nBsncxdmoodA86s0HUuLGw6UxDpTcG6yKiE6k="; }; diff --git a/pkgs/by-name/do/downonspot/package.nix b/pkgs/by-name/do/downonspot/package.nix index 3f6ea6bdc7d2..6d9e05f8efe8 100644 --- a/pkgs/by-name/do/downonspot/package.nix +++ b/pkgs/by-name/do/downonspot/package.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "oSumAtrIX"; repo = "DownOnSpot"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-h/BKVFzvPq9FhX4wZzlIzoegK8nPEt+mR7oKpRC5eV0="; }; diff --git a/pkgs/by-name/dp/dprint/package.nix b/pkgs/by-name/dp/dprint/package.nix index 9df8d207aff2..c517147ff949 100644 --- a/pkgs/by-name/dp/dprint/package.nix +++ b/pkgs/by-name/dp/dprint/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "dprint"; repo = "dprint"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-Zem37oHku90c7PDV8ep/7FN128eGRUvfIvRsaXa7X9g="; }; diff --git a/pkgs/by-name/dp/dprint/plugins/default.nix b/pkgs/by-name/dp/dprint/plugins/default.nix new file mode 100644 index 000000000000..cefe95973b8d --- /dev/null +++ b/pkgs/by-name/dp/dprint/plugins/default.nix @@ -0,0 +1,44 @@ +{ lib, fetchurl }: +let + mkDprintPlugin = + { + url, + hash, + pname, + version, + description, + initConfig, + updateUrl, + license ? lib.licenses.mit, + maintainers ? [ lib.maintainers.phanirithvij ], + }: + fetchurl { + inherit hash url; + name = "${pname}-${version}.wasm"; + meta = { + inherit + description + license + maintainers + ; + }; + passthru = { + updateScript = ./update-plugins.py; + inherit initConfig updateUrl; + }; + }; + inherit (lib) + filterAttrs + mapAttrs' + nameValuePair + removeSuffix + ; + files = filterAttrs ( + name: type: type == "regular" && name != "default.nix" && lib.hasSuffix ".nix" name + ) (builtins.readDir ./.); + plugins = mapAttrs' ( + name: _: + nameValuePair (removeSuffix ".nix" name) (import (./. + "/${name}") { inherit mkDprintPlugin; }) + ) files; +in +plugins // { inherit mkDprintPlugin; } diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix new file mode 100644 index 000000000000..4f1087505d52 --- /dev/null +++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix @@ -0,0 +1,21 @@ +{ mkDprintPlugin }: +mkDprintPlugin { + description = "Biome (JS/TS) wrapper plugin."; + hash = "sha256-+zY+myazFAUxeNuWFigkvF4zpKBs+jzVYQT09jRWFKI="; + initConfig = { + configExcludes = [ "**/node_modules" ]; + configKey = "biome"; + fileExtensions = [ + "ts" + "tsx" + "js" + "jsx" + "cjs" + "mjs" + ]; + }; + pname = "dprint-plugin-biome"; + updateUrl = "https://plugins.dprint.dev/dprint/biome/latest.json"; + url = "https://plugins.dprint.dev/biome-0.7.1.wasm"; + version = "0.7.1"; +} diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-dockerfile.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-dockerfile.nix new file mode 100644 index 000000000000..76e62aceecd7 --- /dev/null +++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-dockerfile.nix @@ -0,0 +1,14 @@ +{ mkDprintPlugin }: +mkDprintPlugin { + description = "Dockerfile code formatter."; + hash = "sha256-gsfMLa4zw8AblOS459ZS9OZrkGCQi5gBN+a3hvOsspk="; + initConfig = { + configExcludes = [ ]; + configKey = "dockerfile"; + fileExtensions = [ "dockerfile" ]; + }; + pname = "dprint-plugin-dockerfile"; + updateUrl = "https://plugins.dprint.dev/dprint/dockerfile/latest.json"; + url = "https://plugins.dprint.dev/dockerfile-0.3.2.wasm"; + version = "0.3.2"; +} diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-json.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-json.nix new file mode 100644 index 000000000000..2d8702539a0a --- /dev/null +++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-json.nix @@ -0,0 +1,14 @@ +{ mkDprintPlugin }: +mkDprintPlugin { + description = "JSON/JSONC code formatter."; + hash = "sha256-Sw+HkUb4K2wrLuQRZibr8gOCR3Rz36IeId4Vd4LijmY="; + initConfig = { + configExcludes = [ "**/*-lock.json" ]; + configKey = "json"; + fileExtensions = [ "json" ]; + }; + pname = "dprint-plugin-json"; + updateUrl = "https://plugins.dprint.dev/dprint/json/latest.json"; + url = "https://plugins.dprint.dev/json-0.19.4.wasm"; + version = "0.19.4"; +} diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-jupyter.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-jupyter.nix new file mode 100644 index 000000000000..f1ac0eae9708 --- /dev/null +++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-jupyter.nix @@ -0,0 +1,14 @@ +{ mkDprintPlugin }: +mkDprintPlugin { + description = "Jupyter notebook code block formatter."; + hash = "sha256-877CEZbMlj9cHkFtl16XCnan37SeEGUL3BHaUKUv8S4="; + initConfig = { + configExcludes = [ ]; + configKey = "jupyter"; + fileExtensions = [ "ipynb" ]; + }; + pname = "dprint-plugin-jupyter"; + updateUrl = "https://plugins.dprint.dev/dprint/jupyter/latest.json"; + url = "https://plugins.dprint.dev/jupyter-0.1.5.wasm"; + version = "0.1.5"; +} diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-markdown.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-markdown.nix new file mode 100644 index 000000000000..0d17600f6827 --- /dev/null +++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-markdown.nix @@ -0,0 +1,14 @@ +{ mkDprintPlugin }: +mkDprintPlugin { + description = "Markdown code formatter."; + hash = "sha256-PIEN9UnYC8doJpdzS7M6QEHQNQtj7WwXAgvewPsTjqs="; + initConfig = { + configExcludes = [ ]; + configKey = "markdown"; + fileExtensions = [ "md" ]; + }; + pname = "dprint-plugin-markdown"; + updateUrl = "https://plugins.dprint.dev/dprint/markdown/latest.json"; + url = "https://plugins.dprint.dev/markdown-0.17.8.wasm"; + version = "0.17.8"; +} diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-ruff.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-ruff.nix new file mode 100644 index 000000000000..deee9292f48f --- /dev/null +++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-ruff.nix @@ -0,0 +1,17 @@ +{ mkDprintPlugin }: +mkDprintPlugin { + description = "Ruff (Python) wrapper plugin."; + hash = "sha256-15InHQgF9c0Js4yUJxmZ1oNj1O16FBU12u/GOoaSAJ8="; + initConfig = { + configExcludes = [ ]; + configKey = "ruff"; + fileExtensions = [ + "py" + "pyi" + ]; + }; + pname = "dprint-plugin-ruff"; + updateUrl = "https://plugins.dprint.dev/dprint/ruff/latest.json"; + url = "https://plugins.dprint.dev/ruff-0.3.9.wasm"; + version = "0.3.9"; +} diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-toml.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-toml.nix new file mode 100644 index 000000000000..3eef32b0e3bd --- /dev/null +++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-toml.nix @@ -0,0 +1,14 @@ +{ mkDprintPlugin }: +mkDprintPlugin { + description = "TOML code formatter."; + hash = "sha256-aDfo/sKfOeNpyfd/4N1LgL1bObTTnviYrA8T7M/1KNs="; + initConfig = { + configExcludes = [ ]; + configKey = "toml"; + fileExtensions = [ "toml" ]; + }; + pname = "dprint-plugin-toml"; + updateUrl = "https://plugins.dprint.dev/dprint/toml/latest.json"; + url = "https://plugins.dprint.dev/toml-0.6.3.wasm"; + version = "0.6.3"; +} diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-typescript.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-typescript.nix new file mode 100644 index 000000000000..a3a805827ec0 --- /dev/null +++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-typescript.nix @@ -0,0 +1,21 @@ +{ mkDprintPlugin }: +mkDprintPlugin { + description = "TypeScript/JavaScript code formatter."; + hash = "sha256-urgKQOjgkoDJCH/K7DWLJCkD0iH0Ok+rvrNDI0i4uS0="; + initConfig = { + configExcludes = [ "**/node_modules" ]; + configKey = "typescript"; + fileExtensions = [ + "ts" + "tsx" + "js" + "jsx" + "cjs" + "mjs" + ]; + }; + pname = "dprint-plugin-typescript"; + updateUrl = "https://plugins.dprint.dev/dprint/typescript/latest.json"; + url = "https://plugins.dprint.dev/typescript-0.93.3.wasm"; + version = "0.93.3"; +} diff --git a/pkgs/by-name/dp/dprint/plugins/g-plane-malva.nix b/pkgs/by-name/dp/dprint/plugins/g-plane-malva.nix new file mode 100644 index 000000000000..c01cad63c064 --- /dev/null +++ b/pkgs/by-name/dp/dprint/plugins/g-plane-malva.nix @@ -0,0 +1,19 @@ +{ mkDprintPlugin }: +mkDprintPlugin { + description = "CSS, SCSS, Sass and Less formatter."; + hash = "sha256-zt7F1tgPhPAn+gtps6+JB5RtvjIZw2n/G85Bv6kazgU="; + initConfig = { + configExcludes = [ "**/node_modules" ]; + configKey = "malva"; + fileExtensions = [ + "css" + "scss" + "sass" + "less" + ]; + }; + pname = "g-plane-malva"; + updateUrl = "https://plugins.dprint.dev/g-plane/malva/latest.json"; + url = "https://plugins.dprint.dev/g-plane/malva-v0.11.1.wasm"; + version = "0.11.1"; +} diff --git a/pkgs/by-name/dp/dprint/plugins/g-plane-markup_fmt.nix b/pkgs/by-name/dp/dprint/plugins/g-plane-markup_fmt.nix new file mode 100644 index 000000000000..b948d3569013 --- /dev/null +++ b/pkgs/by-name/dp/dprint/plugins/g-plane-markup_fmt.nix @@ -0,0 +1,24 @@ +{ mkDprintPlugin }: +mkDprintPlugin { + description = "HTML, Vue, Svelte, Astro, Angular, Jinja, Twig, Nunjucks, and Vento formatter."; + hash = "sha256-G8UnJbc+oZ60V3oi8W2SS6H06zEYfY3wpmSUp+1GF8k="; + initConfig = { + configExcludes = [ ]; + configKey = "markup"; + fileExtensions = [ + "html" + "vue" + "svelte" + "astro" + "jinja" + "jinja2" + "twig" + "njk" + "vto" + ]; + }; + pname = "g-plane-markup_fmt"; + updateUrl = "https://plugins.dprint.dev/g-plane/markup_fmt/latest.json"; + url = "https://plugins.dprint.dev/g-plane/markup_fmt-v0.18.0.wasm"; + version = "0.18.0"; +} diff --git a/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_graphql.nix b/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_graphql.nix new file mode 100644 index 000000000000..38d7326ab416 --- /dev/null +++ b/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_graphql.nix @@ -0,0 +1,17 @@ +{ mkDprintPlugin }: +mkDprintPlugin { + description = "GraphQL formatter."; + hash = "sha256-PlQwpR0tMsghMrOX7is+anN57t9xa9weNtoWpc0E9ec="; + initConfig = { + configExcludes = [ ]; + configKey = "graphql"; + fileExtensions = [ + "graphql" + "gql" + ]; + }; + pname = "g-plane-pretty_graphql"; + updateUrl = "https://plugins.dprint.dev/g-plane/pretty_graphql/latest.json"; + url = "https://plugins.dprint.dev/g-plane/pretty_graphql-v0.2.1.wasm"; + version = "0.2.1"; +} diff --git a/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_yaml.nix b/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_yaml.nix new file mode 100644 index 000000000000..a303b945d5e7 --- /dev/null +++ b/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_yaml.nix @@ -0,0 +1,17 @@ +{ mkDprintPlugin }: +mkDprintPlugin { + description = "YAML formatter."; + hash = "sha256-6ua021G7ZW7Ciwy/OHXTA1Joj9PGEx3SZGtvaA//gzo="; + initConfig = { + configExcludes = [ ]; + configKey = "yaml"; + fileExtensions = [ + "yaml" + "yml" + ]; + }; + pname = "g-plane-pretty_yaml"; + updateUrl = "https://plugins.dprint.dev/g-plane/pretty_yaml/latest.json"; + url = "https://plugins.dprint.dev/g-plane/pretty_yaml-v0.5.0.wasm"; + version = "0.5.0"; +} diff --git a/pkgs/by-name/dp/dprint/plugins/update-plugins.py b/pkgs/by-name/dp/dprint/plugins/update-plugins.py new file mode 100755 index 000000000000..9a3bd7e38cae --- /dev/null +++ b/pkgs/by-name/dp/dprint/plugins/update-plugins.py @@ -0,0 +1,156 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i python -p nix nixfmt-rfc-style 'python3.withPackages (pp: [ pp.requests ])' + +import json +import os +from pathlib import Path +import sys +import subprocess +import requests + +USAGE = """Usage: {0} [ | plugin-name | plugin-file-path] + +eg. + {0} + {0} dprint-plugin-json + {0} /path/to/dprint-plugin-json.nix""" + +FILE_PATH = Path(os.path.realpath(__file__)) +SCRIPT_DIR = FILE_PATH.parent + +pname = "" +if len(sys.argv) > 1: + if "-help" in "".join(sys.argv): + print(USAGE.format(FILE_PATH.name)) + exit(0) + pname = sys.argv[1] +else: + pname = os.environ.get("UPDATE_NIX_PNAME", "") + + +# get sri hash for a url, no unpack +def nix_prefetch_url(url, name, algo="sha256"): + hash = ( + subprocess.check_output( + ["nix-prefetch-url", "--type", algo, "--name", name, url] + ) + .decode("utf-8") + .rstrip() + ) + sri = ( + subprocess.check_output( + # split by space is enough for this command + "nix --extra-experimental-features nix-command " + f"hash convert --hash-algo {algo} --to sri {hash}".split(" ") + ) + .decode("utf-8") + .rstrip() + ) + return sri + + +# json object to nix string +def json_to_nix(jsondata): + # to quote strings, dumps twice does it + json_str = json.dumps(json.dumps(jsondata)) + return ( + subprocess.check_output( + "nix --extra-experimental-features nix-command eval " + f"--expr 'builtins.fromJSON ''{json_str}''' --impure | nixfmt", + shell=True, + ) + .decode("utf-8") + .rstrip() + ) + + +# nix string to json object +def nix_to_json(nixstr): + return json.loads( + subprocess.check_output( + f"nix --extra-experimental-features nix-command eval --json --expr '{nixstr}'", + shell=True, + ) + .decode("utf-8") + .rstrip() + ) + + +# nixfmt a file +def nixfmt(nixfile): + subprocess.run(["nixfmt", nixfile]) + + +def get_update_url(plugin_url): + """Get a single plugin's update url given the plugin's url""" + + # remove -version.wasm at the end + url = "-".join(plugin_url.split("-")[:-1]) + names = url.split("/")[3:] + # if single name then -> dprint/ + if len(names) == 1: + names.insert(0, "dprint") + return "https://plugins.dprint.dev/" + "/".join(names) + "/latest.json" + + +def write_plugin_derivation(drv_attrs): + drv = f"{{ mkDprintPlugin }}: mkDprintPlugin {json_to_nix(drv_attrs)}" + filepath = SCRIPT_DIR / f"{drv_attrs["pname"]}.nix" + with open(filepath, "w+", encoding="utf8") as f: + f.write(drv) + nixfmt(filepath) + + +def update_plugin_by_name(name): + """Update a single plugin by name""" + + # allow passing in filename as well as pname + if name.endswith(".nix"): + name = Path(name[:-4]).name + try: + p = (SCRIPT_DIR / f"{name}.nix").read_text().replace("\n", "") + except OSError as e: + print(f"failed to update plugin {name}: error: {e}") + exit(1) + + start_idx = p.find("mkDprintPlugin {") + len("mkDprintPlugin {") + p = nix_to_json("{" + p[start_idx:].strip()) + + data = requests.get(p["updateUrl"]).json() + p["url"] = data["url"] + p["version"] = data["version"] + p["hash"] = nix_prefetch_url(data["url"], f"{name}-{data["version"]}.wasm") + + write_plugin_derivation(p) + + +def update_plugins(): + """Update all the plugins""" + + data = requests.get("https://plugins.dprint.dev/info.json").json()["latest"] + + for e in data: + update_url = get_update_url(e["url"]) + pname = e["name"] + if "/" in e["name"]: + pname = pname.replace("/", "-") + drv_attrs = { + "url": e["url"], + "hash": nix_prefetch_url(e["url"], f"{pname}-{e["version"]}.wasm"), + "updateUrl": update_url, + "pname": pname, + "version": e["version"], + "description": e["description"], + "initConfig": { + "configKey": e["configKey"], + "configExcludes": e["configExcludes"], + "fileExtensions": e["fileExtensions"], + }, + } + write_plugin_derivation(drv_attrs) + + +if pname != "": + update_plugin_by_name(pname) +else: + update_plugins() diff --git a/pkgs/by-name/dq/dq/package.nix b/pkgs/by-name/dq/dq/package.nix index 60e5b429896c..196d9ecc609e 100644 --- a/pkgs/by-name/dq/dq/package.nix +++ b/pkgs/by-name/dq/dq/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "janmojzis"; repo = "dq"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-aXNj2JsSCxp3+zTF2/7SAffrzwQH+3NCppxpnPCLT4o="; }; diff --git a/pkgs/by-name/dq/dqlite/package.nix b/pkgs/by-name/dq/dqlite/package.nix index 846bc338b8da..14d1bea4103f 100644 --- a/pkgs/by-name/dq/dqlite/package.nix +++ b/pkgs/by-name/dq/dqlite/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "canonical"; repo = pname; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-sWA04CoVMR8380/PXSkMo/Ml2Gk1RNQxPC12CMVqxwE="; }; diff --git a/pkgs/by-name/dr/drat-trim/package.nix b/pkgs/by-name/dr/drat-trim/package.nix index c4070e3f45e7..cb0437860117 100644 --- a/pkgs/by-name/dr/drat-trim/package.nix +++ b/pkgs/by-name/dr/drat-trim/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "marijnheule"; repo = "drat-trim"; - rev = "refs/tags/v05.22.2023"; + tag = "v05.22.2023"; hash = "sha256-sV3A0f1TLSaTIdAtT6y8rU3ZS2UqEePJYSf3UySOlSA="; }; diff --git a/pkgs/by-name/dr/drawing/package.nix b/pkgs/by-name/dr/drawing/package.nix index b41473f8867d..cf75fc8fbbe9 100644 --- a/pkgs/by-name/dr/drawing/package.nix +++ b/pkgs/by-name/dr/drawing/package.nix @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "maoschanz"; repo = pname; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-kNF9db8NoHWW1A0WEFQzxHqAQ4A7kxInMRZFJOXQX/k="; }; diff --git a/pkgs/by-name/dr/driftnet/package.nix b/pkgs/by-name/dr/driftnet/package.nix index 0a533f421131..b0bff18b2955 100644 --- a/pkgs/by-name/dr/driftnet/package.nix +++ b/pkgs/by-name/dr/driftnet/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "deiv"; repo = "driftnet"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-lMn60vtOMPs1Tr+SnAOUZDrNIO7gEXdHpizjXiEkkoM="; }; diff --git a/pkgs/by-name/dr/drogon/package.nix b/pkgs/by-name/dr/drogon/package.nix index 03067cd6ec4c..c1aedb044964 100644 --- a/pkgs/by-name/dr/drogon/package.nix +++ b/pkgs/by-name/dr/drogon/package.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "drogon"; - version = "1.9.8"; + version = "1.9.9"; src = fetchFromGitHub { owner = "drogonframework"; repo = "drogon"; rev = "v${finalAttrs.version}"; - hash = "sha256-vQ9d3l++waYTYt+bvt/ShatBVxTfA7LmYIXV5VSraNQ="; + hash = "sha256-5nJwWlXy0e0ThnTGV9MamdAJ+FqB597gsDz28p8DrQA="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/dr/drone-runner-docker/package.nix b/pkgs/by-name/dr/drone-runner-docker/package.nix index 278d17379d6f..290ca71e3bfd 100644 --- a/pkgs/by-name/dr/drone-runner-docker/package.nix +++ b/pkgs/by-name/dr/drone-runner-docker/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "drone-runners"; repo = pname; - rev = "refs/tags/v${version}"; + tag = "v${version}"; sha256 = "sha256-ZoQeCuT5FRhxp/ikB0gkp3QVOQ6OS7ukkz4QanWT9G0="; }; diff --git a/pkgs/by-name/ds/dssat/package.nix b/pkgs/by-name/ds/dssat/package.nix index 4b40302c415d..c04c35f6f012 100644 --- a/pkgs/by-name/ds/dssat/package.nix +++ b/pkgs/by-name/ds/dssat/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (final: { src = fetchFromGitHub { owner = "DSSAT"; repo = "dssat-csm-os"; - rev = "refs/tags/v${final.version}"; + tag = "v${final.version}"; hash = "sha256-8OaTM7IXFZjlelx5O4O+bVNQj4dIhGzIk2iCfpqI8uA="; }; diff --git a/pkgs/by-name/ds/dssp/package.nix b/pkgs/by-name/ds/dssp/package.nix index ac5d5dce68f9..6f569feda455 100644 --- a/pkgs/by-name/ds/dssp/package.nix +++ b/pkgs/by-name/ds/dssp/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "PDB-REDO"; repo = "dssp"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-YNYpHjp9kEszXvLF3RrNg6gYd4GPvfRVtdkUwJ89qOc="; }; @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Calculate the most likely secondary structure assignment given the 3D structure of a protein"; mainProgram = "mkdssp"; homepage = "https://github.com/PDB-REDO/dssp"; - changelog = "https://github.com/PDB-REDO/dssp/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}"; + changelog = "https://github.com/PDB-REDO/dssp/releases/tag/v${finalAttrs.version}"; license = licenses.bsd2; maintainers = with maintainers; [ natsukium ]; platforms = platforms.unix; diff --git a/pkgs/by-name/dt/dtbloader/package.nix b/pkgs/by-name/dt/dtbloader/package.nix new file mode 100644 index 000000000000..3ce3551137ac --- /dev/null +++ b/pkgs/by-name/dt/dtbloader/package.nix @@ -0,0 +1,59 @@ +{ + lib, + stdenv, + fetchFromGitHub, + llvmPackages, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dtbloader"; + version = "1.2.2"; + + src = fetchFromGitHub { + owner = "TravMurav"; + repo = "dtbloader"; + tag = finalAttrs.version; + hash = "sha256-5Efxi0cojhq9mqB5VMShXx/Sp4CE6Cvr1pcwnUm5zlo="; + fetchSubmodules = true; + }; + + nativeBuildInputs = with llvmPackages; [ + clang + lld + llvm + ]; + + # Disable hardening which adds incompatible flags like -fPIC + hardeningDisable = [ "all" ]; + + enableParallelBuilding = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/dtbloader/efi + cp build-aarch64/dtbloader.efi $out/share/dtbloader/efi/ + + mkdir -p $out/share/doc/dtbloader + cp README.md $out/share/doc/dtbloader/ + + runHook postInstall + ''; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "EFI driver that finds and installs DeviceTree into the UEFI configuration table"; + homepage = "https://github.com/TravMurav/dtbloader"; + changelog = "https://github.com/TravMurav/dtbloader/releases/tag/${finalAttrs.version}"; + license = lib.licenses.bsd3; + platforms = [ + # EFI file only works on aarch64 platforms + "aarch64-linux" + ]; + maintainers = with lib.maintainers; [ liberodark ]; + }; +}) diff --git a/pkgs/by-name/du/dua/package.nix b/pkgs/by-name/du/dua/package.nix index 01ef5d8f9203..1d3b37858e90 100644 --- a/pkgs/by-name/du/dua/package.nix +++ b/pkgs/by-name/du/dua/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-TVwRz5bAdJMtmhhzfZZ/NuV+YrLcnuK6d86Oj/JmgW4="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. diff --git a/pkgs/by-name/dy/dynamips/package.nix b/pkgs/by-name/dy/dynamips/package.nix index 77f662acb6e1..9d36c5295b2d 100644 --- a/pkgs/by-name/dy/dynamips/package.nix +++ b/pkgs/by-name/dy/dynamips/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "GNS3"; repo = "dynamips"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-+h+WsZ/QrDd+dNrR6CJb2uMG+vbUvK8GTxFJZOxknL0="; }; diff --git a/pkgs/by-name/dy/dynisland/package.nix b/pkgs/by-name/dy/dynisland/package.nix index 9c78c061352a..e494d58b9aba 100644 --- a/pkgs/by-name/dy/dynisland/package.nix +++ b/pkgs/by-name/dy/dynisland/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "cr3eperall"; repo = "dynisland"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-HqwykR6BXxtYSxNUYdegmjCwSVTW29pqP7qLWbcqLeg="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/e1/e1s/package.nix b/pkgs/by-name/e1/e1s/package.nix index 7797bce15426..05b435dc7de3 100644 --- a/pkgs/by-name/e1/e1s/package.nix +++ b/pkgs/by-name/e1/e1s/package.nix @@ -13,7 +13,7 @@ buildGoModule { src = fetchFromGitHub { owner = "keidarcy"; repo = "e1s"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-cq2iv502Cr2r20/qba9+648yNmhNoEbaySNoijCbXcM="; }; diff --git a/pkgs/by-name/ea/earlyoom/package.nix b/pkgs/by-name/ea/earlyoom/package.nix index fead6ff586e0..ed3f0006b466 100644 --- a/pkgs/by-name/ea/earlyoom/package.nix +++ b/pkgs/by-name/ea/earlyoom/package.nix @@ -1,11 +1,13 @@ { lib, fetchFromGitHub, - installShellFiles, pandoc, stdenv, nixosTests, - # Boolean flags + fetchpatch, + # The man page requires pandoc to build and resides in a separate "man" + # output which is pulled in on-demand. There is no need to disabled it unless + # pandoc is hard to build on your platform. withManpage ? true, }: @@ -22,25 +24,26 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" ] ++ lib.optionals withManpage [ "man" ]; - patches = [ ./0000-fix-dbus-path.patch ]; - - nativeBuildInputs = lib.optionals withManpage [ - installShellFiles - pandoc + patches = [ + ./0000-fix-dbus-path.patch + # Respect `MANDIR`. + (fetchpatch { + url = "https://github.com/rfjakob/earlyoom/commit/c5a1799a5ff4b3fd3132d50a510e8c126933cf4a.patch"; + hash = "sha256-64AkpTMmjiqZ6Byq6687zNIqrQ/IGRGgzzjyyAfcg14="; + }) + # Correctly handle `PREFIX` as a default rather than always-concatenate. + (fetchpatch { + url = "https://github.com/rfjakob/earlyoom/commit/f7d6f1cc925962fbdcf57b1c2aeeabbf11e2d542.patch"; + hash = "sha256-DJDeQzcEGJMoMGIi1D/ogMaKG1VQvPZN9jXtUDGjyjk="; + }) ]; + nativeBuildInputs = lib.optionals withManpage [ pandoc ]; + makeFlags = [ "VERSION=${finalAttrs.version}" - ]; - - installPhase = '' - runHook preInstall - install -D earlyoom $out/bin/earlyoom - '' + lib.optionalString withManpage '' - installManPage earlyoom.1 - '' + '' - runHook postInstall - ''; + "PREFIX=${placeholder "out"}" + ] ++ lib.optional withManpage "MANDIR=${placeholder "man"}/share/man"; passthru.tests = { inherit (nixosTests) earlyoom; @@ -58,7 +61,9 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.mit; mainProgram = "earlyoom"; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ + oxalica + ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/ea/easel/package.nix b/pkgs/by-name/ea/easel/package.nix new file mode 100644 index 000000000000..d172f891eb69 --- /dev/null +++ b/pkgs/by-name/ea/easel/package.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + perl, + python3, + versionCheckHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "easel"; + version = "0.49"; + + src = fetchFromGitHub { + owner = "EddyRivasLab"; + repo = "easel"; + tag = "easel-${finalAttrs.version}"; + hash = "sha256-NSKy7ptNYR0K/VFJNv+5TGWdC1ZM4Y5i/3L+3Coj/sg="; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + enableParallelBuilding = true; + + doCheck = true; + + nativeCheckInputs = [ + perl + python3 + ]; + + preCheck = '' + patchShebangs devkit/sqc + ''; + + doInstallCheck = true; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + meta = { + description = "Sequence analysis library used by Eddy/Rivas lab code"; + homepage = "https://github.com/EddyRivasLab/easel"; + license = lib.licenses.bsd2; + mainProgram = "easel"; + maintainers = with lib.maintainers; [ natsukium ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/ea/easyeasm/package.nix b/pkgs/by-name/ea/easyeasm/package.nix index 8dd436666d32..6a91e82846f6 100644 --- a/pkgs/by-name/ea/easyeasm/package.nix +++ b/pkgs/by-name/ea/easyeasm/package.nix @@ -16,7 +16,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "g0ldencybersec"; repo = "EasyEASM"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-/PhoH+5k63rJL1N3V3IL1TP1oacsBfGfVw/OueN9j8M="; }; diff --git a/pkgs/by-name/ea/easyeffects/package.nix b/pkgs/by-name/ea/easyeffects/package.nix index 9ceefbbb98be..dabc47f19320 100644 --- a/pkgs/by-name/ea/easyeffects/package.nix +++ b/pkgs/by-name/ea/easyeffects/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-It+kldlhThWF9y/rTgKt9QlIouH1cQcCtSHQTsaGjfo="; }; diff --git a/pkgs/by-name/ec/ecapture/package.nix b/pkgs/by-name/ec/ecapture/package.nix index 3922bab9b40f..091c65abdaf4 100644 --- a/pkgs/by-name/ec/ecapture/package.nix +++ b/pkgs/by-name/ec/ecapture/package.nix @@ -21,13 +21,13 @@ buildGoModule rec { pname = "ecapture"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "gojue"; repo = "ecapture"; tag = "v${version}"; - hash = "sha256-ucauZ1nvsiNxeqMcMHbUaKidAGF/XW7hi04W+Bv6I6Q="; + hash = "sha256-UPWREeyB2YLYU3B4Rxr5oPoOfksL/lnllWyaFxhAe/0="; fetchSubmodules = true; }; @@ -106,7 +106,7 @@ buildGoModule rec { in [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; - vendorHash = "sha256-A+0ASVHMzNcuLsP9F55hvGjflLg68p0ckj6kPbjdg4E="; + vendorHash = "sha256-8ilfqPt5Phuj5Uaf90+Ir/DFN27oW5Fd+Wsp34/EU9M="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ec/ecsk/package.nix b/pkgs/by-name/ec/ecsk/package.nix index 5a38c1d025ff..6fd712e94744 100644 --- a/pkgs/by-name/ec/ecsk/package.nix +++ b/pkgs/by-name/ec/ecsk/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "yukiarrr"; repo = "ecsk"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-1nrV7NslOIXQDHsc7c5YfaWhoJ8kfkEQseoVVeENrHM="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ec/ecwolf/package.nix b/pkgs/by-name/ec/ecwolf/package.nix index e1b571f52e74..f8c3a8fe638a 100644 --- a/pkgs/by-name/ec/ecwolf/package.nix +++ b/pkgs/by-name/ec/ecwolf/package.nix @@ -15,19 +15,29 @@ writers, python3Packages, nix-update, + fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ecwolf"; version = "1.4.1"; src = fetchFromBitbucket { - owner = pname; - repo = pname; - rev = version; - sha256 = "V2pSP8i20zB50WtUMujzij+ISSupdQQ/oCYYrOaTU1g="; + owner = "ecwolf"; + repo = "ecwolf"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-V2pSP8i20zB50WtUMujzij+ISSupdQQ/oCYYrOaTU1g="; }; + patches = [ + # Fixes build with gcc >= 14. Shouldn't be needed for ecwolf versions > 1.4.1. + (fetchpatch { + name = "tmemory.h-const-correctness.patch"; + url = "https://bitbucket.org/ecwolf/ecwolf/commits/400aaf96a36a14ab8eab18a670ba6439046f3bb0/raw"; + hash = "sha256-2YwHEctBPyprs0DVsazimGEgmiCba24zh2dFfw9tOnU="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config @@ -105,4 +115,4 @@ stdenv.mkDerivation rec { ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/by-name/ed/edencommon/package.nix b/pkgs/by-name/ed/edencommon/package.nix index 060ea7cc2da2..3623f1cbf71b 100644 --- a/pkgs/by-name/ed/edencommon/package.nix +++ b/pkgs/by-name/ed/edencommon/package.nix @@ -15,8 +15,6 @@ wangle, fbthrift, gtest, - apple-sdk_11, - darwinMinVersionHook, nix-update-script, }: @@ -33,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "facebookexperimental"; repo = "edencommon"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-pVPkH80vowdpwWv/h6ovEk335OeI6/0k0cAFhhFqSDM="; }; @@ -48,20 +46,15 @@ stdenv.mkDerivation (finalAttrs: { removeReferencesTo ]; - buildInputs = - [ - glog - gflags - folly - fb303 - wangle - fbthrift - gtest - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - (darwinMinVersionHook "11.0") - ]; + buildInputs = [ + glog + gflags + folly + fb303 + wangle + fbthrift + gtest + ]; cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) diff --git a/pkgs/by-name/ed/edgedb/package.nix b/pkgs/by-name/ed/edgedb/package.nix index 8d07257fdbcd..75806744be54 100644 --- a/pkgs/by-name/ed/edgedb/package.nix +++ b/pkgs/by-name/ed/edgedb/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "edgedb"; repo = "edgedb-cli"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-iB0ZWciEx/Xiq+pMg3nMJNHumoy5Z8dB6ev7UneHnVg="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ee/eepers/package.nix b/pkgs/by-name/ee/eepers/package.nix index d642252774e9..d109a13515b2 100644 --- a/pkgs/by-name/ee/eepers/package.nix +++ b/pkgs/by-name/ee/eepers/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "tsoding"; repo = "eepers"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-KG7ci327qlTtlN4yV54P8Q34ExFLJfTGMTZxN3RtZbc="; }; diff --git a/pkgs/by-name/eg/eggnog-mapper/package.nix b/pkgs/by-name/eg/eggnog-mapper/package.nix index 8a8cfe376028..80d9be278eda 100644 --- a/pkgs/by-name/eg/eggnog-mapper/package.nix +++ b/pkgs/by-name/eg/eggnog-mapper/package.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "eggnogdb"; repo = pname; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-+luxXQmtGufYrA/9Ak3yKzbotOj2HM3vhIoOxE+Ty1U="; }; diff --git a/pkgs/by-name/ej/ejabberd/package.nix b/pkgs/by-name/ej/ejabberd/package.nix index 7f0dcb784206..2ca3efb02ebd 100644 --- a/pkgs/by-name/ej/ejabberd/package.nix +++ b/pkgs/by-name/ej/ejabberd/package.nix @@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "processone"; repo = "ejabberd"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-9TyIgsinUpUbirwqg61EYnPB/OyE5vhl3MBMRihqAtE="; }; diff --git a/pkgs/by-name/el/elasticsearch-curator/package.nix b/pkgs/by-name/el/elasticsearch-curator/package.nix index 033dceb3ee8a..b03562d869e8 100644 --- a/pkgs/by-name/el/elasticsearch-curator/package.nix +++ b/pkgs/by-name/el/elasticsearch-curator/package.nix @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "elastic"; repo = "curator"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-Y2GXh+LUKU3VcQ51yZZdEIUjfKzRdbu6QKnXshI1Em0="; }; diff --git a/pkgs/by-name/el/element-web/package.nix b/pkgs/by-name/el/element-web/package.nix index 165761f2a25c..b43013d179d1 100644 --- a/pkgs/by-name/el/element-web/package.nix +++ b/pkgs/by-name/el/element-web/package.nix @@ -1,4 +1,5 @@ { + lib, stdenv, jq, element-web-unwrapped, @@ -22,7 +23,7 @@ else mkdir -p $out ln -s ${element-web-unwrapped}/* $out rm $out/config.json - jq -s '.[0] * $conf' "${element-web-unwrapped}/config.json" --argjson "conf" '${builtins.toJSON conf}' > "$out/config.json" + jq -s '.[0] * $conf' "${element-web-unwrapped}/config.json" --argjson "conf" ${lib.escapeShellArg (builtins.toJSON conf)} > "$out/config.json" runHook postInstall ''; diff --git a/pkgs/by-name/em/ember-cli/package.nix b/pkgs/by-name/em/ember-cli/package.nix index a80a6e56ae78..c7954fb558b3 100644 --- a/pkgs/by-name/em/ember-cli/package.nix +++ b/pkgs/by-name/em/ember-cli/package.nix @@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ember-cli"; repo = "ember-cli"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-xkMsPE+iweIV14m4kE4ytEp4uHMJW6gr+n9oJblr4VQ="; }; diff --git a/pkgs/by-name/em/emplace/package.nix b/pkgs/by-name/em/emplace/package.nix index 711c4d154a39..947c9adc08af 100644 --- a/pkgs/by-name/em/emplace/package.nix +++ b/pkgs/by-name/em/emplace/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "tversteeg"; repo = "emplace"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; sha256 = "sha256-FZ+lvf5HRSruUdmkm/Hqz0aRa95SjfIa43WQczRCGNg="; }; diff --git a/pkgs/by-name/em/empty-epsilon/package.nix b/pkgs/by-name/em/empty-epsilon/package.nix index c61e1bce9702..d4009323fb73 100644 --- a/pkgs/by-name/em/empty-epsilon/package.nix +++ b/pkgs/by-name/em/empty-epsilon/package.nix @@ -15,16 +15,16 @@ let version = { - seriousproton = "2024.08.09"; - emptyepsilon = "2024.08.09"; - basis-universal = "v1_15_update2"; + seriousproton = "2024.12.08"; + emptyepsilon = "2024.12.08"; + basis-universal = "1.15_final"; }; basis-universal = fetchFromGitHub { owner = "BinomialLLC"; repo = "basis_universal"; - rev = version.basis-universal; - hash = "sha256-2snzq/SnhWHIgSbUUgh24B6tka7EfkGO+nwKEObRkU4="; + tag = version.basis-universal; + hash = "sha256-pKvfVvdbPIdzdSOklicThS7xwt4i3/21bE6wg9f8kHY="; }; serious-proton = stdenv.mkDerivation { @@ -34,8 +34,8 @@ let src = fetchFromGitHub { owner = "daid"; repo = "SeriousProton"; - rev = "EE-${version.seriousproton}"; - hash = "sha256-B7BUe5rtN/eABJwkuSyn+h1lIHuV/tZUNcGXTyaWIr4="; + tag = "EE-${version.seriousproton}"; + hash = "sha256-k1YCB7EJIL+kdlHEU4cJjmLZZAZyxIPU0XlSn2t4C90="; }; nativeBuildInputs = [ cmake ]; @@ -69,8 +69,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "daid"; repo = "EmptyEpsilon"; - rev = "EE-${version.emptyepsilon}"; - hash = "sha256-DxaasUyJa8n0ha8RqAfEnqCVELs5Or0zvIOgcK75TnU="; + tag = "EE-${version.emptyepsilon}"; + hash = "sha256-JsHFwbt4VGsgaZz9uxEmwzZGfkYTNsIZTKkpvCCmI48="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/en/en-croissant/package.nix b/pkgs/by-name/en/en-croissant/package.nix index 6b8ea3e50f11..942c2f342a3c 100644 --- a/pkgs/by-name/en/en-croissant/package.nix +++ b/pkgs/by-name/en/en-croissant/package.nix @@ -15,7 +15,6 @@ libsoup_2_4, webkitgtk_4_0, gst_all_1, - apple-sdk_11, }: rustPlatform.buildRustPackage rec { @@ -25,7 +24,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "franciscoBSalgueiro"; repo = "en-croissant"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-EiGML3oFCJR4TZkd+FekUrJwCYe/nGdWD9mAtKKtITQ="; }; @@ -51,17 +50,15 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook3 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeBinaryWrapper ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - openssl - libsoup_2_4 - webkitgtk_4_0 - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-good - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + openssl + libsoup_2_4 + webkitgtk_4_0 + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-good + ]; doCheck = false; # many scoring tests fail diff --git a/pkgs/by-name/en/ente-cli/package.nix b/pkgs/by-name/en/ente-cli/package.nix index 49c0eb21adaa..42fde2888a6d 100644 --- a/pkgs/by-name/en/ente-cli/package.nix +++ b/pkgs/by-name/en/ente-cli/package.nix @@ -20,7 +20,7 @@ buildGoModule { src = fetchFromGitHub { owner = "ente-io"; repo = "ente"; - rev = "refs/tags/cli-v${version}"; + tag = "cli-v${version}"; hash = "sha256-ynbljYl73XwCnt3RUNmOYdrN8FX3sJ+3qDhWa8m2YJs="; sparseCheckout = [ "cli" ]; }; diff --git a/pkgs/by-name/en/ente-web/package.nix b/pkgs/by-name/en/ente-web/package.nix index 53faf8188dcb..10d0c897f87e 100644 --- a/pkgs/by-name/en/ente-web/package.nix +++ b/pkgs/by-name/en/ente-web/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ente-io"; repo = "ente"; sparseCheckout = [ "web" ]; - rev = "refs/tags/photos-v${finalAttrs.version}"; + tag = "photos-v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-DqfUUXY79CndEqPT8TR4PasLtaSCtqZaV2kp10Vu4PQ="; }; diff --git a/pkgs/by-name/en/enum4linux-ng/package.nix b/pkgs/by-name/en/enum4linux-ng/package.nix index 0f143671f4ec..120c580e1666 100644 --- a/pkgs/by-name/en/enum4linux-ng/package.nix +++ b/pkgs/by-name/en/enum4linux-ng/package.nix @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "cddmp"; repo = "enum4linux-ng"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-MN3AUubro9CHkdPe/X1xcE11ye/D/A+Kf6zUOJTN4l0="; }; diff --git a/pkgs/by-name/en/enumer/package.nix b/pkgs/by-name/en/enumer/package.nix index ed2fe3869a6b..d4eae263e383 100644 --- a/pkgs/by-name/en/enumer/package.nix +++ b/pkgs/by-name/en/enumer/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "dmarkham"; repo = "enumer"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-NYL36GBogFM48IgIWhFa1OLZNUeEi0ppS6KXybnPQks="; }; diff --git a/pkgs/by-name/en/enumerepo/package.nix b/pkgs/by-name/en/enumerepo/package.nix index a97320dc3501..8f888ff2b62d 100644 --- a/pkgs/by-name/en/enumerepo/package.nix +++ b/pkgs/by-name/en/enumerepo/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "trickest"; repo = pname; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-PWWx6b+fttxKxMtuHAYPTeEsta0E6+IQ1DSKO6c7Jdc="; }; diff --git a/pkgs/by-name/eo/eolie/package.nix b/pkgs/by-name/eo/eolie/package.nix index bf691b1a42c0..ef455d62358c 100644 --- a/pkgs/by-name/eo/eolie/package.nix +++ b/pkgs/by-name/eo/eolie/package.nix @@ -29,7 +29,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchgit { url = "https://gitlab.gnome.org/World/eolie"; - rev = "refs/tags/${version}"; + tag = version; fetchSubmodules = true; sha256 = "077jww5mqg6bbqbj0j1gss2j3dxlfr2xw8bc43k8vg52drqg6g8w"; }; diff --git a/pkgs/by-name/ep/epson-escpr/package.nix b/pkgs/by-name/ep/epson-escpr/package.nix index 7300749235fd..5d6882fe04fb 100644 --- a/pkgs/by-name/ep/epson-escpr/package.nix +++ b/pkgs/by-name/ep/epson-escpr/package.nix @@ -1,7 +1,18 @@ -{ lib, stdenv, fetchurl, cups }: +{ + lib, + stdenv, + fetchurl, + cups, + fetchpatch, + dos2unix, + automake115x, + autoconf, +}: -let version = "1.7.20"; -in stdenv.mkDerivation { +let + version = "1.8.6-1"; +in +stdenv.mkDerivation { pname = "epson-escpr"; inherit version; @@ -12,16 +23,46 @@ in stdenv.mkDerivation { # version. # NOTE: Don't forget to update the webarchive link too! urls = [ - "https://download3.ebz.epson.net/dsc/f/03/00/13/76/45/5ac2ea8f9cf94a48abd64afd0f967f98c4fc24aa/epson-inkjet-printer-escpr-${version}-1lsb3.2.tar.gz" + "https://download3.ebz.epson.net/dsc/f/03/00/16/21/81/74d098a47c3a616713079c9cd5904b468bb33dea/epson-inkjet-printer-escpr-${version}.tar.gz" - "https://web.archive.org/web/https://download3.ebz.epson.net/dsc/f/03/00/13/76/45/5ac2ea8f9cf94a48abd64afd0f967f98c4fc24aa/epson-inkjet-printer-escpr-${version}-1lsb3.2.tar.gz" + "https://web.archive.org/web/https://download3.ebz.epson.net/dsc/f/03/00/16/21/81/74d098a47c3a616713079c9cd5904b468bb33dea/epson-inkjet-printer-escpr-${version}.tar.gz" ]; - sha256 = "sha256:09rscpm557dgaflylr93wcwmyn6fnvr8nc77abwnq97r6hxwrkhk"; + sha256 = "sha256-hVbX4OXPe4y37Szju3uVdXlVdjX4DFSN/A2Emz3eCcQ="; }; + # DOS Line Endings in /lib directory and UNIX Line endings in /src directory. + # So convert everything to UNIX style line endings. + # Since the files are modified, autoconf and automake is required + postUnpack = '' + dir=''${src%-*} + cd ''${dir#*-} + local f + for f in $(find ./ -type f || die); do + ${dos2unix}/bin/dos2unix $f + done + cd .. + ''; - patches = [ ./cups-filter-ppd-dirs.patch ]; + patches = [ + ./cups-filter-ppd-dirs.patch + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/net-print/epson-inkjet-printer-escpr/files/epson-inkjet-printer-escpr-1.8-missing-include.patch"; + hash = "sha256-L4WhaxPQnJYyqCH00wiKIlFNMmCEXoGe5d7hJ5TMyEI="; + }) + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/net-print/epson-inkjet-printer-escpr/files/1.8.6-warnings.patch"; + hash = "sha256-wSY0LZv2b+1kF7TfPolt554g79y2Ce6N/JqgjJyd3Ag="; + }) + ]; + # To suppress error (Stripping trailing CRs from patch; use --binary to disable.) + patchFlags = [ + "-p1" + ]; buildInputs = [ cups ]; + nativeBuildInputs = [ + automake115x + autoconf + ]; meta = with lib; { homepage = "http://download.ebz.epson.net/dsc/search/01/search/"; diff --git a/pkgs/by-name/ep/epub2txt2/package.nix b/pkgs/by-name/ep/epub2txt2/package.nix index ebf3f7af1543..539e4bbb7414 100644 --- a/pkgs/by-name/ep/epub2txt2/package.nix +++ b/pkgs/by-name/ep/epub2txt2/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "kevinboone"; repo = pname; - rev = "refs/tags/v${version}"; + tag = "v${version}"; sha256 = "sha256-YFaXkcIdat2cn1ITYFyG1hxbbepqcxvyJ6ZzDo4dVYI="; }; diff --git a/pkgs/by-name/eq/equibop/package.nix b/pkgs/by-name/eq/equibop/package.nix index f6105d9f7f6e..d3587cc7e78d 100644 --- a/pkgs/by-name/eq/equibop/package.nix +++ b/pkgs/by-name/eq/equibop/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "Equicord"; repo = "Equibop"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-LGgmWaC7iYj0Mx5wPKmLkYV2ozyhkiwrE4v4uFB0erg="; }; diff --git a/pkgs/by-name/er/era/package.nix b/pkgs/by-name/er/era/package.nix index cbe15bd7b47e..8cfd9aca5ac8 100644 --- a/pkgs/by-name/er/era/package.nix +++ b/pkgs/by-name/er/era/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "kyoheiu"; repo = "era"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-OOPVLY9kg4TmKSrpHgsOmAmeDPbX5df0bX51lA6DvcY="; }; diff --git a/pkgs/by-name/er/erofs-utils/package.nix b/pkgs/by-name/er/erofs-utils/package.nix index aabbe20cde6c..05968132a811 100644 --- a/pkgs/by-name/er/erofs-utils/package.nix +++ b/pkgs/by-name/er/erofs-utils/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "erofs-utils"; - version = "1.8.3"; + version = "1.8.4"; outputs = [ "out" "man" @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-${finalAttrs.version}.tar.gz"; - hash = "sha256-PFzANgPqCLqa5eBCDurqX/F+0p4igGhTEDVsvyUwToU="; + hash = "sha256-eRWHqgdLufn6IYx2LMH2CwFeL1G8ss6R9oLwQ4VqtJQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/er/erosmb/package.nix b/pkgs/by-name/er/erosmb/package.nix index abb3f08474ba..cc5952fa60c3 100644 --- a/pkgs/by-name/er/erosmb/package.nix +++ b/pkgs/by-name/er/erosmb/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "viktor02"; repo = "EroSmb"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-9Zs5Z+3JiBiJkV9Ixl5pPmLv0dUT59CT0UkQDsmneWc="; }; diff --git a/pkgs/by-name/er/errands/package.nix b/pkgs/by-name/er/errands/package.nix index 7448804c3696..a45ed3c74a16 100644 --- a/pkgs/by-name/er/errands/package.nix +++ b/pkgs/by-name/er/errands/package.nix @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "mrvladus"; repo = "Errands"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-kPF6BS7qDFstCGadSB8MSvBy+T4PkG/wRisYAaIU6rY="; }; diff --git a/pkgs/by-name/es/eslint/package.nix b/pkgs/by-name/es/eslint/package.nix index 6ad9acd2afc0..80e37e956e8f 100644 --- a/pkgs/by-name/es/eslint/package.nix +++ b/pkgs/by-name/es/eslint/package.nix @@ -17,7 +17,7 @@ buildNpmPackage' rec { src = fetchFromGitHub { owner = "eslint"; repo = "eslint"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-R5DO4xN3PkwGAIfyMkohs9SvFiLjWf1ddOwkY6wbsjA="; }; diff --git a/pkgs/by-name/es/espanso/package.nix b/pkgs/by-name/es/espanso/package.nix index 636bec07ee1e..10d2f31bce25 100644 --- a/pkgs/by-name/es/espanso/package.nix +++ b/pkgs/by-name/es/espanso/package.nix @@ -19,8 +19,6 @@ wxGTK32, makeWrapper, stdenv, - apple-sdk_11, - darwinMinVersionHook, waylandSupport ? false, x11Support ? stdenv.hostPlatform.isLinux, testers, @@ -81,10 +79,6 @@ rustPlatform.buildRustPackage rec { libnotify libxkbcommon ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - (darwinMinVersionHook "10.13") - ] ++ lib.optionals waylandSupport [ wl-clipboard ] diff --git a/pkgs/by-name/es/espflash/package.nix b/pkgs/by-name/es/espflash/package.nix index cd636ba77210..cacf6c09070a 100644 --- a/pkgs/by-name/es/espflash/package.nix +++ b/pkgs/by-name/es/espflash/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "esp-rs"; repo = "espflash"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-X9VTwXk/6zAkQb5P9Wz8Pt4oIt2xXfff9dhGb8wauG4="; }; diff --git a/pkgs/by-name/es/esptool/package.nix b/pkgs/by-name/es/esptool/package.nix index 8f4b6482d9a6..a77cb5e750d7 100644 --- a/pkgs/by-name/es/esptool/package.nix +++ b/pkgs/by-name/es/esptool/package.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "espressif"; repo = "esptool"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-cNEg2a3j7Vql06GwVaE9y86UtMkNsUdJYM00OEUra2w="; }; diff --git a/pkgs/by-name/et/etebase-server/package.nix b/pkgs/by-name/et/etebase-server/package.nix index b5f350b850d3..407bf12fbdb8 100644 --- a/pkgs/by-name/et/etebase-server/package.nix +++ b/pkgs/by-name/et/etebase-server/package.nix @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "etesync"; repo = "server"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-W2u/d8X8luOzgy1CLNgujnwaoO1pR1QO1Ma7i4CGkdU="; }; diff --git a/pkgs/by-name/et/eternal-terminal/package.nix b/pkgs/by-name/et/eternal-terminal/package.nix index 7f4ce3143be5..634ecfbbf4d0 100644 --- a/pkgs/by-name/et/eternal-terminal/package.nix +++ b/pkgs/by-name/et/eternal-terminal/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "MisterTea"; repo = "EternalTerminal"; - rev = "refs/tags/et-v${version}"; + tag = "et-v${version}"; hash = "sha256-vukh3a6SxHaVCT4hmoVt4hEGB8Sqylu53Nz8fgBWkTM"; }; diff --git a/pkgs/by-name/et/ethq/package.nix b/pkgs/by-name/et/ethq/package.nix index 9e817fe78fd3..b7eb49c86bb2 100644 --- a/pkgs/by-name/et/ethq/package.nix +++ b/pkgs/by-name/et/ethq/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "isc-projects"; repo = "ethq"; - rev = "refs/tags/v${builtins.replaceStrings [ "." ] [ "_" ] version}"; + tag = "v${builtins.replaceStrings [ "." ] [ "_" ] version}"; hash = "sha256-ye5ep9EM9Sq/NqNZHENPmFZefVBx1BGrPm3YEG1NcSc="; }; diff --git a/pkgs/by-name/et/etlegacy-unwrapped/package.nix b/pkgs/by-name/et/etlegacy-unwrapped/package.nix index f7e14dd8c3d3..78e24187eddf 100644 --- a/pkgs/by-name/et/etlegacy-unwrapped/package.nix +++ b/pkgs/by-name/et/etlegacy-unwrapped/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "etlegacy"; repo = "etlegacy"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-k1H3irA9UVOICY3keKGVJMtBczW/b5ObyNvB7fGAcFA="; }; diff --git a/pkgs/by-name/ev/evemu/package.nix b/pkgs/by-name/ev/evemu/package.nix index 06df7e1471a0..1676e1225a47 100644 --- a/pkgs/by-name/ev/evemu/package.nix +++ b/pkgs/by-name/ev/evemu/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # each time it is downloaded :/ src = fetchgit { url = "git://git.freedesktop.org/git/evemu"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; sha256 = "sha256-SQDaARuqBMBVlUz+Nw6mjdxaZfVOukmzTlIqy8U2rus="; }; diff --git a/pkgs/by-name/ev/evil-winrm/package.nix b/pkgs/by-name/ev/evil-winrm/package.nix index b8e88e1db9eb..81acdce03071 100644 --- a/pkgs/by-name/ev/evil-winrm/package.nix +++ b/pkgs/by-name/ev/evil-winrm/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Hackplayers"; repo = "evil-winrm"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-8Lyo7BgypzrHMEcbYlxo/XWwOtBqs2tczYnc3+XEbeA="; }; diff --git a/pkgs/by-name/ev/evillimiter/package.nix b/pkgs/by-name/ev/evillimiter/package.nix index d96b54a9538c..b5d79f882ce7 100644 --- a/pkgs/by-name/ev/evillimiter/package.nix +++ b/pkgs/by-name/ev/evillimiter/package.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "bitbrute"; repo = "evillimiter"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-h6BReZcDW2UYaYYVQVgV0T91/+CsGuZf+J+boUhjCtA="; }; diff --git a/pkgs/by-name/ev/evtx/package.nix b/pkgs/by-name/ev/evtx/package.nix index 25a9d5ff1cca..3eb8b9c23e81 100644 --- a/pkgs/by-name/ev/evtx/package.nix +++ b/pkgs/by-name/ev/evtx/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "omerbenamram"; repo = "evtx"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-ljEuFsLOwydLbx1DprJdBTL3cjFkhmuwr34da8LzG88="; }; diff --git a/pkgs/by-name/ex/exabgp/package.nix b/pkgs/by-name/ex/exabgp/package.nix index 7d8f4917a711..28128bc5b102 100644 --- a/pkgs/by-name/ex/exabgp/package.nix +++ b/pkgs/by-name/ex/exabgp/package.nix @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "Exa-Networks"; repo = "exabgp"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-PrdCAmefKCBmbBFp04KiQGSsZZ4KNFk/ZtMedh9oow4="; }; diff --git a/pkgs/by-name/ex/exercism/package.nix b/pkgs/by-name/ex/exercism/package.nix index 117798021077..4676addc2c2b 100644 --- a/pkgs/by-name/ex/exercism/package.nix +++ b/pkgs/by-name/ex/exercism/package.nix @@ -13,7 +13,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "exercism"; repo = "cli"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-7euitdo/rdeopnP7hHHxQ5lPh8wJVDaTneckeR5BEGo="; }; diff --git a/pkgs/by-name/ex/extism-cli/package.nix b/pkgs/by-name/ex/extism-cli/package.nix index ef165ac07df5..0f3d738ec4f9 100644 --- a/pkgs/by-name/ex/extism-cli/package.nix +++ b/pkgs/by-name/ex/extism-cli/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "extism"; repo = "cli"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-txwpFc1FQlZLAxbpO92Ei7z3vhXBrpdIJHAqnrKp9Bg="; }; diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index db32be221bc0..3313fe74ebd4 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.20.14"; + version = "0.20.15"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-5sZlpJ7xzQsjvECN4pjPndM39qonbgNy4zew6AE06D0="; + hash = "sha256-r68zuMCFIccA0cRLC2RNYCWoFh7tYiGu97Kid4hh0Uw="; }; - cargoHash = "sha256-A8vE2Q/HEMgX6HC+nwR63Kr84gy2iZ5BzYDzaZz/h9Q="; + cargoHash = "sha256-hBsb62fcIrSR2w9O5+UaMUadyUUtu2PLODRg70wG/Xc="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/fa/factorio/package.nix b/pkgs/by-name/fa/factorio/package.nix index 82952186d86e..917c7a2bfb3a 100644 --- a/pkgs/by-name/fa/factorio/package.nix +++ b/pkgs/by-name/fa/factorio/package.nix @@ -40,46 +40,46 @@ let mods = args.mods or [ ]; - helpMsg = '' + helpMsg = + { dlName, storeName }: + '' - ===FETCH FAILED=== - Please ensure you have set the username and token with config.nix, or - /etc/nix/nixpkgs-config.nix if on NixOS. + ===FETCH FAILED=== + Please ensure you have set the username and token with config.nix, or + /etc/nix/nixpkgs-config.nix if on NixOS. - Your token can be seen at https://factorio.com/profile (after logging in). It is - not as sensitive as your password, but should still be safeguarded. There is a - link on that page to revoke/invalidate the token, if you believe it has been - leaked or wish to take precautions. + Your token can be seen at https://factorio.com/profile (after logging in). + Beware this will add the credentials to the Nix store, which is + world-readable on the local machine. It is not as sensitive as your + password, but should still be safeguarded. There is a link on that page to + revoke/invalidate the token, if you believe it has been leaked or wish to + take precautions. - Example: - { - packageOverrides = pkgs: { - factorio = pkgs.factorio.override { - username = "FactorioPlayer1654"; - token = "d5ad5a8971267c895c0da598688761"; + Example: + { + packageOverrides = pkgs: { + factorio = pkgs.factorio.override { + username = "FactorioPlayer1654"; + token = "d5ad5a8971267c895c0da598688761"; + }; }; - }; - } + } - Alternatively, instead of providing the username+token, you may manually - download the release through https://factorio.com/download , then add it to - the store using e.g.: + Alternatively, instead of providing the username+token, you may manually + download the release through https://factorio.com/download , then add it to + the store using e.g.: - releaseType=alpha - version=0.17.74 - nix-prefetch-url file://\''$HOME/Downloads/factorio_\''${releaseType}_x64_\''${version}.tar.xz --name factorio_\''${releaseType}_x64-\''${version}.tar.xz + nix-prefetch-url file://\''$HOME/Downloads/${dlName} --name ${storeName} - Note the ultimate "_" is replaced with "-" in the --name arg! + If you go this route you might want to tell Nix to explicitly hold on to the + source tarball. Otherwise it could get GC'd from the Nix store and you'd + have to redownload it next time the package wants to rebuild to use a newer + dependency. E.g. if you're using NixOS: - If you go this route you might want to tell Nix to explicitly hold on to the - source tarball. Otherwise it could get GC'd from the Nix store and you'd - have to redownload it next time the package wants to rebuild to use a newer - dependency. E.g. if you're using NixOS: - - system.extraDependencies = [ - factorio.src - ]; - ''; + system.extraDependencies = [ + factorio.src + ]; + ''; desktopItem = makeDesktopItem { name = "factorio"; @@ -155,7 +155,10 @@ let ''; failureHook = '' cat < + #include + #include ++#include + #include + + #include "vncauth.h" +diff --git a/vncauth.h b/vncauth.h +index 86dc455..7fdb8d4 100644 +--- a/vncauth.h ++++ b/vncauth.h +@@ -25,6 +25,8 @@ + #define CHALLENGESIZE 16 + + extern int vncEncryptAndStorePasswd(char *passwd, char *fname); ++extern int vncEncryptAndStorePasswd2(char *passwd, char *passwdViewOnly, char *fname); + extern char *vncDecryptPasswdFromFile(char *fname); ++extern int vncDecryptPasswdFromFile2(char *fname, char *passwdFullControl, char *passwdViewOnly); + extern void vncRandomBytes(unsigned char *bytes); + extern void vncEncryptBytes(unsigned char *bytes, char *passwd); diff --git a/pkgs/by-name/fb/fbvnc/package.nix b/pkgs/by-name/fb/fbvnc/package.nix index 74934166b9d9..edcf7eb92dc5 100644 --- a/pkgs/by-name/fb/fbvnc/package.nix +++ b/pkgs/by-name/fb/fbvnc/package.nix @@ -15,6 +15,12 @@ stdenv.mkDerivation rec { hash = "sha256-oT7+6kIeFDgU6GbcHYQ6k0jCU84p8fTEVgUozYMkeVI="; }; + patches = [ + # GCC 14 errors on missing function definitions + # https://github.com/zohead/fbvnc/pull/3 + ./gcc14-fix.patch + ]; + makeFlags = [ "CC:=$(CC)" ]; diff --git a/pkgs/by-name/fc/fcp/package.nix b/pkgs/by-name/fc/fcp/package.nix index e2ca5ee7af93..f65403bcb469 100644 --- a/pkgs/by-name/fc/fcp/package.nix +++ b/pkgs/by-name/fc/fcp/package.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "svetlitski"; repo = "fcp"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; sha256 = "0f242n8w88rikg1srimdifadhggrb2r1z0g65id60ahb4bjm8a0x"; }; diff --git a/pkgs/by-name/fd/fd/package.nix b/pkgs/by-name/fd/fd/package.nix index 9984e3274392..dd055f18f70d 100644 --- a/pkgs/by-name/fd/fd/package.nix +++ b/pkgs/by-name/fd/fd/package.nix @@ -69,6 +69,7 @@ rustPlatform.buildRustPackage rec { globin ma27 zowoq + matthiasbeyer ]; mainProgram = "fd"; }; diff --git a/pkgs/by-name/fe/febio-studio/package.nix b/pkgs/by-name/fe/febio-studio/package.nix index 13271dc23e43..aecec37c9523 100644 --- a/pkgs/by-name/fe/febio-studio/package.nix +++ b/pkgs/by-name/fe/febio-studio/package.nix @@ -9,8 +9,6 @@ qt6Packages, febio, glew, - apple-sdk_11, - darwinMinVersionHook, fetchpatch, sshSupport ? true, openssl, @@ -74,11 +72,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional tetgenSupport tetgen ++ lib.optional ffmpegSupport ffmpeg - ++ lib.optional dicomSupport dcmtk - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - (darwinMinVersionHook "10.15") - ]; + ++ lib.optional dicomSupport dcmtk; meta = { description = "FEBio Suite Solver"; diff --git a/pkgs/by-name/fe/febio/package.nix b/pkgs/by-name/fe/febio/package.nix index 698b0d81ea80..2ee2ca525185 100644 --- a/pkgs/by-name/fe/febio/package.nix +++ b/pkgs/by-name/fe/febio/package.nix @@ -4,9 +4,7 @@ fetchFromGitHub, fetchpatch2, replaceVars, - apple-sdk_11, cmake, - darwinMinVersionHook, ninja, zlib, mklSupport ? true, @@ -48,13 +46,7 @@ stdenv.mkDerivation (finalAttrs: { ninja ]; - buildInputs = - [ zlib ] - ++ lib.optionals mklSupport [ mkl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - (darwinMinVersionHook "10.15") - ]; + buildInputs = [ zlib ] ++ lib.optionals mklSupport [ mkl ]; meta = { description = "FEBio Suite Solver"; diff --git a/pkgs/by-name/fe/fedifetcher/package.nix b/pkgs/by-name/fe/fedifetcher/package.nix index 297e4ffa9a44..d9d5fd4be5fe 100644 --- a/pkgs/by-name/fe/fedifetcher/package.nix +++ b/pkgs/by-name/fe/fedifetcher/package.nix @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "nanos"; repo = "FediFetcher"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-SfR4CYVs2kLLguKCau+x5vy6ha48Zd43OJ+tsA6M9yg="; }; diff --git a/pkgs/by-name/fe/felix-fm/package.nix b/pkgs/by-name/fe/felix-fm/package.nix index ff704f6d27cb..664464e8e836 100644 --- a/pkgs/by-name/fe/felix-fm/package.nix +++ b/pkgs/by-name/fe/felix-fm/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "kyoheiu"; repo = "felix"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-PcC0lZ41qTVE4V3VdwBq83qYfEJO3RJouuS2+bpcBfo="; }; diff --git a/pkgs/by-name/ff/ffsubsync/package.nix b/pkgs/by-name/ff/ffsubsync/package.nix index 35885e0f725b..fdf791d6b3aa 100644 --- a/pkgs/by-name/ff/ffsubsync/package.nix +++ b/pkgs/by-name/ff/ffsubsync/package.nix @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "smacke"; repo = "ffsubsync"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-ZdKZeKfAUe/FXLOur9Btb5RgXewmy3EHunQphqlxpIc="; }; diff --git a/pkgs/by-name/ff/ffuf/package.nix b/pkgs/by-name/ff/ffuf/package.nix index 3b576a117f36..dcd519cc9a71 100644 --- a/pkgs/by-name/ff/ffuf/package.nix +++ b/pkgs/by-name/ff/ffuf/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "ffuf"; repo = "ffuf"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-+wcNqQHtB8yCLiJXMBxolCWsYZbBAsBGS1hs7j1lzUU="; }; diff --git a/pkgs/by-name/fi/fierce/package.nix b/pkgs/by-name/fi/fierce/package.nix index b4e3870c7e9f..684acc2d3f2e 100644 --- a/pkgs/by-name/fi/fierce/package.nix +++ b/pkgs/by-name/fi/fierce/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "mschwager"; repo = "fierce"; - rev = "refs/tags/${version}"; + tag = version; sha256 = "sha256-y5ZSDJCTqslU78kXGyk6DajBpX7xz1CVmbhYerHmyis="; }; diff --git a/pkgs/by-name/fi/fig2dev/package.nix b/pkgs/by-name/fi/fig2dev/package.nix index 1a02390498df..ea50385d213a 100644 --- a/pkgs/by-name/fi/fig2dev/package.nix +++ b/pkgs/by-name/fi/fig2dev/package.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "fig2dev"; - version = "3.2.9"; + version = "3.2.9a"; src = fetchurl { url = "mirror://sourceforge/mcj/fig2dev-${version}.tar.xz"; - hash = "sha256-FeJGyNE8xy3iXggxQDitUM59Le+pzxr8Fy/X9ZMgkLE="; + hash = "sha256-YeGFOTF2hS8DuQGzsFsZ+8Wtglj/FC89pucLG4NRMyY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/fi/figma-agent/package.nix b/pkgs/by-name/fi/figma-agent/package.nix index 3d01590f725b..3c2137433c71 100644 --- a/pkgs/by-name/fi/figma-agent/package.nix +++ b/pkgs/by-name/fi/figma-agent/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "neetly"; repo = "figma-agent-linux"; - rev = "refs/tags/${version}"; + tag = version; sha256 = "sha256-iXLQOc8gomOik+HIIoviw19II5MD6FM0W5DT3aqtIcM="; }; diff --git a/pkgs/by-name/fi/fim-rs/package.nix b/pkgs/by-name/fi/fim-rs/package.nix index c10cc2b50a68..2ecb4b4142d1 100644 --- a/pkgs/by-name/fi/fim-rs/package.nix +++ b/pkgs/by-name/fi/fim-rs/package.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "Achiefs"; repo = "fim"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-V9BzgVcDTnYSy7N5fCo38vQmXRDXLjY6wvnSkIpuDGg="; }; diff --git a/pkgs/by-name/fi/findomain/package.nix b/pkgs/by-name/fi/findomain/package.nix index 09e666128b6e..3c91b450c40d 100644 --- a/pkgs/by-name/fi/findomain/package.nix +++ b/pkgs/by-name/fi/findomain/package.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "findomain"; repo = pname; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-M6i62JI4HjaM0C2rSK8P5O19JeugFP5xIy1E6vE8KP4="; }; diff --git a/pkgs/by-name/fi/findup/package.nix b/pkgs/by-name/fi/findup/package.nix index 645e7731b498..baa0248200ed 100644 --- a/pkgs/by-name/fi/findup/package.nix +++ b/pkgs/by-name/fi/findup/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, testers, zig_0_11, - apple-sdk_11, }: let zig = zig_0_11; @@ -22,8 +21,6 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ zig.hook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; - passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; meta = { diff --git a/pkgs/by-name/fi/fingerprintx/package.nix b/pkgs/by-name/fi/fingerprintx/package.nix index 087d587a0f5d..0b20a8ad6c2f 100644 --- a/pkgs/by-name/fi/fingerprintx/package.nix +++ b/pkgs/by-name/fi/fingerprintx/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "praetorian-inc"; repo = "fingerprintx"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-o0u6UOrdzORnTgfOlc0kSQ5diDtNHjjbwfuyvPoHHKs="; }; diff --git a/pkgs/data/fonts/fira-code/symbols.nix b/pkgs/by-name/fi/fira-code-symbols/package.nix similarity index 100% rename from pkgs/data/fonts/fira-code/symbols.nix rename to pkgs/by-name/fi/fira-code-symbols/package.nix diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/by-name/fi/fira-code/package.nix similarity index 100% rename from pkgs/data/fonts/fira-code/default.nix rename to pkgs/by-name/fi/fira-code/package.nix diff --git a/pkgs/by-name/fi/fire/package.nix b/pkgs/by-name/fi/fire/package.nix index f8f32d05708f..a5c3c0be3681 100644 --- a/pkgs/by-name/fi/fire/package.nix +++ b/pkgs/by-name/fi/fire/package.nix @@ -13,7 +13,6 @@ libXcursor, freetype, alsa-lib, - apple-sdk_11, }: stdenv.mkDerivation (finalAttrs: { @@ -53,17 +52,15 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - libX11 - libXrandr - libXinerama - libXext - libXcursor - freetype - alsa-lib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + libX11 + libXrandr + libXinerama + libXext + libXcursor + freetype + alsa-lib + ]; cmakeFlags = [ (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true) diff --git a/pkgs/by-name/fi/firebase-tools/001-override-nan.patch b/pkgs/by-name/fi/firebase-tools/001-override-nan.patch new file mode 100644 index 000000000000..5da013133fb1 --- /dev/null +++ b/pkgs/by-name/fi/firebase-tools/001-override-nan.patch @@ -0,0 +1,54 @@ +diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json +index da429c128..9c69ec8cb 100644 +--- a/npm-shrinkwrap.json ++++ b/npm-shrinkwrap.json +@@ -14637,9 +14637,10 @@ + } + }, + "node_modules/nan": { +- "version": "2.17.0", +- "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz", +- "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==", ++ "version": "2.22.0", ++ "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz", ++ "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==", ++ "license": "MIT", + "optional": true + }, + "node_modules/nanoid": { +@@ -31852,9 +31853,9 @@ + } + }, + "nan": { +- "version": "2.17.0", +- "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz", +- "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==", ++ "version": "2.22.0", ++ "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz", ++ "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==", + "optional": true + }, + "nanoid": { +@@ -33672,7 +33673,7 @@ + "optional": true, + "requires": { + "install-artifact-from-github": "^1.3.1", +- "nan": "^2.17.0", ++ "nan": "^2.22.0", + "node-gyp": "^9.3.0" + } + }, +diff --git a/package.json b/package.json +index a4284d841..90a0524f2 100644 +--- a/package.json ++++ b/package.json +@@ -98,6 +98,9 @@ + "src/test/**/*" + ] + }, ++ "overrides" : { ++ "nan": "^2.22.0" ++ }, + "dependencies": { + "@electric-sql/pglite": "^0.2.0", + "@google-cloud/cloud-sql-connector": "^1.3.3", diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix index c76310cec6d3..ce164a12789d 100644 --- a/pkgs/by-name/fi/firebase-tools/package.nix +++ b/pkgs/by-name/fi/firebase-tools/package.nix @@ -5,14 +5,14 @@ fetchFromGitHub, python3, xcbuild, + fetchpatch, }: - let version = "13.29.1"; src = fetchFromGitHub { owner = "firebase"; repo = "firebase-tools"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-j6luT+L/vN9qaGjjeMW+8QGuzjJxzbn0sMGDjhqoeZA="; }; in @@ -20,7 +20,18 @@ buildNpmPackage { pname = "firebase-tools"; inherit version src; - npmDepsHash = "sha256-3+XeXK3VGIs4Foi9iW9Kho/Y0JsTQZ7p+582MPgdH1A="; + npmDepsHash = "sha256-lQmoemIxzy2biu80UTR2eA+KJBeXWPh0xZRs/1of0eo="; + + patches = [ + # Use modern version of `ajv` instead of the four year old default in 13.29.1 + (fetchpatch { + name = "bump-ajv.patch"; + url = "https://github.com/firebase/firebase-tools/commit/b684155d827e7d1e8390e22511c0e1b5c46812ef.patch"; + hash = "sha256-yv2AknT85Eyurc1ZFbbF5S9Sj/VEaVnHXBcXI10OWpw="; + }) + # Fix embedded nan version to support node 22 + ./001-override-nan.patch + ]; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json diff --git a/pkgs/by-name/fi/firefly/package.nix b/pkgs/by-name/fi/firefly/package.nix index 631627c3dd57..d01065e22d69 100644 --- a/pkgs/by-name/fi/firefly/package.nix +++ b/pkgs/by-name/fi/firefly/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "Brum3ns"; repo = "firefly"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-hhZw7u4NX+BvapUZv0k2Xu/UOdL7Pt8Idjat4aJzvIk="; }; diff --git a/pkgs/by-name/fi/firewalld/package.nix b/pkgs/by-name/fi/firewalld/package.nix index 0e10e14b03be..f9a263da6c71 100644 --- a/pkgs/by-name/fi/firewalld/package.nix +++ b/pkgs/by-name/fi/firewalld/package.nix @@ -31,13 +31,13 @@ let in stdenv.mkDerivation rec { pname = "firewalld"; - version = "2.2.3"; + version = "2.3.0"; src = fetchFromGitHub { owner = "firewalld"; repo = "firewalld"; rev = "v${version}"; - sha256 = "sha256-ugDleco/Ep+10ku+5xcW4zq/RrhruZCRlX0zKeXzLhg="; + sha256 = "sha256-ubE1zMIOcdg2+mgXsk6brCZxS1XkvJYwVY3E+UXIIiU="; }; patches = [ diff --git a/pkgs/by-name/fi/fish-lsp/package.nix b/pkgs/by-name/fi/fish-lsp/package.nix index b891bda1447e..4d49b1f33685 100644 --- a/pkgs/by-name/fi/fish-lsp/package.nix +++ b/pkgs/by-name/fi/fish-lsp/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ndonfris"; repo = "fish-lsp"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-u125EZXQEouVbmJuoW3KNDNqLB5cS/TzblXraClcw6Q="; }; diff --git a/pkgs/by-name/fi/fizz/package.nix b/pkgs/by-name/fi/fizz/package.nix index 4c5c1efe08c6..157a900789a1 100644 --- a/pkgs/by-name/fi/fizz/package.nix +++ b/pkgs/by-name/fi/fizz/package.nix @@ -14,8 +14,6 @@ zstd, gflags, libevent, - apple-sdk_11, - darwinMinVersionHook, folly, libsodium, @@ -39,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "facebookincubator"; repo = "fizz"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-mNe+CHEXhkwzek9qy2l6zvPXim9tJV44s+naSm6bQ4Q="; }; @@ -49,19 +47,14 @@ stdenv.mkDerivation (finalAttrs: { removeReferencesTo ]; - buildInputs = - [ - openssl - glog - double-conversion - zstd - gflags - libevent - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - (darwinMinVersionHook "11.0") - ]; + buildInputs = [ + openssl + glog + double-conversion + zstd + gflags + libevent + ]; propagatedBuildInputs = [ folly diff --git a/pkgs/by-name/fl/flare-floss/package.nix b/pkgs/by-name/fl/flare-floss/package.nix index 020793273066..8e7936346d76 100644 --- a/pkgs/by-name/fl/flare-floss/package.nix +++ b/pkgs/by-name/fl/flare-floss/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonPackage rec { src = fetchFromGitHub { owner = "mandiant"; repo = "flare-floss"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; fetchSubmodules = true; # for tests hash = "sha256-ciyF1Pt5KdUsmpTgvfgE81hhTHBM5zMBcZpom99R5GY="; }; diff --git a/pkgs/by-name/fl/flarectl/package.nix b/pkgs/by-name/fl/flarectl/package.nix index f4437d876023..aed675be9578 100644 --- a/pkgs/by-name/fl/flarectl/package.nix +++ b/pkgs/by-name/fl/flarectl/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "flarectl"; - version = "0.112.0"; + version = "0.113.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflare-go"; rev = "v${version}"; - hash = "sha256-HdbeGlkOFV1ebP0zylFttfREXECJhUDpta3FTQXtYCE="; + hash = "sha256-3luHcmMa2iCsgtg1wNkBcScH/iO1+DUHXpwpaIR6IFI="; }; - vendorHash = "sha256-TMQCJmCh0UuDdd8aenA9v2VnEISb2JX2LBUgTk0n98w="; + vendorHash = "sha256-SnkIVGrB7McwdfFfI4yMDviQ+mpl4udu2COS3AEMS3o="; subPackages = [ "cmd/flarectl" ]; diff --git a/pkgs/by-name/fl/flashgbx/package.nix b/pkgs/by-name/fl/flashgbx/package.nix index c38f37464777..8e86ab8e11fc 100644 --- a/pkgs/by-name/fl/flashgbx/package.nix +++ b/pkgs/by-name/fl/flashgbx/package.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { repo = "FlashGBX"; owner = "lesserkuma"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-jPD+7bFU6k1+NRKRHwynEmZ0G6ZwnF8AZVuTqk5DjEY="; }; diff --git a/pkgs/by-name/fl/flirt/package.nix b/pkgs/by-name/fl/flirt/package.nix index d5c4e01d499d..b4a2b7245b5e 100644 --- a/pkgs/by-name/fl/flirt/package.nix +++ b/pkgs/by-name/fl/flirt/package.nix @@ -2,6 +2,7 @@ rustPlatform, fetchFromSourcehut, lib, + nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -17,6 +18,8 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-EquriyhfbYyi87TP3zuLiCXDV7baDRaTRuZd7Yht/UA="; + passthru.updateScript = nix-update-script { }; + meta = { description = "FiLe InteRacT, the file interaction tool for your command line"; homepage = "https://git.sr.ht/~hadronized/flirt"; diff --git a/pkgs/by-name/fl/fluent-bit/package.nix b/pkgs/by-name/fl/fluent-bit/package.nix index 388996131179..93638c5efab3 100644 --- a/pkgs/by-name/fl/fluent-bit/package.nix +++ b/pkgs/by-name/fl/fluent-bit/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fluent-bit"; - version = "3.2.3"; + version = "3.2.4"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${finalAttrs.version}"; - hash = "sha256-5Oyw3nHlAyywF+G0UiGyi1v+jAr8eyKt/1cDT5FdJXQ="; + hash = "sha256-oTCGjDmGVovsfj+4fjIKy/xpiuYc0Q44LYwYPI4dSF8="; }; # optional only to avoid linux rebuild diff --git a/pkgs/by-name/fl/fluffychat/package.nix b/pkgs/by-name/fl/fluffychat/package.nix index 373adc09c42a..0de095f4c6e9 100644 --- a/pkgs/by-name/fl/fluffychat/package.nix +++ b/pkgs/by-name/fl/fluffychat/package.nix @@ -28,7 +28,7 @@ flutter324.buildFlutterApplication ( src = fetchFromGitHub { owner = "krille-chan"; repo = "fluffychat"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-T187GK0hBTRLGgUw23dNSzql6VZssreS84NbgCwf558="; }; diff --git a/pkgs/by-name/fl/fluidd/package.nix b/pkgs/by-name/fl/fluidd/package.nix index 05894dc685f7..275be923db0e 100644 --- a/pkgs/by-name/fl/fluidd/package.nix +++ b/pkgs/by-name/fl/fluidd/package.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "fluidd"; - version = "1.31.2"; + version = "1.31.4"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/fluidd-core/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "sha256-It/etwQGBok805FVTneOR+LU7QkHUHWXpUWtKLq6xe0="; + sha256 = "sha256-gqwVZg37pZA+XjT3FpTMYkrOIT1KKUN6upg7e1vh1t0="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/by-name/fl/flyctl/package.nix b/pkgs/by-name/fl/flyctl/package.nix index d8ce4a9f323b..51fbf03d9172 100644 --- a/pkgs/by-name/fl/flyctl/package.nix +++ b/pkgs/by-name/fl/flyctl/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.3.53"; + version = "0.3.56"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-B6Qku84vUy2KtAWQ3mpbOd1G14xAw0FFuB02fDvFE84="; + hash = "sha256-l413128FjVflVKHAYJspK63UP8IomNimIeJi3xyYmxw="; }; - vendorHash = "sha256-B7COrPKxTBDdFehBcNKt47I1ZslBHjWc+ibPiCpIocU="; + vendorHash = "sha256-/YP9qx6OS2OcPSF1BgEZ4l+nSwg+T5rKOHjdDHlNy+k="; subPackages = [ "." ]; diff --git a/pkgs/by-name/fl/flye/package.nix b/pkgs/by-name/fl/flye/package.nix index c81469ea2571..443c66488e23 100644 --- a/pkgs/by-name/fl/flye/package.nix +++ b/pkgs/by-name/fl/flye/package.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "fenderglass"; repo = "flye"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-448PTdGueQVHFIDS5zMy+XKZCtEb0SqP8bspPLHMJn0="; }; diff --git a/pkgs/by-name/fn/fna3d/package.nix b/pkgs/by-name/fn/fna3d/package.nix index 2655ca4eaeee..7b415cd053e0 100644 --- a/pkgs/by-name/fn/fna3d/package.nix +++ b/pkgs/by-name/fn/fna3d/package.nix @@ -7,14 +7,14 @@ }: stdenv.mkDerivation rec { pname = "fna3d"; - version = "24.12"; + version = "25.01"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FNA3D"; rev = version; fetchSubmodules = true; - hash = "sha256-ieodMkzBDPq8WCTEyPMENFxoGwrknWV6qsVCZmi0TwQ="; + hash = "sha256-0BD3aFIg3miBhGr6YuWJyrRxWsNnPNIFNiZSzPalJ/c="; }; buildInputs = [ SDL2 ]; diff --git a/pkgs/by-name/fo/foliate/package.nix b/pkgs/by-name/fo/foliate/package.nix index 6dd3db577152..178a7b70f64f 100644 --- a/pkgs/by-name/fo/foliate/package.nix +++ b/pkgs/by-name/fo/foliate/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "johnfactotum"; repo = "foliate"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-NU4lM+J5Tpd9Fl+eVbBy7WnCQ6LJ7oeWVkBxp6euTHU="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/fo/folio/package.nix b/pkgs/by-name/fo/folio/package.nix index fce873482dd8..b1b727c012d2 100644 --- a/pkgs/by-name/fo/folio/package.nix +++ b/pkgs/by-name/fo/folio/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "toolstack"; repo = "Folio"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-A0vUM6oIchpC/1NEjPmZkT2/f/CmEWmPsMHQrGkDKXQ="; }; diff --git a/pkgs/by-name/fo/folly/package.nix b/pkgs/by-name/fo/folly/package.nix index ca393d884a13..e564965bf956 100644 --- a/pkgs/by-name/fo/folly/package.nix +++ b/pkgs/by-name/fo/folly/package.nix @@ -21,8 +21,6 @@ zstd, libiberty, libunwind, - apple-sdk_11, - darwinMinVersionHook, boost, fmt_11, @@ -52,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "facebook"; repo = "folly"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-CX4YzNs64yeq/nDDaYfD5y8GKrxBueW4y275edPoS0c="; }; @@ -64,26 +62,21 @@ stdenv.mkDerivation (finalAttrs: { ]; # See CMake/folly-deps.cmake in the Folly source tree. - buildInputs = - [ - boost - double-conversion - fast-float - gflags - glog - libevent - zlib - openssl - xz - lz4 - zstd - libiberty - libunwind - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - (darwinMinVersionHook "11.0") - ]; + buildInputs = [ + boost + double-conversion + fast-float + gflags + glog + libevent + zlib + openssl + xz + lz4 + zstd + libiberty + libunwind + ]; propagatedBuildInputs = [ diff --git a/pkgs/by-name/fo/foo2zjs/package.nix b/pkgs/by-name/fo/foo2zjs/package.nix index f1c186529c0d..be8ed41f5217 100644 --- a/pkgs/by-name/fo/foo2zjs/package.nix +++ b/pkgs/by-name/fo/foo2zjs/package.nix @@ -19,14 +19,17 @@ stdenv.mkDerivation rec { sha256 = "14x3wizvncdy0xgvmcx541qanwb7bg76abygqy17bxycn1zh5r1x"; }; - buildInputs = [ - foomatic-filters + nativeBuildInputs = [ bc + foomatic-filters ghostscript - systemd vim ]; + buildInputs = [ + systemd + ]; + patches = [ ./no-hardcode-fw.diff # Support HBPL1 printers. Updated patch based on diff --git a/pkgs/by-name/fo/foot/package.nix b/pkgs/by-name/fo/foot/package.nix index d11b75ad2d34..f1f7b5e5021d 100644 --- a/pkgs/by-name/fo/foot/package.nix +++ b/pkgs/by-name/fo/foot/package.nix @@ -27,7 +27,7 @@ }: let - version = "1.19.0"; + version = "1.20.0"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -104,7 +104,7 @@ stdenv.mkDerivation { owner = "dnkl"; repo = "foot"; rev = version; - hash = "sha256-EY6VNrAxqA20RHLqfusbdxJPfEE7Fchi1W0noHfbxws="; + hash = "sha256-bvU8A2y/9ETqgFtBUZ5wp0dXybTCLl32yY/BB6r/pd8="; }; separateDebugInfo = true; diff --git a/pkgs/by-name/fo/forbidden/package.nix b/pkgs/by-name/fo/forbidden/package.nix index 783f6a3737a0..b5fea8aad7ed 100644 --- a/pkgs/by-name/fo/forbidden/package.nix +++ b/pkgs/by-name/fo/forbidden/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "ivan-sincek"; repo = "forbidden"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-KE2FHn0ocAna5ReRi9re/u8gdNVkCygSbSRj8gEudgI="; }; diff --git a/pkgs/by-name/fo/formatjson5/package.nix b/pkgs/by-name/fo/formatjson5/package.nix index 112f94aa8358..c82393ab490e 100644 --- a/pkgs/by-name/fo/formatjson5/package.nix +++ b/pkgs/by-name/fo/formatjson5/package.nix @@ -5,6 +5,7 @@ stdenv, darwin, nix-update-script, + fetchpatch, }: rustPlatform.buildRustPackage rec { @@ -19,6 +20,13 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Lredw/Fez+2U2++ShZcKTFCv8Qpai9YUvqvpGjG5W0o="; }; + patches = [ + (fetchpatch { + url = "https://github.com/google/json5format/commit/32914546e7088b3d9173ae9a2f307effa87917bf.patch"; + hash = "sha256-kAbRUL/FuhnxkC9Xo4J2bXt9nkMOLeJvgMmOoKnSxKc="; + }) + ]; + cargoHash = "sha256-zPgaZPDyNVPmBXz6QwOYnmh/sbJ8aPST8znLMfIWejk="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/by-name/fo/formula/dotnet-8-upgrade.patch b/pkgs/by-name/fo/formula/dotnet-8-upgrade.patch new file mode 100644 index 000000000000..45c654635a89 --- /dev/null +++ b/pkgs/by-name/fo/formula/dotnet-8-upgrade.patch @@ -0,0 +1,65 @@ +diff --git a/Src/CommandLine/CommandLine.csproj b/Src/CommandLine/CommandLine.csproj +index 2b6a4fe..5eee8c7 100644 +--- a/Src/CommandLine/CommandLine.csproj ++++ b/Src/CommandLine/CommandLine.csproj +@@ -2,7 +2,7 @@ + + + Exe +- net6.0 ++ net8.0 + AnyCPU;x64 + + +diff --git a/Src/Core/Core.csproj b/Src/Core/Core.csproj +index 8e79a00..db64e3a 100644 +--- a/Src/Core/Core.csproj ++++ b/Src/Core/Core.csproj +@@ -2,7 +2,7 @@ + + + Library +- net6.0 ++ net8.0 + + + AnyCPU;x64 +diff --git a/Src/Extensions/FormulaCodeGeneratorTask/FormulaCodeGeneratorTaskDotNet.csproj b/Src/Extensions/FormulaCodeGeneratorTask/FormulaCodeGeneratorTaskDotNet.csproj +index daa042d..9290c12 100644 +--- a/Src/Extensions/FormulaCodeGeneratorTask/FormulaCodeGeneratorTaskDotNet.csproj ++++ b/Src/Extensions/FormulaCodeGeneratorTask/FormulaCodeGeneratorTaskDotNet.csproj +@@ -2,7 +2,7 @@ + + + Library +- net6.0 ++ net8.0 + AnyCPU;x64 + + +diff --git a/Src/Kernel/InteractiveKernel/InteractiveKernel.csproj b/Src/Kernel/InteractiveKernel/InteractiveKernel.csproj +index ed3cde5..6c669cd 100644 +--- a/Src/Kernel/InteractiveKernel/InteractiveKernel.csproj ++++ b/Src/Kernel/InteractiveKernel/InteractiveKernel.csproj +@@ -17,7 +17,7 @@ + + + Exe +- net6.0 ++ net8.0 + enable + dotnet-formula + Microsoft.Jupyter.VUISIS.Formula +diff --git a/Src/Tests/Tests.csproj b/Src/Tests/Tests.csproj +index 8828a49..eebe401 100644 +--- a/Src/Tests/Tests.csproj ++++ b/Src/Tests/Tests.csproj +@@ -1,7 +1,7 @@ + + + +- net6.0 ++ net8.0 + + false + diff --git a/pkgs/by-name/fo/formula/nuget.json b/pkgs/by-name/fo/formula/nuget.json index 007951a96833..30605ef4480f 100644 --- a/pkgs/by-name/fo/formula/nuget.json +++ b/pkgs/by-name/fo/formula/nuget.json @@ -2,531 +2,531 @@ { "pname": "Antlr4.Runtime.Standard", "version": "4.7.2", - "sha256": "1pmrpsgqjfj0nzr1zqzk1m2fm0ynd4nklwq3dhvww08yjg5s0586" + "hash": "sha256-BhWgy5MeAc43bANzOi1p1oPqRA3z4x/yt0A6iZ++ud4=" }, { "pname": "Microsoft.NETCore.Platforms", "version": "1.1.0", - "sha256": "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm" + "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" }, { "pname": "Microsoft.NETCore.Targets", "version": "1.1.0", - "sha256": "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh" + "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" }, { "pname": "Microsoft.Win32.Primitives", "version": "4.3.0", - "sha256": "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq" + "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg=" }, { "pname": "Microsoft.Z3.x64", "version": "4.8.7", - "sha256": "1wxlw29xm5x8vwji2s7gwk39wb88dkbpg76l9s9gq0hqpghwlmdz" + "hash": "sha256-v1XK4bsYAvySTtScd9dsCC2exuTvaBEl36iX2pPgtPM=" }, { "pname": "NETStandard.Library", "version": "1.6.1", - "sha256": "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8" + "hash": "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw=" }, { "pname": "runtime.any.System.Collections", "version": "4.3.0", - "sha256": "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0" + "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8=" }, { "pname": "runtime.any.System.Diagnostics.Tools", "version": "4.3.0", - "sha256": "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk" + "hash": "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I=" }, { "pname": "runtime.any.System.Diagnostics.Tracing", "version": "4.3.0", - "sha256": "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn" + "hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI=" }, { "pname": "runtime.any.System.Globalization", "version": "4.3.0", - "sha256": "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x" + "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU=" }, { "pname": "runtime.any.System.Globalization.Calendars", "version": "4.3.0", - "sha256": "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201" + "hash": "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4=" }, { "pname": "runtime.any.System.IO", "version": "4.3.0", - "sha256": "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x" + "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=" }, { "pname": "runtime.any.System.Reflection", "version": "4.3.0", - "sha256": "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly" + "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" }, { "pname": "runtime.any.System.Reflection.Extensions", "version": "4.3.0", - "sha256": "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33" + "hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8=" }, { "pname": "runtime.any.System.Reflection.Primitives", "version": "4.3.0", - "sha256": "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf" + "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=" }, { "pname": "runtime.any.System.Resources.ResourceManager", "version": "4.3.0", - "sha256": "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl" + "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4=" }, { "pname": "runtime.any.System.Runtime", "version": "4.3.0", - "sha256": "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b" + "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=" }, { "pname": "runtime.any.System.Runtime.Handles", "version": "4.3.0", - "sha256": "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x" + "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4=" }, { "pname": "runtime.any.System.Runtime.InteropServices", "version": "4.3.0", - "sha256": "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19" + "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA=" }, { "pname": "runtime.any.System.Text.Encoding", "version": "4.3.0", - "sha256": "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3" + "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=" }, { "pname": "runtime.any.System.Text.Encoding.Extensions", "version": "4.3.0", - "sha256": "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8" + "hash": "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM=" }, { "pname": "runtime.any.System.Threading.Tasks", "version": "4.3.0", - "sha256": "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va" + "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" }, { "pname": "runtime.any.System.Threading.Timer", "version": "4.3.0", - "sha256": "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086" + "hash": "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs=" }, { "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d" + "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps=" }, { "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59" + "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I=" }, { "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa" + "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA=" }, { "pname": "runtime.native.System", "version": "4.3.0", - "sha256": "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4" + "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" }, { "pname": "runtime.native.System.IO.Compression", "version": "4.3.0", - "sha256": "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d" + "hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8=" }, { "pname": "runtime.native.System.Net.Http", "version": "4.3.0", - "sha256": "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk" + "hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg=" }, { "pname": "runtime.native.System.Security.Cryptography.Apple", "version": "4.3.0", - "sha256": "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q" + "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw=" }, { "pname": "runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97" + "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I=" }, { "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3" + "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM=" }, { "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf" + "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4=" }, { "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple", "version": "4.3.0", - "sha256": "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi" + "hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM=" }, { "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3" + "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0=" }, { "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn" + "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4=" }, { "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3" + "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g=" }, { "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy" + "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc=" }, { "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5" + "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw=" }, { "pname": "runtime.unix.Microsoft.Win32.Primitives", "version": "4.3.0", - "sha256": "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id" + "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg=" }, { "pname": "runtime.unix.System.Console", "version": "4.3.0", - "sha256": "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80" + "hash": "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190=" }, { "pname": "runtime.unix.System.Diagnostics.Debug", "version": "4.3.0", - "sha256": "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5" + "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI=" }, { "pname": "runtime.unix.System.IO.FileSystem", "version": "4.3.0", - "sha256": "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix" + "hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I=" }, { "pname": "runtime.unix.System.Net.Primitives", "version": "4.3.0", - "sha256": "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4" + "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0=" }, { "pname": "runtime.unix.System.Net.Sockets", "version": "4.3.0", - "sha256": "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12" + "hash": "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4=" }, { "pname": "runtime.unix.System.Private.Uri", "version": "4.3.0", - "sha256": "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk" + "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=" }, { "pname": "runtime.unix.System.Runtime.Extensions", "version": "4.3.0", - "sha256": "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p" + "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=" }, { "pname": "System.AppContext", "version": "4.3.0", - "sha256": "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya" + "hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg=" }, { "pname": "System.Buffers", "version": "4.3.0", - "sha256": "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy" + "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=" }, { "pname": "System.Collections", "version": "4.3.0", - "sha256": "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9" + "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=" }, { "pname": "System.Collections.Concurrent", "version": "4.3.0", - "sha256": "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8" + "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI=" }, { "pname": "System.Console", "version": "4.3.0", - "sha256": "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay" + "hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo=" }, { "pname": "System.Diagnostics.Debug", "version": "4.3.0", - "sha256": "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y" + "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=" }, { "pname": "System.Diagnostics.DiagnosticSource", "version": "4.3.0", - "sha256": "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq" + "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw=" }, { "pname": "System.Diagnostics.Tools", "version": "4.3.0", - "sha256": "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1" + "hash": "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y=" }, { "pname": "System.Diagnostics.Tracing", "version": "4.3.0", - "sha256": "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4" + "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q=" }, { "pname": "System.Globalization", "version": "4.3.0", - "sha256": "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki" + "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=" }, { "pname": "System.Globalization.Calendars", "version": "4.3.0", - "sha256": "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq" + "hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc=" }, { "pname": "System.Globalization.Extensions", "version": "4.3.0", - "sha256": "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls" + "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk=" }, { "pname": "System.IO", "version": "4.3.0", - "sha256": "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f" + "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=" }, { "pname": "System.IO.Compression", "version": "4.3.0", - "sha256": "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz" + "hash": "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA=" }, { "pname": "System.IO.Compression.ZipFile", "version": "4.3.0", - "sha256": "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar" + "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs=" }, { "pname": "System.IO.FileSystem", "version": "4.3.0", - "sha256": "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw" + "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw=" }, { "pname": "System.IO.FileSystem.Primitives", "version": "4.3.0", - "sha256": "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c" + "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg=" }, { "pname": "System.Linq", "version": "4.3.0", - "sha256": "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7" + "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A=" }, { "pname": "System.Linq.Expressions", "version": "4.3.0", - "sha256": "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv" + "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8=" }, { "pname": "System.Net.Http", "version": "4.3.0", - "sha256": "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j" + "hash": "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q=" }, { "pname": "System.Net.NameResolution", "version": "4.3.0", - "sha256": "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq" + "hash": "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c=" }, { "pname": "System.Net.Primitives", "version": "4.3.0", - "sha256": "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii" + "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE=" }, { "pname": "System.Net.Sockets", "version": "4.3.0", - "sha256": "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla" + "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus=" }, { "pname": "System.ObjectModel", "version": "4.3.0", - "sha256": "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2" + "hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q=" }, { "pname": "System.Private.Uri", "version": "4.3.0", - "sha256": "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx" + "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=" }, { "pname": "System.Reflection", "version": "4.3.0", - "sha256": "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m" + "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" }, { "pname": "System.Reflection.Emit", "version": "4.3.0", - "sha256": "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74" + "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU=" }, { "pname": "System.Reflection.Emit.ILGeneration", "version": "4.3.0", - "sha256": "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q" + "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA=" }, { "pname": "System.Reflection.Emit.Lightweight", "version": "4.3.0", - "sha256": "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c" + "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I=" }, { "pname": "System.Reflection.Extensions", "version": "4.3.0", - "sha256": "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq" + "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk=" }, { "pname": "System.Reflection.Primitives", "version": "4.3.0", - "sha256": "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276" + "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" }, { "pname": "System.Reflection.TypeExtensions", "version": "4.3.0", - "sha256": "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1" + "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng=" }, { "pname": "System.Resources.ResourceManager", "version": "4.3.0", - "sha256": "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49" + "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=" }, { "pname": "System.Runtime", "version": "4.3.0", - "sha256": "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7" + "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" }, { "pname": "System.Runtime.Extensions", "version": "4.3.0", - "sha256": "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60" + "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=" }, { "pname": "System.Runtime.Handles", "version": "4.3.0", - "sha256": "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8" + "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=" }, { "pname": "System.Runtime.InteropServices", "version": "4.3.0", - "sha256": "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j" + "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=" }, { "pname": "System.Runtime.InteropServices.RuntimeInformation", "version": "4.3.0", - "sha256": "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii" + "hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA=" }, { "pname": "System.Runtime.Numerics", "version": "4.3.0", - "sha256": "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z" + "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc=" }, { "pname": "System.Security.Claims", "version": "4.3.0", - "sha256": "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn" + "hash": "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks=" }, { "pname": "System.Security.Cryptography.Algorithms", "version": "4.3.0", - "sha256": "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml" + "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8=" }, { "pname": "System.Security.Cryptography.Cng", "version": "4.3.0", - "sha256": "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv" + "hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw=" }, { "pname": "System.Security.Cryptography.Csp", "version": "4.3.0", - "sha256": "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1" + "hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ=" }, { "pname": "System.Security.Cryptography.Encoding", "version": "4.3.0", - "sha256": "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32" + "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss=" }, { "pname": "System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc" + "hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4=" }, { "pname": "System.Security.Cryptography.Primitives", "version": "4.3.0", - "sha256": "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby" + "hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318=" }, { "pname": "System.Security.Cryptography.X509Certificates", "version": "4.3.0", - "sha256": "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h" + "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0=" }, { "pname": "System.Security.Principal", "version": "4.3.0", - "sha256": "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf" + "hash": "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk=" }, { "pname": "System.Security.Principal.Windows", "version": "4.3.0", - "sha256": "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr" + "hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE=" }, { "pname": "System.Text.Encoding", "version": "4.3.0", - "sha256": "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr" + "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" }, { "pname": "System.Text.Encoding.Extensions", "version": "4.3.0", - "sha256": "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy" + "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc=" }, { "pname": "System.Text.RegularExpressions", "version": "4.3.0", - "sha256": "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l" + "hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0=" }, { "pname": "System.Threading", "version": "4.3.0", - "sha256": "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34" + "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=" }, { "pname": "System.Threading.Tasks", "version": "4.3.0", - "sha256": "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7" + "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" }, { "pname": "System.Threading.Tasks.Extensions", "version": "4.3.0", - "sha256": "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z" + "hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc=" }, { "pname": "System.Threading.ThreadPool", "version": "4.3.0", - "sha256": "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1" + "hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg=" }, { "pname": "System.Threading.Timer", "version": "4.3.0", - "sha256": "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56" + "hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s=" }, { "pname": "System.Xml.ReaderWriter", "version": "4.3.0", - "sha256": "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1" + "hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA=" }, { "pname": "System.Xml.XDocument", "version": "4.3.0", - "sha256": "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd" + "hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI=" } ] diff --git a/pkgs/by-name/fo/formula/package.nix b/pkgs/by-name/fo/formula/package.nix index df3141e0184e..7913d9ec8a7e 100644 --- a/pkgs/by-name/fo/formula/package.nix +++ b/pkgs/by-name/fo/formula/package.nix @@ -1,6 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, buildDotnetModule, dotnetCorePackages, unstableGitUpdater }: +{ + lib, + stdenvNoCC, + fetchFromGitHub, + buildDotnetModule, + dotnetCorePackages, + unstableGitUpdater, +}: -buildDotnetModule rec { +buildDotnetModule (finalAttrs: { pname = "formula-dotnet"; version = "2.0"; @@ -8,22 +15,26 @@ buildDotnetModule rec { owner = "VUISIS"; repo = "formula-dotnet"; rev = "8ee2e6abfd4ce038e1d9cb9c8602dec1ed6c0163"; - sha256 = "sha256-2ulv//YV3OqrfFltgUCeDe4rOPC0qqJ+80/D2lIoih8="; + hash = "sha256-2ulv//YV3OqrfFltgUCeDe4rOPC0qqJ+80/D2lIoih8="; }; - dotnet-sdk = dotnetCorePackages.sdk_6_0; + patches = [ ./dotnet-8-upgrade.patch ]; + + dotnet-sdk = dotnetCorePackages.sdk_8_0; nugetDeps = ./nuget.json; projectFile = "Src/CommandLine/CommandLine.csproj"; - postFixup = if stdenv.hostPlatform.isLinux then '' - mv $out/bin/CommandLine $out/bin/formula - '' else lib.optionalString stdenv.hostPlatform.isDarwin '' - makeWrapper ${dotnetCorePackages.runtime_6_0}/bin/dotnet $out/bin/formula \ - --add-flags "$out/lib/formula-dotnet/CommandLine.dll" \ - --prefix DYLD_LIBRARY_PATH : $out/lib/formula-dotnet/runtimes/macos/native - ''; + postFixup = + lib.optionalString stdenvNoCC.hostPlatform.isLinux '' + mv $out/bin/CommandLine $out/bin/formula + '' + + lib.optionalString stdenvNoCC.hostPlatform.isDarwin '' + makeWrapper ${dotnetCorePackages.runtime_8_0}/bin/dotnet $out/bin/formula \ + --add-flags "$out/lib/formula-dotnet/CommandLine.dll" \ + --prefix DYLD_LIBRARY_PATH : $out/lib/formula-dotnet/runtimes/macos/native + ''; - passthru.updateScript = unstableGitUpdater { url = meta.homepage; }; + passthru.updateScript = unstableGitUpdater { url = finalAttrs.meta.homepage; }; meta = with lib; { description = "Formal Specifications for Verification and Synthesis"; @@ -33,4 +44,4 @@ buildDotnetModule rec { platforms = platforms.unix; mainProgram = "formula"; }; -} +}) diff --git a/pkgs/by-name/fr/freenet/package.nix b/pkgs/by-name/fr/freenet/package.nix index 2d69097c057f..4046a270c3e7 100644 --- a/pkgs/by-name/fr/freenet/package.nix +++ b/pkgs/by-name/fr/freenet/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "freenet"; repo = "fred"; - rev = "refs/tags/build${version}"; + tag = "build${version}"; hash = "sha256-L9vae7wB6Ow2O4JA7CG/XV/zI8OS9/Rg7in/TSatXxY="; }; diff --git a/pkgs/by-name/fr/freeplane/package.nix b/pkgs/by-name/fr/freeplane/package.nix index a92d25976e3f..6ba59f984aa4 100644 --- a/pkgs/by-name/fr/freeplane/package.nix +++ b/pkgs/by-name/fr/freeplane/package.nix @@ -7,6 +7,7 @@ jdk17, gradle_8, which, + copyDesktopItems, }: let @@ -31,6 +32,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { makeBinaryWrapper jdk gradle + copyDesktopItems ]; mitmCache = gradle.fetchDeps { diff --git a/pkgs/by-name/fr/freeradius/package.nix b/pkgs/by-name/fr/freeradius/package.nix index d24c66fe1be9..dda4a5943a72 100644 --- a/pkgs/by-name/fr/freeradius/package.nix +++ b/pkgs/by-name/fr/freeradius/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "FreeRADIUS"; repo = "freeradius-server"; - rev = "refs/tags/release_${lib.replaceStrings [ "." ] [ "_" ] version}"; + tag = "release_${lib.replaceStrings [ "." ] [ "_" ] version}"; hash = "sha256-1n447BpTqmkg5tyXe9yPzjfDoh7wMLZhwouUEzkwxKM="; }; diff --git a/pkgs/by-name/fr/freesasa/package.nix b/pkgs/by-name/fr/freesasa/package.nix index a20ace885373..141554495903 100644 --- a/pkgs/by-name/fr/freesasa/package.nix +++ b/pkgs/by-name/fr/freesasa/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "mittinatten"; repo = "freesasa"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; fetchSubmodules = true; hash = "sha256-OH1/GGFtMBnHuoOu3pdR+ohVO1m0I/jmCZbxPQ0C0jo="; }; diff --git a/pkgs/by-name/fr/frescobaldi/package.nix b/pkgs/by-name/fr/frescobaldi/package.nix index ae51e88588ab..d9a63a5fe2fc 100644 --- a/pkgs/by-name/fr/frescobaldi/package.nix +++ b/pkgs/by-name/fr/frescobaldi/package.nix @@ -13,7 +13,7 @@ python311Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "wbsoft"; repo = "frescobaldi"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; sha256 = "sha256-Q6ruthNcpjLlYydUetkuTECiCIzu055bw40O8BPGq/A="; }; diff --git a/pkgs/by-name/fr/frigate/package.nix b/pkgs/by-name/fr/frigate/package.nix index 924efe720d28..93256c130d21 100644 --- a/pkgs/by-name/fr/frigate/package.nix +++ b/pkgs/by-name/fr/frigate/package.nix @@ -15,7 +15,7 @@ let name = "frigate-${version}-source"; owner = "blakeblackshear"; repo = "frigate"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-PfUlo9ua4SVcQJTfmSVoEXHH1MUJ8A/w3kJHFpEzll8="; }; diff --git a/pkgs/by-name/fr/fritz-exporter/package.nix b/pkgs/by-name/fr/fritz-exporter/package.nix index e2230ff91977..cd0d327c8dc7 100644 --- a/pkgs/by-name/fr/fritz-exporter/package.nix +++ b/pkgs/by-name/fr/fritz-exporter/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "pdreker"; repo = "fritz_exporter"; - rev = "refs/tags/fritzexporter-v${version}"; + tag = "fritzexporter-v${version}"; hash = "sha256-qqvvoOQRFNl9IUjaBc/qzg9AevT5c2JDsfDVAZW6d6E="; }; diff --git a/pkgs/by-name/fs/fsg/package.nix b/pkgs/by-name/fs/fsg/package.nix index 5f7340f9f039..0a8048d5e6f8 100644 --- a/pkgs/by-name/fs/fsg/package.nix +++ b/pkgs/by-name/fs/fsg/package.nix @@ -25,6 +25,12 @@ stdenv.mkDerivation rec { patches = [ ./wxgtk-3.2.patch ]; + # use correct wx-config for cross-compiling + postPatch = '' + substituteInPlace makefile \ + --replace-fail 'wx-config' "${lib.getExe' wxGTK32 "wx-config"}" + ''; + hardeningDisable = [ "format" ]; nativeBuildInputs = [ pkg-config ]; @@ -45,6 +51,10 @@ stdenv.mkDerivation rec { sed -re '/ctrans_prob/s/energy\[center][+]energy\[other]/(int)(fmin(energy[center]+energy[other],99))/g' -i Canvas.cpp ''; + makeFlags = [ + "CPP=${stdenv.cc.targetPrefix}c++" + ]; + installPhase = '' mkdir -p $out/bin $out/libexec cp sand $out/libexec diff --git a/pkgs/by-name/fs/fsmon/package.nix b/pkgs/by-name/fs/fsmon/package.nix index bbdf9cad5e2f..7667bfdd0c63 100644 --- a/pkgs/by-name/fs/fsmon/package.nix +++ b/pkgs/by-name/fs/fsmon/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "nowsecure"; repo = "fsmon"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-m0Bu1lT3KH4ytkpEakI7fvRHV1kmgaXS71+wmNGmEl8="; }; diff --git a/pkgs/by-name/ft/ftjam/package.nix b/pkgs/by-name/ft/ftjam/package.nix deleted file mode 100644 index b78215472a7c..000000000000 --- a/pkgs/by-name/ft/ftjam/package.nix +++ /dev/null @@ -1,117 +0,0 @@ -{ - lib, - bison, - buildPackages, - fetchurl, - installShellFiles, - pkgsBuildTarget, - stdenv, - testers, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "ftjam"; - version = "2.5.2"; - - src = fetchurl { - url = "mirror://sourceforge/project/freetype/ftjam/${finalAttrs.version}/ftjam-${finalAttrs.version}.tar.bz2"; - hash = "sha256-6JdzUAqSkS3pGOn+v/q+S2vOedaa8ZRDX04DK4ptZqM="; - }; - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - - nativeBuildInputs = [ - bison - installShellFiles - ]; - - # Doesn't understand how to cross compile once bootstrapped, so we'll just use - # the Makefile for the bootstrapping portion - configurePlatforms = [ - "build" - "target" - ]; - - configureFlags = [ - "CC=${buildPackages.stdenv.cc.targetPrefix}cc" - "--host=${stdenv.buildPlatform.config}" - ]; - - makeFlags = [ - "CC=${buildPackages.stdenv.cc.targetPrefix}cc" - ]; - - env = { - LOCATE_TARGET = "bin.unix"; - # Jam uses c89 conventions - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-std=c89"; - }; - - enableParallelBuilding = true; - - strictDeps = true; - - # Jambase expects ar to have flags. - preConfigure = '' - export AR="$AR rc" - ''; - - # When cross-compiling, we need to set the preprocessor macros - # OSMAJOR/OSMINOR/OSPLAT to the values from the target platform, not the host - # platform. This looks a little ridiculous because the vast majority of build - # tools don't embed target-specific information into their binary, but in this - # case we behave more like a compiler than a make(1)-alike. - postPatch = - '' - substituteInPlace Jamfile \ - --replace "strip" "${stdenv.cc.targetPrefix}strip" - '' - + lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) '' - cat >>jam.h <