diff --git a/.github/workflows/check-nix-format.yml b/.github/workflows/check-format.yml similarity index 80% rename from .github/workflows/check-nix-format.yml rename to .github/workflows/check-format.yml index 8c35196e4944..ca3da602575b 100644 --- a/.github/workflows/check-nix-format.yml +++ b/.github/workflows/check-format.yml @@ -1,7 +1,4 @@ -# NOTE: Formatting with the RFC-style nixfmt command is not yet stable. -# See https://github.com/NixOS/rfcs/pull/166. - -name: Check that Nix files are formatted +name: Check that files are formatted on: pull_request_target: @@ -14,7 +11,7 @@ jobs: uses: ./.github/workflows/get-merge-commit.yml nixos: - name: nixfmt-check + name: fmt-check runs-on: ubuntu-24.04 needs: get-merge-commit if: needs.get-merge-commit.outputs.mergedSha @@ -27,13 +24,13 @@ jobs: with: extra_nix_config: sandbox = true - - name: Check that Nix files are formatted + - name: Check that files are formatted run: | # Note that it's fine to run this on untrusted code because: # - There's no secrets accessible here # - The build is sandboxed if ! nix-build ci -A fmt.check; then - echo "Some Nix files are not properly formatted" + echo "Some files are not properly formatted" echo "Please format them by going to the Nixpkgs root directory and running one of:" echo " nix-shell --run treefmt" echo " nix develop --command treefmt" diff --git a/.github/workflows/check-nixf-tidy.yml b/.github/workflows/check-nixf-tidy.yml deleted file mode 100644 index 1bb43c746bc5..000000000000 --- a/.github/workflows/check-nixf-tidy.yml +++ /dev/null @@ -1,132 +0,0 @@ -name: Check changed Nix files with nixf-tidy (experimental) - -on: - pull_request_target: - types: [opened, synchronize, reopened, edited] - -permissions: {} - -jobs: - nixos: - name: exp-nixf-tidy-check - runs-on: ubuntu-24.04 - if: "!contains(github.event.pull_request.title, '[skip treewide]')" - steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - ref: refs/pull/${{ github.event.pull_request.number }}/merge - # Fetches the merge commit and its parents - fetch-depth: 2 - - - name: Checking out target branch - run: | - target=$(mktemp -d) - targetRev=$(git rev-parse HEAD^1) - git worktree add "$target" "$targetRev" - echo "targetRev=$targetRev" >> "$GITHUB_ENV" - echo "target=$target" >> "$GITHUB_ENV" - - - name: Get Nixpkgs revision for nixf - run: | - # pin to a commit from nixpkgs-unstable to avoid e.g. building nixf - # from staging - # This should not be a URL, because it would allow PRs to run arbitrary code in CI! - rev=$(jq -r .rev ci/pinned-nixpkgs.json) - echo "url=https://github.com/NixOS/nixpkgs/archive/$rev.tar.gz" >> "$GITHUB_ENV" - - - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31 - with: - extra_nix_config: sandbox = true - nix_path: nixpkgs=${{ env.url }} - - - name: Install nixf and jq - # provided jq is incompatible with our expression - run: "nix-env -f '' -iAP nixf jq" - - - name: Check that Nix files pass nixf-tidy - run: | - # Filtering error messages we don't like - nixf_wrapper(){ - nixf-tidy --variable-lookup < "$1" | jq -r ' - [ - "sema-escaping-with" - ] - as $ignored_errors|[.[]|select(.sname as $s|$ignored_errors|index($s)|not)] - ' - } - - failedFiles=() - - # Don't report errors to file overview - # to avoid duplicates when editing title and description - if [[ "${{ github.event.action }}" == 'edited' ]] && [[ -z "${{ github.event.edited.changes.base }}" ]]; then - DONT_REPORT_ERROR=1 - else - DONT_REPORT_ERROR= - fi - # TODO: Make this more parallel - - # Loop through all Nix files touched by the PR - while readarray -d '' -n 2 entry && (( ${#entry[@]} != 0 )); do - type=${entry[0]} - file=${entry[1]} - case $type in - A*) - source="" - dest=$file - ;; - M*) - source=$file - dest=$file - ;; - C*|R*) - source=$file - read -r -d '' dest - ;; - *) - echo "Ignoring file $file with type $type" - continue - esac - - if [[ -n "$source" ]] && [[ "$(nixf_wrapper ${{ env.target }}/"$source")" != '[]' ]] 2>/dev/null; then - echo "Ignoring file $file because it doesn't pass nixf-tidy in the target commit" - echo # insert blank line - else - nixf_report="$(nixf_wrapper "$dest")" - if [[ "$nixf_report" != '[]' ]]; then - echo "$dest doesn't pass nixf-tidy. Reported by nixf-tidy:" - errors=$(echo "$nixf_report" | jq -r --arg dest "$dest" ' - def getLCur: "line=" + (.line+1|tostring) + ",col=" + (.column|tostring); - def getRCur: "endLine=" + (.line+1|tostring) + ",endColumn=" + (.column|tostring); - def getRange: "file=\($dest)," + (.lCur|getLCur) + "," + (.rCur|getRCur); - def getBody: . as $top|(.range|getRange) + ",title="+ .sname + "::" + - (.message|sub("{}" ; ($top.args.[]|tostring))); - def getNote: "\n::notice " + (.|getBody); - def getMessage: "::error " + (.|getBody) + (if (.notes|length)>0 then - ([.notes.[]|getNote]|add) else "" end); - .[]|getMessage - ') - if [[ -z "$DONT_REPORT_ERROR" ]]; then - echo "$errors" - else - # just print in plain text - echo "${errors/::/}" - echo # add one empty line - fi - failedFiles+=("$dest") - fi - fi - done < <(git diff -z --name-status ${{ env.targetRev }} -- '*.nix') - - if [[ -n "$DONT_REPORT_ERROR" ]]; then - echo "Edited the PR but didn't change the base branch, only the description/title." - echo "Not reporting errors again to avoid duplication." - echo # add one empty line - fi - - if (( "${#failedFiles[@]}" > 0 )); then - echo "Some new/changed Nix files don't pass nixf-tidy." - echo "See ${{ github.event.pull_request.html_url }}/files for reported errors." - echo "If you believe this is a false positive, ping @Aleksanaa and @inclyc in this PR." - exit 1 - fi diff --git a/.github/workflows/editorconfig-v2.yml b/.github/workflows/editorconfig-v2.yml deleted file mode 100644 index 68d780f2190f..000000000000 --- a/.github/workflows/editorconfig-v2.yml +++ /dev/null @@ -1,52 +0,0 @@ -name: "Checking EditorConfig v2" - -on: - pull_request_target: - -permissions: {} - -jobs: - get-merge-commit: - uses: ./.github/workflows/get-merge-commit.yml - - tests: - name: editorconfig-check - runs-on: ubuntu-24.04 - needs: get-merge-commit - if: "needs.get-merge-commit.outputs.mergedSha && !contains(github.event.pull_request.title, '[skip treewide]')" - steps: - - name: Get list of changed files from PR - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - gh api \ - repos/${{ github.repository }}/pulls/${{ github.event.number }}/files --paginate \ - | jq '.[] | select(.status != "removed") | .filename' \ - > "$HOME/changed_files" - - - name: print list of changed files - run: | - cat "$HOME/changed_files" - - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - ref: ${{ needs.get-merge-commit.outputs.mergedSha }} - - - name: Get Nixpkgs revision for editorconfig-checker - run: | - # Pin to a commit from nixpkgs-unstable to avoid building from e.g. staging. - # This should not be a URL, because it would allow PRs to run arbitrary code in CI! - rev=$(jq -r .rev ci/pinned-nixpkgs.json) - echo "url=https://github.com/NixOS/nixpkgs/archive/$rev.tar.gz" >> "$GITHUB_ENV" - - - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31 - with: - nix_path: nixpkgs=${{ env.url }} - - - name: Checking EditorConfig - run: | - < "$HOME/changed_files" nix-shell -p editorconfig-checker --run 'xargs -r editorconfig-checker -disable-indent-size' - - - if: ${{ failure() }} - run: | - echo "::error :: Hey! It looks like your changes don't follow our editorconfig settings. Read https://editorconfig.org/#download to configure your editor so you never see this error again." diff --git a/.github/workflows/keep-sorted.yml b/.github/workflows/keep-sorted.yml deleted file mode 100644 index ec2237f52bd9..000000000000 --- a/.github/workflows/keep-sorted.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: Check that files are sorted - -on: - pull_request_target: - types: [opened, synchronize, reopened] - -permissions: {} - -jobs: - get-merge-commit: - uses: ./.github/workflows/get-merge-commit.yml - - nixos: - name: keep-sorted - runs-on: ubuntu-24.04 - needs: get-merge-commit - if: "needs.get-merge-commit.outputs.mergedSha && !contains(github.event.pull_request.title, '[skip treewide]')" - steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - ref: ${{ needs.get-merge-commit.outputs.mergedSha }} - - - name: Get Nixpkgs revision for keep-sorted - run: | - # Pin to a commit from nixpkgs-unstable to avoid e.g. building nixfmt from staging. - # This should not be a URL, because it would allow PRs to run arbitrary code in CI! - rev=$(jq -r .rev ci/pinned-nixpkgs.json) - echo "url=https://github.com/NixOS/nixpkgs/archive/$rev.tar.gz" >> "$GITHUB_ENV" - - - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31 - with: - extra_nix_config: sandbox = true - nix_path: nixpkgs=${{ env.url }} - - - name: Install keep-sorted - run: "nix-env -f '' -iAP keep-sorted jq" - - - name: Check that Nix files are sorted - shell: bash - run: | - git ls-files | xargs keep-sorted --mode lint | jq --raw-output '.[] | "Please make sure any new entries in \(.path) are sorted alphabetically."' diff --git a/ci/OWNERS b/ci/OWNERS index 13b5c0ac4f0a..69a122d537e7 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -16,7 +16,7 @@ # CI /.github/*_TEMPLATE* @SigmaSquadron /.github/workflows @NixOS/Security @Mic92 @zowoq @infinisil @azuwis @wolfgangwalther -/.github/workflows/check-nix-format.yml @infinisil @wolfgangwalther +/.github/workflows/check-format.yml @infinisil @wolfgangwalther /.github/workflows/codeowners-v2.yml @infinisil @wolfgangwalther /.github/workflows/nixpkgs-vet.yml @infinisil @philiptaron @wolfgangwalther /ci @infinisil @philiptaron @NixOS/Security @wolfgangwalther diff --git a/ci/default.nix b/ci/default.nix index 67f59d61bfd4..9d0fff7d119a 100644 --- a/ci/default.nix +++ b/ci/default.nix @@ -44,10 +44,19 @@ let # By default it's info, which is too noisy since we have many unmatched files settings.on-unmatched = "debug"; + programs.keep-sorted.enable = true; + # This uses nixfmt-rfc-style underneath, # the default formatter for Nix code. # See https://github.com/NixOS/nixfmt programs.nixfmt.enable = true; + + settings.formatter.editorconfig-checker = { + command = "${pkgs.lib.getExe pkgs.editorconfig-checker}"; + options = [ "-disable-indent-size" ]; + includes = [ "*" ]; + priority = 1; + }; }; fs = pkgs.lib.fileset; nixFilesSrc = fs.toSource { diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ab7b8bc17083..52c741b7c370 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4966,6 +4966,12 @@ githubId = 6487079; name = "Dane Rieber"; }; + conduktorbot = { + email = "automation@conduktor.io"; + github = "conduktorbot"; + githubId = 96434751; + name = "Conduktor Bot"; + }; confus = { email = "con-f-use@gmx.net"; github = "con-f-use"; @@ -15056,6 +15062,12 @@ githubId = 1709273; name = "Robin Hack"; }; + marnas = { + email = "marco@santonastaso.com"; + name = "Marco Santonastaso"; + github = "marnas"; + githubId = 39352252; + }; marnym = { email = "markus@nyman.dev"; github = "marnym"; diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 2bf76afe5352..bbbe0a7ed4a9 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -274,7 +274,7 @@ in description = '' Disable nixos-rebuild, nixos-generate-config, nixos-installer and other NixOS tools. This is useful to shrink embedded, - read-only systems which are not expected to be rebuild or + read-only systems which are not expected to rebuild or reconfigure themselves. Use at your own risk! ''; }; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 487c0c39e68e..e881354c7341 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2110,8 +2110,8 @@ let publisher = "github"; name = "copilot"; # Verify which version is available with nix run nixpkgs#vsce -- show github.copilot --json - version = "1.309.0"; - hash = "sha256-i1PcbbOBgULd+inwypezE/ZsePrJaqM2z6qrDcNBLVA="; + version = "1.317.0"; + hash = "sha256-w8HH1ibkOrpuKi3Yhzr+DjVIY7HWZ2L4rYzNYrHkfbc="; }; meta = { diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index cac34eec585d..de16eb2c5c2d 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -26,11 +26,11 @@ let hash = { - x86_64-linux = "sha256-dAckjPosKsL1ZM2lQNKtxl1jOo/q1lBd1rkbj3G2AVs="; - x86_64-darwin = "sha256-z3U5wBJ72XG/k4HWUaaZm+MMEw4pqtvhejTnFq5fDmQ="; - aarch64-linux = "sha256-ZLbMknKHc6yVZ+fJOGZWh1NeFWMYYCXyNnnPRBMM6R4="; - aarch64-darwin = "sha256-RPL60SMdic8Q5GMtgY5yEoR0dzhnniEaoYKusfPN0Ks="; - armv7l-linux = "sha256-UrLjrBDFfTeSSsrzq4lIAd1lXNssmgrEWKpaweMtVRc="; + x86_64-linux = "sha256-C1v6M3gliVm4iufKjAWNJgiJ2K2cIrIqvYqtsX/fyAQ="; + x86_64-darwin = "sha256-/0uFfMQa78joIQ2CogAddBnXmo4wpnh47Y0glJ7vWJg="; + aarch64-linux = "sha256-v2GLRrvQVFBlTkGi/teA+bpJYJIdZVNmjTS8oXjhF1c="; + aarch64-darwin = "sha256-qFJYQpOCDlwQO7Dy6P1hm/9yE3LACpF6PYOLK1kNzDs="; + armv7l-linux = "sha256-g/fWf17WWtAd8TKbZGWvGGiy0qTicEE9m5bFteLvswo="; } .${system} or throwSystem; @@ -41,7 +41,7 @@ callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.99.32704"; + version = "1.99.32846"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix index a16e7f6b5e79..5defd3f14dd5 100644 --- a/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "palemoon-bin"; - version = "33.7.0"; + version = "33.7.1"; src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}"; @@ -174,11 +174,11 @@ stdenv.mkDerivation (finalAttrs: { { gtk3 = fetchzip { urls = urlRegionVariants "gtk3"; - hash = "sha256-pWqBcYBSRFI67Q4A38qf7KibZQ1vRlDnTEhJJbTw1Yg="; + hash = "sha256-80L93pQaozdyqMnIswWnS+gNo+xVYv5eFVNnLiK/rcU="; }; gtk2 = fetchzip { urls = urlRegionVariants "gtk2"; - hash = "sha256-hZhhWIuRu1329VNArT7bsaDqcw/NCopZ5/x5rXVE6y4="; + hash = "sha256-dnDQKRCqADzdotJRUeETqaGV+S+M6/de5LuBgMYYvPE="; }; }; diff --git a/pkgs/by-name/al/alliance/package.nix b/pkgs/by-name/al/alliance/package.nix index 726c25a932e9..1b6ab31d2318 100644 --- a/pkgs/by-name/al/alliance/package.nix +++ b/pkgs/by-name/al/alliance/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitLab, + fetchFromGitHub, xorgproto, motif, libX11, @@ -16,17 +16,18 @@ stdenv.mkDerivation { pname = "alliance"; - version = "unstable-2022-01-13"; + version = "unstable-2025-02-24"; - src = fetchFromGitLab { - domain = "gitlab.lip6.fr"; - owner = "vlsi-eda"; - repo = "alliance"; - rev = "ebece102e15c110fc79f1da50524c68fd9523f0c"; - hash = "sha256-NGtE3ZmN9LrgXG4NIKrp7dFRVzrKMoudlPUtYYKrZjY="; - }; - - prePatch = "cd alliance/src"; + src = + let + src = fetchFromGitHub { + owner = "lip6"; + repo = "alliance"; + rev = "a8502d32df0a4ad1bd29ab784c4332319669ecd2"; + hash = "sha256-b2uaYZEzHMB3qCMRVANNnjTxr6OYb1Unswxjq5knYzM="; + }; + in + "${src}/alliance/src"; nativeBuildInputs = [ libtool @@ -43,17 +44,13 @@ stdenv.mkDerivation { bison ]; - # Disable parallel build, errors: - # ./pat_decl_y.y:736:5: error: expected '=', ... - enableParallelBuilding = false; - - ALLIANCE_TOP = placeholder "out"; - configureFlags = [ - "--prefix=${placeholder "out"}" "--enable-alc-shared" ]; + # To avoid compiler error in LoadDataBase.c:366:27 + env.NIX_CFLAGS_COMPILE = "-Wno-incompatible-pointer-types"; + postPatch = '' # texlive for docs seems extreme substituteInPlace autostuff \ diff --git a/pkgs/by-name/an/antimatter-dimensions/package.nix b/pkgs/by-name/an/antimatter-dimensions/package.nix index 9e40ab88bf29..2a70d2d9722c 100644 --- a/pkgs/by-name/an/antimatter-dimensions/package.nix +++ b/pkgs/by-name/an/antimatter-dimensions/package.nix @@ -19,12 +19,12 @@ let in buildNpmPackage rec { pname = "antimatter-dimensions"; - version = "0-unstable-2024-10-16"; + version = "0-unstable-2025-05-08"; src = fetchFromGitHub { owner = "IvarK"; repo = "AntimatterDimensionsSourceCode"; - rev = "b813542c2f77501d0b8d07ae8b0044df2a994e86"; - hash = "sha256-1uZeY0Lgqbo9X9xbXed0aYy8mNApMBXJRlaoliZb/mA="; + rev = "7b29fa1c0771b93a8bf8198ca04886167ecffc0b"; + hash = "sha256-z7dVToxu8qWCPajf0vKprXF4zSBCRDquBgjf55ZPgyE="; }; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/by-name/ba/balatro/package.nix b/pkgs/by-name/ba/balatro/package.nix index 181cd305411b..526ca9ee051f 100644 --- a/pkgs/by-name/ba/balatro/package.nix +++ b/pkgs/by-name/ba/balatro/package.nix @@ -11,18 +11,17 @@ withMods ? true, withLinuxPatch ? true, }: -let - version = "1.0.1n"; - balatroExe = requireFile { - name = "Balatro-${version}.exe"; +stdenv.mkDerivation (finalAttrs: { + pname = "balatro"; + version = "1.0.1o"; + + src = requireFile { + name = "Balatro-${finalAttrs.version}.exe"; url = "https://store.steampowered.com/app/2379780/Balatro/"; # Use `nix hash file --sri --type sha256` to get the correct hash - hash = "sha256-mJ5pL+Qj3+ldOLFcQc64dM0edTeQSePIYpp5EuwxKXo="; + hash = "sha256-DXX+FkrM8zEnNNSzesmHiN0V8Ljk+buLf5DE5Z3pP0c="; }; -in -stdenv.mkDerivation { - pname = "balatro"; - inherit version; + nativeBuildInputs = [ p7zip copyDesktopItems @@ -43,7 +42,7 @@ stdenv.mkDerivation { buildPhase = '' runHook preBuild tmpdir=$(mktemp -d) - 7z x ${balatroExe} -o$tmpdir -y + 7z x ${finalAttrs.src} -o$tmpdir -y ${if withLinuxPatch then "patch $tmpdir/globals.lua -i ${./globals.patch}" else ""} patchedExe=$(mktemp -u).zip 7z a $patchedExe $tmpdir/* @@ -76,4 +75,4 @@ stdenv.mkDerivation { platforms = love.meta.platforms; mainProgram = "balatro"; }; -} +}) diff --git a/pkgs/by-name/bo/boringssl/package.nix b/pkgs/by-name/bo/boringssl/package.nix index 9c8ea8edad61..fa45b473b54a 100644 --- a/pkgs/by-name/bo/boringssl/package.nix +++ b/pkgs/by-name/bo/boringssl/package.nix @@ -55,6 +55,8 @@ buildGoModule { ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ "-DCMAKE_OSX_ARCHITECTURES=" ]; installPhase = '' + runHook preInstall + mkdir -p $bin/bin $dev $out/lib mv tool/bssl $bin/bin @@ -64,6 +66,8 @@ buildGoModule { mv decrepit/libdecrepit.a $out/lib mv ../include $dev + + runHook postInstall ''; outputs = [ diff --git a/pkgs/by-name/ca/canto-curses/package.nix b/pkgs/by-name/ca/canto-curses/package.nix index 78be4ecaeb2d..69e02fac6472 100644 --- a/pkgs/by-name/ca/canto-curses/package.nix +++ b/pkgs/by-name/ca/canto-curses/package.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, + fetchurl, python3Packages, readline, ncurses, @@ -18,6 +19,14 @@ python3Packages.buildPythonApplication rec { sha256 = "1vzb9n1j4gxigzll6654ln79lzbrrm6yy0lyazd9kldyl349b8sr"; }; + # Fixes the issue found here https://github.com/themoken/canto-curses/issues/59 + patches = [ + (fetchurl { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/canto-curses/-/raw/6daa56bc5baebb2444c368a8208666ef484a6fc0/fix-build.patch"; + hash = "sha256-2TMNmwjUAGyenSDqxfI+U2hNeDZaj2CivfTfpX7CKgY="; + }) + ]; + buildInputs = [ readline ncurses diff --git a/pkgs/by-name/ca/cargo-careful/package.nix b/pkgs/by-name/ca/cargo-careful/package.nix index 849ec6df3eb3..8d168b4f9961 100644 --- a/pkgs/by-name/ca/cargo-careful/package.nix +++ b/pkgs/by-name/ca/cargo-careful/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-careful"; - version = "0.4.3"; + version = "0.4.5"; src = fetchFromGitHub { owner = "RalfJung"; repo = "cargo-careful"; rev = "v${version}"; - hash = "sha256-pYfyqsS+bGwSP6YZAtI+8iMXdID/hrCiX+cuYoYiZmc="; + hash = "sha256-dalsBILFZzVHBIhGGIOUMSCWuM7xE46w91MbzCYa1Io="; }; useFetchCargoVendor = true; - cargoHash = "sha256-hb3x2LKtDNAhMbRCB3kAwHloFTojGzQdXsMjxeJYB6k="; + cargoHash = "sha256-Es5BT0jfyJXuw7TTtGRhI4PeplZgTYm6JhSxQiZ+6NE="; meta = with lib; { description = "Tool to execute Rust code carefully, with extra checking along the way"; diff --git a/pkgs/by-name/co/conduktor-ctl/package.nix b/pkgs/by-name/co/conduktor-ctl/package.nix new file mode 100644 index 000000000000..2b5cd8832535 --- /dev/null +++ b/pkgs/by-name/co/conduktor-ctl/package.nix @@ -0,0 +1,60 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, + stdenv, + versionCheckHook, +}: +buildGoModule rec { + pname = "conduktor-ctl"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "conduktor"; + repo = "ctl"; + rev = "refs/tags/v${version}"; + hash = "sha256-NNhaYBhLCCVXBbZKKefPRk1CD8GQm98FvChgeHvPDKs="; + }; + + vendorHash = "sha256-kPCBzLU6aH6MNlKZcKKFcli99ZmdOtPV5+5gxPs5GH4="; + + nativeBuildInputs = [ installShellFiles ]; + + ldflags = [ "-X github.com/conduktor/ctl/utils.version=${version}" ]; + + checkPhase = '' + go test ./... + ''; + + postInstall = + '' + mv $out/bin/ctl $out/bin/conduktor + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd conduktor \ + --bash <($out/bin/conduktor completion bash) \ + --fish <($out/bin/conduktor completion fish) \ + --zsh <($out/bin/conduktor completion zsh) + ''; + + doInstallCheck = true; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + versionCheckProgram = "${placeholder "out"}/bin/conduktor"; + + versionCheckProgramArg = "version"; + + meta = { + description = "CLI tool to interact with the Conduktor Console and Gateway"; + mainProgram = "conduktor"; + homepage = "https://github.com/conduktor/ctl"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + conduktorbot + marnas + ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +} diff --git a/pkgs/by-name/cp/cpp-netlib/0001-Compatibility-with-boost-1.83.patch b/pkgs/by-name/cp/cpp-netlib/0001-Compatibility-with-boost-1.83.patch new file mode 100644 index 000000000000..2c860aaba4f7 --- /dev/null +++ b/pkgs/by-name/cp/cpp-netlib/0001-Compatibility-with-boost-1.83.patch @@ -0,0 +1,33 @@ +From 8be99f5972826c25378bccb9fbd7291623c7b2a7 Mon Sep 17 00:00:00 2001 +From: Moraxyc +Date: Fri, 9 May 2025 13:39:17 +0800 +Subject: [PATCH] Compatibility with boost 1.83 + +--- + boost/network/protocol/http/server/impl/parsers.ipp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/boost/network/protocol/http/server/impl/parsers.ipp b/boost/network/protocol/http/server/impl/parsers.ipp +index c31e60e..3272c2f 100755 +--- a/boost/network/protocol/http/server/impl/parsers.ipp ++++ b/boost/network/protocol/http/server/impl/parsers.ipp +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + #ifdef BOOST_NETWORK_NO_LIB + #ifndef BOOST_NETWORK_INLINE +@@ -32,7 +33,7 @@ typedef std::basic_string u32_string; + template <> // + struct assign_to_container_from_value { + static void call(u32_string const& val, std::string& attr) { +- u32_to_u8_iterator begin = val.begin(), ++ boost::u32_to_u8_iterator begin = val.begin(), + end = val.end(); + for (; begin != end; ++begin) attr += *begin; + } +-- +2.48.1 + diff --git a/pkgs/by-name/cp/cpp-netlib/package.nix b/pkgs/by-name/cp/cpp-netlib/package.nix index decceeb7a845..466884fbbd33 100644 --- a/pkgs/by-name/cp/cpp-netlib/package.nix +++ b/pkgs/by-name/cp/cpp-netlib/package.nix @@ -3,11 +3,15 @@ stdenv, fetchFromGitHub, cmake, - boost181, + boost186, openssl, + llvmPackages_18, }: - -stdenv.mkDerivation rec { +let + # std::char_traits has been removed + stdenvForCppNetlib = if stdenv.hostPlatform.isDarwin then llvmPackages_18.stdenv else stdenv; +in +stdenvForCppNetlib.mkDerivation rec { pname = "cpp-netlib"; version = "0.13.0-final"; @@ -19,9 +23,15 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + # 'u32_to_u8_iterator' was not declared + ./0001-Compatibility-with-boost-1.83.patch + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ - boost181 + # io_service.hpp has been removed in boost 1.87+ + boost186 openssl ]; diff --git a/pkgs/by-name/dw/dwlb/package.nix b/pkgs/by-name/dw/dwlb/package.nix index 1c3354d54f02..c864de7dafdb 100644 --- a/pkgs/by-name/dw/dwlb/package.nix +++ b/pkgs/by-name/dw/dwlb/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation { pname = "dwlb"; - version = "0-unstable-2024-05-16"; + version = "0-unstable-2025-05-05"; src = fetchFromGitHub { owner = "kolunmi"; repo = "dwlb"; - rev = "0daa1c1fdd82c4d790e477bf171e23ca2fdfa0cb"; - hash = "sha256-Bu20IqRwBP1WRBgbcEQU4Q2BZ2FBnVaySOTsCn0iSSE="; + rev = "efaef82d5ee390e478fba57b6300953f838803cd"; + hash = "sha256-rkvJZKf5mB8Xxvab+i1jKUeNtuaA8wTd/pkL9lMhGi8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ev/evcxr/package.nix b/pkgs/by-name/ev/evcxr/package.nix index c5c35893e00d..3ac0a2963e1e 100644 --- a/pkgs/by-name/ev/evcxr/package.nix +++ b/pkgs/by-name/ev/evcxr/package.nix @@ -1,29 +1,32 @@ { - cargo, + lib, + stdenv, + rustPlatform, fetchFromGitHub, makeWrapper, pkg-config, - rustPlatform, - lib, - stdenv, - gcc, cmake, libiconv, + cargo, + gcc, + mold, + rustc, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "evcxr"; - version = "0.17.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "google"; repo = "evcxr"; - rev = "v${version}"; - sha256 = "sha256-6gSJJ3ptqpYydjg+xf5Pz3iTk0D+bkC6N79OeiKxPHY="; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-8PjZFWUH76QrA8EI9Cx0sBCzocvSmnp84VD7Nv9QMc8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-U2LBesQNOa/E/NkVeLulb8JUtGsHgMne0MgY0RT9lqI="; + cargoHash = "sha256-hE/O6lHC0o+nrN4vaQ155Nn2gZscpfsZ6o7IDi/IEjI="; RUST_SRC_PATH = "${rustPlatform.rustLibSrc}"; @@ -37,12 +40,28 @@ rustPlatform.buildRustPackage rec { ]; checkFlags = [ - # test broken with rust 1.69: - # * https://github.com/evcxr/evcxr/issues/294 - # * https://github.com/NixOS/nixpkgs/issues/229524 - "--skip=check_for_errors" + # outdated rust-analyzer (disabled, upstream) + # https://github.com/evcxr/evcxr/blob/fcdac75f49dcab3229524e671d4417d36c12130b/evcxr/tests/integration_tests.rs#L741 + # https://github.com/evcxr/evcxr/issues/295 + "--skip=partially_inferred_variable_type" + # fail, but can't reproduce in the REPL + "--skip=code_completion" + "--skip=save_and_restore_variables" ]; + # Some tests fail when types aren't explicitly specified, but which can't be + # reproduced inside the REPL. + # Likely related to https://github.com/evcxr/evcxr/issues/295 + postConfigure = '' + substituteInPlace evcxr/tests/integration_tests.rs \ + --replace-fail "let var2 = String" "let var2: String = String" `# code_completion` \ + --replace-fail "let a = vec" "let a: Vec = vec" `# function_panics_{with,without}_variable_preserving` \ + --replace-fail "let a = Some(" "let a: Option = Some(" `# moved_value` \ + --replace-fail "let a = \"foo\"" "let a: String = \"foo\"" `# statement_and_expression` \ + --replace-fail "let owned = \"owned\"" "let owned:String = \"owned\"" `# question_mark_operator` \ + --replace-fail "let mut owned_mut =" "let mut owned_mut: String =" + ''; + postInstall = let wrap = exe: '' @@ -51,6 +70,8 @@ rustPlatform.buildRustPackage rec { lib.makeBinPath [ cargo gcc + mold # fix fatal error: "unknown command line option: -run" + rustc # requires rust edition 2024 ] } \ --set-default RUST_SRC_PATH "$RUST_SRC_PATH" @@ -62,14 +83,16 @@ rustPlatform.buildRustPackage rec { rm $out/bin/testing_runtime ''; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Evaluation context for Rust"; homepage = "https://github.com/google/evcxr"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ protoben ma27 ]; mainProgram = "evcxr"; }; -} +}) diff --git a/pkgs/by-name/fo/foundry/package.nix b/pkgs/by-name/fo/foundry/package.nix index fd6d298e711a..8b8d331882fd 100644 --- a/pkgs/by-name/fo/foundry/package.nix +++ b/pkgs/by-name/fo/foundry/package.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "foundry"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "foundry-rs"; repo = "foundry"; tag = "v${version}"; - hash = "sha256-YTsneUj5OPw7EyKZMFLJJeAtZoD0je1DdmfMjVju4L8="; + hash = "sha256-bFr1mzp1evaCJsVj5H20ShoaGMJ1TPB/91Yd37ZGNsI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-vVRFS7o0zV+ek9ho+URks6peOryMpFCE1sDzN9g7uH0="; + cargoHash = "sha256-v+7sykIVdrzBOkNVnpgUnCUG7SUf2UToq9P539UAOH4="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gf/gftp/package.nix b/pkgs/by-name/gf/gftp/package.nix index 9f6a1f4fb2f8..4d7db1e79dc8 100644 --- a/pkgs/by-name/gf/gftp/package.nix +++ b/pkgs/by-name/gf/gftp/package.nix @@ -25,6 +25,10 @@ stdenv.mkDerivation rec { hash = "sha256-0zdv2oYl24BXh61IGCWby/2CCkzNjLpDrAFc0J89Pw4="; }; + env.NIX_CFLAGS_COMPILE = toString [ + "-Wno-incompatible-pointer-types" # https://github.com/masneyb/gftp/issues/178 + ]; + nativeBuildInputs = [ autoconf automake diff --git a/pkgs/by-name/go/goshs/package.nix b/pkgs/by-name/go/goshs/package.nix index b7c63e191a53..1accceb44c3d 100644 --- a/pkgs/by-name/go/goshs/package.nix +++ b/pkgs/by-name/go/goshs/package.nix @@ -1,7 +1,6 @@ { buildGoModule, fetchFromGitHub, - gitUpdater, stdenv, versionCheckHook, lib, @@ -33,8 +32,6 @@ buildGoModule (finalAttrs: { "-skip=^TestGetIPv4Addr$" ]; - passthru.updateScript = gitUpdater { rev-prefix = "v"; }; - meta = { description = "Simple, yet feature-rich web server written in Go"; homepage = "https://goshs.de"; diff --git a/pkgs/by-name/ha/halo/package.nix b/pkgs/by-name/ha/halo/package.nix index 84680ec9677b..4576bf66f5fd 100644 --- a/pkgs/by-name/ha/halo/package.nix +++ b/pkgs/by-name/ha/halo/package.nix @@ -8,10 +8,10 @@ }: stdenv.mkDerivation rec { pname = "halo"; - version = "2.20.19"; + version = "2.20.20"; src = fetchurl { url = "https://github.com/halo-dev/halo/releases/download/v${version}/halo-${version}.jar"; - hash = "sha256-4xXg1pW6vXebrmmyhzQKmJReR8gfRrflrfuB3ijk4tc="; + hash = "sha256-8q87oGE7uEbs78rkFcF3FD+ms+9dlk+12G2CL/tEJKY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/jo/joplin-desktop/package.nix b/pkgs/by-name/jo/joplin-desktop/package.nix index 2fcab1654d77..cb314eaf4c93 100644 --- a/pkgs/by-name/jo/joplin-desktop/package.nix +++ b/pkgs/by-name/jo/joplin-desktop/package.nix @@ -82,7 +82,7 @@ let unpackPhase = '' runHook preUnpack - 7zz x -x'!Joplin ${version}/Applications' $src + 7zz x -x'!Joplin ${version}/Applications' -xr'!*:com.apple.cs.Code*' $src runHook postUnpack ''; diff --git a/pkgs/by-name/ka/kanidm-provision/package.nix b/pkgs/by-name/ka/kanidm-provision/package.nix index 6cc34970e683..f7a603dba55c 100644 --- a/pkgs/by-name/ka/kanidm-provision/package.nix +++ b/pkgs/by-name/ka/kanidm-provision/package.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "kanidm-provision"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "oddlama"; repo = "kanidm-provision"; tag = "v${finalAttrs.version}"; - hash = "sha256-+NQJEAJ0DqKEV1cYZN7CLzGoBJNUL3SQAMmxRQG5DMI="; + hash = "sha256-kwxGrLz59Zk8PSsfQzPUeA/xWQZrV1NWlS5/yuqfIyI="; }; postPatch = '' diff --git a/pkgs/by-name/ku/kubetui/package.nix b/pkgs/by-name/ku/kubetui/package.nix index d271b1c88329..a88c47c290a4 100644 --- a/pkgs/by-name/ku/kubetui/package.nix +++ b/pkgs/by-name/ku/kubetui/package.nix @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage rec { pname = "kubetui"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "sarub0b0"; repo = "kubetui"; tag = "v${version}"; - hash = "sha256-p7NPHOmeDzZ8OlVnpOOoTksWbWcnKlzsXu/mYmMU4l4="; + hash = "sha256-CtKckAmvXdH+CU+nV1hNGhemOCj5HRkAEQDSMD32CFE="; }; checkFlags = [ @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { ]; useFetchCargoVendor = true; - cargoHash = "sha256-fMrlZMe2uD+ImM6zPXzo/+/Eto2MeIyscYfU8msLJFw="; + cargoHash = "sha256-+O22eo2vj4WLbSQoUfGOOfp2a43j2RrVXvB7CmYRA1o="; meta = { homepage = "https://github.com/sarub0b0/kubetui"; diff --git a/pkgs/by-name/li/libmcfp/package.nix b/pkgs/by-name/li/libmcfp/package.nix index 81643693b47b..dc07d6117e10 100644 --- a/pkgs/by-name/li/libmcfp/package.nix +++ b/pkgs/by-name/li/libmcfp/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libmcfp"; - version = "1.3.5"; + version = "1.4.2"; src = fetchFromGitHub { owner = "mhekkel"; repo = "libmcfp"; tag = "v${finalAttrs.version}"; - hash = "sha256-e4scwaCwKU2M5FJ/+UTNDigazopQwGhCIqDatQX7ERw="; + hash = "sha256-qKmSkVuxY5kXQ1eSs/T500lFpCLzU3sXAoUmpXhTUp4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libowfat/package.nix b/pkgs/by-name/li/libowfat/package.nix index f39bdbe81f52..23ce6cfb41bb 100644 --- a/pkgs/by-name/li/libowfat/package.nix +++ b/pkgs/by-name/li/libowfat/package.nix @@ -26,7 +26,10 @@ stdenv.mkDerivation rec { make headers ''; - makeFlags = [ "prefix=$(out)" ]; + makeFlags = [ + "prefix=$(out)" + "CC=${stdenv.cc.targetPrefix}cc" + ]; enableParallelBuilding = true; meta = with lib; { @@ -34,5 +37,7 @@ stdenv.mkDerivation rec { homepage = "https://www.fefe.de/libowfat/"; license = licenses.gpl2; platforms = platforms.linux; + # build tool "json" is built for the host platform + broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; }; } diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix index 16bc3620f3e0..c230464133e9 100644 --- a/pkgs/by-name/my/myks/package.nix +++ b/pkgs/by-name/my/myks/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "myks"; - version = "4.8.1"; + version = "4.8.2"; src = fetchFromGitHub { owner = "mykso"; repo = "myks"; tag = "v${version}"; - hash = "sha256-bjry2szn4bOGsIeJl221T+6aV+MW9yXQcLBS3sJcswQ="; + hash = "sha256-HG3TuK4mh44D+qVtcfM09dbuf+M2ZuREASXxG0me3B4="; }; - vendorHash = "sha256-kUOjbBosj2u25n/fGoC0DpAYkWIgoxIfkXJlNpRALfw="; + vendorHash = "sha256-lxqAd7N5yrW453s6cEGAtCcxLyJMsWK8LtT31kTODoc="; subPackages = "."; diff --git a/pkgs/by-name/n9/n98-magerun2/package.nix b/pkgs/by-name/n9/n98-magerun2/package.nix index 1453c2128862..1856863cf74d 100644 --- a/pkgs/by-name/n9/n98-magerun2/package.nix +++ b/pkgs/by-name/n9/n98-magerun2/package.nix @@ -1,11 +1,11 @@ { lib, fetchFromGitHub, - php, + php83, versionCheckHook, }: -php.buildComposerProject2 (finalAttrs: { +php83.buildComposerProject2 (finalAttrs: { pname = "n98-magerun2"; version = "8.0.0"; diff --git a/pkgs/by-name/ne/netbird/package.nix b/pkgs/by-name/ne/netbird/package.nix index c2ffdade1216..9ec81aa17401 100644 --- a/pkgs/by-name/ne/netbird/package.nix +++ b/pkgs/by-name/ne/netbird/package.nix @@ -31,13 +31,13 @@ let in buildGoModule (finalAttrs: { pname = "netbird"; - version = "0.43.2"; + version = "0.43.3"; src = fetchFromGitHub { owner = "netbirdio"; repo = "netbird"; tag = "v${finalAttrs.version}"; - hash = "sha256-VZWd7KXMfh/OOnvprF5S69ztDK3N5w3lmfO2OGUC+FQ="; + hash = "sha256-+WEAUM+BrckRCUycCaYr7tveZBZ2kStnMPxyDVixAsA="; }; vendorHash = "sha256-/STnSegRtpdMhh9RaCqwc6dSXvt7UO5GVz7/M9JzamM="; diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/by-name/qm/qmmp/package.nix similarity index 87% rename from pkgs/applications/audio/qmmp/default.nix rename to pkgs/by-name/qm/qmmp/package.nix index 407d44c785da..afe7406a6a97 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/by-name/qm/qmmp/package.nix @@ -4,10 +4,7 @@ fetchurl, cmake, pkg-config, - qtbase, - qttools, - qtmultimedia, - wrapQtAppsHook, + qt6, # transports curl, libmms, @@ -57,24 +54,24 @@ stdenv.mkDerivation rec { pname = "qmmp"; - version = "2.1.8"; + version = "2.2.5"; src = fetchurl { - url = "https://qmmp.ylsoftware.com/files/qmmp/2.1/${pname}-${version}.tar.bz2"; - hash = "sha256-hGphQ8epqym47C9doiSOQd3yc28XwV2UsNc7ivhaae4="; + url = "https://qmmp.ylsoftware.com/files/qmmp/2.2/${pname}-${version}.tar.bz2"; + hash = "sha256-WCEfMnrDhau8fXXmpdjdZLzbXMDxEZMp8pJ9FjEJfhg="; }; nativeBuildInputs = [ cmake pkg-config - wrapQtAppsHook + qt6.wrapQtAppsHook ]; buildInputs = [ # basic requirements - qtbase - qttools - qtmultimedia + qt6.qtbase + qt6.qttools + qt6.qtmultimedia # transports curl libmms diff --git a/pkgs/by-name/sd/SDL_compat/package.nix b/pkgs/by-name/sd/SDL_compat/package.nix index 59788c98bbcf..683d6eb38c98 100644 --- a/pkgs/by-name/sd/SDL_compat/package.nix +++ b/pkgs/by-name/sd/SDL_compat/package.nix @@ -11,6 +11,12 @@ pkg-config, pkg-config-unwrapped, stdenv, + testers, + dosbox, + SDL_image, + SDL_ttf, + SDL_mixer, + SDL_sound, # Boolean flags libGLSupported ? lib.elem stdenv.hostPlatform.system mesa.meta.platforms, openglSupport ? libGLSupported, @@ -52,8 +58,33 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals openglSupport [ libGLU ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'set(CMAKE_SKIP_RPATH TRUE)' 'set(CMAKE_SKIP_RPATH FALSE)' + ''; + + dontPatchELF = true; # don't strip rpath + + cmakeFlags = + let + rpath = lib.makeLibraryPath [ sdl2-compat ]; + in + [ + (lib.cmakeFeature "CMAKE_INSTALL_RPATH" rpath) + (lib.cmakeFeature "CMAKE_BUILD_RPATH" rpath) + (lib.cmakeBool "SDL12TESTS" finalAttrs.finalPackage.doCheck) + ]; + enableParallelBuilding = true; + # Darwin fails with "Critical error: required built-in appearance SystemAppearance not found" + doCheck = !stdenv.hostPlatform.isDarwin; + checkPhase = '' + runHook preCheck + ./testver + runHook postCheck + ''; + postInstall = '' # allow as a drop in replacement for SDL # Can be removed after treewide switch from pkg-config to pkgconf @@ -66,24 +97,17 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./find-headers.patch ]; setupHook = ./setup-hook.sh; - postFixup = '' - for lib in $out/lib/*${stdenv.hostPlatform.extensions.sharedLibrary}* ; do - if [[ -L "$lib" ]]; then - ${ - if stdenv.hostPlatform.isDarwin then - '' - install_name_tool ${ - lib.strings.concatMapStrings (x: " -add_rpath ${lib.makeLibraryPath [ x ]} ") finalAttrs.buildInputs - } "$lib" - '' - else - '' - patchelf --set-rpath "$(patchelf --print-rpath $lib):${lib.makeLibraryPath finalAttrs.buildInputs}" "$lib" - '' - } - fi - done - ''; + passthru.tests = { + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + inherit + SDL_image + SDL_ttf + SDL_mixer + SDL_sound + dosbox + ; + }; meta = { homepage = "https://www.libsdl.org/"; @@ -93,5 +117,9 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ peterhoeg ]; teams = [ lib.teams.sdl ]; platforms = lib.platforms.all; + pkgConfigModules = [ + "sdl" + "sdl12_compat" + ]; }; }) diff --git a/pkgs/by-name/sl/slang/package.nix b/pkgs/by-name/sl/slang/package.nix index aa21473271cf..a72855654ceb 100644 --- a/pkgs/by-name/sl/slang/package.nix +++ b/pkgs/by-name/sl/slang/package.nix @@ -5,7 +5,6 @@ libiconv, libpng, ncurses, - pcre, readline, zlib, writeScript, @@ -36,7 +35,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--with-pcre=${pcre.dev}" + "--without-pcre" "--with-png=${libpng.dev}" "--with-readline=${readline.dev}" "--with-z=${zlib.dev}" @@ -44,7 +43,6 @@ stdenv.mkDerivation rec { buildInputs = [ libpng - pcre readline zlib ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ libiconv ]; diff --git a/pkgs/by-name/sy/syslogng/package.nix b/pkgs/by-name/sy/syslogng/package.nix index 455aff78d5d9..205bc2c8dd57 100644 --- a/pkgs/by-name/sy/syslogng/package.nix +++ b/pkgs/by-name/sy/syslogng/package.nix @@ -66,13 +66,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "syslog-ng"; - version = "4.8.1"; + version = "4.8.2"; src = fetchFromGitHub { owner = "syslog-ng"; repo = "syslog-ng"; rev = "syslog-ng-${finalAttrs.version}"; - hash = "sha256-YdGbDpGMC0DPuPSbfe9HvZshBVdv1s1+hiHDnhYbs6Q="; + hash = "sha256-iWH64e5LBEiIy/A5N8pfOkjbn9wbmAswk2NhGyJ63f8="; fetchSubmodules = true; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vr/vrcx/deps.json b/pkgs/by-name/vr/vrcx/deps.json index bab0850a0623..a65e6cabd866 100644 --- a/pkgs/by-name/vr/vrcx/deps.json +++ b/pkgs/by-name/vr/vrcx/deps.json @@ -51,13 +51,13 @@ }, { "pname": "Microsoft.JavaScript.NodeApi", - "version": "0.9.5", - "hash": "sha256-IJjCix/X0rh+3Fc7eVxKyk0P/Ex5ItlAM4ugTG7OYo4=" + "version": "0.9.11", + "hash": "sha256-1F2lG7ePVKy9QXMt76AWf64zj5o9upVik3//AqPaw7U=" }, { "pname": "Microsoft.JavaScript.NodeApi.Generator", - "version": "0.9.5", - "hash": "sha256-Me3fsW0tc00O8bCcItEjLvm2Tik6Xbc7FPBddaLim8w=" + "version": "0.9.11", + "hash": "sha256-WAunMB3ksE0trHmohr+fTxGXiYNd553PUJoDaOSmLxo=" }, { "pname": "Microsoft.NETCore.Platforms", @@ -116,8 +116,8 @@ }, { "pname": "Microsoft.Win32.SystemEvents", - "version": "9.0.2", - "hash": "sha256-WXgu8y2LT8OtQSVRojumtlTkJVjfvXeZ8N9iRKIW/lI=" + "version": "9.0.4", + "hash": "sha256-vWObhv9e/nPVaMkEYb4lTlMmX/v4fluVWuHAtxYrUIQ=" }, { "pname": "NETStandard.Library", @@ -369,6 +369,41 @@ "version": "4.4.0", "hash": "sha256-jPnWzDcbufO51GLGjynWHy0b+5PBqNxM+VKmSrObeUw=" }, + { + "pname": "runtime.win.Microsoft.Win32.Primitives", + "version": "4.3.0", + "hash": "sha256-ZnzR82+YDpNYf1GICTbzPjB20AjSy8dlRhfocK1FMEw=" + }, + { + "pname": "runtime.win.System.Console", + "version": "4.3.1", + "hash": "sha256-xhkY/NXkqEv2bieaeD9M2HxB48qDBz/XrD5FS6xm1MI=" + }, + { + "pname": "runtime.win.System.Diagnostics.Debug", + "version": "4.3.0", + "hash": "sha256-DpU+PGIUCtaK6gQEl/OWSO/JKg/TA9yeD01Zzxaxy5k=" + }, + { + "pname": "runtime.win.System.IO.FileSystem", + "version": "4.3.0", + "hash": "sha256-6JnGF9kj6jYd9xneKQdTvb3zNTSHdeWW/pr7vui0AbA=" + }, + { + "pname": "runtime.win.System.Net.Primitives", + "version": "4.3.0", + "hash": "sha256-jqUpP60h/kkampLU9Bt8T5gSDaVXwxPsOOTEVVKAPbY=" + }, + { + "pname": "runtime.win.System.Net.Sockets", + "version": "4.3.0", + "hash": "sha256-k2lTk08ryI2NSEI3IFlO0y2cltiT8TIhNnqHgeL8I1M=" + }, + { + "pname": "runtime.win.System.Runtime.Extensions", + "version": "4.3.0", + "hash": "sha256-+TMflNyjP+Lf5bge0xVN5AKxMAk4/caWY6zZrqtyAJw=" + }, { "pname": "SharpDX", "version": "4.2.0", @@ -391,18 +426,18 @@ }, { "pname": "SixLabors.Fonts", - "version": "2.0.8", - "hash": "sha256-ujiUYbg/uHYjJsLuljwK0kdaQHzrceZ+W6jgjCpv5LE=" + "version": "2.1.3", + "hash": "sha256-lUTFK7OBtiXU1gyROax4GXDRvNj3aqgGlZZvicc37VQ=" }, { "pname": "SixLabors.ImageSharp", - "version": "3.1.6", - "hash": "sha256-FQjLyC4158F1GyhlKjzjGo6TxAu698rYWTY9lkko/fA=" + "version": "3.1.8", + "hash": "sha256-cE9BQfbCvJ0Mf+fQiTD8elOZEPcfZHjDz2BHdiO+D08=" }, { "pname": "SixLabors.ImageSharp.Drawing", - "version": "2.1.5", - "hash": "sha256-n54bDQpp5i2V4LgMXuuq/bHHs6/7PyK8eSx0vJ2NHbA=" + "version": "2.1.6", + "hash": "sha256-2VYoBw8XidjqFUS03EgxOq9vw/WRZjhF3z1pwfaSzUc=" }, { "pname": "sqlite-net-pcl", @@ -451,8 +486,8 @@ }, { "pname": "System.CodeDom", - "version": "9.0.2", - "hash": "sha256-hNhCSyuD9/teTgFuX4zrBn/LWlijczwrMqv+r3/yfHI=" + "version": "9.0.4", + "hash": "sha256-X8IDHw/ssp0vgPSnyM/tmDTb3poH6GLe+gZ4MR9qfho=" }, { "pname": "System.Collections", @@ -536,8 +571,8 @@ }, { "pname": "System.Drawing.Common", - "version": "9.0.2", - "hash": "sha256-S7IMV4R/nWbZs/YCwI9UwwLHDP57NkfSEIaoYNbRq54=" + "version": "9.0.4", + "hash": "sha256-taudg5yVeaNrgvD9LMEumByKE0G032jp9s9AGfKYI9A=" }, { "pname": "System.Globalization", @@ -591,8 +626,8 @@ }, { "pname": "System.Management", - "version": "9.0.2", - "hash": "sha256-7FhGnAYgoJnPcHy+HbVdK/fD8ICSLAttLtueTLBoWZc=" + "version": "9.0.4", + "hash": "sha256-+sW/NQELaBGjUfzndaNLPHKKQVdI1yOJMaqF4tV2SVY=" }, { "pname": "System.Memory", @@ -759,6 +794,11 @@ "version": "4.7.0", "hash": "sha256-/9ZCPIHLdhzq7OW4UKqTsR0O93jjHd6BRG1SRwgHE1g=" }, + { + "pname": "System.Security.Claims", + "version": "4.3.0", + "hash": "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks=" + }, { "pname": "System.Security.Cryptography.Algorithms", "version": "4.3.0", @@ -804,6 +844,11 @@ "version": "4.7.0", "hash": "sha256-BGgXMLUi5rxVmmChjIhcXUxisJjvlNToXlyaIbUxw40=" }, + { + "pname": "System.Security.Principal", + "version": "4.3.0", + "hash": "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk=" + }, { "pname": "System.Security.Principal.Windows", "version": "4.3.0", @@ -836,8 +881,8 @@ }, { "pname": "System.Text.Json", - "version": "9.0.2", - "hash": "sha256-kftKUuGgZtF4APmp77U79ws76mEIi+R9+DSVGikA5y8=" + "version": "9.0.4", + "hash": "sha256-oIOqfOIIUXXVkfFiTCI9wwIJBETQqF7ZcOJv2iYuq1s=" }, { "pname": "System.Text.RegularExpressions", @@ -859,6 +904,11 @@ "version": "8.0.0", "hash": "sha256-c5TYoLNXDLroLIPnlfyMHk7nZ70QAckc/c7V199YChg=" }, + { + "pname": "System.Threading.Overlapped", + "version": "4.3.0", + "hash": "sha256-tUX099CChkqWiHyP/1e4jGYzZAjgIthMOdMmiOGMUNk=" + }, { "pname": "System.Threading.Tasks", "version": "4.3.0", diff --git a/pkgs/by-name/vr/vrcx/package.nix b/pkgs/by-name/vr/vrcx/package.nix index e1c651982fdf..0e7be5909138 100644 --- a/pkgs/by-name/vr/vrcx/package.nix +++ b/pkgs/by-name/vr/vrcx/package.nix @@ -4,7 +4,7 @@ buildDotnetModule, dotnetCorePackages, buildNpmPackage, - electron_34, + electron_35, makeWrapper, copyDesktopItems, makeDesktopItem, @@ -12,17 +12,15 @@ }: let pname = "vrcx"; - version = "2025.03.01"; + version = "2025.05.09"; dotnet = dotnetCorePackages.dotnet_9; - electron = electron_34; + electron = electron_35; src = fetchFromGitHub { owner = "vrcx-team"; repo = "VRCX"; - # v2025.03.01 tag is actually behind a few commits, namely the one that bumps the version (so it complains about not being up-to-date) - #tag = "v${version}"; - rev = "1980eeb4cccebfcf33826d44b7833a9aa6f5a955"; - hash = "sha256-HiFcHnytynWYbeUd+KsG38dLU1FhDu0VD3JPT3kUO6s="; + tag = "v${version}"; + hash = "sha256-sqdDucjERHC5YykisFDiBOJw40snsldBcuCH1FAahSo="; }; backend = buildDotnetModule { @@ -47,7 +45,7 @@ in buildNpmPackage { inherit pname version src; - npmDepsHash = "sha256-2ZU+9NPPx3GbU75XfjVroZCpjXr7IK2HtEIqLJLOjyw="; + npmDepsHash = "sha256-sXWKsW9vPyq1oK9ysJod3uAUOICsK/TBLbSekT1SO+k="; npmFlags = [ "--ignore-scripts" ]; makeCacheWritable = true; diff --git a/pkgs/by-name/wt/wtwitch/package.nix b/pkgs/by-name/wt/wtwitch/package.nix index cf9d19877857..569f32735d2d 100644 --- a/pkgs/by-name/wt/wtwitch/package.nix +++ b/pkgs/by-name/wt/wtwitch/package.nix @@ -13,19 +13,23 @@ mpv, procps, scdoc, - stdenv, + stdenvNoCC, streamlink, vlc, + fzf, + withMpv ? true, + withVlc ? false, + withMplayer ? false, }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "wtwitch"; version = "2.6.3"; src = fetchFromGitHub { owner = "krathalan"; - repo = pname; - rev = version; + repo = "wtwitch"; + tag = finalAttrs.version; hash = "sha256-2YLBuxGwGkav3zB2qMqM6yRXf7ZLqgULoJV4s5p+hSw="; }; @@ -35,7 +39,11 @@ stdenv.mkDerivation rec { ''; buildPhase = '' + runHook preBuild + scdoc < src/wtwitch.1.scd > wtwitch.1 + + runHook postBuild ''; nativeBuildInputs = [ @@ -45,6 +53,8 @@ stdenv.mkDerivation rec { ]; installPhase = '' + runHook preInstall + installManPage wtwitch.1 installShellCompletion --cmd wtwitch \ --bash src/wtwitch-completion.bash \ @@ -54,29 +64,32 @@ stdenv.mkDerivation rec { --set-default LANG en_US.UTF-8 \ --prefix PATH : ${ lib.makeBinPath ( - lib.optionals stdenv.hostPlatform.isLinux [ vlc ] - ++ [ + [ bash coreutils-prefixed curl gnused gnugrep jq - mplayer - mpv procps streamlink + fzf ] + ++ lib.optional withMpv mpv + ++ lib.optional withVlc vlc + ++ lib.optional withMplayer mplayer ) } + + runHook postInstall ''; - meta = with lib; { + meta = { description = "Terminal user interface for Twitch"; homepage = "https://github.com/krathalan/wtwitch"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ urandom ]; - platforms = platforms.all; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.urandom ]; + platforms = lib.platforms.all; mainProgram = "wtwitch"; }; -} +}) diff --git a/pkgs/by-name/yq/yq-go/package.nix b/pkgs/by-name/yq/yq-go/package.nix index ba6e639b5732..13d0f6eb1e8e 100644 --- a/pkgs/by-name/yq/yq-go/package.nix +++ b/pkgs/by-name/yq/yq-go/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.45.1"; + version = "4.45.3"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - hash = "sha256-AsTDbeRMb6QJE89Z0NGooyTY3xZpWFoWkT7dofsu0DI="; + hash = "sha256-xa0kIdb/Y+1zqGulmQ3qR62E9q4s5CCooYvsUDsZN9E="; }; - vendorHash = "sha256-d4dwhZYzEuyh1zJQ2xU0WkygHjoVLoCBrDKuAHUzu1w="; + vendorHash = "sha256-cA5Y0/2lvYfVXr4zgtp/U8aBUkHnh9xb9jDHVk/2OME="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ze/zenn-cli/package.nix b/pkgs/by-name/ze/zenn-cli/package.nix index 0abf85d292aa..eac27008ec60 100644 --- a/pkgs/by-name/ze/zenn-cli/package.nix +++ b/pkgs/by-name/ze/zenn-cli/package.nix @@ -35,13 +35,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "zenn-cli"; - version = "0.1.157"; + version = "0.1.159"; src = fetchFromGitHub { owner = "zenn-dev"; repo = "zenn-editor"; tag = finalAttrs.version; - hash = "sha256-1+5UaSYtY00F+1oJfovLIBPnmfRnKpIkQHpxb93rO2k="; + hash = "sha256-q28XSsGf+Uz+FTRwyu1xg/8bnYxuL6Jt+t3mk0CcWGY="; # turborepo requires .git directory leaveDotGit = true; }; diff --git a/pkgs/development/coq-modules/coqeal/default.nix b/pkgs/development/coq-modules/coqeal/default.nix index 08f1ad8c473d..603d2be00601 100644 --- a/pkgs/development/coq-modules/coqeal/default.nix +++ b/pkgs/development/coq-modules/coqeal/default.nix @@ -23,7 +23,7 @@ let [ { cases = [ - (range "9.0" "9.0") + (range "8.20" "9.0") (isGe "2.3.0") ]; out = "2.1.0"; diff --git a/pkgs/development/coq-modules/deriving/default.nix b/pkgs/development/coq-modules/deriving/default.nix index 30cb78815193..9f20bdc3b335 100644 --- a/pkgs/development/coq-modules/deriving/default.nix +++ b/pkgs/development/coq-modules/deriving/default.nix @@ -20,14 +20,21 @@ mkCoqDerivation { { cases = [ (range "8.17" "9.0") - (isGe "2.0.0") + (range "2.0.0" "2.4.0") + ]; + out = "0.2.2"; + } + { + cases = [ + (range "8.17" "9.0") + (range "2.0.0" "2.3.0") ]; out = "0.2.1"; } { cases = [ (range "8.17" "8.20") - (isGe "2.0.0") + (range "2.0.0" "2.2.0") ]; out = "0.2.0"; } @@ -43,6 +50,7 @@ mkCoqDerivation { releaseRev = v: "v${v}"; + release."0.2.2".sha256 = "sha256-qsbyQ4spg5vVLZkechb2LoBazGjMh7pR9sSS0s7tXxs="; release."0.2.1".sha256 = "sha256-053bNa3rcy0fCs9CQoKPxDLXnKRHzteyClLDURpaZJo="; release."0.2.0".sha256 = "sha256-xPsuEayHstjF0PGFJZJ+5cm0oMUrpoGLXN23op97vjM="; release."0.1.1".sha256 = "sha256-Gu8aInLxTXfAFE0/gWRYI046Dx3Gv1j1+gx92v/UnPI="; diff --git a/pkgs/development/coq-modules/extructures/default.nix b/pkgs/development/coq-modules/extructures/default.nix index 270c6146fe3e..e57da9deb4f7 100644 --- a/pkgs/development/coq-modules/extructures/default.nix +++ b/pkgs/development/coq-modules/extructures/default.nix @@ -20,14 +20,14 @@ { cases = [ (range "8.17" "9.0") - (isGe "2.0.0") + (range "2.0.0" "2.4.0") ]; out = "0.5.0"; } { cases = [ (range "8.17" "8.20") - (isGe "2.0.0") + (range "2.0.0" "2.3.0") ]; out = "0.4.0"; } diff --git a/pkgs/development/coq-modules/fourcolor/default.nix b/pkgs/development/coq-modules/fourcolor/default.nix index 3768db213bd8..5effd74fc033 100644 --- a/pkgs/development/coq-modules/fourcolor/default.nix +++ b/pkgs/development/coq-modules/fourcolor/default.nix @@ -18,6 +18,7 @@ mkCoqDerivation { release."1.3.0".sha256 = "sha256-h9pa6vaKT6jCEaIdEdcu0498Ou5kEXtZdb9P7WXK1DQ="; release."1.3.1".sha256 = "sha256-wBizm1hJXPYBu0tHFNScQHd22FebsJYoggT5OlhY/zM="; release."1.4.0".sha256 = "sha256-8TtNPEbp3uLAH+MjOKiTZHOjPb3vVYlabuqsdWxbg80="; + release."1.4.1".sha256 = "sha256-0UASpo9CdpvidRv33BDWrevo+NSOhxLQFPCJAWPXf+s="; inherit version; defaultVersion = @@ -30,7 +31,7 @@ mkCoqDerivation { (isGe "8.16") (isGe "2.0") ]; - out = "1.4.0"; + out = "1.4.1"; } { cases = [ diff --git a/pkgs/development/coq-modules/gaia/default.nix b/pkgs/development/coq-modules/gaia/default.nix index c10aab6198d8..9dc1865dcea3 100644 --- a/pkgs/development/coq-modules/gaia/default.nix +++ b/pkgs/development/coq-modules/gaia/default.nix @@ -17,6 +17,7 @@ mkCoqDerivation { release."1.15".sha256 = "sha256:04zchnkvaq2mzpcilpspn5l947689gj3m0w20m0nd7w4drvlahnw"; release."1.17".sha256 = "sha256-2VzdopXgKS/wC5Rd1/Zlr12J5bSIGINFjG1nrMjDrGE="; release."2.2".sha256 = "sha256-y8LlQg9d9rfPFjzS9Xu3BW/H3tPiOC+Eb/zwXJGW9d4="; + release."2.3".sha256 = "sha256-inWJok0F3SZpVfoyMfpRXHVHn4z2aY8JjCKKhdVTnoc="; releaseRev = (v: "v${v}"); inherit version; @@ -25,6 +26,13 @@ mkCoqDerivation { lib.switch [ coq.version mathcomp.version ] [ + { + cases = [ + (range "8.16" "9.0") + (range "2.0" "2.4") + ]; + out = "2.3"; + } { cases = [ (range "8.16" "9.0") diff --git a/pkgs/development/coq-modules/graph-theory/default.nix b/pkgs/development/coq-modules/graph-theory/default.nix index 1f0b0eb41f28..b07e5dff78e3 100644 --- a/pkgs/development/coq-modules/graph-theory/default.nix +++ b/pkgs/development/coq-modules/graph-theory/default.nix @@ -6,7 +6,7 @@ mathcomp-finmap, mathcomp-algebra-tactics, fourcolor, - hierarchy-builder, + stdlib, version ? null, }: @@ -18,6 +18,7 @@ mkCoqDerivation { release."0.9.2".sha256 = "sha256-DPYCZS8CzkfgpR+lmYhV2v20ezMtyWp8hdWpuh0OOQU="; release."0.9.3".sha256 = "sha256-9WX3gsw+4btJLqcGg2W+7Qy+jaZtkfw7vCp8sXYmaWw="; release."0.9.4".sha256 = "sha256-fXTAsRdPisNhg8Umaa7S7gZ1M8zuPGg426KP9fAkmXQ="; + release."0.9.6".sha256 = "sha256-fvGb970tRE4xj1pBIhNBDaqssDd6kNQ/+s0c+aOO5IE="; releaseRev = v: "v${v}"; @@ -27,6 +28,13 @@ mkCoqDerivation { lib.switch [ coq.coq-version mathcomp.version ] [ + { + cases = [ + (range "8.18" "9.0") + (range "2.0.0" "2.4.0") + ]; + out = "0.9.6"; + } { cases = [ (range "8.16" "8.19") @@ -71,7 +79,7 @@ mkCoqDerivation { mathcomp.fingroup mathcomp-algebra-tactics fourcolor - hierarchy-builder + stdlib ]; meta = with lib; { diff --git a/pkgs/development/coq-modules/jasmin/default.nix b/pkgs/development/coq-modules/jasmin/default.nix index ec542b6815af..73ee3dd6d317 100644 --- a/pkgs/development/coq-modules/jasmin/default.nix +++ b/pkgs/development/coq-modules/jasmin/default.nix @@ -21,7 +21,7 @@ mkCoqDerivation { { cases = [ (range "8.19" "9.0") - (range "2.2" "2.3") + (range "2.2" "2.4") ]; out = "2025.02.0"; } diff --git a/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix b/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix index 3ea3a67f390b..89e53c0e0f64 100644 --- a/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix +++ b/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix @@ -23,6 +23,13 @@ mkCoqDerivation { lib.switch [ coq.coq-version mathcomp-algebra.version ] [ + { + cases = [ + (range "8.20" "9.0") + (isGe "2.4") + ]; + out = "1.2.5"; + } { cases = [ (range "8.16" "9.0") @@ -59,6 +66,7 @@ mkCoqDerivation { release."1.2.2".sha256 = "sha256-EU9RJGV3BvnmsX+mGH+6+MDXiGHgDI7aP5sIYiMUXTs="; release."1.2.3".sha256 = "sha256-6uc1VEfDv+fExEfBR2c0/Q/KjrkX0TbEMCLgeYcpkls="; release."1.2.4".sha256 = "sha256-BRxt0LGPz2u3kJRjcderaZqCfs8M8qKAAwNSWmIck7Q="; + release."1.2.5".sha256 = "sha256-wTfe+g7ljWs1S+g02VQutnJGLVIOzNX1lm1HTMXeUUA="; propagatedBuildInputs = [ mathcomp-ssreflect diff --git a/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/pkgs/development/coq-modules/mathcomp-analysis/default.nix index 419a8d689350..02103c2eb986 100644 --- a/pkgs/development/coq-modules/mathcomp-analysis/default.nix +++ b/pkgs/development/coq-modules/mathcomp-analysis/default.nix @@ -16,6 +16,7 @@ let repo = "analysis"; owner = "math-comp"; + release."1.11.0".sha256 = "sha256-1apbzBvaLNw/8ARLUhGGy89CyXW+/6O4ckdxKPraiVc="; release."1.9.0".sha256 = "sha256-zj7WSDUg8ISWxcipGpjEwvvnLp1g8nm23BZiib/15+g="; release."1.8.0".sha256 = "sha256-2ZafDmZAwGB7sxdUwNIE3xvwBRw1kFDk0m5Vz+onWZc="; release."1.7.0".sha256 = "sha256-GgsMIHqLkWsPm2VyOPeZdOulkN00IoBz++qA6yE9raQ="; @@ -49,6 +50,13 @@ let lib.switch [ coq.version mathcomp.version ] [ + { + cases = [ + (range "8.20" "9.0") + (range "2.1.0" "2.4.0") + ]; + out = "1.11.0"; + } { cases = [ (range "8.19" "8.20") diff --git a/pkgs/development/coq-modules/mathcomp-finmap/default.nix b/pkgs/development/coq-modules/mathcomp-finmap/default.nix index 8e3245c619a1..0d761eac6bcf 100644 --- a/pkgs/development/coq-modules/mathcomp-finmap/default.nix +++ b/pkgs/development/coq-modules/mathcomp-finmap/default.nix @@ -20,10 +20,17 @@ mkCoqDerivation { lib.switch [ coq.version mathcomp-boot.version ] [ + { + cases = [ + (range "8.20" "9.0") + (range "2.3" "2.4") + ]; + out = "2.2.0"; + } { cases = [ (range "8.16" "9.0") - (isGe "2.0") + (range "2.0" "2.3") ]; out = "2.1.0"; } @@ -93,6 +100,7 @@ mkCoqDerivation { ] null; release = { + "2.2.0".sha256 = "sha256-oDQEZOutrJxmN8FvzovUIhqw0mwc8Ej7thrieJrW8BY="; "2.1.0".sha256 = "sha256-gh0cnhdVDyo+D5zdtxLc10kGKQLQ3ITzHnMC45mCtpY="; "2.0.0".sha256 = "sha256-0Wr1ZUYVuZH74vawO4EZlZ+K3kq+s1xEz/BfzyKj+wk="; "1.5.2".sha256 = "sha256-0KmmSjc2AlUo6BKr9RZ4FjL9wlGISlTGU0X1Eu7l4sw="; diff --git a/pkgs/development/coq-modules/mathcomp-infotheo/default.nix b/pkgs/development/coq-modules/mathcomp-infotheo/default.nix index 9f791ce654bf..c1f8d149c605 100644 --- a/pkgs/development/coq-modules/mathcomp-infotheo/default.nix +++ b/pkgs/development/coq-modules/mathcomp-infotheo/default.nix @@ -23,6 +23,13 @@ lib.switch [ coq.version mathcomp-analysis.version ] [ + { + cases = [ + (range "8.20" "8.20") + (isGe "1.10") + ]; + out = "0.9.3"; + } { cases = [ (range "8.19" "8.20") @@ -88,6 +95,7 @@ } ] null; + release."0.9.3".sha256 = "sha256-8+cnVKNAvZ3MVV3BpS8UmCIxJphsQRBv3swek1eEBjE="; release."0.9.1".sha256 = "sha256-WI20HxMHr1ZUwOGPIUl+nRI8TxVUa2+F1xcGjRDHO9g="; release."0.7.7".sha256 = "sha256-kEbpMl7U+I2kvqi1VrjhIVFkZFO6h0tTHEUZRbHYG7E="; release."0.7.5".sha256 = "sha256-pzPo+Acjx3vlyqOkSZQ8uT2BDLSTfbAnRm39e+/CqE0="; diff --git a/pkgs/development/coq-modules/mathcomp-real-closed/default.nix b/pkgs/development/coq-modules/mathcomp-real-closed/default.nix index 7654c47abf08..522000b7c379 100644 --- a/pkgs/development/coq-modules/mathcomp-real-closed/default.nix +++ b/pkgs/development/coq-modules/mathcomp-real-closed/default.nix @@ -17,6 +17,7 @@ mkCoqDerivation { owner = "math-comp"; inherit version; release = { + "2.0.3".sha256 = "sha256-heZ7aZ7TO9YNAESIvbAc1qqzO91xMyLAox8VKueIk/s="; "2.0.2".sha256 = "sha256-hBo9JMtmXDYBmf5ihKGksQLHv3c0+zDBnd8/aI2V/ao="; "2.0.1".sha256 = "sha256-tQTI3PCl0q1vWpps28oATlzOI8TpVQh1jhTwVmhaZic="; "2.0.0".sha256 = "sha256-sZvfiC5+5Lg4nRhfKKqyFzovCj2foAhqaq/w9F2bdU8="; @@ -35,17 +36,24 @@ mkCoqDerivation { lib.switch [ coq.version mathcomp.version ] [ + { + cases = [ + (range "8.18" "9.0") + (isGe "2.2.0") + ]; + out = "2.0.3"; + } { cases = [ (range "8.17" "9.0") - (isGe "2.1.0") + (range "2.1.0" "2.3.0") ]; out = "2.0.2"; } { cases = [ (range "8.17" "8.20") - (isGe "2.0.0") + (range "2.0.0" "2.2.0") ]; out = "2.0.1"; } diff --git a/pkgs/development/coq-modules/mathcomp-tarjan/default.nix b/pkgs/development/coq-modules/mathcomp-tarjan/default.nix index 9246a0b0682e..4f8549c00f89 100644 --- a/pkgs/development/coq-modules/mathcomp-tarjan/default.nix +++ b/pkgs/development/coq-modules/mathcomp-tarjan/default.nix @@ -25,7 +25,14 @@ mkCoqDerivation { { cases = [ (range "8.16" "9.0") - (isGe "2.0.0") + (range "2.0.0" "2.4.0") + ]; + out = "1.0.3"; + } + { + cases = [ + (range "8.16" "9.0") + (range "2.0.0" "2.3.0") ]; out = "1.0.2"; } @@ -45,6 +52,7 @@ mkCoqDerivation { } ] null; + release."1.0.3".sha256 = "sha256-5lpOCDyH6NFzGLvnXHHAnR7Qv5oXsUyC8TLBFrIiBag="; release."1.0.2".sha256 = "sha256-U20xgA+e9KTRdvILD1cxN6ia+dlA8uBTIbc4QlKz9ss="; release."1.0.1".sha256 = "sha256-utNjFCAqC5xOuhdyKhfMZkRYJD0xv9Gt6U3ZdQ56mek="; release."1.0.0".sha256 = "sha256:0r459r0makshzwlygw6kd4lpvdjc43b3x5y9aa8x77f2z5gymjq1"; diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index b9cc26880506..963fd6e2b6d2 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -34,6 +34,10 @@ let inherit (lib.versions) range; in lib.switch coq.coq-version [ + { + case = range "8.20" "9.0"; + out = "2.4.0"; + } { case = range "8.19" "9.0"; out = "2.3.0"; @@ -108,6 +112,7 @@ let } ] null; release = { + "2.4.0".sha256 = "sha256-A1XgLLwZRvKS8QyceCkSQa7ue6TYyf5fMft5gSx9NOs="; "2.3.0".sha256 = "sha256-wa6OBig8rhAT4iwupSylyCAMhO69rADa0MQIX5zzL+Q="; "2.2.0".sha256 = "sha256-SPyWSI5kIP5w7VpgnQ4vnK56yEuWnJylNQOT7M77yoQ="; "2.1.0".sha256 = "sha256-XDLx0BIkVRkSJ4sGCIE51j3rtkSGemNTs/cdVmTvxqo="; diff --git a/pkgs/development/coq-modules/multinomials/default.nix b/pkgs/development/coq-modules/multinomials/default.nix index 1817d4011199..93dcf55a6ab2 100644 --- a/pkgs/development/coq-modules/multinomials/default.nix +++ b/pkgs/development/coq-modules/multinomials/default.nix @@ -24,10 +24,17 @@ mkCoqDerivation { lib.switch [ coq.version mathcomp.version ] [ + { + cases = [ + (range "8.18" "9.0") + (range "2.1.0" "2.4.0") + ]; + out = "2.4.0"; + } { cases = [ (range "8.17" "9.0") - (isGe "2.1.0") + (range "2.1.0" "2.3.0") ]; out = "2.3.0"; } @@ -111,6 +118,7 @@ mkCoqDerivation { ] null; release = { + "2.4.0".sha256 = "sha256-7zfIddRH+Sl4nhEPtS/lMZwRUZI45AVFpcC/UC8Z0Yo="; "2.3.0".sha256 = "sha256-usIcxHOAuN+f/j3WjVbPrjz8Hl9ac8R6kYeAKi3CEts="; "2.2.0".sha256 = "sha256-Cie6paweITwPZy6ej9+qIvHFWknVR382uJPW927t/fo="; "2.1.0".sha256 = "sha256-QT91SBJ6DXhyg4j/okTvPP6yj2DnnPbnSlJ/p8pvZbY="; diff --git a/pkgs/development/coq-modules/odd-order/default.nix b/pkgs/development/coq-modules/odd-order/default.nix index 26688b4cba6c..504b05508760 100644 --- a/pkgs/development/coq-modules/odd-order/default.nix +++ b/pkgs/development/coq-modules/odd-order/default.nix @@ -9,6 +9,7 @@ mkCoqDerivation { pname = "odd-order"; owner = "math-comp"; + release."2.2.0".sha256 = "sha256-z0C7+wtY8NpoT8wYqHiy8mB2HPYAeJndzDmf7Bb0mg8="; release."2.1.0".sha256 = "sha256-TPlaQbO0yXEpUgy3rlCx/w1MSLECJk5tdU26fAGe48Q="; release."1.14.0".sha256 = "0iln70npkvixqyz469l6nry545a15jlaix532i1l7pzfkqqn6v68"; release."1.13.0".sha256 = "sha256-EzNKR/JzM8T17sMhPhgZNs14e50X4dY3OwFi133IsT0="; @@ -19,6 +20,10 @@ mkCoqDerivation { defaultVersion = with lib.versions; lib.switch mathcomp.character.version [ + { + case = (range "2.2.0" "2.4.0"); + out = "2.2.0"; + } { case = (range "2.1.0" "2.3.0"); out = "2.1.0"; diff --git a/pkgs/development/coq-modules/reglang/default.nix b/pkgs/development/coq-modules/reglang/default.nix index fdb9ed07774b..cb00b6f48991 100644 --- a/pkgs/development/coq-modules/reglang/default.nix +++ b/pkgs/development/coq-modules/reglang/default.nix @@ -12,6 +12,7 @@ mkCoqDerivation { releaseRev = v: "v${v}"; + release."1.2.2".sha256 = "sha256-js1JaLSpYbxfiAfh8XvGsnJpx5DV13heouUm3oeBfNg="; release."1.2.1".sha256 = "sha256-giCRK8wzpVVzXAkFAieQDWqSsP7upSJSUUHkwG4QqO4="; release."1.2.0".sha256 = "sha256-gSqQ7D2HLwM4oYopTWkMFYfYXxsH/7VxI3AyrLwNf3o="; release."1.1.3".sha256 = "sha256-kaselYm8K0JBsTlcI6K24m8qpv8CZ9+VNDJrOtFaExg="; @@ -26,7 +27,14 @@ mkCoqDerivation { { cases = [ (range "8.16" "9.0") - (isGe "2.0.0") + (range "2.0.0" "2.4.0") + ]; + out = "1.2.2"; + } + { + cases = [ + (range "8.16" "9.0") + (range "2.0.0" "2.3.0") ]; out = "1.2.1"; } diff --git a/pkgs/development/coq-modules/ssprove/default.nix b/pkgs/development/coq-modules/ssprove/default.nix index c3db4a8be0e5..b1a26558a0bd 100644 --- a/pkgs/development/coq-modules/ssprove/default.nix +++ b/pkgs/development/coq-modules/ssprove/default.nix @@ -9,6 +9,7 @@ mathcomp-experimental-reals, extructures, deriving, + mathcomp-word, }: (mkCoqDerivation { @@ -21,10 +22,17 @@ lib.switch [ coq.coq-version mathcomp-boot.version ] [ + { + cases = [ + (range "8.18" "9.0") + (range "2.3.0" "2.4.0") + ]; + out = "0.2.4"; + } { cases = [ (range "8.18" "8.20") - "2.3.0" + (range "2.3.0" "2.3.0") ]; out = "0.2.3"; } @@ -54,6 +62,7 @@ releaseRev = v: "v${v}"; + release."0.2.4".sha256 = "sha256-uglr47aDgSkKi2JyVyN+2BrokZISZUAE8OUylGjy7ds="; release."0.2.3".sha256 = "sha256-Y3dmNIF36IuIgrVILteofOv8e5awKfq93S4YN7enswI="; release."0.2.2".sha256 = "sha256-tBF8equJd6hKZojpe+v9h6Tg9xEnMTVFgOYK7ZnMfxk="; release."0.2.1".sha256 = "sha256-X00q5QFxdcGWeNqOV/PLTOqQyyfqFEinbGUTO7q8bC4="; @@ -67,6 +76,7 @@ mathcomp-experimental-reals extructures deriving + mathcomp-word ]; meta = with lib; { diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 81052105ae98..9f71bf60a545 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.153"; + version = "9.2.154"; pyproject = true; disabled = pythonOlder "3.11"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "angr"; repo = "ailment"; tag = "v${version}"; - hash = "sha256-CigfIFKoZu/mggPMLr5FTRvWqZ6ikP8701hDgck2I3o="; + hash = "sha256-JjS+jYWrbErkb6uM0DtB5h2ht6ZMmiYOQL/Emm6wC5U="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index ab6928dca909..170e8a92b48e 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.153"; + version = "9.2.154"; pyproject = true; disabled = pythonOlder "3.11"; @@ -47,7 +47,7 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; tag = "v${version}"; - hash = "sha256-j/VcfsRrw8Et92olT5aKkpkaEZ7YksBCokQBziAKLvI="; + hash = "sha256-aOgZXHk6GTWZAEraZQahEXUYs8LWAWv1n9GfX+2XTPU="; }; pythonRelaxDeps = [ "capstone" ]; diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 85d55cc13c75..765aff9a1a05 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.153"; + version = "9.2.154"; pyproject = true; disabled = pythonOlder "3.12"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "angr"; repo = "archinfo"; tag = "v${version}"; - hash = "sha256-FIr/A8dihHa2T+SQ4b+8Yk9h8ToCEkGGEMbzS/re5ao="; + hash = "sha256-Vks7Rjd8x2zeHnJPs0laH56S4b8pnR1cK82SpK+XOgE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 917803f20c4c..e68e7d869d60 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.153"; + version = "9.2.154"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; tag = "v${version}"; - hash = "sha256-M3rUBZBA8WbvLU0VJb9H2pQU2PePBhqkpM6OsS20Uj4="; + hash = "sha256-90JX+VDWK/yKhuX6D8hbLxjIOS8vGKrN1PKR8iWjt2o="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 8906d5da75ac..682232b5bf1a 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -17,14 +17,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.153"; + version = "9.2.154"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; rev = "refs/tags/v${version}"; - hash = "sha256-KvCYnvyFjQdGeNe89ylTDkYrs7RhSeT5RcTRvg9BsQE="; + hash = "sha256-XXJBySIT3ylK1nd3suP2bq4bVSVah/1XhOmkEONbCoY="; }; in buildPythonPackage rec { @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-MHQZfRmtq3kueJWOGX06B7W3LLyLReuUcb0D1dy7DMQ="; + hash = "sha256-rWbZzm5hWi/C+te8zeQChxqYHO0S795tJ6Znocq9TTs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/connected-components-3d/default.nix b/pkgs/development/python-modules/connected-components-3d/default.nix new file mode 100644 index 000000000000..07097becde00 --- /dev/null +++ b/pkgs/development/python-modules/connected-components-3d/default.nix @@ -0,0 +1,61 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + cython, + numpy, + pbr, + fastremap, + pytestCheckHook, + scipy, +}: + +buildPythonPackage rec { + pname = "connected-components-3d"; + version = "3.22.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "seung-lab"; + repo = "connected-components-3d"; + tag = version; + hash = "sha256-txgQY9k96hFKLrKVLE6ldPdNbSnKOk2FIMrHkRQXlPk="; + }; + + build-system = [ + cython + numpy + pbr + setuptools + ]; + + dependencies = [ numpy ]; + + optional-dependencies = { + stack = [ + # crackle-codec # not in nixpkgs + fastremap + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + scipy + ] ++ optional-dependencies.stack; + + disabledTests = [ + # requires optional dependency crackle-codec (not in nixpkgs) + "test_connected_components_stack" + ]; + + pythonImportsCheck = [ "cc3d" ]; + + meta = { + description = "Connected components on discrete and continuous multilabel 3D & 2D images"; + homepage = "https://github.com/seung-lab/connected-components-3d"; + changelog = "https://github.com/seung-lab/connected-components-3d/releases/tag/${version}"; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix index 8219db84dc34..d580a343dcd3 100644 --- a/pkgs/development/python-modules/cyclopts/default.nix +++ b/pkgs/development/python-modules/cyclopts/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, docstring-parser, fetchFromGitHub, - importlib-metadata, poetry-core, poetry-dynamic-versioning, pydantic, @@ -12,23 +11,23 @@ pytestCheckHook, pythonOlder, pyyaml, - rich, rich-rst, - typing-extensions, + rich, + trio, }: buildPythonPackage rec { pname = "cyclopts"; - version = "3.14.2"; + version = "3.16.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.12"; src = fetchFromGitHub { owner = "BrianPugh"; repo = "cyclopts"; tag = "v${version}"; - hash = "sha256-vQTODRlHktmA+mf9Yy8ab8H+HVlQjK8MZ4XpjLHbozs="; + hash = "sha256-5njodmW28F1l9CO/FymNBh4wEsNNtJl74yBSucAH1EI="; }; build-system = [ @@ -39,18 +38,21 @@ buildPythonPackage rec { dependencies = [ attrs docstring-parser - importlib-metadata rich rich-rst - typing-extensions ]; + optional-dependencies = { + trio = [ trio ]; + yaml = [ pyyaml ]; + }; + nativeCheckInputs = [ pydantic pytest-mock pytestCheckHook pyyaml - ]; + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "cyclopts" ]; diff --git a/pkgs/development/python-modules/easyenergy/default.nix b/pkgs/development/python-modules/easyenergy/default.nix index 9800a9a7d9d7..86a6c19739eb 100644 --- a/pkgs/development/python-modules/easyenergy/default.nix +++ b/pkgs/development/python-modules/easyenergy/default.nix @@ -6,15 +6,17 @@ fetchFromGitHub, poetry-core, pytest-asyncio, + pytest-cov-stub, pytest-freezer, pytestCheckHook, pythonOlder, + syrupy, yarl, }: buildPythonPackage rec { pname = "easyenergy"; - version = "2.1.2"; + version = "2.2.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,13 +25,12 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-easyenergy"; tag = "v${version}"; - hash = "sha256-tWKfcGznxck8VLK3YshOIbPet2CEbUZbT8JzgaAhAso="; + hash = "sha256-AFEygSSHr7YJK4Yx4dvBVGR3wBswAeUNrC/7NndzfBg="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace '"0.0.0"' '"${version}"' \ - --replace 'addopts = "--cov"' "" + --replace '"0.0.0"' '"${version}"' ''; nativeBuildInputs = [ poetry-core ]; @@ -42,8 +43,10 @@ buildPythonPackage rec { nativeCheckInputs = [ aresponses pytest-asyncio + pytest-cov-stub pytest-freezer pytestCheckHook + syrupy ]; pythonImportsCheck = [ "easyenergy" ]; @@ -66,8 +69,8 @@ buildPythonPackage rec { meta = with lib; { description = "Module for getting energy/gas prices from easyEnergy"; homepage = "https://github.com/klaasnicolaas/python-easyenergy"; - changelog = "https://github.com/klaasnicolaas/python-easyenergy/releases/tag/v${version}"; - license = with licenses; [ mit ]; + changelog = "https://github.com/klaasnicolaas/python-easyenergy/releases/tag/${src.tag}"; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/fastremap/default.nix b/pkgs/development/python-modules/fastremap/default.nix new file mode 100644 index 000000000000..0e2fd9cfbefd --- /dev/null +++ b/pkgs/development/python-modules/fastremap/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + cython, + numpy, + pbr, + setuptools, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "fastremap"; + version = "1.15.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "seung-lab"; + repo = "fastremap"; + tag = version; + hash = "sha256-naDagGD0VNRjoJ1+gkgLm3QbrnE9hD85ULz91xAfKa4="; + }; + + build-system = [ + cython + numpy + pbr + setuptools + ]; + + dependencies = [ + numpy + ]; + + env.PBR_VERSION = version; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "fastremap" + ]; + + meta = { + description = "Remap, mask, renumber, unique, and in-place transposition of 3D labeled images and point clouds"; + homepage = "https://github.com/seung-lab/fastremap"; + changelog = "https://github.com/seung-lab/fastremap/releases/tag/${version}"; + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 5be98a23ea4e..3941658f9b98 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.71"; + version = "0.72"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "vacanza"; repo = "python-holidays"; tag = "v${version}"; - hash = "sha256-umfwSIi9Vu3fDvSVbq3cbQZ83q925VwxVPHedzrcqag="; + hash = "sha256-WkmB0jzNai7iCpSAJBzeRhtTDa+E74K8ebMiPIImXS0="; }; build-system = [ diff --git a/pkgs/development/python-modules/i-pi/default.nix b/pkgs/development/python-modules/i-pi/default.nix index f76239735798..325dfebbbd41 100644 --- a/pkgs/development/python-modules/i-pi/default.nix +++ b/pkgs/development/python-modules/i-pi/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "i-pi"; - version = "3.1.2"; + version = "3.1.4"; pyproject = true; src = fetchFromGitHub { owner = "i-pi"; repo = "i-pi"; tag = "v${version}"; - hash = "sha256-OZuPJgcLyxZ+z3U3vraTq4MwgyMkBOHVJxB/y3qd7qw="; + hash = "sha256-qM1DQNHTliYGWtVeYo0KEAg88cdt9GPB9w0pep0erj8="; }; build-system = [ diff --git a/pkgs/development/python-modules/imagecodecs/default.nix b/pkgs/development/python-modules/imagecodecs/default.nix new file mode 100644 index 000000000000..30dfe4dc7de7 --- /dev/null +++ b/pkgs/development/python-modules/imagecodecs/default.nix @@ -0,0 +1,90 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + cython, + numpy, + setuptools, + pkgs, + jxrlib, + lcms2, + lerc, + libdeflate, + libpng, + libtiff, + libwebp, + openjpeg, + xz, + zlib, + zstd, + pytest, +}: + +let + version = "2025.3.30"; +in +buildPythonPackage { + pname = "imagecodecs"; + inherit version; + pyproject = true; + + src = fetchFromGitHub { + owner = "cgohlke"; + repo = "imagecodecs"; + tag = "v${version}"; + hash = "sha256-KtrQNABQOr3mNiWOfaZBcFceSCixPGV8Hte2uPKn1+k="; + }; + + build-system = [ + cython + numpy + setuptools + ]; + + nativeBuildInputs = [ + pkgs.lz4.dev # lz4 was hidden by python3Packages.lz4 + lcms2.dev + openjpeg.dev + ]; + + buildInputs = [ + pkgs.lz4 + jxrlib + lcms2 + lerc + libdeflate + libpng + libtiff + libwebp + openjpeg + xz # liblzma + zlib + zstd + ]; + + dependencies = [ + numpy + ]; + + prePatch = '' + substituteInPlace setup.py \ + --replace-fail "/usr/include/openjpeg" "${openjpeg.dev}/include/openjpeg" \ + --replace-fail "/usr/include/jxrlib" "${jxrlib}/include/jxrlib" + ''; + + nativeCheckInputs = [ + pytest + ]; + + pythonImportsCheck = [ + "imagecodecs" + ]; + + meta = { + description = "Image transformation, compression, and decompression codecs"; + homepage = "https://github.com/cgohlke/imagecodecs"; + changelog = "https://github.com/cgohlke/imagecodecs/blob/v${version}/CHANGES.rst"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ yzx9 ]; + }; +} diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix index 51b1a8171551..b13e862d8b5f 100644 --- a/pkgs/development/python-modules/internetarchive/default.nix +++ b/pkgs/development/python-modules/internetarchive/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "internetarchive"; - version = "5.3.0"; + version = "5.4.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "jjjake"; repo = "internetarchive"; tag = "v${version}"; - hash = "sha256-1DJ4ZPL1Px1BKP9RHY/evoIwLzxG0aQNq9gteBi4RZs="; + hash = "sha256-2IL4VUt958atKDqCmj6rZ9I74tBRsA42EF1F1YT433E="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix index cc36014395a7..4f9f2087118d 100644 --- a/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "json-schema-for-humans"; - version = "1.3.4"; + version = "1.4.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "coveooss"; repo = "json-schema-for-humans"; tag = "v${version}"; - hash = "sha256-+IvLFejEcu477BNY8F0h4WLqe18f6i2+gXyx/mRHzpI="; + hash = "sha256-TmHqKf4/zzw3kImyYvnXsYJB7sL6RRs3vGCl8+Y+4BQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/modbus-tk/default.nix b/pkgs/development/python-modules/modbus-tk/default.nix index d56deb1ff34d..b02aa6a0c9c0 100644 --- a/pkgs/development/python-modules/modbus-tk/default.nix +++ b/pkgs/development/python-modules/modbus-tk/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "modbus-tk"; - version = "1.1.4"; + version = "1.1.5"; pyproject = true; disabled = pythonOlder "3.10"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "modbus_tk"; inherit version; - hash = "sha256-aJd3ZusQRplz3VaigUvZgbhd0YC3kEMkh4bYgAjyWTs="; + hash = "sha256-d6cqOtnV0yodIRC8BCFmgMpX11IpEuDycem/XxtwGzY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/model-checker/default.nix b/pkgs/development/python-modules/model-checker/default.nix index 42766f8771f2..63e48787ae25 100644 --- a/pkgs/development/python-modules/model-checker/default.nix +++ b/pkgs/development/python-modules/model-checker/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "model-checker"; - version = "0.9.19"; + version = "0.9.20"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "model_checker"; inherit version; - hash = "sha256-OzK2TqEXujCdpOyS2qo5L8PAv8cfLLbiItD+OkzlyyI="; + hash = "sha256-n5wLf5iZ+pMXpXAy1K+SVC1fszCi0lr9LsqqEn8KU0w="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index ef50eaf7876e..647729d3bcdd 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "oci"; - version = "2.142.0"; + version = "2.151.0"; pyproject = true; src = fetchFromGitHub { owner = "oracle"; repo = "oci-python-sdk"; tag = "v${version}"; - hash = "sha256-QZJjUgu2FSL1+fDuSD74mV1t7Y4PyMRJ1TsXrgOmvDU="; + hash = "sha256-8nAe7r62ItTyjFi32r3b3ikAg6/vw9huO7204sUVmuI="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/oras/default.nix b/pkgs/development/python-modules/oras/default.nix index d3ad961a3c10..1834e02ce343 100644 --- a/pkgs/development/python-modules/oras/default.nix +++ b/pkgs/development/python-modules/oras/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "oras"; - version = "0.2.29"; + version = "0.2.31"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "oras-project"; repo = "oras-py"; tag = version; - hash = "sha256-+31DTtUie+Ve5H3jx/8AFzJ5YHPQzOKN3+fq2ujtj28="; + hash = "sha256-8dew0GtVYFHwm/M4yIkJqqVaC1PURn5Pn3fPf7vWQzk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/proxmoxer/default.nix b/pkgs/development/python-modules/proxmoxer/default.nix index 957d3ce1aab3..2b3abbe28352 100644 --- a/pkgs/development/python-modules/proxmoxer/default.nix +++ b/pkgs/development/python-modules/proxmoxer/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "proxmoxer"; - version = "2.2.0"; + version = "2.2.0-unstable-2025-02-18"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "proxmoxer"; repo = "proxmoxer"; - tag = version; - hash = "sha256-56PccWOZiYLPSaJrFfOqP9kTuHqqhgiF1DpnNgFSabI="; + rev = "cf1bcde696537c74ef00d8e71fb86735fb4c2c79"; + hash = "sha256-h5Sla7/4XiZSGwKstyiqs/T2Qgi13jI9YMVPqDcF3sA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pynmeagps/default.nix b/pkgs/development/python-modules/pynmeagps/default.nix index feb2c7c95879..4a2456811c4c 100644 --- a/pkgs/development/python-modules/pynmeagps/default.nix +++ b/pkgs/development/python-modules/pynmeagps/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pynmeagps"; - version = "1.0.49"; + version = "1.0.50"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "semuconsulting"; repo = "pynmeagps"; tag = "v${version}"; - hash = "sha256-ePqXJ29x+IF/K+Dz7BiLOdiaMx43yVriY8RFBDVlCB0="; + hash = "sha256-ApZoltkqbbBVqbVouLNJj80FlQhAJIf2qCiGLgwrZbk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index dd4c108edb80..f7a50e0a3e5a 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.153"; + version = "9.2.154"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-K0m8FFWIQP9qoKX6a5Wr+ZAB6+M8DDlEtPRJBHhS24M="; + hash = "sha256-a3ei2w66v18QKAofpPvDUoM42zHRHPrNQic+FE+rLKY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/sdflit/default.nix b/pkgs/development/python-modules/sdflit/default.nix new file mode 100644 index 000000000000..fbb48e9bb131 --- /dev/null +++ b/pkgs/development/python-modules/sdflit/default.nix @@ -0,0 +1,47 @@ +{ + lib, + fetchFromGitHub, + buildPythonPackage, + cargo, + rustPlatform, + rustc, +}: + +let + version = "0.2.6"; + + src = fetchFromGitHub { + owner = "yzx9"; + repo = "sdflit"; + tag = "v${version}"; + hash = "sha256-Ze3J5Dp+TskhIiGP6kMK3AIHLnhVBuEaKJokccIr+SM="; + }; +in +buildPythonPackage { + pname = "sdflit"; + inherit version src; + pyproject = true; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit src; + hash = "sha256-CrMe5DuO9sQZZ50Hy+av4nF4gbOe296zSWJfJ8th7zs="; + }; + + build-system = [ + cargo + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + rustc + ]; + + pythonImportsCheck = [ + "sdflit" + ]; + + meta = { + description = "Fast and Robust Signed Distance Function Library"; + homepage = "https://github.com/yzx9/sdflit"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ yzx9 ]; + }; +} diff --git a/pkgs/development/python-modules/swcgeom/default.nix b/pkgs/development/python-modules/swcgeom/default.nix new file mode 100644 index 000000000000..7de34846241a --- /dev/null +++ b/pkgs/development/python-modules/swcgeom/default.nix @@ -0,0 +1,90 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + cython, + numpy, + setuptools, + wheel, + imagecodecs, + matplotlib, + pandas, + pynrrd, + scipy, + sdflit, + seaborn, + tifffile, + tqdm, + typing-extensions, + beautifulsoup4, + certifi, + chardet, + lmdb, + requests, + urllib3, + pytest, +}: + +let + version = "0.19.3"; +in +buildPythonPackage { + pname = "swcgeom"; + inherit version; + pyproject = true; + + src = fetchFromGitHub { + owner = "yzx9"; + repo = "swcgeom"; + tag = "v${version}"; + hash = "sha256-mpp8Dw0XcU59fYt7vjswAnXCmrRP3mhbgTDG+J4UwzI="; + }; + + build-system = [ + cython + numpy + setuptools + wheel + ]; + + dependencies = [ + imagecodecs + matplotlib + numpy + pandas + pynrrd + scipy + sdflit + seaborn + tifffile + tqdm + typing-extensions + ]; + + optional-dependencies = { + all = [ + beautifulsoup4 + certifi + chardet + lmdb + requests + urllib3 + ]; + }; + + nativeCheckInputs = [ + pytest + ]; + + pythonImportsCheck = [ + "swcgeom" + ]; + + meta = { + description = "Neuron geometry library for swc format"; + homepage = "https://github.com/yzx9/swcgeom"; + changelog = "https://github.com/yzx9/swcgeom/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ yzx9 ]; + }; +} diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix index 7eed932da6eb..f7a3a6ed4a96 100644 --- a/pkgs/development/python-modules/types-awscrt/default.nix +++ b/pkgs/development/python-modules/types-awscrt/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "types-awscrt"; - version = "0.26.1"; + version = "0.27.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_awscrt"; inherit version; - hash = "sha256-rKlviJs3RcDnT0Lwjyd/7Tv26bqiz5sGo29413cg5QQ="; + hash = "sha256-PCvuUu5FAi2q9PEG1dG18P8Kjj5gk92mX1MVt2abxBg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix index 20cceb5b5d1c..a9ba7efe7ae5 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -18,8 +18,8 @@ let in buildNodejs { inherit enableNpm; - version = "20.19.0"; - sha256 = "5ac2516fc905b6a0bc1a33e7302937eac664a820b887cc86bd48c035fba392d7"; + version = "20.19.1"; + sha256 = "5587b23e907d0c7af2ea8a8deb33ec50010453b46dbb3df5987c5678eee5ed51"; patches = [ ./configure-emulator.patch ./configure-armv6-vfpv2.patch diff --git a/pkgs/development/web/nodejs/v24.nix b/pkgs/development/web/nodejs/v24.nix index 85e78b3b3c77..7d65f2d10c94 100644 --- a/pkgs/development/web/nodejs/v24.nix +++ b/pkgs/development/web/nodejs/v24.nix @@ -17,8 +17,8 @@ let in buildNodejs { inherit enableNpm; - version = "24.0.0"; - sha256 = "914f3f1b03f84a0994d7357f190ff13c038800c693b6c06da2290eb588c82761"; + version = "24.0.1"; + sha256 = "70271026971808409a7ed6444360d5fe3ef4146c1ca53f2ca290c60d214be84e"; patches = ( if (stdenv.hostPlatform.emulatorAvailable buildPackages) then diff --git a/pkgs/kde/frameworks/kguiaddons/default.nix b/pkgs/kde/frameworks/kguiaddons/default.nix index e4cf58bbb36f..7e664e9f70ad 100644 --- a/pkgs/kde/frameworks/kguiaddons/default.nix +++ b/pkgs/kde/frameworks/kguiaddons/default.nix @@ -2,11 +2,15 @@ mkKdeDerivation, qtwayland, pkg-config, + wayland-protocols, }: mkKdeDerivation { pname = "kguiaddons"; extraNativeBuildInputs = [ pkg-config ]; - extraBuildInputs = [ qtwayland ]; + extraBuildInputs = [ + qtwayland + wayland-protocols + ]; meta.mainProgram = "kde-geo-uri-handler"; } diff --git a/pkgs/kde/frameworks/kwallet/default.nix b/pkgs/kde/frameworks/kwallet/default.nix index bc478ed582cc..3ba43cd40e3e 100644 --- a/pkgs/kde/frameworks/kwallet/default.nix +++ b/pkgs/kde/frameworks/kwallet/default.nix @@ -1,13 +1,20 @@ { mkKdeDerivation, + pkg-config, libgcrypt, + libsecret, kdoctools, }: mkKdeDerivation { pname = "kwallet"; + extraNativeBuildInputs = [ + pkg-config + ]; + extraBuildInputs = [ libgcrypt + libsecret kdoctools ]; } diff --git a/pkgs/kde/generated/sources/frameworks.json b/pkgs/kde/generated/sources/frameworks.json index 7cc16f3efb7a..4201331259ff 100644 --- a/pkgs/kde/generated/sources/frameworks.json +++ b/pkgs/kde/generated/sources/frameworks.json @@ -1,362 +1,362 @@ { "attica": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/attica-6.13.0.tar.xz", - "hash": "sha256-rMy3/2Lh5CH6pf/TgbQXd9DHv7omj64e2AK1GmvZioc=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/attica-6.14.0.tar.xz", + "hash": "sha256-fDVWr+sK4OkywuTTCd9JBfPi9Brz47OAUbSdnyeTV8E=" }, "baloo": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/baloo-6.13.0.tar.xz", - "hash": "sha256-W0V02aSggL3JdekxvUEac4agwX/w1cV1HdJskgEBM/g=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/baloo-6.14.0.tar.xz", + "hash": "sha256-q2D5Q2B/Z5KbYZwClJjwf6h2euxqf7Auz3OSztJXNLQ=" }, "bluez-qt": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/bluez-qt-6.13.0.tar.xz", - "hash": "sha256-GpmVSgqtcNMOe2DoC2czJTR0PsRVbr2yem9AtvEUkUI=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/bluez-qt-6.14.0.tar.xz", + "hash": "sha256-6oRfkw7MfE8lnEeK5mgMeTldyyWY7j9bRbztbfJ3+dU=" }, "breeze-icons": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/breeze-icons-6.13.0.tar.xz", - "hash": "sha256-dtoFRILAuX4K5ouUqsqRmMUAKI3teLNL2ws8uIxHO10=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/breeze-icons-6.14.0.tar.xz", + "hash": "sha256-zfnLZ86dbrmWnsMkzpJVbK8alPEncMVs8MWI3CxoHS8=" }, "extra-cmake-modules": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/extra-cmake-modules-6.13.0.tar.xz", - "hash": "sha256-cAYBfADIF/9MBWmVFG0nF5HRSHo5jTnqbKwc1ZqL9AI=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/extra-cmake-modules-6.14.0.tar.xz", + "hash": "sha256-0Cy7syabOWgIhKv28Uumj0SFcMVUFz9SSdo7h2F4TBM=" }, "frameworkintegration": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/frameworkintegration-6.13.0.tar.xz", - "hash": "sha256-GCuRHJoI3piQwkJ+ihz8ICtK4FrqN8bZOaRJv6mH8x8=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/frameworkintegration-6.14.0.tar.xz", + "hash": "sha256-6iY3It5LN8h0KnCrBX2gYuW3HQ4I6YZFaj3ETiDwA7c=" }, "kapidox": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kapidox-6.13.0.tar.xz", - "hash": "sha256-820HphMbOUf0yMX4XapiDpI2sF/R5kpe7Hrxo5LLNjE=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kapidox-6.14.0.tar.xz", + "hash": "sha256-zXuXa5jR5sbMPaHSDFOVM+DRrnYl5j4UvHx4EJapFUY=" }, "karchive": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/karchive-6.13.0.tar.xz", - "hash": "sha256-PJtdzzq9/idh4hU9cNnWZ/H/D9L2yArdunVJ2pVPzJA=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/karchive-6.14.0.tar.xz", + "hash": "sha256-LLL1TLn4Ey2vaIpdSs1/S+xAIDsBVR/wbm2h6fh/Dvk=" }, "kauth": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kauth-6.13.0.tar.xz", - "hash": "sha256-ozvweCjYjPSZyL/nF/Avfiidz09YuPOq6eL5VhWo2NY=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kauth-6.14.0.tar.xz", + "hash": "sha256-9aFuSJ8mtXQdPxG/ayA/2ZqE7KrnmOtrDqoNcciPZkU=" }, "kbookmarks": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kbookmarks-6.13.0.tar.xz", - "hash": "sha256-ax1T1I46jS2vgzXxBcM4n5lwi+Rv98wC3uXVkOZtstI=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kbookmarks-6.14.0.tar.xz", + "hash": "sha256-o/CmH8/MplCfHX0hKJ4yd2YW58rd7AfLnhyoHi946kM=" }, "kcalendarcore": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kcalendarcore-6.13.0.tar.xz", - "hash": "sha256-4VBKhR85+/m+rAXWIspG671unysRBuccXUu/fKf6H0E=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kcalendarcore-6.14.0.tar.xz", + "hash": "sha256-cCv8Lt/O1NCQM2VldDT9jC3AuPZtDOluTqC2lQ74eYs=" }, "kcmutils": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kcmutils-6.13.0.tar.xz", - "hash": "sha256-EfAyO4250hUXlirw/7vvW6P5PA8RmIHe0IvpQA3BXI8=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kcmutils-6.14.0.tar.xz", + "hash": "sha256-IzbwXuRmaN4r5wwwFmDJ06iBxABG75DRIF5AgmC0YAU=" }, "kcodecs": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kcodecs-6.13.0.tar.xz", - "hash": "sha256-3d3gXZcNAmrmorMeNVlTIQf03mDybX2HpFczF24SIII=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kcodecs-6.14.0.tar.xz", + "hash": "sha256-AI9ZEhYtOUSYAi0OlVyGDHfDOGfo+kSOmUSPOjZNaRQ=" }, "kcolorscheme": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kcolorscheme-6.13.0.tar.xz", - "hash": "sha256-irilZ724uD9kgkrT1EkHfsuS9zAkMU9V7qt3d9kSnt8=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kcolorscheme-6.14.0.tar.xz", + "hash": "sha256-YBswTdXML7Bl2OZYvbC4fh43AhAAz2pvWy7opb+69ck=" }, "kcompletion": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kcompletion-6.13.0.tar.xz", - "hash": "sha256-VVzqytv9kaBZ3t49nwapOThY/eoStVhBNa1BOaKnkQo=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kcompletion-6.14.0.tar.xz", + "hash": "sha256-065qmjZfE9Ha5AQLtMl86Gp0hlym7SH5CBEVmKITgTY=" }, "kconfig": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kconfig-6.13.0.tar.xz", - "hash": "sha256-LsZsmWKI30cvzDq6UFQOJm+2IY1g0456SkRdSxk/lEU=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kconfig-6.14.0.tar.xz", + "hash": "sha256-obJ+dit4+8NBJPNf1BJXEfQDauUyx50889xoMonB52U=" }, "kconfigwidgets": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kconfigwidgets-6.13.0.tar.xz", - "hash": "sha256-xd9V1zsRb+VmhjzDuQvU7f1cSYnxIez9jgwffI5ANlo=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kconfigwidgets-6.14.0.tar.xz", + "hash": "sha256-Av7maFktUrs5KU+ZmvZ3l9eXfj8cYbucd8CGcwWUMZ8=" }, "kcontacts": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kcontacts-6.13.0.tar.xz", - "hash": "sha256-w/OJ+eQfKq6+XGssb7wzkn9kQjyyTMJA9h6T28BXUG8=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kcontacts-6.14.0.tar.xz", + "hash": "sha256-ZP1vJpLcW+qbxyD1K/2yiAdx2C2yfhycD2GshG5QNyk=" }, "kcoreaddons": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kcoreaddons-6.13.0.tar.xz", - "hash": "sha256-oRC8MwPFQfusPi06qTwuslQTBV3iRjSmkDQhD23929s=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kcoreaddons-6.14.0.tar.xz", + "hash": "sha256-lVXRcpX0/s4YtG49KJBVuvWLNS4ILk2m5uNS2NXAQu4=" }, "kcrash": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kcrash-6.13.0.tar.xz", - "hash": "sha256-Ji4prbpEXT0AslBD5TwCPzKix93hFxHCpIPDU21XuV8=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kcrash-6.14.0.tar.xz", + "hash": "sha256-adc2vnO75Kk2+JlsNZGlPBaBbUOW0kLS5j3OB5omjDQ=" }, "kdav": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kdav-6.13.0.tar.xz", - "hash": "sha256-12fo9RWNf0wfWI8XKGF3FFiA2Az7LiFfVUpsgg+GsNk=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kdav-6.14.0.tar.xz", + "hash": "sha256-qSuV+wYSx5xYdOeoX0g2nDoA0sHS2Ux3ZWIpyUXnfCo=" }, "kdbusaddons": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kdbusaddons-6.13.0.tar.xz", - "hash": "sha256-my8WBFo4sNsU0ZRqPfVSrtRe2smB5b/2n8l1Kryxf54=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kdbusaddons-6.14.0.tar.xz", + "hash": "sha256-9nPJ8pXfWZiUje+UyvktSH1jiGRSgC/7l60VExVifuQ=" }, "kdeclarative": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kdeclarative-6.13.0.tar.xz", - "hash": "sha256-6CjjYz2PBv69a7HK9dyYMhjofJ+1qxJZQptnb5awoyg=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kdeclarative-6.14.0.tar.xz", + "hash": "sha256-7QqmJlP+Wgm8RPWE+qpjPLOG96EGz5tckwEirobAodA=" }, "kded": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kded-6.13.0.tar.xz", - "hash": "sha256-cHWkLQcMQksIODzrAedms0lXvjfP201xNs29+ECTH7g=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kded-6.14.0.tar.xz", + "hash": "sha256-WfGuyUvQF266i//TWmrVklttQHAuJu4Wl6RrOkYX0co=" }, "kdesu": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kdesu-6.13.0.tar.xz", - "hash": "sha256-a+keshkSuyUh9OTxkmdjnDvtM6td0J958nni+Uw4CmI=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kdesu-6.14.0.tar.xz", + "hash": "sha256-EDoGMRwDVEX9WISEXFc2nwcikjn5u+vpHMlbfOjFyiM=" }, "kdnssd": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kdnssd-6.13.0.tar.xz", - "hash": "sha256-49Jd+qOIbf9IUeW4j2Uva8bo6HGHCL2AukmHUUGQfoI=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kdnssd-6.14.0.tar.xz", + "hash": "sha256-zpA5UrkIVmuZ1QpKVJgl6k75XXVEaGzczM9pO4EQYZk=" }, "kdoctools": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kdoctools-6.13.0.tar.xz", - "hash": "sha256-tcXAJdJpyDlHfz8mTAl68HTnPysHrRqGgzZ/OV0qyq0=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kdoctools-6.14.0.tar.xz", + "hash": "sha256-rLnHYejhDDDywyBh9kCWllRZoFEyUO30Qy9AgxoPU24=" }, "kfilemetadata": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kfilemetadata-6.13.0.tar.xz", - "hash": "sha256-CQ/NBVd815QOcHL8+IVfGn8Hb/Ca4zl7v6QGgd6kvp4=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kfilemetadata-6.14.0.tar.xz", + "hash": "sha256-klqdsnF2UZCZ0kYlBwv368FgD65+fQauTu4yeaZ9MeU=" }, "kglobalaccel": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kglobalaccel-6.13.0.tar.xz", - "hash": "sha256-mVTxaozyV/RWnP27ZKhCz1N/4vr2tPqP4Y9idE7+lrA=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kglobalaccel-6.14.0.tar.xz", + "hash": "sha256-56rKFrtMW1hlrz7UtI8jR8UWMGXRfCskvpd1L/Xoxx0=" }, "kguiaddons": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kguiaddons-6.13.0.tar.xz", - "hash": "sha256-koCg8E8puOT/q+PJQmIeLGCSvcADejq54LmeXqVohL8=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kguiaddons-6.14.0.tar.xz", + "hash": "sha256-PzzH43SL101Hako2FmVHhufYYfezkehJmuvHxBDyHsU=" }, "kholidays": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kholidays-6.13.0.tar.xz", - "hash": "sha256-N9Kur7LHaV923cCY0HZG639loDrufItf7Qq3xO8mR3U=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kholidays-6.14.0.tar.xz", + "hash": "sha256-bdZvy6r8jUUEWson4zTh9g32r9mgcLHzKZa6BJcncXc=" }, "ki18n": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/ki18n-6.13.0.tar.xz", - "hash": "sha256-AIwKMiNdwqfTqi+pqYpUDxtLr2q179FIOaEf2m50ahQ=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/ki18n-6.14.0.tar.xz", + "hash": "sha256-KlE1QSyvCgfrpO62CGesaSnfHIPBRa51emoSMPhC5mk=" }, "kiconthemes": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kiconthemes-6.13.0.tar.xz", - "hash": "sha256-oyeMXSnC/bDvXdcqDV+bWnXAcmYwJuHk/bsn9Rv6WqE=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kiconthemes-6.14.0.tar.xz", + "hash": "sha256-qYzSMb/KQgUZ1VsLiOTgibTifsebSoVCuB3opf+K9tU=" }, "kidletime": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kidletime-6.13.0.tar.xz", - "hash": "sha256-7hfT983VBzkODpupaJa33PqgCOOFqdtCMge8PuI25tw=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kidletime-6.14.0.tar.xz", + "hash": "sha256-FndbK9w+/VTGWpa85vJ6AB0RmQVTHYS7I+IyFaGW7Lg=" }, "kimageformats": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kimageformats-6.13.0.tar.xz", - "hash": "sha256-jKzpLcSc4krYZbMdG/suqy189VBUJmD50qFtvptH804=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kimageformats-6.14.0.tar.xz", + "hash": "sha256-Og+BviXpoOq33BNzvFZICryzBByhpajH8NbVLSIdVEk=" }, "kio": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kio-6.13.0.tar.xz", - "hash": "sha256-QxVS0LdA81fE233i4o3PDsKOK/sEGgQtpXCK4m7CogM=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kio-6.14.0.tar.xz", + "hash": "sha256-mwN0b9AIUEqW9Wnzetj/kCzHFJXn4SPao8beef8qzEU=" }, "kirigami": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kirigami-6.13.0.tar.xz", - "hash": "sha256-3Vqhtbj7xOtzEieFGvfKnKodyqwNyZQh29PQ1Y2Ygyk=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kirigami-6.14.0.tar.xz", + "hash": "sha256-Fixim6UOfa5EOe9QJyoMFQy6s3FBWn0esWDb42OPYZo=" }, "kitemmodels": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kitemmodels-6.13.0.tar.xz", - "hash": "sha256-QWxHkumRjE+Qnh2tj751UftWFwPALU4AAbNy3x+rWOY=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kitemmodels-6.14.0.tar.xz", + "hash": "sha256-HWlBgEZOH9leJCXYS7hGFX+tPCpQCXJ+zbZ2bZfbIug=" }, "kitemviews": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kitemviews-6.13.0.tar.xz", - "hash": "sha256-4N6Mn6K6onvear04R7bV9MtUrs6rNDbGT4mlD+HZaV0=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kitemviews-6.14.0.tar.xz", + "hash": "sha256-mXFnQC26p4ha4qqkz4tfQJ9X1QvOBqO1bFd+k6l1uko=" }, "kjobwidgets": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kjobwidgets-6.13.0.tar.xz", - "hash": "sha256-aPg4gSxDBCEsDSVhHEJRwnqHYIhbPbIt+pCTVcVzuJU=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kjobwidgets-6.14.0.tar.xz", + "hash": "sha256-jEcEKvrldEeUW0PMkdiX+jUyhiN6Y+NSlL5OtKRmKr0=" }, "knewstuff": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/knewstuff-6.13.0.tar.xz", - "hash": "sha256-M4hzzsoFk/A6dgcy5PjQ/RuwWfIbfe3N4T9eWUIm15g=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/knewstuff-6.14.0.tar.xz", + "hash": "sha256-HkS3HvxdxMsFzHrdNE2aVfyMmY3ibnSGfTAK+9FvjQQ=" }, "knotifications": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/knotifications-6.13.0.tar.xz", - "hash": "sha256-0rEvHUroD3ALyHQRLs7pmx5EQ4xJuyqKd860xwVp+d0=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/knotifications-6.14.0.tar.xz", + "hash": "sha256-p26V3nQSnhL1ALAfjOJSm8avk7df8szpnIJxKVI9dRc=" }, "knotifyconfig": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/knotifyconfig-6.13.0.tar.xz", - "hash": "sha256-q5s56/wd6C+Kq8OkQa/tcwICoz1ygoMI6tyBIy74ObQ=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/knotifyconfig-6.14.0.tar.xz", + "hash": "sha256-Bn66XJllqwXN0+ilfWr6Jeip53kF1NAaMnU2wR1Myos=" }, "kpackage": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kpackage-6.13.0.tar.xz", - "hash": "sha256-piJpSqcj15t7SYjLK8UfhdIPyq/uAg90HuUgU9yFZIo=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kpackage-6.14.0.tar.xz", + "hash": "sha256-+y4mD3ouK0z9pFWYgUhYmad89fvDuK4F0GREvsgu0as=" }, "kparts": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kparts-6.13.0.tar.xz", - "hash": "sha256-yNM2+rTTewlryfD/8tCm7yU5QFm8h/ypOwDqaynjPfQ=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kparts-6.14.0.tar.xz", + "hash": "sha256-lhBhAsTeuJMwfrNVgKikWqaEHtwDi5oP04qhnW4Fa/o=" }, "kpeople": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kpeople-6.13.0.tar.xz", - "hash": "sha256-OuwcoRHvIceScXCgDSDpcbWxlbGah98Yo65cuWh8+AQ=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kpeople-6.14.0.tar.xz", + "hash": "sha256-ydIRDa8uTVnVi0r2PFT9UXuw9GWRqRwgeJ/8cV7rYs4=" }, "kplotting": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kplotting-6.13.0.tar.xz", - "hash": "sha256-kYtW+dCsZ318Tr4/EknatcfUav2KKPlAdRZV+8STWRY=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kplotting-6.14.0.tar.xz", + "hash": "sha256-5rYxhPlzvw0SQCd539GHH3aFt5VONomORkCshrnJd6w=" }, "kpty": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kpty-6.13.0.tar.xz", - "hash": "sha256-r6j6jFeb0spLDMzGlCf5A1+n12zv4lhjnsF9lmqkNRM=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kpty-6.14.0.tar.xz", + "hash": "sha256-l54LsZzX2duEO/XfNRFUR+tJJjegmetTw0W4L8gL6mU=" }, "kquickcharts": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kquickcharts-6.13.0.tar.xz", - "hash": "sha256-vOB+laRg9EyxpRkalv2yLa/uaB8J2+0o/nUI4zIZ6gs=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kquickcharts-6.14.0.tar.xz", + "hash": "sha256-37M8kO7cfJUOBD+yrfbIot83ReedK7zV5ZV1dEj+mLc=" }, "krunner": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/krunner-6.13.0.tar.xz", - "hash": "sha256-XeF3Wm5drztygQ+biq/e6WXRS/Zwhkrq3kR45Q8E9Ts=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/krunner-6.14.0.tar.xz", + "hash": "sha256-E4z7mM1zOSci9EmUCNB1osdwW9v0NuzAdzYMMVPbL6Y=" }, "kservice": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kservice-6.13.0.tar.xz", - "hash": "sha256-ZdlUL3KdML49zBKqLr61AjjOTTCoUHdfmwBrm58cHNU=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kservice-6.14.0.tar.xz", + "hash": "sha256-XvgPRwNNWCzgWgvs8BlSZjGR+vxWnPs+97hcJP0peoU=" }, "kstatusnotifieritem": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kstatusnotifieritem-6.13.0.tar.xz", - "hash": "sha256-7Th/3uPctbw/qVbva7mb0tTA7VbuXi8diauusMC03po=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kstatusnotifieritem-6.14.0.tar.xz", + "hash": "sha256-nYXESncErQUnQHUhBuWesm5J2ARn+bHTySvSS3c5VBc=" }, "ksvg": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/ksvg-6.13.0.tar.xz", - "hash": "sha256-m/DSp2JlV7Q8UIIbq30ZYKc/jrmB6okqZMtKESd+0ks=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/ksvg-6.14.0.tar.xz", + "hash": "sha256-FFZkn/LhOX4qZmziS7tvB0/aXLlq2kJdEivMFHRKXc4=" }, "ktexteditor": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/ktexteditor-6.13.0.tar.xz", - "hash": "sha256-fBLvBh9FvcO17MXA7skInNZSHEmSF94HonPcZf3Xx88=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/ktexteditor-6.14.0.tar.xz", + "hash": "sha256-uXDWu3YjkhV415CevvGMb3p5jqEcWx4kU/cyFpVndlE=" }, "ktexttemplate": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/ktexttemplate-6.13.0.tar.xz", - "hash": "sha256-QFDOdt44rLgQTYwLbn7LOL8o/01lSZ7JEfsxbzg/ktk=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/ktexttemplate-6.14.0.tar.xz", + "hash": "sha256-ZakIqlc+QM+YhKnUKkuNVXS68vQCoZdkzaLMzeJ8iXo=" }, "ktextwidgets": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/ktextwidgets-6.13.0.tar.xz", - "hash": "sha256-H/Kb8Cskfwn/qq/kV48Jd7UcQrZ+74T921Z33X0e3y4=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/ktextwidgets-6.14.0.tar.xz", + "hash": "sha256-TiTm2kd+CND3FVLwgSBlFvzZq0pZPPN9d+vWkIVrdrU=" }, "kunitconversion": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kunitconversion-6.13.0.tar.xz", - "hash": "sha256-II8DfoCJ+ZnguwqvhVcbOi00HNjkDBEbNerZ0mEAF+o=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kunitconversion-6.14.0.tar.xz", + "hash": "sha256-0H1g7CxcISRvOqn4ngEibghMkP6ZtisItlGTPDEc8I0=" }, "kuserfeedback": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kuserfeedback-6.13.0.tar.xz", - "hash": "sha256-SMGGSC/npvEBen5Qs6Fv18EMEPf5Y8APMsYbsHNAS5o=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kuserfeedback-6.14.0.tar.xz", + "hash": "sha256-JKzW0rhYK91q6b/KlyeKlnY+4YSmzey8Dc1k/U/COLI=" }, "kwallet": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kwallet-6.13.0.tar.xz", - "hash": "sha256-Gm/yzPZgpDO9prAKyHN5bctGvSRDeH/PX75MQzyoyzY=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kwallet-6.14.0.tar.xz", + "hash": "sha256-p0d+Tl58y0NJHFoOzK32oz6WIIjVrzLEtrSqy5IPWeM=" }, "kwidgetsaddons": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kwidgetsaddons-6.13.0.tar.xz", - "hash": "sha256-oVOIKZlzGfivAETteuhPebThjPKzLKzU/cR0i48cdAY=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kwidgetsaddons-6.14.0.tar.xz", + "hash": "sha256-YCcgvD6Gy6I4Tw9F4WyFJKGXR5aj1bfFwe2Q52jPEh8=" }, "kwindowsystem": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kwindowsystem-6.13.0.tar.xz", - "hash": "sha256-T6g0JPOal9f+eEUz0q1NSWn/h40mQ43ancAOMHRZWaw=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kwindowsystem-6.14.0.tar.xz", + "hash": "sha256-ZiX31aRsucciibyqpl7nRFCmceTb9u6+/HcmUPJM8qY=" }, "kxmlgui": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kxmlgui-6.13.0.tar.xz", - "hash": "sha256-4QZILTuxX3r97rVULg8PPKJrm1xjdKA8oYFT1dJ1DeY=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kxmlgui-6.14.0.tar.xz", + "hash": "sha256-X5o10WjlvoXEPlZvh79xCMGOOhlCDh2TebST4oiAkUs=" }, "modemmanager-qt": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/modemmanager-qt-6.13.0.tar.xz", - "hash": "sha256-Je/TMsFq+PWNwzXowlnsPBOz5en0wq6tuH7KVi0029A=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/modemmanager-qt-6.14.0.tar.xz", + "hash": "sha256-wfA6TfGMKMQlQLpZ2fm5li1Z9AdM32hrx4fi/1lXg9k=" }, "networkmanager-qt": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/networkmanager-qt-6.13.0.tar.xz", - "hash": "sha256-mp41laG5gWsnN7BBa52St24rDKCYnQ72WpXl+JWsNsE=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/networkmanager-qt-6.14.0.tar.xz", + "hash": "sha256-DDkr30+N2F8UQfZbqTHY9JVBxVZ/I1DHjnsSFDTDsSY=" }, "prison": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/prison-6.13.0.tar.xz", - "hash": "sha256-I8RuKJwn8drLDIMRer3GIbXAv+q0XNGHRksAaPcAA+E=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/prison-6.14.0.tar.xz", + "hash": "sha256-tQRUqwoNeJGsH5tsTk4AzNMmm61jCmo5L0EMTiUv+2Q=" }, "purpose": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/purpose-6.13.0.tar.xz", - "hash": "sha256-K6t0kHUFvulfqs3JyT6KlLKrM2Ual9KufWP9SD9Fgyc=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/purpose-6.14.0.tar.xz", + "hash": "sha256-3Z8juvTEpE8ccffTsL/n+/vN2iAC101LSc2EYxrImek=" }, "qqc2-desktop-style": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/qqc2-desktop-style-6.13.0.tar.xz", - "hash": "sha256-qKWozjQ+p3yx0LMAwS6GgpyRPgNsb/itXSG4+WIYQmo=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/qqc2-desktop-style-6.14.0.tar.xz", + "hash": "sha256-lgSzXLVTlhxGRt3KaeIH30L/etnj4WCDh/+SPY2fPP8=" }, "solid": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/solid-6.13.0.tar.xz", - "hash": "sha256-VBnxGKmkXVx2qOK3G9K+Ox37UxP8JkSEu7ocLkRkBR8=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/solid-6.14.0.tar.xz", + "hash": "sha256-AJlvBjR4hj/mG5AtIMlsnrT0rEM1Plm3ebRm+mKxqMQ=" }, "sonnet": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/sonnet-6.13.0.tar.xz", - "hash": "sha256-1HRlqdYjJXz7AZLDpNwkczSQqolSMQQi5ALYKK1GHu4=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/sonnet-6.14.0.tar.xz", + "hash": "sha256-oN5kwTLAjUmGsA3p7o4plhWtUACLFOJpEPzvytc0r9M=" }, "syndication": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/syndication-6.13.0.tar.xz", - "hash": "sha256-H+B6WBcFZZdT+ZWn7gmXe/UosCCmWXg0m5cihi2gj7c=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/syndication-6.14.0.tar.xz", + "hash": "sha256-FOWsb2MtwwIvajK5yOW9AIlr3aX62FhXRQI7JTlWGhk=" }, "syntax-highlighting": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/syntax-highlighting-6.13.0.tar.xz", - "hash": "sha256-1vGbuIbW4cclHYE0l/FOzJ2sQTJTdk62Go86g2gGRQ0=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/syntax-highlighting-6.14.0.tar.xz", + "hash": "sha256-39wCWslop9DLQwgm5U8+lrTKh5jP9LXfffST4tDk37w=" }, "threadweaver": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/threadweaver-6.13.0.tar.xz", - "hash": "sha256-ZKFi9J/SUmPdmSs+cIVLens7zRURS7ZwlbtRPECX45o=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/threadweaver-6.14.0.tar.xz", + "hash": "sha256-qPcffml1Hjbbx/zpWB9VtmhEvGjfavLoqUwiyP6YcK4=" } } \ No newline at end of file diff --git a/pkgs/servers/deconz/default.nix b/pkgs/servers/deconz/default.nix index 62dd20a976d7..f2ad6d918cb9 100644 --- a/pkgs/servers/deconz/default.nix +++ b/pkgs/servers/deconz/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "deconz"; - version = "2.29.5"; + version = "2.30.2"; src = fetchurl { url = "https://deconz.dresden-elektronik.de/ubuntu/beta/deconz-${version}-qt5.deb"; - sha256 = "sha256-vUMnxduQfZv6YHA2hRnhbKf9sBvVCCE2n4ZnutmaRpw="; + sha256 = "sha256-exkelou1xgFEtW3vUqMZFc4AqXruzMRD9n23WmUFr3k="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/deepsecrets/default.nix b/pkgs/tools/security/deepsecrets/default.nix index 6d77a683039d..1238d51b23bc 100644 --- a/pkgs/tools/security/deepsecrets/default.nix +++ b/pkgs/tools/security/deepsecrets/default.nix @@ -22,11 +22,11 @@ python3.pkgs.buildPythonApplication rec { "mmh3" ]; - nativeBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ poetry-core ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ dotwiz mmh3 ordered-set @@ -40,12 +40,23 @@ python3.pkgs.buildPythonApplication rec { "deepsecrets" ]; - meta = with lib; { + nativeCheckInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + disabledTests = [ + # assumes package is built in /app (docker?), and not /build/${src.name} (nix sandbox) + "test_1_cli" + "test_config" + "test_basic_info" + ]; + + meta = { description = "Secrets scanner that understands code"; mainProgram = "deepsecrets"; homepage = "https://github.com/avito-tech/deepsecrets"; changelog = "https://github.com/avito-tech/deepsecrets/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 348c0a0b684a..de11457dd689 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13817,8 +13817,6 @@ with pkgs; qmidinet = libsForQt5.callPackage ../applications/audio/qmidinet { }; - qmmp = qt6Packages.callPackage ../applications/audio/qmmp { }; - qnotero = libsForQt5.callPackage ../applications/office/qnotero { }; qpwgraph = qt6Packages.callPackage ../applications/audio/qpwgraph { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e3ffeb21bb12..232e53fe5cec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2795,6 +2795,8 @@ self: super: with self; { connect-box = callPackage ../development/python-modules/connect-box { }; + connected-components-3d = callPackage ../development/python-modules/connected-components-3d { }; + connection-pool = callPackage ../development/python-modules/connection-pool { }; connexion = callPackage ../development/python-modules/connexion { }; @@ -4826,6 +4828,8 @@ self: super: with self; { fastprogress = callPackage ../development/python-modules/fastprogress { }; + fastremap = callPackage ../development/python-modules/fastremap { }; + fastrlock = callPackage ../development/python-modules/fastrlock { }; fasttext = callPackage ../development/python-modules/fasttext { }; @@ -6638,6 +6642,8 @@ self: super: with self; { image-go-nord = callPackage ../development/python-modules/image-go-nord { }; + imagecodecs = callPackage ../development/python-modules/imagecodecs { }; + imagecodecs-lite = callPackage ../development/python-modules/imagecodecs-lite { }; imagecorruptions = callPackage ../development/python-modules/imagecorruptions { }; @@ -15586,6 +15592,8 @@ self: super: with self; { sdds = callPackage ../development/python-modules/sdds { }; + sdflit = callPackage ../development/python-modules/sdflit { }; + sdjson = callPackage ../development/python-modules/sdjson { }; sdkmanager = callPackage ../development/python-modules/sdkmanager { }; @@ -16867,6 +16875,8 @@ self: super: with self; { swagger-ui-bundle = callPackage ../development/python-modules/swagger-ui-bundle { }; + swcgeom = callPackage ../development/python-modules/swcgeom { }; + swh-auth = callPackage ../development/python-modules/swh-auth { }; swh-core = callPackage ../development/python-modules/swh-core { };