diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index b9a9c7e9dcbe..ccf54af04e32 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -4,8 +4,8 @@ on: pull_request: paths: - .github/workflows/eval.yml + - .github/workflows/reviews.yml # needs eval results from the same event type pull_request_target: - types: [opened, ready_for_review, synchronize, reopened] push: # Keep this synced with ci/request-reviews/dev-branches.txt branches: @@ -153,12 +153,13 @@ jobs: name: diff-${{ matrix.system }} path: diff/* - tag: - name: Tag + compare: + name: Comparison runs-on: ubuntu-24.04-arm needs: [ prepare, outpaths ] if: needs.prepare.outputs.targetSha permissions: + issues: write # needed to create *new* labels pull-requests: write statuses: write steps: @@ -209,11 +210,8 @@ jobs: name: comparison path: comparison/* - - name: Build the requestReviews derivation - run: nix-build trusted/ci -A requestReviews - - name: Labelling pull request - if: ${{ github.event_name == 'pull_request_target' && github.repository_owner == 'NixOS' }} + if: ${{ github.event_name == 'pull_request_target' }} env: GH_TOKEN: ${{ github.token }} REPOSITORY: ${{ github.repository }} @@ -247,7 +245,7 @@ jobs: done < <(comm -13 before after) - name: Add eval summary to commit statuses - if: ${{ github.event_name == 'pull_request_target' && github.repository_owner == 'NixOS' }} + if: ${{ github.event_name == 'pull_request_target' }} env: GH_TOKEN: ${{ github.token }} PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }} @@ -266,30 +264,12 @@ jobs: "/repos/$GITHUB_REPOSITORY/statuses/$PR_HEAD_SHA" \ -f "context=Eval / Summary" -f "state=success" -f "description=$description" -f "target_url=$target_url" - # See ./codeowners-v2.yml, reuse the same App because we need the same permissions - # Can't use the token received from permissions above, because it can't get enough permissions - - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6 - if: vars.OWNER_APP_ID - id: app-token - with: - app-id: ${{ vars.OWNER_APP_ID }} - private-key: ${{ secrets.OWNER_APP_PRIVATE_KEY }} - permission-administration: read - permission-members: read - permission-pull-requests: write - - - name: Requesting maintainer reviews - if: ${{ steps.app-token.outputs.token && github.repository_owner == 'NixOS' }} - env: - GH_TOKEN: ${{ github.token }} - REPOSITORY: ${{ github.repository }} - NUMBER: ${{ github.event.number }} - AUTHOR: ${{ github.event.pull_request.user.login }} - # Don't request reviewers on draft PRs - DRY_MODE: ${{ github.event.pull_request.draft && '1' || '' }} - run: | - # maintainers.json contains GitHub IDs. Look up handles to request reviews from. - # There appears to be no API to request reviews based on GitHub IDs - jq -r 'keys[]' comparison/maintainers.json \ - | while read -r id; do gh api /user/"$id" --jq .login; done \ - | GH_TOKEN=${{ steps.app-token.outputs.token }} result/bin/request-reviewers.sh "$REPOSITORY" "$NUMBER" "$AUTHOR" + reviewers: + name: Reviewers + # No dependency on "compare", so that it can start at the same time. + # We only wait for the "comparison" artifact to be available, which makes the start-to-finish time + # for the eval workflow considerably faster. + needs: [ prepare, outpaths ] + if: needs.prepare.outputs.targetSha + uses: ./.github/workflows/reviewers.yml + secrets: inherit diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml index 05fbb691d488..1fab6eba3977 100644 --- a/.github/workflows/labels.yml +++ b/.github/workflows/labels.yml @@ -10,13 +10,14 @@ on: permissions: contents: read + issues: write # needed to create *new* labels pull-requests: write jobs: labels: name: label-pr runs-on: ubuntu-24.04-arm - if: "github.repository_owner == 'NixOS' && !contains(github.event.pull_request.title, '[skip treewide]')" + if: "!contains(github.event.pull_request.title, '[skip treewide]')" steps: - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0 if: | diff --git a/.github/workflows/manual-nixpkgs-v2.yml b/.github/workflows/manual-nixpkgs-v2.yml index 13949dd3c36e..c6af1f14b34e 100644 --- a/.github/workflows/manual-nixpkgs-v2.yml +++ b/.github/workflows/manual-nixpkgs-v2.yml @@ -5,8 +5,6 @@ on: paths: - .github/workflows/manual-nixpkgs-v2.yml pull_request_target: - branches: - - master paths: - 'doc/**' - 'lib/**' @@ -38,4 +36,4 @@ jobs: authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - name: Building Nixpkgs manual - run: NIX_PATH=nixpkgs=$(pwd)/untrusted nix-build --option restrict-eval true untrusted/ci -A manual-nixpkgs -A manual-nixpkgs-tests + run: nix-build untrusted/ci -A manual-nixpkgs -A manual-nixpkgs-tests diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml new file mode 100644 index 000000000000..62c8f242164b --- /dev/null +++ b/.github/workflows/reviewers.yml @@ -0,0 +1,98 @@ +# This workflow will request reviews from the maintainers of each package +# listed in the PR's most recent eval comparison artifact. + +name: Reviewers + +on: + pull_request: + paths: + - .github/workflows/reviewers.yml + pull_request_target: + types: [ready_for_review] + workflow_call: + +permissions: {} + +jobs: + request: + name: Request + runs-on: ubuntu-24.04-arm + steps: + - name: Check out the PR at the base commit + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + with: + path: trusted + sparse-checkout: ci + + - name: Install Nix + uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31 + with: + extra_nix_config: sandbox = true + + - name: Build the requestReviews derivation + run: nix-build trusted/ci -A requestReviews + + # See ./codeowners-v2.yml, reuse the same App because we need the same permissions + # Can't use the token received from permissions above, because it can't get enough permissions + - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6 + if: vars.OWNER_APP_ID + id: app-token + with: + app-id: ${{ vars.OWNER_APP_ID }} + private-key: ${{ secrets.OWNER_APP_PRIVATE_KEY }} + permission-administration: read + permission-members: read + permission-pull-requests: write + + + # In the regular case, this workflow is called via workflow_call from the eval workflow directly. + # In the more special case, when a PR is undrafted an eval run will have started already. + - name: Wait for comparison to be done + uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1 + with: + script: | + const run_id = (await github.rest.actions.listWorkflowRuns({ + owner: context.repo.owner, + repo: context.repo.repo, + workflow_id: 'eval.yml', + event: context.eventName, + head_sha: context.payload.pull_request.head.sha + })).data.workflow_runs[0].id + + // Waiting 120 * 5 sec = 10 min. max. + // The extreme case is an Eval run that just started when the PR is undrafted. + // Eval takes max 5-6 minutes, normally. + for (let i = 0; i < 120; i++) { + const result = await github.rest.actions.listWorkflowRunArtifacts({ + owner: context.repo.owner, + repo: context.repo.repo, + run_id, + name: 'comparison' + }) + if (result.data.total_count > 0) return + await new Promise(resolve => setTimeout(resolve, 5000)) + } + throw new Error("No comparison artifact found.") + + - name: Download the comparison results + uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 + with: + pattern: comparison + path: comparison + merge-multiple: true + + - name: Requesting maintainer reviews + if: ${{ steps.app-token.outputs.token }} + env: + GH_TOKEN: ${{ github.token }} + REPOSITORY: ${{ github.repository }} + NUMBER: ${{ github.event.number }} + AUTHOR: ${{ github.event.pull_request.user.login }} + # Don't request reviewers on draft PRs + DRY_MODE: ${{ github.event.pull_request.draft && '1' || '' }} + run: | + # maintainers.json contains GitHub IDs. Look up handles to request reviews from. + # There appears to be no API to request reviews based on GitHub IDs + jq -r 'keys[]' comparison/maintainers.json \ + | while read -r id; do gh api /user/"$id" --jq .login; done \ + | GH_TOKEN=${{ steps.app-token.outputs.token }} result/bin/request-reviewers.sh "$REPOSITORY" "$NUMBER" "$AUTHOR" diff --git a/ci/default.nix b/ci/default.nix index 939e8411d27a..94d049903fca 100644 --- a/ci/default.nix +++ b/ci/default.nix @@ -82,8 +82,8 @@ in # CI jobs lib-tests = import ../lib/tests/release.nix { inherit pkgs; }; manual-nixos = (import ../nixos/release.nix { }).manual.${system} or null; - manual-nixpkgs = (import ../pkgs/top-level/release.nix { }).manual; - manual-nixpkgs-tests = (import ../pkgs/top-level/release.nix { }).manual.tests; + manual-nixpkgs = (import ../doc { }); + manual-nixpkgs-tests = (import ../doc { }).tests; nixpkgs-vet = pkgs.callPackage ./nixpkgs-vet.nix { }; parse = pkgs.lib.recurseIntoAttrs { latest = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.latest; }; diff --git a/ci/pinned-nixpkgs.json b/ci/pinned-nixpkgs.json index f5efff109e8c..7a9596380c41 100644 --- a/ci/pinned-nixpkgs.json +++ b/ci/pinned-nixpkgs.json @@ -1,4 +1,4 @@ { - "rev": "eaeed9530c76ce5f1d2d8232e08bec5e26f18ec1", - "sha256": "132nimgi1g88fbhddk4b8b1qk68jly494x2mnphyk3xa1d2wy9q7" + "rev": "3d1f29646e4b57ed468d60f9d286cde23a8d1707", + "sha256": "1wzvc9h9a6l9wyhzh892xb5x88kxmbzxb1k8s7fizyyw2q4nqw07" } diff --git a/doc/default.nix b/doc/default.nix index 2c9a0439feb5..7e2d0df152cc 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -1,6 +1,6 @@ { - pkgs ? (import ./.. { }), + pkgs ? (import ../ci { }).pkgs, nixpkgs ? { }, }: -pkgs.nixpkgs-manual.override { inherit nixpkgs; } +pkgs.callPackage ./doc-support/package.nix { inherit nixpkgs; } diff --git a/doc/shell.nix b/doc/shell.nix index 3aad697742b2..fbd4670b9465 100644 --- a/doc/shell.nix +++ b/doc/shell.nix @@ -1,7 +1 @@ -let - pkgs = import ../. { - config = { }; - overlays = [ ]; - }; -in -pkgs.nixpkgs-manual.shell +(import ./default.nix { }).shell diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4c3845ff7ac0..6f36850b0e60 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15720,6 +15720,16 @@ name = "John McParland"; keys = [ { fingerprint = "39D2 171D D733 C718 DD21 285E B326 E14B 05D8 7A4E"; } ]; }; + MCSeekeri = { + email = "mcseekeri@outlook.com"; + github = "mcseekeri"; + githubId = 20928094; + name = "MCSeekeri"; + keys = [ + { fingerprint = "5922 79AB D9D6 85EB 9D16 754C ECDC AD89 5A38 4A12"; } + { fingerprint = "0762 A387 F160 76F1 116C BF13 3276 6666 6666 6666"; } + ]; + }; McSinyx = { email = "cnx@loang.net"; github = "McSinyx"; @@ -21768,6 +21778,12 @@ githubId = 7309170; name = "Ryota Kameoka"; }; + ryota2357 = { + email = "contact@ryota2357.com"; + github = "ryota2357"; + githubId = 61523777; + name = "Ryota Otsuki"; + }; rypervenche = { email = "git@ryper.org"; github = "rypervenche"; diff --git a/pkgs/README.md b/pkgs/README.md index bcadafd73f0a..3e8192115493 100644 --- a/pkgs/README.md +++ b/pkgs/README.md @@ -107,7 +107,7 @@ Now that this is out of the way. To add a package to Nixpkgs: - XML::Simple, a Perl module: [`pkgs/top-level/perl-packages.nix`](top-level/perl-packages.nix) (search for the `XMLSimple` attribute). Most Perl modules are so simple to build that they are defined directly in `perl-packages.nix`; no need to make a separate file for them. - - Adobe Reader: [`pkgs/applications/misc/adobe-reader/default.nix`](applications/misc/adobe-reader/default.nix). Shows how binary-only packages can be supported. In particular the `postFixup` phase uses `patchelf` to set the RUNPATH and ELF interpreter of the executables so that the right libraries are found at runtime. + - Discord Game SDK: [`pkgs/by-name/di/discord-gamesdk/package.nix`](./by-name/di/discord-gamesdk/package.nix). Shows how binary-only packages can be supported. In particular, the `autoPatchelfHook` is used to set the RUNPATH and ELF interpreter of the executables so that the right libraries are found at runtime. Some notes: diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix deleted file mode 100644 index b98b427740a6..000000000000 --- a/pkgs/applications/misc/adobe-reader/default.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - libX11, - cups, - zlib, - libxml2, - pango, - atk, - gtk2, - glib, - gdk-pixbuf, - gdk-pixbuf-xlib, -}: - -stdenv.mkDerivation rec { - pname = "adobe-reader"; - version = "9.5.5"; - - src = fetchurl { - url = "http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/${version}/enu/AdbeRdr${version}-1_i486linux_enu.tar.bz2"; - sha256 = "0h35misxrqkl5zlmmvray1bqf4ywczkm89n9qw7d9arqbg3aj3pf"; - }; - - # !!! Adobe Reader contains copies of OpenSSL, libcurl, and libicu. - # We should probably remove those and use the regular Nixpkgs versions. - libPath = lib.makeLibraryPath [ - stdenv.cc.cc - libX11 - zlib - libxml2 - cups - pango - atk - gtk2 - glib - gdk-pixbuf - gdk-pixbuf-xlib - ]; - - installPhase = '' - p=$out/libexec/adobe-reader - mkdir -p $out/libexec - tar xvf COMMON.TAR -C $out - tar xvf ILINXR.TAR -C $out - mv $out/Adobe/Reader9 $p - rmdir $out/Adobe - - # Disable this plugin for now (it needs LDAP). - rm $p/Reader/intellinux/plug_ins/PPKLite.api - - # Remove unneeded files - rm $p/bin/UNINSTALL - ''; - - postFixup = '' - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $libPath \ - $p/Reader/intellinux/bin/acroread - - # The "xargs -r" is to shut up a warning when Mozilla can't be found. - substituteInPlace $p/bin/acroread \ - --replace-fail /bin/pwd $(type -P pwd) \ - --replace-fail /bin/ls $(type -P ls) \ - --replace-fail xargs "xargs -r" - - mkdir -p $out/bin - ln -s $p/bin/acroread $out/bin/acroread - - mkdir -p $out/share/applications - mv $p/Resource/Support/AdobeReader.desktop $out/share/applications/ - icon=$p/Resource/Icons/128x128/AdobeReader9.png - [ -e $icon ] - sed -i $out/share/applications/AdobeReader.desktop \ - -e "s|Icon=.*|Icon=$icon|" - - mkdir -p $out/share/mimelnk/application - mv $p/Resource/Support/vnd*.desktop $out/share/mimelnk/application - ''; - - dontStrip = true; - - passthru.mozillaPlugin = "/libexec/adobe-reader/Browser/intellinux"; - - meta = { - description = "Adobe Reader, a viewer for PDF documents"; - homepage = "http://www.adobe.com/products/reader"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.unfree; - knownVulnerabilities = [ - "Numerous unresolved vulnerabilities" - "See: https://www.cvedetails.com/product/497/Adobe-Acrobat-Reader.html?vendor_id=53" - ]; - platforms = [ "i686-linux" ]; - maintainers = with lib.maintainers; [ onny ]; - mainProgram = "acroread"; - }; -} diff --git a/pkgs/applications/networking/geph/default.nix b/pkgs/applications/networking/geph/default.nix deleted file mode 100644 index 3a8082687666..000000000000 --- a/pkgs/applications/networking/geph/default.nix +++ /dev/null @@ -1,142 +0,0 @@ -{ - lib, - stdenvNoCC, - rustPlatform, - fetchFromGitHub, - buildGoModule, - makeWrapper, - nodejs, - pnpm, - esbuild, - perl, - pkg-config, - glib, - webkitgtk_4_0, - libayatana-appindicator, - cairo, - openssl, -}: - -let - version = "4.99.16"; - geph-meta = with lib; { - description = "Modular Internet censorship circumvention system designed specifically to deal with national filtering"; - homepage = "https://geph.io"; - platforms = platforms.linux; - maintainers = with maintainers; [ penalty1083 ]; - }; -in -{ - cli = rustPlatform.buildRustPackage rec { - pname = "geph4-client"; - inherit version; - - src = fetchFromGitHub { - owner = "geph-official"; - repo = pname; - rev = "v${version}"; - hash = "sha256-6YWPsSRIZpvVCIGZ1z7srobDvVzLr0o2jBcB/7kbK7I="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-igIYTlI3hqvlOTgdwouA9YussP9h0pOHUUTCjA2LE5U="; - - nativeBuildInputs = [ perl ]; - - meta = geph-meta // { - license = with lib.licenses; [ gpl3Only ]; - }; - }; - - gui = stdenvNoCC.mkDerivation (finalAttrs: { - pname = "geph-gui"; - inherit version; - - src = fetchFromGitHub { - owner = "geph-official"; - repo = "gephgui-pkg"; - rev = "9f0d5c689c2cae67a4750a68295676f449724a98"; - hash = "sha256-/aHd1EDrFp1kXen5xRCCl8LVlMVH0pY8buILZri81II="; - fetchSubmodules = true; - }; - - gephgui-wry = rustPlatform.buildRustPackage { - pname = "gephgui-wry"; - inherit (finalAttrs) version src; - - sourceRoot = "${finalAttrs.src.name}/gephgui-wry"; - - useFetchCargoVendor = true; - cargoHash = "sha256-pCj4SulUVEC4QTPBrPQBn5xJ+sHPs6KfjsdVRcsRapY="; - - pnpmDeps = pnpm.fetchDeps { - inherit (finalAttrs) pname version src; - sourceRoot = "${finalAttrs.src.name}/gephgui-wry/gephgui"; - hash = "sha256-0MGlsLEgugQ1wEz07ROIwkanTa8PSKwIaxNahyS1014="; - }; - - nativeBuildInputs = [ - pkg-config - pnpm.configHook - makeWrapper - nodejs - ]; - - buildInputs = [ - glib - webkitgtk_4_0 - libayatana-appindicator - cairo - openssl - ]; - - ESBUILD_BINARY_PATH = "${lib.getExe ( - esbuild.override { - buildGoModule = - args: - buildGoModule ( - args - // rec { - version = "0.15.10"; - src = fetchFromGitHub { - owner = "evanw"; - repo = "esbuild"; - rev = "v${version}"; - hash = "sha256-DebmLtgPrla+1UcvOHMnWmxa/ZqrugeRRKXIiJ9LYDk="; - }; - vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; - } - ); - } - )}"; - - pnpmRoot = "gephgui"; - - preBuild = '' - pushd gephgui - pnpm build - popd - ''; - }; - - dontBuild = true; - - installPhase = '' - install -Dt $out/bin ${finalAttrs.gephgui-wry}/bin/gephgui-wry - install -d $out/share/icons/hicolor - for i in '16' '32' '64' '128' '256' - do - name=''${i}x''${i} - dir=$out/share/icons/hicolor - mkdir -p $dir - mv flatpak/icons/$name $dir - done - install -Dt $out/share/applications flatpak/icons/io.geph.GephGui.desktop - sed -i -e '/StartupWMClass/s/=.*/=gephgui-wry/' $out/share/applications/io.geph.GephGui.desktop - ''; - - meta = geph-meta // { - license = with lib.licenses; [ unfree ]; - }; - }); -} diff --git a/pkgs/by-name/av/avr-sim/package.nix b/pkgs/by-name/av/avr-sim/package.nix deleted file mode 100644 index 9a4ad182a95f..000000000000 --- a/pkgs/by-name/av/avr-sim/package.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ - lib, - stdenv, - fetchzip, - lazarus, - fpc, - pango, - cairo, - glib, - atk, - gtk2, - libX11, - gdk-pixbuf, -}: -stdenv.mkDerivation rec { - pname = "avr-sim"; - version = "2.8"; - - # Unfortunately old releases get removed: - # http://www.avr-asm-tutorial.net/avr_sim/avr_sim-download.html - # Therefore, fallback to an archive.org snapshot - src = fetchzip { - urls = [ - "http://www.avr-asm-tutorial.net/avr_sim/28/avr_sim_28_lin_src.zip" - "https://web.archive.org/web/20231129125754/http://www.avr-asm-tutorial.net/avr_sim/28/avr_sim_28_lin_src.zip" - ]; - hash = "sha256-7MgUzMs+l+3RVUbORAWyU1OUpgrKIeWhS+ObgRJtOHc="; - }; - - nativeBuildInputs = [ - lazarus - fpc - ]; - - buildInputs = [ - pango - cairo - glib - atk - gtk2 - libX11 - gdk-pixbuf - ]; - - NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}"; - - buildPhase = '' - runHook preBuild - - lazbuild --lazarusdir=${lazarus}/share/lazarus --build-mode=Release avr_sim.lpi - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - - cp avr_sim $out/bin - - runHook postInstall - ''; - - meta = with lib; { - description = "AVR assembler simulator for the stepwise execution of assembler source code - with many extras"; - homepage = "http://www.avr-asm-tutorial.net/avr_sim/index_en.html"; - license = licenses.unfree; - platforms = platforms.unix; - maintainers = with maintainers; [ ameer ]; - }; -} diff --git a/pkgs/by-name/bi/biblioteca/package.nix b/pkgs/by-name/bi/biblioteca/package.nix index 7f6d8fa5359d..da7aaefd56ad 100644 --- a/pkgs/by-name/bi/biblioteca/package.nix +++ b/pkgs/by-name/bi/biblioteca/package.nix @@ -24,14 +24,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "biblioteca"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "workbenchdev"; repo = "Biblioteca"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-zrrI3u4ukGN6eb/eK/aZG4gi/xtXciyRS+JX9Js9KEw="; + hash = "sha256-9AL8obvXB/bgqhTw8VE30OytNFQmxvJ6TYGN8ir+NfI="; }; patches = [ diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix index 85c2a75ac2d1..96ee86a8bf83 100644 --- a/pkgs/by-name/ch/checkov/package.nix +++ b/pkgs/by-name/ch/checkov/package.nix @@ -25,14 +25,14 @@ with py.pkgs; python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.435"; + version = "3.2.436"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; tag = version; - hash = "sha256-zV430pGFkfyf0oznXe69lTsMkGUrrA5TTyGobE4AK9I="; + hash = "sha256-QI7gJjk7TtafSqGJ8vX+bTgajeRjBUHQnNJxhDiVUDI="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/di/directx-headers/package.nix b/pkgs/by-name/di/directx-headers/package.nix index 2c8773045ab5..ff4841c868f4 100644 --- a/pkgs/by-name/di/directx-headers/package.nix +++ b/pkgs/by-name/di/directx-headers/package.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation rec { pname = "directx-headers"; - version = "1.615.0"; + version = "1.616.0"; src = fetchFromGitHub { owner = "microsoft"; repo = "DirectX-Headers"; rev = "v${version}"; - hash = "sha256-1s/lrvUUOBGVAtfyAG2b/9raQVj2Hcjw9/RtqBO7ENA="; + hash = "sha256-bPFeaNCxECKnecvt9jDIvxiQE6VaT7qD8Tyqm8L3u3M="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/do/dotenvx/package.nix b/pkgs/by-name/do/dotenvx/package.nix index 010cad0a3c74..6ad39382f339 100644 --- a/pkgs/by-name/do/dotenvx/package.nix +++ b/pkgs/by-name/do/dotenvx/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "dotenvx"; - version = "1.41.0"; + version = "1.44.1"; src = fetchFromGitHub { owner = "dotenvx"; repo = "dotenvx"; tag = "v${version}"; - hash = "sha256-qYigFqJF/+37bd8LPg8u9EkI/50ULxTs3LwjrcAYntk="; + hash = "sha256-uzEZfzGAwA/boDft/Z3Toq3gUG0n3nqREtLjgmIO1Kw="; }; - npmDepsHash = "sha256-k+M3AdEHSrpl+rKTbxmTkcHVgwm5lHt3xjj2fQ4UFiI="; + npmDepsHash = "sha256-kWOj/78yurII4O9XYzcvC2JflCWRbbqIOU4WkdbX5AM="; dontNpmBuild = true; diff --git a/pkgs/by-name/fx/fx/package.nix b/pkgs/by-name/fx/fx/package.nix index c02673b3ad81..1c83f71bc82c 100644 --- a/pkgs/by-name/fx/fx/package.nix +++ b/pkgs/by-name/fx/fx/package.nix @@ -5,21 +5,23 @@ installShellFiles, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "fx"; - version = "36.0.0"; + version = "36.0.3"; src = fetchFromGitHub { owner = "antonmedv"; repo = "fx"; - rev = version; - hash = "sha256-wUiyMczToGqfHZ/FMUhCO4ud6h/bNHhVt4eWoZJckbU="; + tag = finalAttrs.version; + hash = "sha256-SUv6kHqIft7M7XyypA7jBYcEuYHLYYVtTnwgL1vhT3w="; }; - nativeBuildInputs = [ installShellFiles ]; - vendorHash = "sha256-8KiCj2khO0zxsZDG1YD0EjsoZSY4q+IXC+NLeeXgVj4="; + ldflags = [ "-s" ]; + + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' installShellCompletion --cmd fx \ --bash <($out/bin/fx --comp bash) \ @@ -27,12 +29,12 @@ buildGoModule rec { --zsh <($out/bin/fx --comp zsh) ''; - meta = with lib; { + meta = { + changelog = "https://github.com/antonmedv/fx/releases/tag/${finalAttrs.src.tag}"; description = "Terminal JSON viewer"; - mainProgram = "fx"; homepage = "https://github.com/antonmedv/fx"; - changelog = "https://github.com/antonmedv/fx/releases/tag/${src.rev}"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.mit; + mainProgram = "fx"; + maintainers = with lib.maintainers; [ figsoda ]; }; -} +}) diff --git a/pkgs/by-name/ge/geph/package.nix b/pkgs/by-name/ge/geph/package.nix new file mode 100644 index 000000000000..e8b6ba8cdbb2 --- /dev/null +++ b/pkgs/by-name/ge/geph/package.nix @@ -0,0 +1,115 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + libxkbcommon, + openssl, + rust-jemalloc-sys-unprefixed, + sqlite, + vulkan-loader, + wayland, + iproute2, + iptables, + libglvnd, + copyDesktopItems, + makeDesktopItem, +}: +let + binPath = lib.makeBinPath [ + iproute2 + iptables + ]; +in +rustPlatform.buildRustPackage (finalAttrs: { + pname = "geph5"; + version = "0.2.61"; + + src = fetchFromGitHub { + owner = "geph-official"; + repo = "geph5"; + rev = "geph5-client-v${finalAttrs.version}"; + hash = "sha256-qy1E5x5Fn+xwS5st6HkMrJu9nksXQQIyJf97FvNOKO4="; + }; + + cargoHash = "sha256-r97DsSsqp/KtgqtYQe92nz2qaOBcJF6w9ckfxpk8Cxg="; + + patches = [ ./test-fix.patch ]; + + postPatch = '' + substituteInPlace binaries/geph5-client/src/vpn/*.sh \ + --replace-fail 'PATH=' 'PATH=${binPath}:' + ''; + + nativeBuildInputs = [ + pkg-config + copyDesktopItems + ]; + + buildInputs = [ + openssl + rust-jemalloc-sys-unprefixed + sqlite + ]; + + env = { + OPENSSL_NO_VENDOR = true; + LIBSQLITE3_SYS_USE_PKG_CONFIG = "1"; + }; + + buildFeatures = [ + "aws_lambda" + "windivert" + ]; + + checkFlags = [ + # Wrong test + "--skip=traffcount::tests::test_traffic_cleanup" + "--skip=traffcount::tests::test_traffic_count_basic" + # Requires network + "--skip=dns::tests::resolve_google" + # Never finish + "--skip=tests::test_blind_sign" + "--skip=tests::test_generate_secret_key" + ]; + + desktopItems = [ + (makeDesktopItem { + name = "Geph5"; + desktopName = "Geph5"; + icon = "geph5"; + exec = "geph5-client-gui"; + categories = [ "Network" ]; + comment = "Modular Internet censorship circumvention system designed specifically to deal with national filtering"; + }) + ]; + + postInstall = '' + install -m 444 -D binaries/geph5-client-gui/icon.png $out/share/icons/hicolor/512x512/apps/geph5.png + ''; + + postFixup = '' + # Add required but not explicitly requested libraries + patchelf --add-rpath '${ + lib.makeLibraryPath [ + wayland + libxkbcommon + vulkan-loader + libglvnd + ] + }' "$out/bin/geph5-client-gui" + ''; + + meta = { + description = "Modular Internet censorship circumvention system designed specifically to deal with national filtering"; + homepage = "https://github.com/geph-official/geph5"; + changelog = "https://github.com/geph-official/geph5/releases/tag/geph5-client-v${finalAttrs.version}"; + mainProgram = "geph5-client"; + platforms = lib.platforms.unix; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ + penalty1083 + MCSeekeri + ]; + }; +}) diff --git a/pkgs/by-name/ge/geph/test-fix.patch b/pkgs/by-name/ge/geph/test-fix.patch new file mode 100644 index 000000000000..6df6cd4e589f --- /dev/null +++ b/pkgs/by-name/ge/geph/test-fix.patch @@ -0,0 +1,27 @@ +diff --git a/binaries/geph5-client/src/traffcount.rs b/binaries/geph5-client/src/traffcount.rs +index 5c91a27..61c0b3b 100644 +--- a/binaries/geph5-client/src/traffcount.rs ++++ b/binaries/geph5-client/src/traffcount.rs +@@ -28,14 +28,14 @@ impl TraffCount { + } + + // /// Create a new traffic counter with custom history length +- // pub fn with_history(max_seconds: usize) -> Self { +- // let now = Instant::now(); +- // Self { +- // bins: VecDeque::with_capacity(max_seconds), +- // window_start: now, +- // max_history_seconds: max_seconds, +- // } +- // } ++ pub fn with_history(max_seconds: usize) -> Self { ++ let now = Instant::now(); ++ Self { ++ bins: VecDeque::with_capacity(max_seconds), ++ window_start: now, ++ max_history_seconds: max_seconds, ++ } ++ } + + /// Increment the traffic count with the given number of bytes + pub fn incr(&mut self, bytes: f64) { diff --git a/pkgs/by-name/go/google-chrome/update.sh b/pkgs/by-name/go/google-chrome/update.sh index f31a67b4b700..c65b8ae4dfec 100755 --- a/pkgs/by-name/go/google-chrome/update.sh +++ b/pkgs/by-name/go/google-chrome/update.sh @@ -30,7 +30,7 @@ update_linux() { local new_hash local new_sri_hash - read -ra version_info <<< "$(get_version_info "linux" "linux = stdenv.mkDerivation" "});")" + read -ra version_info <<< "$(get_version_info "linux" "linux = stdenvNoCC.mkDerivation" "});")" version="${version_info[0]}" current_version="${version_info[1]}" @@ -43,8 +43,8 @@ update_linux() { new_hash="$(nix-prefetch-url "$download_url" 2>/dev/null)" new_sri_hash="$(nix hash to-sri --type sha256 "$new_hash")" - sed -i "/^ linux = stdenv.mkDerivation/,/^ });/s/version = \".*\"/version = \"$version\"/" "$DEFAULT_NIX" - sed -i "/^ linux = stdenv.mkDerivation/,/^ });/s|hash = \".*\"|hash = \"$new_sri_hash\"|" "$DEFAULT_NIX" + sed -i "/^ linux = stdenvNoCC.mkDerivation/,/^ });/s/version = \".*\"/version = \"$version\"/" "$DEFAULT_NIX" + sed -i "/^ linux = stdenvNoCC.mkDerivation/,/^ });/s|hash = \".*\"|hash = \"$new_sri_hash\"|" "$DEFAULT_NIX" echo "[Nix] Linux google-chrome: $current_version -> $version with hash $new_hash" } diff --git a/pkgs/by-name/li/libcifpp/package.nix b/pkgs/by-name/li/libcifpp/package.nix index 2b7eab77f104..9d1311cce6d5 100644 --- a/pkgs/by-name/li/libcifpp/package.nix +++ b/pkgs/by-name/li/libcifpp/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libcifpp"; - version = "8.0.0"; + version = "8.0.1"; src = fetchFromGitHub { owner = "PDB-REDO"; repo = "libcifpp"; tag = "v${finalAttrs.version}"; - hash = "sha256-t1ovrrKu+QSSdwgTp2Nag4SsAJeU9aRizJccd+u+dVI="; + hash = "sha256-cfyou+R0VrAfYM8ez5myZkDKO5VfB9WAQF+amy3oRzU="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/li/libnick/package.nix b/pkgs/by-name/li/libnick/package.nix index 4a5bb2ec33ca..cd28002b1158 100644 --- a/pkgs/by-name/li/libnick/package.nix +++ b/pkgs/by-name/li/libnick/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libnick"; - version = "2025.3.3"; + version = "2025.5.3"; src = fetchFromGitHub { owner = "NickvisionApps"; repo = "libnick"; tag = finalAttrs.version; - hash = "sha256-5GO39rtSvg96y6VE0Ej4x7j1zDatP6JSktIcyhSrb98="; + hash = "sha256-JibExEI5MisKZ9kEIOMzDg8A8LEM8U+ckGFfnZu+ghQ="; }; nativeBuildInputs = diff --git a/pkgs/by-name/lu/luau-lsp/package.nix b/pkgs/by-name/lu/luau-lsp/package.nix index aa43da2dff41..653b353e250f 100644 --- a/pkgs/by-name/lu/luau-lsp/package.nix +++ b/pkgs/by-name/lu/luau-lsp/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "luau-lsp"; - version = "1.47.0"; + version = "1.48.0"; src = fetchFromGitHub { owner = "JohnnyMorganz"; repo = "luau-lsp"; tag = finalAttrs.version; - hash = "sha256-/LJCLH94Egk7FvsarsMimIyehE3T9tgMz7SK6vf+BDg="; + hash = "sha256-KW47R5hOFESDiPt/dvVLFQqHqLxza/lUNLy2PYUPxIg="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/lu/lug-helper/package.nix b/pkgs/by-name/lu/lug-helper/package.nix index 92ca76d081d6..0c2b4551b0a7 100644 --- a/pkgs/by-name/lu/lug-helper/package.nix +++ b/pkgs/by-name/lu/lug-helper/package.nix @@ -15,12 +15,12 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { name = "lug-helper"; - version = "3.9"; + version = "3.10"; src = fetchFromGitHub { owner = "starcitizen-lug"; repo = "lug-helper"; tag = "v${finalAttrs.version}"; - hash = "sha256-Fne0esV/1o+f4Fnn8oeUL+gc29d0ndGpYG21YQvZDvM="; + hash = "sha256-AEHFyKoxIdckir/S96hwR3h9PuzlB5EMWF7PPbeVPYg="; }; buildInputs = [ diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index dcc8fbd39452..4644d2a7453c 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -9,13 +9,13 @@ }: let pname = "open-webui"; - version = "0.6.12"; + version = "0.6.13"; src = fetchFromGitHub { owner = "open-webui"; repo = "open-webui"; tag = "v${version}"; - hash = "sha256-q8pb+XIBKzU8zWohBtKNQhYBwcQF51/uqgVrMxcKcUc="; + hash = "sha256-teBGAo9YyFSBVXMElpw2zON5oCa3O8k+pf9pSNSW5gc="; }; frontend = buildNpmPackage rec { @@ -32,7 +32,7 @@ let url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2"; }; - npmDepsHash = "sha256-576Cd7I4CzOItSycQH8CwLAelLoNnQcJVZ338IhMb/k="; + npmDepsHash = "sha256-/olaKqd0ZBFKyfoyhuPsd1Gl7nC9pro2apiWLjPe07s="; # Disabling `pyodide:fetch` as it downloads packages during `buildPhase` # Until this is solved, running python packages from the browser will not work. diff --git a/pkgs/by-name/pa/parabolic/package.nix b/pkgs/by-name/pa/parabolic/package.nix index 4f7c4b109e7b..b204f89c24b2 100644 --- a/pkgs/by-name/pa/parabolic/package.nix +++ b/pkgs/by-name/pa/parabolic/package.nix @@ -7,6 +7,7 @@ itstool, ninja, yelp-tools, + desktop-file-utils, pkg-config, libnick, boost, @@ -18,6 +19,8 @@ libxmlxx5, blueprint-compiler, qt6, + qlementine, + qlementine-icons, yt-dlp, ffmpeg, aria2, @@ -31,13 +34,13 @@ assert lib.assertOneOf "uiPlatform" uiPlatform [ stdenv.mkDerivation (finalAttrs: { pname = "parabolic"; - version = "2025.1.4"; + version = "2025.5.4"; src = fetchFromGitHub { owner = "NickvisionApps"; repo = "Parabolic"; tag = finalAttrs.version; - hash = "sha256-B8/e5urhy5tAgHNd/PR3HlNQd0M0CxgC56nArFGlQ9c="; + hash = "sha256-2CFV9//8gFK1TYksdy9P4nLb7kj/8Q5dr5huoAuDNRs="; }; # Patches desktop file/dbus service bypassing wrapped executable @@ -59,6 +62,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config itstool yelp-tools + desktop-file-utils ] ++ lib.optionals (uiPlatform == "gnome") [ wrapGAppsHook4 @@ -76,6 +80,8 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals (uiPlatform == "qt") [ qt6.qtbase qt6.qtsvg + qlementine + qlementine-icons ] ++ lib.optionals (uiPlatform == "gnome") [ glib @@ -88,16 +94,28 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeFeature "UI_PLATFORM" uiPlatform) ]; + dontWrapGApps = true; + dontWrapQtApps = true; + preFixup = - lib.optionalString (uiPlatform == "gnome") "gappsWrapperArgs" - + lib.optionalString (uiPlatform == "qt") "qtWrapperArgs" - + "+=(--prefix PATH : ${ - lib.makeBinPath [ - aria2 - ffmpeg - yt-dlp - ] - })"; + lib.optionalString (uiPlatform == "gnome") '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + '' + + lib.optionalString (uiPlatform == "qt") '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + '' + + '' + makeWrapperArgs+=(--prefix PATH : ${ + lib.makeBinPath [ + aria2 + ffmpeg + yt-dlp + ] + }) + + wrapProgram $out/bin/org.nickvision.tubeconverter \ + ''${makeWrapperArgs[@]} + ''; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/po/postgres-lsp/package.nix b/pkgs/by-name/po/postgres-lsp/package.nix index dd2238068a49..ef0bfcdf8cc4 100644 --- a/pkgs/by-name/po/postgres-lsp/package.nix +++ b/pkgs/by-name/po/postgres-lsp/package.nix @@ -2,6 +2,7 @@ lib, rustPlatform, fetchFromGitHub, + rust-jemalloc-sys, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "postgres-lsp"; @@ -22,6 +23,10 @@ rustPlatform.buildRustPackage (finalAttrs: { rustPlatform.bindgenHook ]; + buildInputs = [ + rust-jemalloc-sys + ]; + env = { SQLX_OFFLINE = 1; @@ -43,7 +48,10 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Tools and language server for Postgres"; homepage = "https://pgtools.dev"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ figsoda ]; + maintainers = with lib.maintainers; [ + figsoda + myypo + ]; mainProgram = "postgrestools"; }; }) diff --git a/pkgs/by-name/ql/qlementine-icons/package.nix b/pkgs/by-name/ql/qlementine-icons/package.nix new file mode 100644 index 000000000000..e577ee139fdc --- /dev/null +++ b/pkgs/by-name/ql/qlementine-icons/package.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + qt6, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "qlementine-icons"; + version = "1.8.1"; + + src = fetchFromGitHub { + owner = "oclero"; + repo = "qlementine-icons"; + tag = "v${finalAttrs.version}"; + hash = "sha256-b6krWtDCQjJRzzkFNYLt33iSSQHm1UZ3AedXrzRrDTs="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + qt6.qtbase + qt6.qtsvg + ]; + + dontWrapQtApps = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Vector icon set for modern desktop Qt5/Qt6 applications"; + longDescription = '' + An icon set aimed to be used in conjunction with the Qlementine Qt library. + + This icon set provides icons as requested by the Freedesktop + standard, and vastly expands it, in 16×16 pixels. + + The icons are in SVG format, so can be scaled to any size without + loosing any quality. However, they've been designed to be used in + `16×16` pixels, to be pixel-perfect. + ''; + homepage = "https://github.com/oclero/qlementine-icons"; + changelog = "https://github.com/oclero/qlementine-icons/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ normalcea ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/ql/qlementine/package.nix b/pkgs/by-name/ql/qlementine/package.nix new file mode 100644 index 000000000000..b2ab5b9e70de --- /dev/null +++ b/pkgs/by-name/ql/qlementine/package.nix @@ -0,0 +1,54 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + qt6, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "qlementine"; + version = "1.2.2"; + + src = fetchFromGitHub { + owner = "oclero"; + repo = "qlementine"; + tag = "v${finalAttrs.version}"; + hash = "sha256-icImLN04Ux+pqWaBTNruCkZC+735vzMz8tzssyCncjI="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + qt6.qtbase + qt6.qtsvg + ]; + + dontWrapQtApps = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Modern QStyle for desktop Qt6 applications"; + longDescription = '' + A QStyle for desktop Qt6 applications. + + This library contains: + + - A custom QStyle named QlementineStyle, that implements all the + necessary API to give a modern look and feel to your Qt + application. It's a drop-in replacement for the default QStyle. + + - Lots of utilities to help you write beautiful QWidgets that fits + well with the style. + + - A collection of new QWidgets that are missing in Qt's standard + collection, such as Switch. + ''; + homepage = "https://oclero.github.io/qlementine/"; + changelog = "https://github.com/oclero/qlementine/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ normalcea ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/sk/skim/package.nix b/pkgs/by-name/sk/skim/package.nix index 0656f449a518..aee7240ff1ae 100644 --- a/pkgs/by-name/sk/skim/package.nix +++ b/pkgs/by-name/sk/skim/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { pname = "skim"; - version = "0.17.3"; + version = "0.18.0"; outputs = [ "out" @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { owner = "skim-rs"; repo = "skim"; tag = "v${version}"; - hash = "sha256-aq6qOlxFftiUyMqzbIgv/PnxqSNt6TsHCsy586LdZy0="; + hash = "sha256-79HHJeAP3pnM/KAdGsGw31MRXl3Qz2ttTvXX+oBCcow="; }; postPatch = '' @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { ''; useFetchCargoVendor = true; - cargoHash = "sha256-yhZFLrpI2U/9VWGZkzYGzF5nPRmKpqJnfZ+6bmBYXNI="; + cargoHash = "sha256-N1s6Kf6iy28QcrLQy6TVbXjfSb9KtzJeaKksW4wXsMw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/tr/trivy/package.nix b/pkgs/by-name/tr/trivy/package.nix index e0e2459e3d49..56b5c2468148 100644 --- a/pkgs/by-name/tr/trivy/package.nix +++ b/pkgs/by-name/tr/trivy/package.nix @@ -11,19 +11,19 @@ buildGo124Module rec { pname = "trivy"; - version = "0.62.1"; + version = "0.63.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = "trivy"; tag = "v${version}"; - hash = "sha256-STu/xkKC2Ci5HbUi+gdz3ZXB+xgpkh6bs/lB/pG2Uig="; + hash = "sha256-e1T4z0L1poPzZgq8ooBmXiA+d+aTaf9bE09Rx2yFk68="; }; # Hash mismatch on across Linux and Darwin proxyVendor = true; - vendorHash = "sha256-0/nM0mcTWF4OPIZvHd6fOPfYMMDw5d96acNuw4kM7Tw="; + vendorHash = "sha256-lp5rajoeGR+nLO8EOLPdRLz0r19nGq2YNSjba8Zpq9E="; subPackages = [ "cmd/trivy" ]; diff --git a/pkgs/by-name/ya/yazi-unwrapped/package.nix b/pkgs/by-name/ya/yazi-unwrapped/package.nix index 25f0becdca75..8a2bdb633c0e 100644 --- a/pkgs/by-name/ya/yazi-unwrapped/package.nix +++ b/pkgs/by-name/ya/yazi-unwrapped/package.nix @@ -8,18 +8,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "yazi"; - version = "25.5.28"; + version = "25.5.31"; srcs = builtins.attrValues finalAttrs.passthru.srcs; sourceRoot = finalAttrs.passthru.srcs.code_src.name; useFetchCargoVendor = true; - cargoHash = "sha256-g+6RawDZsgYnXiybhaiosOfz/k4LHe5iX+VqHikfPzM="; + cargoHash = "sha256-5oNhqiQYkzaNZ1vK3hV5vWQCNr6D9VPNoqkS8ZOLf/4="; env.YAZI_GEN_COMPLETIONS = true; env.VERGEN_GIT_SHA = "Nixpkgs"; - env.VERGEN_BUILD_DATE = "2025-05-28"; + env.VERGEN_BUILD_DATE = "2025-05-30"; nativeBuildInputs = [ installShellFiles ]; buildInputs = [ rust-jemalloc-sys ]; @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "sxyazi"; repo = "yazi"; tag = "v${finalAttrs.version}"; - hash = "sha256-z+dh1lO6lvStlv58mi5T/cxYdewo2+5bRSO7naVcHMs="; + hash = "sha256-Er9d/5F34c2Uw+DN/9j+j7TdeWiSxMQlZSgsATC04cM="; }; man_src = fetchFromGitHub { diff --git a/pkgs/by-name/yu/yubioath-flutter/package.nix b/pkgs/by-name/yu/yubioath-flutter/package.nix index e22005d905ce..b324152d8585 100644 --- a/pkgs/by-name/yu/yubioath-flutter/package.nix +++ b/pkgs/by-name/yu/yubioath-flutter/package.nix @@ -1,6 +1,6 @@ { lib, - flutter324, + flutter332, python3, fetchFromGitHub, pcre2, @@ -10,25 +10,27 @@ gnome-screenshot, makeWrapper, removeReferencesTo, + runCommand, + yq, + yubioath-flutter, + _experimental-update-script-combinators, + gitUpdater, }: -flutter324.buildFlutterApplication rec { +flutter332.buildFlutterApplication rec { pname = "yubioath-flutter"; - version = "7.1.1"; + version = "7.2.2"; src = fetchFromGitHub { owner = "Yubico"; repo = "yubioath-flutter"; - rev = version; - hash = "sha256-MpY6yJvGBaFiEwuGEme2Uvyi5INCYhZJHyaRpC9pCuk="; + tag = version; + hash = "sha256-XkRSyy845hxQX5Ew5Sx3ZLh9UXfFMF6YdZJx+p/PJpo="; }; - passthru.helper = python3.pkgs.callPackage ./helper.nix { inherit src version meta; }; - pubspecLock = lib.importJSON ./pubspec.lock.json; - gitHashes = { - window_manager = "sha256-mLX51nbWFccsAfcqLQIYDjYz69y9wAz4U1RZ8TIYSj0="; - }; + + gitHashes.window_manager = "sha256-WKcNwEOthXj1S2lKlpdhy+r8JZslVqhwY2ywXeTSBEs="; postPatch = '' rm -f pubspec.lock @@ -37,40 +39,6 @@ flutter324.buildFlutterApplication rec { --replace-fail "../build/linux/helper" "${passthru.helper}/libexec/helper" ''; - preInstall = '' - # Make sure we have permission to delete things CMake has copied in to our build directory from elsewhere. - chmod -R +w build - ''; - - postInstall = '' - # Swap the authenticator-helper symlink with the correct symlink. - ln -fs "${passthru.helper}/bin/authenticator-helper" "$out/app/$pname/helper/authenticator-helper" - - # Move the icon. - mkdir $out/share/icons - mv $out/app/$pname/linux_support/com.yubico.yubioath.png $out/share/icons - - # Cleanup. - rm -rf \ - "$out/app/$pname/README.adoc" \ - "$out/app/$pname/desktop_integration.sh" \ - "$out/app/$pname/linux_support" \ - $out/bin/* # We will repopulate this directory later. - - # Symlink binary. - ln -sf "$out/app/$pname/authenticator" "$out/bin/yubioath-flutter" - - # Set the correct path to the binary in desktop file. - substituteInPlace "$out/share/applications/com.yubico.authenticator.desktop" \ - --replace "@EXEC_PATH/authenticator" "$out/bin/yubioath-flutter" \ - --replace "@EXEC_PATH/linux_support/com.yubico.yubioath.png" "$out/share/icons/com.yubico.yubioath.png" - ''; - - # Needed for QR scanning to work - extraWrapProgramArgs = '' - --prefix PATH : ${lib.makeBinPath [ gnome-screenshot ]} - ''; - nativeBuildInputs = [ makeWrapper removeReferencesTo @@ -83,12 +51,63 @@ flutter324.buildFlutterApplication rec { libappindicator ]; - meta = with lib; { + preInstall = '' + # Make sure we have permission to delete things CMake has copied in to our build directory from elsewhere. + chmod -R +w build + ''; + + postInstall = '' + # Swap the authenticator-helper symlink with the correct symlink. + ln -fs "${passthru.helper}/bin/authenticator-helper" "$out/app/$pname/helper/authenticator-helper" + + # Move the icon. + mkdir $out/share/pixmaps + mv $out/app/$pname/linux_support/com.yubico.yubioath.png $out/share/pixmaps + + # Cleanup. + rm -rf \ + "$out/app/$pname/README.adoc" \ + "$out/app/$pname/desktop_integration.sh" \ + "$out/app/$pname/linux_support" \ + $out/bin/* # We will repopulate this directory later. + + # Symlink binary. + ln -sf "$out/app/$pname/authenticator" "$out/bin/yubioath-flutter" + + # Set the correct path to the binary in desktop file. + substituteInPlace "$out/share/applications/com.yubico.yubioath.desktop" \ + --replace-fail '"@EXEC_PATH/authenticator"' "yubioath-flutter" \ + --replace-fail "@EXEC_PATH/linux_support/com.yubico.yubioath.png" "com.yubico.yubioath" + ''; + + # Needed for QR scanning to work + extraWrapProgramArgs = '' + --prefix PATH : ${lib.makeBinPath [ gnome-screenshot ]} + ''; + + passthru = { + helper = python3.pkgs.callPackage ./helper.nix { inherit src version meta; }; + pubspecSource = + runCommand "pubspec.lock.json" + { + nativeBuildInputs = [ yq ]; + inherit (yubioath-flutter) src; + } + '' + cat $src/pubspec.lock | yq > $out + ''; + updateScript = _experimental-update-script-combinators.sequence [ + (gitUpdater { }) + (_experimental-update-script-combinators.copyAttrOutputToFile "yubioath-flutter.pubspecSource" ./pubspec.lock.json) + ]; + }; + + meta = { description = "Yubico Authenticator for Desktop"; mainProgram = "yubioath-flutter"; homepage = "https://github.com/Yubico/yubioath-flutter"; - license = licenses.asl20; - maintainers = with maintainers; [ lukegb ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ lukegb ]; platforms = [ "x86_64-linux" "aarch64-linux" diff --git a/pkgs/by-name/yu/yubioath-flutter/pubspec.lock.json b/pkgs/by-name/yu/yubioath-flutter/pubspec.lock.json index 3f4e0ce4b083..228c90c40fbf 100644 --- a/pkgs/by-name/yu/yubioath-flutter/pubspec.lock.json +++ b/pkgs/by-name/yu/yubioath-flutter/pubspec.lock.json @@ -4,67 +4,61 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834", + "sha256": "dc27559385e905ad30838356c5f5d574014ba39872d732111cd07ac0beff4c57", "url": "https://pub.dev" }, "source": "hosted", - "version": "72.0.0" - }, - "_macros": { - "dependency": "transitive", - "description": "dart", - "source": "sdk", - "version": "0.3.2" + "version": "80.0.0" }, "analyzer": { "dependency": "direct dev", "description": { "name": "analyzer", - "sha256": "b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139", + "sha256": "192d1c5b944e7e53b24b5586db760db934b177d4147c42fbca8c8c5f1eb8d11e", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.7.0" + "version": "7.3.0" }, "analyzer_plugin": { "dependency": "direct dev", "description": { "name": "analyzer_plugin", - "sha256": "9661b30b13a685efaee9f02e5d01ed9f2b423bd889d28a304d02d704aee69161", + "sha256": "1d460d14e3c2ae36dc2b32cef847c4479198cf87704f63c3c3c8150ee50c3916", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.11.3" + "version": "0.12.0" }, "archive": { "dependency": "direct main", "description": { "name": "archive", - "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", + "sha256": "0c64e928dcbefddecd234205422bcfc2b5e6d31be0b86fef0d0dd48d7b4c9742", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.6.1" + "version": "4.0.4" }, "args": { "dependency": "direct main", "description": { "name": "args", - "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a", + "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.0" + "version": "2.7.0" }, "async": { "dependency": "direct main", "description": { "name": "async", - "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.11.0" + "version": "2.12.0" }, "base32": { "dependency": "direct main", @@ -80,71 +74,71 @@ "dependency": "transitive", "description": { "name": "boolean_selector", - "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "build": { "dependency": "transitive", "description": { "name": "build", - "sha256": "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.1" - }, - "build_config": { - "dependency": "transitive", - "description": { - "name": "build_config", - "sha256": "bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.1" - }, - "build_daemon": { - "dependency": "transitive", - "description": { - "name": "build_daemon", - "sha256": "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.0.2" - }, - "build_resolvers": { - "dependency": "transitive", - "description": { - "name": "build_resolvers", - "sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a", + "sha256": "cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0", "url": "https://pub.dev" }, "source": "hosted", "version": "2.4.2" }, + "build_config": { + "dependency": "transitive", + "description": { + "name": "build_config", + "sha256": "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "build_daemon": { + "dependency": "transitive", + "description": { + "name": "build_daemon", + "sha256": "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.4" + }, + "build_resolvers": { + "dependency": "transitive", + "description": { + "name": "build_resolvers", + "sha256": "b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.4" + }, "build_runner": { "dependency": "direct dev", "description": { "name": "build_runner", - "sha256": "dd09dd4e2b078992f42aac7f1a622f01882a8492fef08486b27ddde929c19f04", + "sha256": "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.12" + "version": "2.4.15" }, "build_runner_core": { "dependency": "transitive", "description": { "name": "build_runner_core", - "sha256": "f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0", + "sha256": "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.3.2" + "version": "8.0.0" }, "built_collection": { "dependency": "transitive", @@ -160,21 +154,31 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb", + "sha256": "ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.9.2" + "version": "8.9.5" + }, + "chalkdart": { + "dependency": "transitive", + "description": { + "name": "chalkdart", + "sha256": "e7cfcc9a9d9546843304c1ff87fe0696c7eb82ee70e6df63f555f321b15a40d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.3" }, "characters": { "dependency": "transitive", "description": { "name": "characters", - "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605", + "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.4.0" }, "checked_yaml": { "dependency": "transitive", @@ -200,51 +204,51 @@ "dependency": "transitive", "description": { "name": "cli_util", - "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19", + "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.4.1" + "version": "0.4.2" }, "clock": { "dependency": "transitive", "description": { "name": "clock", - "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.1" + "version": "1.1.2" }, "code_builder": { "dependency": "transitive", "description": { "name": "code_builder", - "sha256": "f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37", + "sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.10.0" + "version": "4.10.1" }, "collection": { "dependency": "direct main", "description": { "name": "collection", - "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.18.0" + "version": "1.19.1" }, "convert": { "dependency": "direct main", "description": { "name": "convert", - "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", + "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.1" + "version": "3.1.2" }, "cross_file": { "dependency": "transitive", @@ -260,111 +264,121 @@ "dependency": "direct main", "description": { "name": "crypto", - "sha256": "ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27", + "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.5" + "version": "3.0.6" }, "custom_lint": { "dependency": "direct dev", "description": { "name": "custom_lint", - "sha256": "6e1ec47427ca968f22bce734d00028ae7084361999b41673291138945c5baca0", + "sha256": "021897cce2b6c783b2521543e362e7fe1a2eaab17bf80514d8de37f99942ed9e", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.7" + "version": "0.7.3" }, "custom_lint_builder": { "dependency": "direct dev", "description": { "name": "custom_lint_builder", - "sha256": "ba2f90fff4eff71d202d097eb14b14f87087eaaef742e956208c0eb9d3a40a21", + "sha256": "e4235b9d8cef59afe621eba086d245205c8a0a6c70cd470be7cb17494d6df32d", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.7" + "version": "0.7.3" }, "custom_lint_core": { "dependency": "transitive", "description": { "name": "custom_lint_core", - "sha256": "4ddbbdaa774265de44c97054dcec058a83d9081d071785ece601e348c18c267d", + "sha256": "6dcee8a017181941c51a110da7e267c1d104dc74bec8862eeb8c85b5c8759a9e", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.5" + "version": "0.7.1" + }, + "custom_lint_visitor": { + "dependency": "transitive", + "description": { + "name": "custom_lint_visitor", + "sha256": "36282d85714af494ee2d7da8c8913630aa6694da99f104fb2ed4afcf8fc857d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0+7.3.0" }, "dart_style": { "dependency": "transitive", "description": { "name": "dart_style", - "sha256": "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9", + "sha256": "27eb0ae77836989a3bc541ce55595e8ceee0992807f14511552a898ddd0d88ac", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.6" + "version": "3.0.1" }, "desktop_drop": { "dependency": "direct main", "description": { "name": "desktop_drop", - "sha256": "d55a010fe46c8e8fcff4ea4b451a9ff84a162217bdb3b2a0aa1479776205e15d", + "sha256": "03abf1c0443afdd1d65cf8fa589a2f01c67a11da56bbb06f6ea1de79d5628e94", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.4.4" + "version": "0.5.0" }, "fake_async": { "dependency": "transitive", "description": { "name": "fake_async", - "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", + "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.1" + "version": "1.3.2" }, "ffi": { "dependency": "transitive", "description": { "name": "ffi", - "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", + "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.3" + "version": "2.1.4" }, "file": { "dependency": "transitive", "description": { "name": "file", - "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", + "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.0.0" + "version": "7.0.1" }, "file_picker": { "dependency": "direct main", "description": { "name": "file_picker", - "sha256": "167bb619cdddaa10ef2907609feb8a79c16dfa479d3afaf960f8e223f754bf12", + "sha256": "8d938fd5c11dc81bf1acd4f7f0486c683fe9e79a0b13419e27730f9ce4d8a25b", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.1.2" + "version": "9.2.1" }, "fixnum": { "dependency": "transitive", "description": { "name": "fixnum", - "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1", + "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.1.1" }, "flutter": { "dependency": "direct main", @@ -382,11 +396,11 @@ "dependency": "direct dev", "description": { "name": "flutter_lints", - "sha256": "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c", + "sha256": "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.0" + "version": "5.0.0" }, "flutter_localizations": { "dependency": "direct main", @@ -398,21 +412,21 @@ "dependency": "transitive", "description": { "name": "flutter_plugin_android_lifecycle", - "sha256": "9ee02950848f61c4129af3d6ec84a1cfc0e47931abc746b03e7a3bc3e8ff6eda", + "sha256": "5a1e6fb2c0561958d7e4c33574674bda7b77caaca7a33b758876956f2902eea3", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.22" + "version": "2.0.27" }, "flutter_riverpod": { "dependency": "direct main", "description": { "name": "flutter_riverpod", - "sha256": "0f1974eff5bbe774bf1d870e406fc6f29e3d6f1c46bd9c58e7172ff68a785d7d", + "sha256": "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.1" + "version": "2.6.1" }, "flutter_test": { "dependency": "direct dev", @@ -430,11 +444,11 @@ "dependency": "direct dev", "description": { "name": "freezed", - "sha256": "44c19278dd9d89292cf46e97dc0c1e52ce03275f40a97c5a348e802a924bf40e", + "sha256": "59a584c24b3acdc5250bb856d0d3e9c0b798ed14a4af1ddb7dc1c7b41df91c9c", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.7" + "version": "2.5.8" }, "freezed_annotation": { "dependency": "direct main", @@ -466,11 +480,11 @@ "dependency": "transitive", "description": { "name": "glob", - "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.3" }, "graphs": { "dependency": "transitive", @@ -486,41 +500,41 @@ "dependency": "transitive", "description": { "name": "hotreloader", - "sha256": "ed56fdc1f3a8ac924e717257621d09e9ec20e308ab6352a73a50a1d7a4d9158e", + "sha256": "bc167a1163807b03bada490bfe2df25b0d744df359227880220a5cbd04e5734b", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2.0" + "version": "4.3.0" }, "http": { "dependency": "transitive", "description": { "name": "http", - "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", + "sha256": "fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.2" + "version": "1.3.0" }, "http_multi_server": { "dependency": "transitive", "description": { "name": "http_multi_server", - "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", + "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.1" + "version": "3.2.2" }, "http_parser": { "dependency": "transitive", "description": { "name": "http_parser", - "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", + "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.2" + "version": "4.1.2" }, "integration_test": { "dependency": "direct dev", @@ -542,21 +556,21 @@ "dependency": "direct main", "description": { "name": "io", - "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", + "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.4" + "version": "1.0.5" }, "js": { "dependency": "transitive", "description": { "name": "js", - "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf", + "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.1" + "version": "0.7.2" }, "json_annotation": { "dependency": "direct main", @@ -572,31 +586,31 @@ "dependency": "direct dev", "description": { "name": "json_serializable", - "sha256": "ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b", + "sha256": "81f04dee10969f89f604e1249382d46b97a1ccad53872875369622b5bfc9e58a", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.8.0" + "version": "6.9.4" }, "leak_tracker": { "dependency": "transitive", "description": { "name": "leak_tracker", - "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05", + "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.0.5" + "version": "10.0.8" }, "leak_tracker_flutter_testing": { "dependency": "transitive", "description": { "name": "leak_tracker_flutter_testing", - "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806", + "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.5" + "version": "3.0.9" }, "leak_tracker_testing": { "dependency": "transitive", @@ -621,11 +635,11 @@ "dependency": "transitive", "description": { "name": "lints", - "sha256": "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235", + "sha256": "c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.0" + "version": "5.1.1" }, "local_notifier": { "dependency": "direct main", @@ -641,31 +655,21 @@ "dependency": "direct main", "description": { "name": "logging", - "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", + "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" - }, - "macros": { - "dependency": "transitive", - "description": { - "name": "macros", - "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.2-main.4" + "version": "1.3.0" }, "matcher": { "dependency": "transitive", "description": { "name": "matcher", - "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.12.16+1" + "version": "0.12.17" }, "material_color_utilities": { "dependency": "transitive", @@ -681,11 +685,11 @@ "dependency": "direct main", "description": { "name": "material_symbols_icons", - "sha256": "66416c4e30bd363508e12669634fc4f3250b83b69e862de67f4f9c480cf42414", + "sha256": "5f359722bb52bc91c4351d7e575268a9d944a0c2d3b19befd70e4ff60cdbfc9b", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2785.1" + "version": "4.2810.1" }, "menu_base": { "dependency": "transitive", @@ -701,81 +705,81 @@ "dependency": "transitive", "description": { "name": "meta", - "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.15.0" + "version": "1.16.0" }, "mime": { "dependency": "transitive", "description": { "name": "mime", - "sha256": "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a", + "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.6" + "version": "2.0.0" }, "package_config": { "dependency": "transitive", "description": { "name": "package_config", - "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", + "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.2.0" }, "path": { "dependency": "direct main", "description": { "name": "path", - "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.9.0" + "version": "1.9.1" }, "path_parsing": { "dependency": "transitive", "description": { "name": "path_parsing", - "sha256": "e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf", + "sha256": "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.1" + "version": "1.1.0" }, "path_provider": { "dependency": "direct main", "description": { "name": "path_provider", - "sha256": "fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378", + "sha256": "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.4" + "version": "2.1.5" }, "path_provider_android": { "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7", + "sha256": "0ca7359dad67fd7063cb2892ab0c0737b2daafd807cf1acecd62374c8fae6c12", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.10" + "version": "2.2.16" }, "path_provider_foundation": { "dependency": "transitive", "description": { "name": "path_provider_foundation", - "sha256": "f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16", + "sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.0" + "version": "2.4.1" }, "path_provider_linux": { "dependency": "transitive", @@ -811,21 +815,21 @@ "dependency": "transitive", "description": { "name": "petitparser", - "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.2" + "version": "6.1.0" }, "platform": { "dependency": "transitive", "description": { "name": "platform", - "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65", + "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.5" + "version": "3.1.6" }, "plugin_platform_interface": { "dependency": "transitive", @@ -847,35 +851,45 @@ "source": "hosted", "version": "1.5.1" }, + "posix": { + "dependency": "transitive", + "description": { + "name": "posix", + "sha256": "a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.1" + }, "process": { "dependency": "transitive", "description": { "name": "process", - "sha256": "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32", + "sha256": "107d8be718f120bbba9dcd1e95e3bd325b1b4a4f07db64154635ba03f2567a0d", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.0.2" + "version": "5.0.3" }, "pub_semver": { "dependency": "transitive", "description": { "name": "pub_semver", - "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", + "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.4" + "version": "2.2.0" }, "pubspec_parse": { "dependency": "transitive", "description": { "name": "pubspec_parse", - "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8", + "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.5.0" }, "qrscanner_zxing": { "dependency": "direct main", @@ -890,11 +904,11 @@ "dependency": "transitive", "description": { "name": "riverpod", - "sha256": "f21b32ffd26a36555e501b04f4a5dca43ed59e16343f1a30c13632b2351dfa4d", + "sha256": "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.1" + "version": "2.6.1" }, "rxdart": { "dependency": "transitive", @@ -910,41 +924,81 @@ "dependency": "direct main", "description": { "name": "screen_retriever", - "sha256": "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90", + "sha256": "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.9" + "version": "0.2.0" + }, + "screen_retriever_linux": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_linux", + "sha256": "f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_macos": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_macos", + "sha256": "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_platform_interface": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_platform_interface", + "sha256": "ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_windows": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_windows", + "sha256": "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" }, "shared_preferences": { "dependency": "direct main", "description": { "name": "shared_preferences", - "sha256": "746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051", + "sha256": "846849e3e9b68f3ef4b60c60cf4b3e02e9321bc7f4d8c4692cf87ffa82fc8a3a", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.2" + "version": "2.5.2" }, "shared_preferences_android": { "dependency": "transitive", "description": { "name": "shared_preferences_android", - "sha256": "480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e", + "sha256": "3ec7210872c4ba945e3244982918e502fa2bfb5230dff6832459ca0e1879b7ad", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.2" + "version": "2.4.8" }, "shared_preferences_foundation": { "dependency": "transitive", "description": { "name": "shared_preferences_foundation", - "sha256": "c4b35f6cb8f63c147312c054ce7c2254c8066745125264f0c88739c417fc9d9f", + "sha256": "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.2" + "version": "2.5.4" }, "shared_preferences_linux": { "dependency": "transitive", @@ -970,11 +1024,11 @@ "dependency": "transitive", "description": { "name": "shared_preferences_web", - "sha256": "d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e", + "sha256": "c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.2" + "version": "2.4.3" }, "shared_preferences_windows": { "dependency": "transitive", @@ -990,21 +1044,21 @@ "dependency": "transitive", "description": { "name": "shelf", - "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", + "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.4.1" + "version": "1.4.2" }, "shelf_web_socket": { "dependency": "transitive", "description": { "name": "shelf_web_socket", - "sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611", + "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.0" + "version": "3.0.0" }, "shortid": { "dependency": "transitive", @@ -1020,37 +1074,37 @@ "dependency": "transitive", "description": "flutter", "source": "sdk", - "version": "0.0.99" + "version": "0.0.0" }, "source_gen": { "dependency": "transitive", "description": { "name": "source_gen", - "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832", + "sha256": "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.5.0" + "version": "2.0.0" }, "source_helper": { "dependency": "transitive", "description": { "name": "source_helper", - "sha256": "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd", + "sha256": "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.4" + "version": "1.3.5" }, "source_span": { "dependency": "transitive", "description": { "name": "source_span", - "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.10.0" + "version": "1.10.1" }, "sprintf": { "dependency": "transitive", @@ -1066,11 +1120,11 @@ "dependency": "transitive", "description": { "name": "stack_trace", - "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", + "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.11.1" + "version": "1.12.1" }, "state_notifier": { "dependency": "transitive", @@ -1086,31 +1140,31 @@ "dependency": "transitive", "description": { "name": "stream_channel", - "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.4" }, "stream_transform": { "dependency": "transitive", "description": { "name": "stream_transform", - "sha256": "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f", + "sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.1.1" }, "string_scanner": { "dependency": "transitive", "description": { "name": "string_scanner", - "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", + "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" + "version": "1.4.1" }, "sync_http": { "dependency": "transitive", @@ -1126,21 +1180,21 @@ "dependency": "transitive", "description": { "name": "term_glyph", - "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.1" + "version": "1.2.2" }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb", + "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.2" + "version": "0.7.4" }, "test_res": { "dependency": "direct dev", @@ -1155,81 +1209,81 @@ "dependency": "transitive", "description": { "name": "timing", - "sha256": "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32", + "sha256": "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.1" + "version": "1.0.2" }, "tray_manager": { "dependency": "direct main", "description": { "name": "tray_manager", - "sha256": "c9a63fd88bd3546287a7eb8ccc978d707eef82c775397af17dda3a4f4c039e64", + "sha256": "80be6c508159a6f3c57983de795209ac13453e9832fd574143b06dceee188ed2", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.3" + "version": "0.3.2" }, "typed_data": { "dependency": "transitive", "description": { "name": "typed_data", - "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.2" + "version": "1.4.0" }, "url_launcher": { "dependency": "direct main", "description": { "name": "url_launcher", - "sha256": "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.3.0" - }, - "url_launcher_android": { - "dependency": "transitive", - "description": { - "name": "url_launcher_android", - "sha256": "e35a698ac302dd68e41f73250bd9517fe3ab5fa4f18fe4647a0872db61bacbab", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.3.10" - }, - "url_launcher_ios": { - "dependency": "transitive", - "description": { - "name": "url_launcher_ios", - "sha256": "e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e", + "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603", "url": "https://pub.dev" }, "source": "hosted", "version": "6.3.1" }, + "url_launcher_android": { + "dependency": "transitive", + "description": { + "name": "url_launcher_android", + "sha256": "1d0eae19bd7606ef60fe69ef3b312a437a16549476c42321d5dc1506c9ca3bf4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.15" + }, + "url_launcher_ios": { + "dependency": "transitive", + "description": { + "name": "url_launcher_ios", + "sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.2" + }, "url_launcher_linux": { "dependency": "transitive", "description": { "name": "url_launcher_linux", - "sha256": "e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af", + "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.0" + "version": "3.2.1" }, "url_launcher_macos": { "dependency": "transitive", "description": { "name": "url_launcher_macos", - "sha256": "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de", + "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.0" + "version": "3.2.2" }, "url_launcher_platform_interface": { "dependency": "transitive", @@ -1245,61 +1299,61 @@ "dependency": "transitive", "description": { "name": "url_launcher_web", - "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e", + "sha256": "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.3" + "version": "2.4.0" }, "url_launcher_windows": { "dependency": "transitive", "description": { "name": "url_launcher_windows", - "sha256": "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185", + "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.2" + "version": "3.1.4" }, "uuid": { "dependency": "transitive", "description": { "name": "uuid", - "sha256": "f33d6bb662f0e4f79dcd7ada2e6170f3b3a2530c28fc41f49a411ddedd576a77", + "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.5.0" + "version": "4.5.1" }, "vector_graphics": { "dependency": "direct main", "description": { "name": "vector_graphics", - "sha256": "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3", + "sha256": "44cc7104ff32563122a929e4620cf3efd584194eec6d1d913eb5ba593dbcf6de", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.11+1" + "version": "1.1.18" }, "vector_graphics_codec": { "dependency": "transitive", "description": { "name": "vector_graphics_codec", - "sha256": "c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da", + "sha256": "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.11+1" + "version": "1.1.13" }, "vector_graphics_compiler": { "dependency": "direct main", "description": { "name": "vector_graphics_compiler", - "sha256": "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81", + "sha256": "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.11+1" + "version": "1.1.16" }, "vector_math": { "dependency": "transitive", @@ -1315,31 +1369,31 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d", + "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.2.5" + "version": "14.3.1" }, "watcher": { "dependency": "transitive", "description": { "name": "watcher", - "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", + "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.1.1" }, "web": { "dependency": "transitive", "description": { "name": "web", - "sha256": "d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062", + "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.0" + "version": "1.1.1" }, "web_socket": { "dependency": "transitive", @@ -1355,52 +1409,52 @@ "dependency": "transitive", "description": { "name": "web_socket_channel", - "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f", + "sha256": "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.1" + "version": "3.0.2" }, "webdriver": { "dependency": "transitive", "description": { "name": "webdriver", - "sha256": "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e", + "sha256": "3d773670966f02a646319410766d3b5e1037efb7f07cc68f844d5e06cd4d61c8", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.3" + "version": "3.0.4" }, "win32": { "dependency": "transitive", "description": { "name": "win32", - "sha256": "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a", + "sha256": "dc6ecaa00a7c708e5b4d10ee7bec8c270e9276dfcab1783f57e9962d7884305f", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.5.4" + "version": "5.12.0" }, "window_manager": { "dependency": "direct main", "description": { - "path": ".", - "ref": "2272d45bcf46d7e2b452a038906fbc85df3ce83d", - "resolved-ref": "2272d45bcf46d7e2b452a038906fbc85df3ce83d", + "path": "packages/window_manager", + "ref": "af74247d3c1616968ec281435f7410bcc7f9355c", + "resolved-ref": "af74247d3c1616968ec281435f7410bcc7f9355c", "url": "https://github.com/fdennis/window_manager.git" }, "source": "git", - "version": "0.3.8" + "version": "0.4.3" }, "xdg_directories": { "dependency": "transitive", "description": { "name": "xdg_directories", - "sha256": "faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d", + "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.4" + "version": "1.1.0" }, "xml": { "dependency": "transitive", @@ -1416,15 +1470,15 @@ "dependency": "transitive", "description": { "name": "yaml", - "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", + "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.2" + "version": "3.1.3" } }, "sdks": { - "dart": ">=3.5.0 <4.0.0", - "flutter": ">=3.24.0" + "dart": ">=3.7.0 <4.0.0", + "flutter": ">=3.27.0" } } diff --git a/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix b/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix index 406022b7074e..395d1dc0c7eb 100644 --- a/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix @@ -2,7 +2,9 @@ stdenv, lib, fetchFromGitLab, + fetchpatch, gitUpdater, + nixosTests, testers, cmake, cmake-extras, @@ -31,13 +33,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-content-hub"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-content-hub"; rev = finalAttrs.version; - hash = "sha256-eA5oCoAZB7fWyWm0Sy6wXh0EW+h76bdfJ2dotr7gUC0="; + hash = "sha256-S/idjDdcRvqZqKmflkYJyQckz4/9k/8JY6eRDACk9Ag="; }; outputs = [ @@ -47,9 +49,18 @@ stdenv.mkDerivation (finalAttrs: { "examples" ]; + patches = [ + # Remove when version > 2.1.0 + (fetchpatch { + name = "0001-lomiri-content-hub-treewide-Add-missing-LDM-include-dirs.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-content-hub/-/commit/cdd3371714c183d4caf166157082288c022bb98d.patch"; + hash = "sha256-Uubd425T+0KxPR9lJW6+ejO2fFzcDwEIpJATSZ9jYD4="; + }) + ]; + postPatch = '' substituteInPlace import/*/Content/CMakeLists.txt \ - --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" + --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt\''${QT_VERSION_MAJOR}/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" # Look for peer files in running system substituteInPlace src/com/lomiri/content/service/registry-updater.cpp \ @@ -101,6 +112,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "GSETTINGS_COMPILE" true) (lib.cmakeBool "GSETTINGS_LOCALINSTALL" true) + (lib.cmakeBool "ENABLE_QT6" (lib.strings.versionAtLeast qtbase.version "6")) (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck) (lib.cmakeBool "ENABLE_DOC" true) (lib.cmakeBool "ENABLE_UBUNTU_COMPAT" true) # in case something still depends on it @@ -145,7 +157,12 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + tests = { + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + # Tests content-hub functionality, up to the point where one app receives a content exchange request + # from another and changes into a mode to pick the content to send + vm = nixosTests.lomiri.desktop-appinteractions; + }; updateScript = gitUpdater { }; }; diff --git a/pkgs/desktops/lomiri/services/mediascanner2/default.nix b/pkgs/desktops/lomiri/services/mediascanner2/default.nix index 001824c7b36e..511cf9b42094 100644 --- a/pkgs/desktops/lomiri/services/mediascanner2/default.nix +++ b/pkgs/desktops/lomiri/services/mediascanner2/default.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitLab, - fetchpatch, gitUpdater, nixosTests, testers, @@ -32,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mediascanner2"; - version = "0.117"; + version = "0.118"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/mediascanner2"; - rev = finalAttrs.version; - hash = "sha256-e1vDPnIIfevXj9ODEEKJ2y4TiU0H+08aTf2vU+emdQk="; + tag = finalAttrs.version; + hash = "sha256-ZJXJNDZUDor5EJ+rn7pQt7lLzoszZUQM3B+u1gBSMs8="; }; outputs = [ @@ -46,22 +45,6 @@ stdenv.mkDerivation (finalAttrs: { "dev" ]; - patches = [ - (fetchpatch { - name = "0001-mediascanner2-scannerdaemon-Drop-desktop-and-MEDIASCANNER_RUN-check.patch"; - url = "https://gitlab.com/ubports/development/core/mediascanner2/-/commit/1e65b32e32a0536b9e2f283ba563fa78b6ef6d61.patch"; - hash = "sha256-Xhm5+/E/pP+mn+4enqdsor1oRqfYTzabg1ODVfIhra4="; - }) - - # Fix taglib 2.x compat - # Remove when version > 0.117 - (fetchpatch { - name = "0002-mediascanner2-Fix-taglib-2.x-compat.patch"; - url = "https://gitlab.com/ubports/development/core/mediascanner2/-/commit/0ce744ecb32abb39516d1b9f98d47c3e86690158.patch"; - hash = "sha256-hz/EB83yNoxhxkEcg7ZMezknpKajhH1BNkYD3wrf/eY="; - }) - ]; - postPatch = '' substituteInPlace src/qml/MediaScanner.*/CMakeLists.txt \ --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" @@ -131,6 +114,9 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Media scanner service & access library"; homepage = "https://gitlab.com/ubports/development/core/mediascanner2"; + changelog = "https://gitlab.com/ubports/development/core/mediascanner2/-/blob/${ + if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev + }/ChangeLog"; license = lib.licenses.gpl3Only; teams = [ lib.teams.lomiri ]; mainProgram = "mediascanner-service-2.0"; diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 10c37de9a8ca..03d0383402fd 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -26,6 +26,7 @@ sqlite, xz, zlib, + zstd, # platform-specific dependencies bashNonInteractive, @@ -202,6 +203,8 @@ let ++ optionals (!stdenv.hostPlatform.isDarwin) [ autoconf-archive # needed for AX_CHECK_COMPILE_FLAG autoreconfHook + ] + ++ optionals (!stdenv.hostPlatform.isDarwin || passthru.pythonAtLeast "3.14") [ pkg-config ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ @@ -231,6 +234,9 @@ let xz zlib ] + ++ optionals (passthru.pythonAtLeast "3.14") [ + zstd + ] ++ optionals withMpdecimal [ mpdecimal ] diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 298f1ebb9431..eb3a6d6aa67f 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.38.24"; + version = "1.38.27"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-Fgd4T9N5RY5V7pL0/R12vzKHgaJ928Miw91ht85KoeM="; + hash = "sha256-ikXzK4PSnsPbKLN+po6l8XmxQYYyEUl++SuhjiqJauw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 2daaf2fb2e07..0abffec95991 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.38.24"; + version = "1.38.27"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-7TRpF1kdG3SZLq3IvQIKCdVSKMvfnTJzpNsriPC9uPk="; + hash = "sha256-WDFdExi3nY+L0oiLFYfZD6T/phAKWLYQlGEQ6IVwuZU="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/mechanicalsoup/default.nix b/pkgs/development/python-modules/mechanicalsoup/default.nix index 5671f85df582..75692db12f22 100644 --- a/pkgs/development/python-modules/mechanicalsoup/default.nix +++ b/pkgs/development/python-modules/mechanicalsoup/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "mechanicalsoup"; - version = "1.3.0"; + version = "1.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "MechanicalSoup"; repo = "MechanicalSoup"; tag = "v${version}"; - hash = "sha256-iZ2nwBxikf0cTTlxzcGvHJim4N6ZEqIhlK7t1WAYdms="; + hash = "sha256-fu3DGTsLrw+MHZCFF4WHMpyjqkexH/c8j9ko9ZAeAwU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/mitogen/default.nix b/pkgs/development/python-modules/mitogen/default.nix index dbe29f233da1..431a8dc3d155 100644 --- a/pkgs/development/python-modules/mitogen/default.nix +++ b/pkgs/development/python-modules/mitogen/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "mitogen"; - version = "0.3.23"; + version = "0.3.24"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "mitogen-hq"; repo = "mitogen"; tag = "v${version}"; - hash = "sha256-UhIimbD+Nx2v/W+A0y2L4a/iYFGF+PH59wCqW2Q4ioQ="; + hash = "sha256-TogWhsKnwF4uHOhCNxPpNiyWen3Vfh5bbDI8wKprP/k="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index d8683b2d05f5..aa3fecbc922f 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -66,8 +66,8 @@ rec { "sha256-NoNqTKRj7/wlqoBwsEW/wgj1cBAHYRXgLVfZvkP5EV0="; mypy-boto3-amplify = - buildMypyBoto3Package "amplify" "1.38.0" - "sha256-Yv+wP2Evnr71q1ySqNuz5jxwiJAi55frDVr/Js8rOd4="; + buildMypyBoto3Package "amplify" "1.38.26" + "sha256-m+R9I+UnOmamcErUqyzSgmJJB1Z8aM+GiF4m+vKNb1w="; mypy-boto3-amplifybackend = buildMypyBoto3Package "amplifybackend" "1.38.0" @@ -150,8 +150,8 @@ rec { "sha256-6OgMopfNAD7bpLnDFXlcejFqKYTOvrJOd/X39SHYa1A="; mypy-boto3-autoscaling = - buildMypyBoto3Package "autoscaling" "1.38.0" - "sha256-cktwW7m3hDjlGuli/kLnjup8v6+NMypkis1uwaMjDGw="; + buildMypyBoto3Package "autoscaling" "1.38.26" + "sha256-U70vqWbBuDSUxbftuGdZasnmjBOk5QUDShSE+JAr5rA="; mypy-boto3-autoscaling-plans = buildMypyBoto3Package "autoscaling-plans" "1.38.0" @@ -250,8 +250,8 @@ rec { "sha256-YpciSNXGJznUocicc/2Yw3DPbBd75hysRiRQz8aCMHM="; mypy-boto3-cloudtrail = - buildMypyBoto3Package "cloudtrail" "1.38.0" - "sha256-YF6b1GuGRcUxY+5RICiH6V12DoDxjLq6lyrjItqfNQk="; + buildMypyBoto3Package "cloudtrail" "1.38.26" + "sha256-M1KQxsztgLZFr6TgOX0+P7eEKS3FEAm6UFoNWEnJOoc="; mypy-boto3-cloudtrail-data = buildMypyBoto3Package "cloudtrail-data" "1.38.0" @@ -338,8 +338,8 @@ rec { "sha256-GaC5ClnSfg8/8jCv2ropPoUS7YOIhKkyicDhsYUUPwk="; mypy-boto3-connect = - buildMypyBoto3Package "connect" "1.38.7" - "sha256-Aq0JiXGaBHSN31Z72a0LL8jG25f+0dBIlIWZuCergV4="; + buildMypyBoto3Package "connect" "1.38.26" + "sha256-6Gaap6zNuKaibd/8iM9uSgryw69A0abbb8cUXtjRQ6Q="; mypy-boto3-connect-contact-lens = buildMypyBoto3Package "connect-contact-lens" "1.38.0" @@ -374,16 +374,16 @@ rec { "sha256-du5cZjwXzIW8FP2N7e9Ob9Cm9pPlReSY65EQkfsa+bg="; mypy-boto3-dataexchange = - buildMypyBoto3Package "dataexchange" "1.38.0" - "sha256-0ys8v/ATJ7c0+MJoAiSqIBoCcgO022HB9C/Jg7vFgNc="; + buildMypyBoto3Package "dataexchange" "1.38.26" + "sha256-0S7/kVuT7nll8VsBWQg34kfeil3AVQxrFNOqDDkhjDM="; mypy-boto3-datapipeline = buildMypyBoto3Package "datapipeline" "1.38.0" "sha256-BpMkYM5+cchfhg+xJR9/cXd75fzl44rwsXXEe5ofowU="; mypy-boto3-datasync = - buildMypyBoto3Package "datasync" "1.38.20" - "sha256-/tlmBxr4MvI1YuPq5+BgHzQj2J+c1nN/C/poOxE0Xd8="; + buildMypyBoto3Package "datasync" "1.38.26" + "sha256-6QbYEYPwv26NV5rZSeQWmD2YqV0EOooDpVL0fFP0Hac="; mypy-boto3-dax = buildMypyBoto3Package "dax" "1.38.0" @@ -446,8 +446,8 @@ rec { "sha256-RQh46jrXqj4bXTRJ+tPR9sql7yUn7Ek9u4p0OU0A7b0="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.38.24" - "sha256-QehCKooiP5jPrE6UA4OA6MJTdCczUTPsoFfDi/R13TQ="; + buildMypyBoto3Package "ec2" "1.38.25" + "sha256-rtfXRsfGr34/dUJK1kgpp85blNyHERSkScQDraIpVMs="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.38.0" @@ -506,8 +506,8 @@ rec { "sha256-Lr2cpSBkWl30iIS3fc4qiOWBTbIu5L0MMW5O9Au+COM="; mypy-boto3-emr-serverless = - buildMypyBoto3Package "emr-serverless" "1.38.0" - "sha256-WxLk2ka6qnoynRbOQcXAEv84896eFOY4AYApw3c+ZlA="; + buildMypyBoto3Package "emr-serverless" "1.38.27" + "sha256-+BU0uQBQmQSxGwXalJ9A95Y8RXaFy9L6Lk8Z3D6QwkM="; mypy-boto3-entityresolution = buildMypyBoto3Package "entityresolution" "1.38.0" @@ -518,8 +518,8 @@ rec { "sha256-u6EpWVFrrL7BCeaBdRCvY33m46fj8qQX8uNYRZfsUOI="; mypy-boto3-events = - buildMypyBoto3Package "events" "1.38.0" - "sha256-MBfgy4G5lVYXGzbs0aQK8qx3b16tmiAyq/ZTguwtbdI="; + buildMypyBoto3Package "events" "1.38.25" + "sha256-7Qy4CTzuWYTg2DF4odirHVLfwx4a1BVtJ62jcAlNDoY="; mypy-boto3-evidently = buildMypyBoto3Package "evidently" "1.38.0" @@ -558,8 +558,8 @@ rec { "sha256-t1Pj8GSr9XDym/s1qAXaiGSGWEEttDhjBnPrB/L6Lwo="; mypy-boto3-fsx = - buildMypyBoto3Package "fsx" "1.38.0" - "sha256-lDGC5LuanclpzeDgrQ9bApm3BFzG3sANnFvchVM48UQ="; + buildMypyBoto3Package "fsx" "1.38.26" + "sha256-Njes201HxzOKDRwaxXWLp3ZjoRjEi62jYM0y2yvetWY="; mypy-boto3-gamelift = buildMypyBoto3Package "gamelift" "1.38.0" @@ -702,8 +702,8 @@ rec { "sha256-FdGvtAvQGv9Aqho48WB/6+LYchVetmrjQ0i/GJrdvx4="; mypy-boto3-ivs-realtime = - buildMypyBoto3Package "ivs-realtime" "1.38.0" - "sha256-l8fDX2Dy1+SV0YUKs1g5AO4UcETibLAuuRFyfSpiWgo="; + buildMypyBoto3Package "ivs-realtime" "1.38.26" + "sha256-qCSBnfEsBKOLtuM986Kxul4wusWT2/+Kf/MEDWUxRf8="; mypy-boto3-ivschat = buildMypyBoto3Package "ivschat" "1.38.0" @@ -938,8 +938,8 @@ rec { "sha256-wAV1UHqtLfNs+bh/PaWh61pT+wZU7cx3dfcjwxPR0m4="; mypy-boto3-mwaa = - buildMypyBoto3Package "mwaa" "1.38.0" - "sha256-2hV5TYKrrowbOqQZiw0DphDW2d2lFo8PYGolyqewznw="; + buildMypyBoto3Package "mwaa" "1.38.26" + "sha256-cwlTRUR7R/EBhLS5KUzLjbOxrOomGzI/jnLBHLiPDY0="; mypy-boto3-neptune = buildMypyBoto3Package "neptune" "1.38.18" @@ -950,8 +950,8 @@ rec { "sha256-U0fMJNyZpqwYlMuqTBSZCgAtls7IuyKnjWBAJ+6rTV8="; mypy-boto3-network-firewall = - buildMypyBoto3Package "network-firewall" "1.38.0" - "sha256-Ty7z/tbUkc8Zu/YpdKrL+7ZbJoIPzVOvFKdbgrS9baY="; + buildMypyBoto3Package "network-firewall" "1.38.25" + "sha256-R2uEXo+0gtP1b76aKT9VWCKM0Uy3PulOO2T9WH2V8dM="; mypy-boto3-networkmanager = buildMypyBoto3Package "networkmanager" "1.38.0" @@ -1162,8 +1162,8 @@ rec { "sha256-gBkjxkSmaolRcBzYEbUwRvaZpEcPSD4cmfx/mi7VPM4="; mypy-boto3-s3 = - buildMypyBoto3Package "s3" "1.38.0" - "sha256-+P5YbkUSP/zTBaDDCEcSjzkx2IhknitMWlL0Ehg8hAo="; + buildMypyBoto3Package "s3" "1.38.26" + "sha256-OKRd7leC1cB93qB+pQllxNK6fndhfBn2E7TJ+A+WG1I="; mypy-boto3-s3control = buildMypyBoto3Package "s3control" "1.38.14" @@ -1174,8 +1174,8 @@ rec { "sha256-lBWZesgIKYnjSjUOPBhF4GNsNSk09YDSEyX0qweT3iM="; mypy-boto3-sagemaker = - buildMypyBoto3Package "sagemaker" "1.38.14" - "sha256-XKVR3rpjs3qNWapIjo28h2D5CywnrBYi8dEbkCtzRhg="; + buildMypyBoto3Package "sagemaker" "1.38.27" + "sha256-uzh49125b/AmTSUP5MtNqeahVwFpUZn7KclG2kgiCJE="; mypy-boto3-sagemaker-a2i-runtime = buildMypyBoto3Package "sagemaker-a2i-runtime" "1.38.0" @@ -1346,8 +1346,8 @@ rec { "sha256-b6TgvxWdQI5TAI/OsJzmzlte1v30NdJucdedKgCb9LY="; mypy-boto3-synthetics = - buildMypyBoto3Package "synthetics" "1.38.13" - "sha256-goFpYJQHLzYybY8gt9FTUVXXMX+8k58YNxZ8VsNfwr4="; + buildMypyBoto3Package "synthetics" "1.38.25" + "sha256-E9+a0LjuQfyxL/b/uZpMCrvWFmX2vPS+qJNMKcc10mU="; mypy-boto3-textract = buildMypyBoto3Package "textract" "1.38.0" diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix index 84d5348a85b6..bbf9fcdab2f0 100644 --- a/pkgs/development/python-modules/opower/default.nix +++ b/pkgs/development/python-modules/opower/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "opower"; - version = "0.12.2"; + version = "0.12.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "opower"; tag = "v${version}"; - hash = "sha256-9qDkhhx96+Zu2yr+EWJc0m2ntNlCo0luFOr6NxWtJSw="; + hash = "sha256-fsZpAipBw6XLeLdum1p5gkpKSOG40TLa6cLFTUSA05Y="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pymupdf4llm/default.nix b/pkgs/development/python-modules/pymupdf4llm/default.nix new file mode 100644 index 000000000000..9f3a84eafde1 --- /dev/null +++ b/pkgs/development/python-modules/pymupdf4llm/default.nix @@ -0,0 +1,56 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pymupdf, +}: + +buildPythonPackage rec { + pname = "pymupdf4llm"; + version = "0.0.17"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pymupdf"; + repo = "RAG"; + tag = "v${version}"; + hash = "sha256-+RLK+UorkU8eVQJGrc7pVNZPtIpxMgA9mBKA6GeWUa0="; + }; + + sourceRoot = "${src.name}/pymupdf4llm"; + + build-system = [ setuptools ]; + + dependencies = [ pymupdf ]; + + checkPhase = '' + runHook preCheck + + python3 - <<'EOF' + import fitz + import pymupdf4llm + + doc = fitz.open() + page = doc.new_page() + page.insert_text((72, 72), "Hello, Nix!") + doc.save("input.pdf") + + md = pymupdf4llm.to_markdown("input.pdf") + assert isinstance(md, str), "Returned value is not a string" + assert "Hello, Nix!" in md, "Returned value does not contain the expected text" + EOF + + runHook postCheck + ''; + + pythonImportsCheck = [ "pymupdf4llm" ]; + + meta = { + description = "PyMuPDF Utilities for LLM/RAG - converts PDF pages to Markdown format for Retrieval-Augmented Generation"; + homepage = "https://github.com/pymupdf/RAG"; + changelog = "https://github.com/pymupdf/RAG/blob/${src.tag}/CHANGES.md"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ ryota2357 ]; + }; +} diff --git a/pkgs/development/python-modules/sendgrid/default.nix b/pkgs/development/python-modules/sendgrid/default.nix index 0240ed4b23d0..660fff341efb 100644 --- a/pkgs/development/python-modules/sendgrid/default.nix +++ b/pkgs/development/python-modules/sendgrid/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "sendgrid"; - version = "6.12.2"; + version = "6.12.3"; pyproject = true; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = pname; repo = "sendgrid-python"; tag = version; - hash = "sha256-p9U/tno5LhcfhhZE4iPspN2Du0RA7vurqwxlZmTwavk="; + hash = "sha256-7j/V731e+eXFW42WRHuJpZ3OFObVXLOgl81Ww3EAApU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 25f899573a62..c50956c17ad5 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1389"; + version = "3.0.1390"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-mLBC1ZOLO8vh5QMmG15TD07hHwBBlaRABY5ZMjKES1I="; + hash = "sha256-UOJ1NCWKFqcrU2uMX4qTy8ooFEy6TIrb1YTIthHspuM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index cca5ca4c18fb..9658dae61427 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "9.6.1"; + version = "9.6.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; tag = version; - hash = "sha256-6prKi6gMEBA0kxY/57Uyc56Kf54tEQOlEf8nL0wivXA="; + hash = "sha256-W0+lRCVWrm+dieZozloePlro/pGp3ag2WBTzpJ9CXxY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/yolink-api/default.nix b/pkgs/development/python-modules/yolink-api/default.nix index 87cdeef0883a..238559fb44ab 100644 --- a/pkgs/development/python-modules/yolink-api/default.nix +++ b/pkgs/development/python-modules/yolink-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "yolink-api"; - version = "0.5.2"; + version = "0.5.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "YoSmart-Inc"; repo = "yolink-api"; tag = "v${version}"; - hash = "sha256-ZFEEFYCA5hBtQTe1G80wxIOF6sR+gbaqpjm9oqyyvE8="; + hash = "sha256-b83ozdnaZ15LMUiDJH2LPZv9D/ovV0Nx15+R6tip6Yk="; }; build-system = [ setuptools ]; diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index d6253cf4726b..e15de15e0df9 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -24,16 +24,16 @@ "hash": "sha256:1v1pq9yzxrlaxx4y4cj5q3wska0jbv2inc7phqfw70fj88kai0hx" }, "6.12": { - "version": "6.12.30", - "hash": "sha256:0bpqkh64bj6nslbb43hj28lxmrxinrapwgh05q5wwh0yjx46l16z" + "version": "6.12.31", + "hash": "sha256:19sba8zak31gn89pzfa3kb9rv7y9z8kybvyikigamq7nblz5nk5h" }, "6.13": { "version": "6.13.12", "hash": "sha256:0hhj49k3ksjcp0dg5yiahqzryjfdpr9c1a9ph6j9slzmkikbn7v1" }, "6.14": { - "version": "6.14.8", - "hash": "sha256:0199maj3mk577wwaszbi0cl5a0afx1ynad896bmmg8vm636jxcb2" + "version": "6.14.9", + "hash": "sha256:0qgkr69745al6nf4wicxq284xnsmxybh29r7hjh2b6bi6bhds31r" }, "6.15": { "version": "6.15", diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index ea5de9e217dd..fac30b6f1cc6 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.88.33"; + version = "3.88.35"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; tag = "v${version}"; - hash = "sha256-cliUjSMH36XhV0VLHqTcZa2xBbgRqFl2kczl4AmVEwU="; + hash = "sha256-x83lA3VWrs3PfGjprqTqt12JtSs2wgqThNNVGviLddI="; }; - vendorHash = "sha256-sF7+2IrVlGskoQjVYrnmFC7KSNSh0fl3BErSMJESrcA="; + vendorHash = "sha256-i7yS/+HQa8gOWhkWzyop3IObOwkjpzmzyqBlp9dSV3Y="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c81c29b7a3b1..d80465dcdce6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -237,6 +237,7 @@ mapAliases { adminer-pematon = adminneo; # Added 2025-02-20 adminerneo = adminneo; # Added 2025-02-27 adtool = throw "'adtool' has been removed, as it was broken and unmaintained"; + adobe-reader = throw "'adobe-reader' has been removed, as it was broken, outdated and insecure"; # added 2025-05-31 adom = throw "'adom' has been removed, as it was broken and unmaintained"; # added 2024-05-09 adoptopenjdk-bin = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-bin`"; # Added 2024-05-09 adoptopenjdk-bin-17-packages-darwin = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-bin-17`."; # Added 2024-05-09 @@ -318,6 +319,7 @@ mapAliases { authy = throw "'authy' has been removed since it reached end of life"; # Added 2024-04-19 autoadb = throw "'autoadb' has been removed due to lack of maintenance upstream"; # Added 2025-01-25 avldrums-lv2 = throw "'avldrums-lv2' has been renamed to/replaced by 'x42-avldrums'"; # Converted to throw 2024-10-17 + avr-sim = throw "'avr-sim' has been removed as it was broken and unmaintained. Possible alternatives are 'simavr', SimulAVR and AVRStudio."; # Added 2025-05-31 avrlibcCross = avrlibc; # Added 2024-09-06 axmldec = throw "'axmldec' has been removed as it was broken and unmaintained for 8 years"; # Added 2025-05-17 awesome-4-0 = awesome; # Added 2022-05-05 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7413d53857f5..28034bae5d8a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8135,8 +8135,6 @@ with pkgs; gecode_6 = qt5.callPackage ../development/libraries/gecode { }; gecode = gecode_6; - geph = recurseIntoAttrs (callPackages ../applications/networking/geph { pnpm = pnpm_8; }); - gegl = callPackage ../development/libraries/gegl { openexr = openexr_2; }; @@ -11933,8 +11931,6 @@ with pkgs; activitywatch = callPackage ../applications/office/activitywatch/wrapper.nix { }; - adobe-reader = pkgsi686Linux.callPackage ../applications/misc/adobe-reader { }; - anilibria-winmaclinux = libsForQt5.callPackage ../applications/video/anilibria-winmaclinux { }; masterpdfeditor4 = libsForQt5.callPackage ../applications/misc/masterpdfeditor4 { }; @@ -13012,7 +13008,7 @@ with pkgs; k3s_1_32 k3s_1_33 ; - k3s = k3s_1_32; + k3s = k3s_1_33; kapow = libsForQt5.callPackage ../applications/misc/kapow { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f2f6aedc924d..e63a5136ea8d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12916,6 +12916,8 @@ self: super: with self; { pymupdf-fonts = callPackage ../development/python-modules/pymupdf-fonts { }; + pymupdf4llm = callPackage ../development/python-modules/pymupdf4llm { }; + pymvglive = callPackage ../development/python-modules/pymvglive { }; pymysensors = callPackage ../development/python-modules/pymysensors { };