Merge staging-next into staging

.github/ISSUE_TEMPLATE/01_bug_report.yml

@@ -101,7 +101,7 @@ body:
       label: "Notify maintainers"
       description: |
         Please mention the people who are in the **Maintainers** list of the offending package. This is done by by searching for the package on the [NixOS Package Search](https://search.nixos.org/packages) and mentioning the people listed under **Maintainers** by prefixing their GitHub usernames with an '@' character. Please add the mentions above the `---` characters in the template below.
-      value: |
+      value: |2
 
 
         ---

.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml

@@ -115,7 +115,7 @@ body:
         Please mention the people who are in the **Maintainers** list of the offending package. This is done by by searching for the package on the [NixOS Package Search](https://search.nixos.org/packages) and mentioning the people listed under **Maintainers** by prefixing their GitHub usernames with an '@' character. Please add the mentions above the `---` characters in the template below.
 
         If this issue is related to the Darwin packaging architecture as a whole, or is related to the core Darwin frameworks, consider mentioning the `@NixOS/darwin-core` team.
-      value: |
+      value: |2
 
 
         ---

.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml

@@ -105,7 +105,7 @@ body:
         Please note that the maintainer attribute name does not always match the maintainer's GitHub username. If that occurs, try looking in [`maintainers/maintainer-list.nix`](https://github.com/NixOS/nixpkgs/blob/master/maintainers/maintainer-list.nix) for the maintainer attribute name, and checking if the maintainer has a listed GitHub username.
 
         If in doubt, check `git blame` for whoever last touched the module, or check the associated package's maintainers. Please add the mentions above the `---` characters.
-      value: |
+      value: |2
 
 
         ---

.github/ISSUE_TEMPLATE/04_build_failure.yml

@@ -111,7 +111,7 @@ body:
       label: "Notify maintainers"
       description: |
         Please mention the people who are in the **Maintainers** list of the offending package. This is done by by searching for the package on the [NixOS Package Search](https://search.nixos.org/packages) and mentioning the people listed under **Maintainers** by prefixing their GitHub usernames with an '@' character. Please add the mentions above the `---` characters in the template below.
-      value: |
+      value: |2
 
 
         ---

.github/ISSUE_TEMPLATE/05_update_request.yml

@@ -86,7 +86,7 @@ body:
       label: "Notify maintainers"
       description: |
         Please mention the people who are in the **Maintainers** list of the offending package. This is done by by searching for the package on the [NixOS Package Search](https://search.nixos.org/packages) and mentioning the people listed under **Maintainers** by prefixing their GitHub usernames with an '@' character. Please add the mentions above the `---` characters in the template below.
-      value: |
+      value: |2
 
 
         ---

.github/ISSUE_TEMPLATE/06_module_request.yml

@@ -61,7 +61,7 @@ body:
       label: "Notify maintainers"
       description: |
         Please mention the people who are in the **Maintainers** list of the offending package. This is done by by searching for the package on the [NixOS Package Search](https://search.nixos.org/packages) and mentioning the people listed under **Maintainers** by prefixing their GitHub usernames with an '@' character. Please add the mentions above the `---` characters in the template below.
-      value: |
+      value: |2
 
 
         ---

.github/ISSUE_TEMPLATE/07_backport_request.yml

@@ -66,7 +66,7 @@ body:
       label: "Notify maintainers"
       description: |
         Please mention the people who are in the **Maintainers** list of the offending package. This is done by by searching for the package on the [NixOS Package Search](https://search.nixos.org/packages) and mentioning the people listed under **Maintainers** by prefixing their GitHub usernames with an '@' character. Please add the mentions above the `---` characters in the template below.
-      value: |
+      value: |2
 
 
         ---

.github/ISSUE_TEMPLATE/08_documentation_request.yml

@@ -48,7 +48,7 @@ body:
       label: "Notify maintainers"
       description: |
         Please mention the people who are in the **Maintainers** list of the offending package. This is done by by searching for the package on the [NixOS Package Search](https://search.nixos.org/packages) and mentioning the people listed under **Maintainers** by prefixing their GitHub usernames with an '@' character. Please add the mentions above the `---` characters in the template below.
-      value: |
+      value: |2
 
 
         ---

.github/ISSUE_TEMPLATE/09_unreproducible_package.yml

@@ -120,7 +120,7 @@ body:
       label: "Notify maintainers"
       description: |
         Please mention the people who are in the **Maintainers** list of the offending package. This is done by by searching for the package on the [NixOS Package Search](https://search.nixos.org/packages) and mentioning the people listed under **Maintainers** by prefixing their GitHub usernames with an '@' character. Please add the mentions above the `---` characters in the template below.
-      value: |
+      value: |2
 
 
         ---

.github/actions/get-merge-commit/action.yml

@@ -72,10 +72,10 @@ runs:
           }
           throw new Error("Not retrying anymore. It's likely that GitHub is having internal issues: check https://www.githubstatus.com.")
 
+    - if: inputs.merged-as-untrusted && steps.commits.outputs.mergedSha
       # Would be great to do the checkouts in git worktrees of the existing spare checkout instead,
       # but Nix is broken with them:
       # https://github.com/NixOS/nix/issues/6073
-    - if: inputs.merged-as-untrusted && steps.commits.outputs.mergedSha
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       with:
         ref: ${{ steps.commits.outputs.mergedSha }}

.github/dependabot.yml

@@ -4,4 +4,4 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
-    labels: [ ]
+    labels: []

.github/labeler-development-branches.yml

@@ -3,21 +3,21 @@
 
 "4.workflow: package set update":
   - any:
-    - head-branch:
-      - '-updates$'
+      - head-branch:
+          - '-updates$'
 
 "4.workflow: staging":
   - any:
-    - head-branch:
-      - '^staging-next$'
-      - '^staging-next-'
+      - head-branch:
+          - '^staging-next$'
+          - '^staging-next-'
 
 "6.topic: haskell":
   - any:
-    - head-branch:
-      - '^haskell-updates$'
+      - head-branch:
+          - '^haskell-updates$'
 
 "6.topic: python":
   - any:
-    - head-branch:
-      - '^python-updates$'
+      - head-branch:
+          - '^python-updates$'

.github/labeler-no-sync.yml

@@ -5,35 +5,35 @@
 
 "6.topic: policy discussion":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - .github/**/*
-        - CONTRIBUTING.md
-        - pkgs/README.md
-        - nixos/README.md
-        - maintainers/README.md
-        - lib/README.md
-        - doc/README.md
+      - changed-files:
+          - any-glob-to-any-file:
+              - .github/**/*
+              - CONTRIBUTING.md
+              - pkgs/README.md
+              - nixos/README.md
+              - maintainers/README.md
+              - lib/README.md
+              - doc/README.md
 
 "8.has: documentation":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - doc/**/*
-        - nixos/doc/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - doc/**/*
+              - nixos/doc/**/*
 
 "backport release-24.11":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - .github/workflows/*
-        - ci/**/*.*
+      - changed-files:
+          - any-glob-to-any-file:
+              - .github/workflows/*
+              - ci/**/*.*
 
 "backport release-25.05":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - .github/workflows/*
-        - ci/**/*.*
+      - changed-files:
+          - any-glob-to-any-file:
+              - .github/workflows/*
+              - ci/**/*.*
 
 # keep-sorted end

.github/labeler.yml

@@ -5,599 +5,599 @@
 
 "4.workflow: backport":
   - any:
-    - base-branch:
-      - '^release-'
-      - '^staging-\d'
-      - '^staging-next-\d'
+      - base-branch:
+          - '^release-'
+          - '^staging-\d'
+          - '^staging-next-\d'
 
 # NOTE: bsd, darwin and cross-compilation labels are handled by ofborg
 "6.topic: agda":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - doc/languages-frameworks/agda.section.md
-        - nixos/tests/agda.nix
-        - pkgs/build-support/agda/**/*
-        - pkgs/development/libraries/agda/**/*
-        - pkgs/top-level/agda-packages.nix
+      - changed-files:
+          - any-glob-to-any-file:
+              - doc/languages-frameworks/agda.section.md
+              - nixos/tests/agda.nix
+              - pkgs/build-support/agda/**/*
+              - pkgs/development/libraries/agda/**/*
+              - pkgs/top-level/agda-packages.nix
 
 "6.topic: cinnamon":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/modules/services/x11/desktop-managers/cinnamon.nix
-        - nixos/tests/cinnamon.nix
-        - nixos/tests/cinnamon-wayland.nix
-        - pkgs/by-name/ci/cinnamon-*/**/*
-        - pkgs/by-name/cj/cjs/**/*
-        - pkgs/by-name/mu/muffin/**/*
-        - pkgs/by-name/ne/nemo/**/*
-        - pkgs/by-name/ne/nemo-*/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/modules/services/x11/desktop-managers/cinnamon.nix
+              - nixos/tests/cinnamon.nix
+              - nixos/tests/cinnamon-wayland.nix
+              - pkgs/by-name/ci/cinnamon-*/**/*
+              - pkgs/by-name/cj/cjs/**/*
+              - pkgs/by-name/mu/muffin/**/*
+              - pkgs/by-name/ne/nemo/**/*
+              - pkgs/by-name/ne/nemo-*/**/*
 
 "6.topic: continuous integration":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - .github/**/*
-        - ci/**/*.*
+      - changed-files:
+          - any-glob-to-any-file:
+              - .github/**/*
+              - ci/**/*.*
 
 "6.topic: coq":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/applications/science/logic/coq/**/*
-        - pkgs/development/coq-modules/**/*
-        - pkgs/top-level/coq-packages.nix
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/applications/science/logic/coq/**/*
+              - pkgs/development/coq-modules/**/*
+              - pkgs/top-level/coq-packages.nix
 
 "6.topic: COSMIC":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/modules/services/desktop-managers/cosmic.nix
-        - nixos/modules/services/display-managers/cosmic-greeter.nix
-        - nixos/tests/cosmic.nix
-        - pkgs/by-name/co/cosmic-*/**/*
-        - pkgs/by-name/xd/xdg-desktop-portal-cosmic/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/modules/services/desktop-managers/cosmic.nix
+              - nixos/modules/services/display-managers/cosmic-greeter.nix
+              - nixos/tests/cosmic.nix
+              - pkgs/by-name/co/cosmic-*/**/*
+              - pkgs/by-name/xd/xdg-desktop-portal-cosmic/*
 
 "6.topic: crystal":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/development/compilers/crystal/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/development/compilers/crystal/**/*
 
 "6.topic: cuda":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/development/cuda-modules/**/*
-        - pkgs/top-level/cuda-packages.nix
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/development/cuda-modules/**/*
+              - pkgs/top-level/cuda-packages.nix
 
 "6.topic: deepin":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/modules/services/desktops/deepin/**/*
-        - pkgs/desktops/deepin/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/modules/services/desktops/deepin/**/*
+              - pkgs/desktops/deepin/**/*
 
 "6.topic: docker tools":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/applications/virtualization/docker/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/applications/virtualization/docker/**/*
 
 "6.topic: dotnet":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - doc/languages-frameworks/dotnet.section.md
-        - maintainers/scripts/update-dotnet-lockfiles.nix
-        - pkgs/build-support/dotnet/**/*
-        - pkgs/development/compilers/dotnet/**/*
-        - pkgs/test/dotnet/**/*
-        - pkgs/top-level/dotnet-packages.nix
+      - changed-files:
+          - any-glob-to-any-file:
+              - doc/languages-frameworks/dotnet.section.md
+              - maintainers/scripts/update-dotnet-lockfiles.nix
+              - pkgs/build-support/dotnet/**/*
+              - pkgs/development/compilers/dotnet/**/*
+              - pkgs/test/dotnet/**/*
+              - pkgs/top-level/dotnet-packages.nix
 
 "6.topic: emacs":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/modules/services/editors/emacs.nix
-        - nixos/modules/services/editors/emacs.xml
-        - nixos/tests/emacs-daemon.nix
-        - pkgs/applications/editors/emacs/build-support/**/*
-        - pkgs/applications/editors/emacs/elisp-packages/**/*
-        - pkgs/applications/editors/emacs/**/*
-        - pkgs/top-level/emacs-packages.nix
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/modules/services/editors/emacs.nix
+              - nixos/modules/services/editors/emacs.xml
+              - nixos/tests/emacs-daemon.nix
+              - pkgs/applications/editors/emacs/build-support/**/*
+              - pkgs/applications/editors/emacs/elisp-packages/**/*
+              - pkgs/applications/editors/emacs/**/*
+              - pkgs/top-level/emacs-packages.nix
 
 "6.topic: Enlightenment DE":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/modules/services/x11/desktop-managers/enlightenment.nix
-        - pkgs/desktops/enlightenment/**/*
-        - pkgs/development/python-modules/python-efl/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/modules/services/x11/desktop-managers/enlightenment.nix
+              - pkgs/desktops/enlightenment/**/*
+              - pkgs/development/python-modules/python-efl/*
 
 "6.topic: erlang":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - doc/languages-frameworks/beam.section.md
-        - pkgs/development/beam-modules/**/*
-        - pkgs/development/interpreters/elixir/**/*
-        - pkgs/development/interpreters/erlang/**/*
-        - pkgs/development/tools/build-managers/rebar/**/*
-        - pkgs/development/tools/build-managers/rebar3/**/*
-        - pkgs/development/tools/erlang/**/*
-        - pkgs/top-level/beam-packages.nix
+      - changed-files:
+          - any-glob-to-any-file:
+              - doc/languages-frameworks/beam.section.md
+              - pkgs/development/beam-modules/**/*
+              - pkgs/development/interpreters/elixir/**/*
+              - pkgs/development/interpreters/erlang/**/*
+              - pkgs/development/tools/build-managers/rebar/**/*
+              - pkgs/development/tools/build-managers/rebar3/**/*
+              - pkgs/development/tools/erlang/**/*
+              - pkgs/top-level/beam-packages.nix
 
 "6.topic: fetch":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/build-support/fetch*/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/build-support/fetch*/**/*
 
 "6.topic: flakes":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - '**/flake.nix'
-        - lib/systems/flake-systems.nix
-        - nixos/modules/config/nix-flakes.nix
+      - changed-files:
+          - any-glob-to-any-file:
+              - '**/flake.nix'
+              - lib/systems/flake-systems.nix
+              - nixos/modules/config/nix-flakes.nix
 
 "6.topic: flutter":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/build-support/flutter/*.nix
-        - pkgs/development/compilers/flutter/**/*.nix
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/build-support/flutter/*.nix
+              - pkgs/development/compilers/flutter/**/*.nix
 
 "6.topic: games":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/games/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/games/**/*
 
 "6.topic: GNOME":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - doc/languages-frameworks/gnome.section.md
-        - nixos/modules/services/desktops/gnome/**/*
-        - nixos/modules/services/desktop-managers/gnome.nix
-        - nixos/tests/gnome-xorg.nix
-        - nixos/tests/gnome.nix
-        - pkgs/desktops/gnome/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - doc/languages-frameworks/gnome.section.md
+              - nixos/modules/services/desktops/gnome/**/*
+              - nixos/modules/services/desktop-managers/gnome.nix
+              - nixos/tests/gnome-xorg.nix
+              - nixos/tests/gnome.nix
+              - pkgs/desktops/gnome/**/*
 
 "6.topic: golang":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - doc/languages-frameworks/go.section.md
-        - pkgs/build-support/go/**/*
-        - pkgs/development/compilers/go/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - doc/languages-frameworks/go.section.md
+              - pkgs/build-support/go/**/*
+              - pkgs/development/compilers/go/**/*
 
 "6.topic: hardware":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/modules/hardware/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/modules/hardware/**/*
 
 "6.topic: haskell":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - doc/languages-frameworks/haskell.section.md
-        - maintainers/scripts/haskell/**/*
-        - pkgs/development/compilers/ghc/**/*
-        - pkgs/development/haskell-modules/**/*
-        - pkgs/development/tools/haskell/**/*
-        - pkgs/test/haskell/**/*
-        - pkgs/top-level/haskell-packages.nix
-        - pkgs/top-level/release-haskell.nix
+      - changed-files:
+          - any-glob-to-any-file:
+              - doc/languages-frameworks/haskell.section.md
+              - maintainers/scripts/haskell/**/*
+              - pkgs/development/compilers/ghc/**/*
+              - pkgs/development/haskell-modules/**/*
+              - pkgs/development/tools/haskell/**/*
+              - pkgs/test/haskell/**/*
+              - pkgs/top-level/haskell-packages.nix
+              - pkgs/top-level/release-haskell.nix
 
 "6.topic: java":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        # Distributions
-        - pkgs/development/compilers/adoptopenjdk-icedtea-web/**/*
-        - pkgs/development/compilers/corretto/**/*
-        - pkgs/development/compilers/graalvm/**/*
-        - pkgs/development/compilers/openjdk/**/*
-        - pkgs/by-name/op/openjfx/**/*
-        - pkgs/development/compilers/semeru-bin/**/*
-        - pkgs/development/compilers/temurin-bin/**/*
-        - pkgs/development/compilers/zulu/**/*
-        # Documentation
-        - doc/languages-frameworks/java.section.md
-        # Gradle
-        - doc/languages-frameworks/gradle.section.md
-        - pkgs/development/tools/build-managers/gradle/**/*
-        - pkgs/by-name/gr/gradle-completion/**/*
-        # Maven
-        - pkgs/by-name/ma/maven/**/*
-        - doc/languages-frameworks/maven.section.md
-        # Ant
-        - pkgs/by-name/an/ant/**/*
-        # javaPackages attrset
-        - pkgs/development/java-modules/**/*
-        - pkgs/top-level/java-packages.nix
-        # Maintainer tooling
-        - pkgs/by-name/ni/nixpkgs-openjdk-updater/**/*
-        # Misc
-        - nixos/modules/programs/java.nix
+      - changed-files:
+          - any-glob-to-any-file:
+              # Distributions
+              - pkgs/development/compilers/adoptopenjdk-icedtea-web/**/*
+              - pkgs/development/compilers/corretto/**/*
+              - pkgs/development/compilers/graalvm/**/*
+              - pkgs/development/compilers/openjdk/**/*
+              - pkgs/by-name/op/openjfx/**/*
+              - pkgs/development/compilers/semeru-bin/**/*
+              - pkgs/development/compilers/temurin-bin/**/*
+              - pkgs/development/compilers/zulu/**/*
+              # Documentation
+              - doc/languages-frameworks/java.section.md
+              # Gradle
+              - doc/languages-frameworks/gradle.section.md
+              - pkgs/development/tools/build-managers/gradle/**/*
+              - pkgs/by-name/gr/gradle-completion/**/*
+              # Maven
+              - pkgs/by-name/ma/maven/**/*
+              - doc/languages-frameworks/maven.section.md
+              # Ant
+              - pkgs/by-name/an/ant/**/*
+              # javaPackages attrset
+              - pkgs/development/java-modules/**/*
+              - pkgs/top-level/java-packages.nix
+              # Maintainer tooling
+              - pkgs/by-name/ni/nixpkgs-openjdk-updater/**/*
+              # Misc
+              - nixos/modules/programs/java.nix
 
 "6.topic: jitsi":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/modules/services/networking/jitsi-videobridge.nix
-        - nixos/modules/services/web-apps/jitsi-meet.nix
-        - pkgs/servers/web-apps/jitsi-meet/**/*
-        - pkgs/servers/jitsi-videobridge/**/*
-        - pkgs/applications/networking/instant-messengers/jitsi/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/modules/services/networking/jitsi-videobridge.nix
+              - nixos/modules/services/web-apps/jitsi-meet.nix
+              - pkgs/servers/web-apps/jitsi-meet/**/*
+              - pkgs/servers/jitsi-videobridge/**/*
+              - pkgs/applications/networking/instant-messengers/jitsi/**/*
 
 "6.topic: julia":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - doc/languages-frameworks/julia.section.md
-        - pkgs/development/compilers/julia/**/*
-        - pkgs/development/julia-modules/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - doc/languages-frameworks/julia.section.md
+              - pkgs/development/compilers/julia/**/*
+              - pkgs/development/julia-modules/**/*
 
 "6.topic: jupyter":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/development/python-modules/jupyter*/**/*
-        - pkgs/development/python-modules/mkdocs-jupyter/*
-        - nixos/modules/services/development/jupyter/**/*
-        - pkgs/applications/editors/jupyter-kernels/**/*
-        - pkgs/applications/editors/jupyter/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/development/python-modules/jupyter*/**/*
+              - pkgs/development/python-modules/mkdocs-jupyter/*
+              - nixos/modules/services/development/jupyter/**/*
+              - pkgs/applications/editors/jupyter-kernels/**/*
+              - pkgs/applications/editors/jupyter/**/*
 
 "6.topic: k3s":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/modules/services/cluster/k3s/**/*
-        - nixos/tests/k3s/**/*
-        - pkgs/applications/networking/cluster/k3s/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/modules/services/cluster/k3s/**/*
+              - nixos/tests/k3s/**/*
+              - pkgs/applications/networking/cluster/k3s/**/*
 
 "6.topic: kernel":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/build-support/kernel/**/*
-        - pkgs/os-specific/linux/kernel/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/build-support/kernel/**/*
+              - pkgs/os-specific/linux/kernel/**/*
 
 "6.topic: lib":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - lib/**
+      - changed-files:
+          - any-glob-to-any-file:
+              - lib/**
 
 "6.topic: llvm/clang":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/development/compilers/llvm/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/development/compilers/llvm/**/*
 
 "6.topic: lua":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/development/tools/misc/luarocks/*
-        - pkgs/development/interpreters/lua-5/**/*
-        - pkgs/development/interpreters/luajit/**/*
-        - pkgs/development/lua-modules/**/*
-        - pkgs/top-level/lua-packages.nix
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/development/tools/misc/luarocks/*
+              - pkgs/development/interpreters/lua-5/**/*
+              - pkgs/development/interpreters/luajit/**/*
+              - pkgs/development/lua-modules/**/*
+              - pkgs/top-level/lua-packages.nix
 
 "6.topic: Lumina DE":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/modules/services/x11/desktop-managers/lumina.nix
-        - pkgs/desktops/lumina/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/modules/services/x11/desktop-managers/lumina.nix
+              - pkgs/desktops/lumina/**/*
 
 "6.topic: LXQt":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/modules/services/x11/desktop-managers/lxqt.nix
-        - pkgs/desktops/lxqt/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/modules/services/x11/desktop-managers/lxqt.nix
+              - pkgs/desktops/lxqt/**/*
 
 "6.topic: mate":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/modules/services/x11/desktop-managers/mate.nix
-        - nixos/tests/mate.nix
-        - pkgs/desktops/mate/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/modules/services/x11/desktop-managers/mate.nix
+              - nixos/tests/mate.nix
+              - pkgs/desktops/mate/**/*
 
 "6.topic: module system":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - lib/modules.nix
-        - lib/types.nix
-        - lib/options.nix
-        - lib/tests/modules.sh
-        - lib/tests/modules/**
+      - changed-files:
+          - any-glob-to-any-file:
+              - lib/modules.nix
+              - lib/types.nix
+              - lib/options.nix
+              - lib/tests/modules.sh
+              - lib/tests/modules/**
 
 "6.topic: musl":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/os-specific/linux/musl/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/os-specific/linux/musl/**/*
 
 "6.topic: nim":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - doc/languages-frameworks/nim.section.md
-        - pkgs/build-support/build-nim-package.nix
-        - pkgs/build-support/build-nim-sbom.nix
-        - pkgs/by-name/ni/nim*
-        - pkgs/top-level/nim-overrides.nix
+      - changed-files:
+          - any-glob-to-any-file:
+              - doc/languages-frameworks/nim.section.md
+              - pkgs/build-support/build-nim-package.nix
+              - pkgs/build-support/build-nim-sbom.nix
+              - pkgs/by-name/ni/nim*
+              - pkgs/top-level/nim-overrides.nix
 
 "6.topic: nixos":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/**/*
-        - pkgs/by-name/sw/switch-to-configuration-ng/**/*
-        - pkgs/by-name/ni/nixos-rebuild-ng/**/*
-        - pkgs/os-specific/linux/nixos-rebuild/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/**/*
+              - pkgs/by-name/sw/switch-to-configuration-ng/**/*
+              - pkgs/by-name/ni/nixos-rebuild-ng/**/*
+              - pkgs/os-specific/linux/nixos-rebuild/**/*
 
 "6.topic: nixos-container":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/modules/virtualisation/nixos-containers.nix
-        - pkgs/tools/virtualization/nixos-container/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/modules/virtualisation/nixos-containers.nix
+              - pkgs/tools/virtualization/nixos-container/**/*
 
 "6.topic: nodejs":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - doc/languages-frameworks/javascript.section.md
-        - pkgs/build-support/node/**/*
-        - pkgs/development/node-packages/**/*
-        - pkgs/development/tools/yarn/*
-        - pkgs/development/tools/yarn2nix-moretea/**/*
-        - pkgs/development/tools/pnpm/**/*
-        - pkgs/development/web/nodejs/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - doc/languages-frameworks/javascript.section.md
+              - pkgs/build-support/node/**/*
+              - pkgs/development/node-packages/**/*
+              - pkgs/development/tools/yarn/*
+              - pkgs/development/tools/yarn2nix-moretea/**/*
+              - pkgs/development/tools/pnpm/**/*
+              - pkgs/development/web/nodejs/*
 
 "6.topic: nvidia":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/modules/hardware/video/nvidia.nix
-        - nixos/modules/services/hardware/nvidia-container-toolkit/**/*
-        - nixos/modules/services/hardware/nvidia-optimus.nix
-        - pkgs/os-specific/linux/nvidia-x11/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/modules/hardware/video/nvidia.nix
+              - nixos/modules/services/hardware/nvidia-container-toolkit/**/*
+              - nixos/modules/services/hardware/nvidia-optimus.nix
+              - pkgs/os-specific/linux/nvidia-x11/**/*
 
 "6.topic: ocaml":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - doc/languages-frameworks/ocaml.section.md
-        - pkgs/development/compilers/ocaml/**/*
-        - pkgs/development/compilers/reason/**/*
-        - pkgs/development/ocaml-modules/**/*
-        - pkgs/development/tools/ocaml/**/*
-        - pkgs/top-level/ocaml-packages.nix
+      - changed-files:
+          - any-glob-to-any-file:
+              - doc/languages-frameworks/ocaml.section.md
+              - pkgs/development/compilers/ocaml/**/*
+              - pkgs/development/compilers/reason/**/*
+              - pkgs/development/ocaml-modules/**/*
+              - pkgs/development/tools/ocaml/**/*
+              - pkgs/top-level/ocaml-packages.nix
 
 "6.topic: pantheon":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/modules/services/desktops/pantheon/**/*
-        - nixos/modules/services/x11/desktop-managers/pantheon.nix
-        - nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
-        - nixos/tests/pantheon.nix
-        - pkgs/desktops/pantheon/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/modules/services/desktops/pantheon/**/*
+              - nixos/modules/services/x11/desktop-managers/pantheon.nix
+              - nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
+              - nixos/tests/pantheon.nix
+              - pkgs/desktops/pantheon/**/*
 
 "6.topic: php":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - doc/languages-frameworks/php.section.md
-        - nixos/tests/php/**/*
-        - pkgs/build-support/php/**/*
-        - pkgs/development/interpreters/php/**/*
-        - pkgs/development/php-packages/**/*
-        - pkgs/test/php/default.nix
-        - pkgs/top-level/php-packages.nix
+      - changed-files:
+          - any-glob-to-any-file:
+              - doc/languages-frameworks/php.section.md
+              - nixos/tests/php/**/*
+              - pkgs/build-support/php/**/*
+              - pkgs/development/interpreters/php/**/*
+              - pkgs/development/php-packages/**/*
+              - pkgs/test/php/default.nix
+              - pkgs/top-level/php-packages.nix
 
 "6.topic: printing":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/modules/services/printing/cupsd.nix
-        - pkgs/misc/cups/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/modules/services/printing/cupsd.nix
+              - pkgs/misc/cups/**/*
 
 "6.topic: python":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - doc/languages-frameworks/python.section.md
-        - pkgs/development/interpreters/python/**/*
-        - pkgs/development/python-modules/**/*
-        - pkgs/top-level/python-packages.nix
+      - changed-files:
+          - any-glob-to-any-file:
+              - doc/languages-frameworks/python.section.md
+              - pkgs/development/interpreters/python/**/*
+              - pkgs/development/python-modules/**/*
+              - pkgs/top-level/python-packages.nix
 
 "6.topic: qt/kde":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - doc/languages-frameworks/qt.section.md
-        - nixos/modules/services/x11/desktop-managers/plasma5.nix
-        - nixos/tests/plasma5.nix
-        - pkgs/applications/kde/**/*
-        - pkgs/desktops/plasma-5/**/*
-        - pkgs/development/libraries/kde-frameworks/**/*
-        - pkgs/development/libraries/qt-5/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - doc/languages-frameworks/qt.section.md
+              - nixos/modules/services/x11/desktop-managers/plasma5.nix
+              - nixos/tests/plasma5.nix
+              - pkgs/applications/kde/**/*
+              - pkgs/desktops/plasma-5/**/*
+              - pkgs/development/libraries/kde-frameworks/**/*
+              - pkgs/development/libraries/qt-5/**/*
 
 "6.topic: R":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/applications/science/math/R/**/*
-        - pkgs/development/r-modules/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/applications/science/math/R/**/*
+              - pkgs/development/r-modules/**/*
 
 "6.topic: rocm":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/development/rocm-modules/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/development/rocm-modules/**/*
 
 "6.topic: ruby":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - doc/languages-frameworks/ruby.section.md
-        - pkgs/development/interpreters/ruby/**/*
-        - pkgs/development/ruby-modules/**/*
-        - pkgs/top-level/ruby-packages.nix
+      - changed-files:
+          - any-glob-to-any-file:
+              - doc/languages-frameworks/ruby.section.md
+              - pkgs/development/interpreters/ruby/**/*
+              - pkgs/development/ruby-modules/**/*
+              - pkgs/top-level/ruby-packages.nix
 
 "6.topic: rust":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - doc/languages-frameworks/rust.section.md
-        - pkgs/build-support/rust/**/*
-        - pkgs/development/compilers/rust/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - doc/languages-frameworks/rust.section.md
+              - pkgs/build-support/rust/**/*
+              - pkgs/development/compilers/rust/**/*
 
 "6.topic: stdenv":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/stdenv/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/stdenv/**/*
 
 "6.topic: steam":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/games/steam/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/games/steam/**/*
 
 "6.topic: systemd":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/os-specific/linux/systemd/**/*
-        - nixos/modules/system/boot/systemd*/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/os-specific/linux/systemd/**/*
+              - nixos/modules/system/boot/systemd*/**/*
 
 "6.topic: tcl":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - doc/languages-frameworks/tcl.section.md
-        - pkgs/development/interpreters/tcl/*
-        - pkgs/development/tcl-modules/**/*
-        - pkgs/top-level/tcl-packages.nix
+      - changed-files:
+          - any-glob-to-any-file:
+              - doc/languages-frameworks/tcl.section.md
+              - pkgs/development/interpreters/tcl/*
+              - pkgs/development/tcl-modules/**/*
+              - pkgs/top-level/tcl-packages.nix
 
 "6.topic: teams":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-          - maintainers/team-list.nix
+      - changed-files:
+          - any-glob-to-any-file:
+              - maintainers/team-list.nix
 
 "6.topic: testing":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        # NOTE: Let's keep the scope limited to test frameworks that are
-        #       *developed in this repo*;
-        #       - not individual tests
-        #       - not packages for test frameworks
-        - pkgs/build-support/testers/**
-        - nixos/lib/testing/**
-        - nixos/lib/test-driver/**
-        - nixos/tests/nixos-test-driver/**
-        - nixos/lib/testing-python.nix      # legacy
-        - nixos/tests/make-test-python.nix  # legacy
-        # lib/debug.nix has a test framework (runTests) but it's not the main focus
+      - changed-files:
+          - any-glob-to-any-file:
+              # NOTE: Let's keep the scope limited to test frameworks that are
+              #       *developed in this repo*;
+              #       - not individual tests
+              #       - not packages for test frameworks
+              - pkgs/build-support/testers/**
+              - nixos/lib/testing/**
+              - nixos/lib/test-driver/**
+              - nixos/tests/nixos-test-driver/**
+              - nixos/lib/testing-python.nix # legacy
+              - nixos/tests/make-test-python.nix # legacy
+              # lib/debug.nix has a test framework (runTests) but it's not the main focus
 
 "6.topic: TeX":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - doc/languages-frameworks/texlive.section.md
-        - pkgs/test/texlive/**
-        - pkgs/tools/typesetting/tex/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - doc/languages-frameworks/texlive.section.md
+              - pkgs/test/texlive/**
+              - pkgs/tools/typesetting/tex/**/*
 
 "6.topic: updaters":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/common-updater/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/common-updater/**/*
 
 "6.topic: vim":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - doc/languages-frameworks/vim.section.md
-        - pkgs/applications/editors/vim/**/*
-        - pkgs/applications/editors/vim/plugins/**/*
-        - nixos/modules/programs/neovim.nix
-        - pkgs/applications/editors/neovim/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - doc/languages-frameworks/vim.section.md
+              - pkgs/applications/editors/vim/**/*
+              - pkgs/applications/editors/vim/plugins/**/*
+              - nixos/modules/programs/neovim.nix
+              - pkgs/applications/editors/neovim/**/*
 
 "6.topic: vscode":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/applications/editors/vscode/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/applications/editors/vscode/**/*
 
 "6.topic: windows":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/os-specific/windows/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/os-specific/windows/**/*
 
 "6.topic: xen-project":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/modules/virtualisation/xen*
-        - pkgs/by-name/xe/xen/*
-        - pkgs/by-name/qe/qemu_xen/*
-        - pkgs/by-name/xe/xen-guest-agent/*
-        - pkgs/by-name/xt/xtf/*
-        - pkgs/build-support/xen/*
-        - pkgs/development/ocaml-modules/xen*/*
-        - pkgs/development/ocaml-modules/vchan/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/modules/virtualisation/xen*
+              - pkgs/by-name/xe/xen/*
+              - pkgs/by-name/qe/qemu_xen/*
+              - pkgs/by-name/xe/xen-guest-agent/*
+              - pkgs/by-name/xt/xtf/*
+              - pkgs/build-support/xen/*
+              - pkgs/development/ocaml-modules/xen*/*
+              - pkgs/development/ocaml-modules/vchan/*
 
 "6.topic: xfce":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/doc/manual/configuration/xfce.xml
-        - nixos/modules/services/x11/desktop-managers/xfce.nix
-        - nixos/tests/xfce.nix
-        - pkgs/desktops/xfce/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/doc/manual/configuration/xfce.xml
+              - nixos/modules/services/x11/desktop-managers/xfce.nix
+              - nixos/tests/xfce.nix
+              - pkgs/desktops/xfce/**/*
 
 "6.topic: zig":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/development/compilers/zig/**/*
-        - doc/hooks/zig.section.md
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/development/compilers/zig/**/*
+              - doc/hooks/zig.section.md
 
 "8.has: changelog":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/doc/manual/release-notes/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/doc/manual/release-notes/**/*
 
 "8.has: maintainer-list (update)":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - maintainers/maintainer-list.nix
+      - changed-files:
+          - any-glob-to-any-file:
+              - maintainers/maintainer-list.nix
 
 "8.has: module (update)":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/modules/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/modules/**/*
 
 # keep-sorted end

.github/workflows/build.yml

@@ -24,10 +24,10 @@ jobs:
         include:
           - runner: ubuntu-24.04
             system: x86_64-linux
-            builds: [shell,manual-nixos,lib-tests]
+            builds: [shell, manual-nixos, lib-tests]
           - runner: ubuntu-24.04-arm
             system: aarch64-linux
-            builds: [shell,manual-nixos,manual-nixpkgs,manual-nixpkgs-tests]
+            builds: [shell, manual-nixos, manual-nixpkgs, manual-nixpkgs-tests]
           - runner: macos-13
             system: x86_64-darwin
             builds: [shell]

.github/workflows/eval.yml

@@ -52,7 +52,7 @@ jobs:
   outpaths:
     name: Outpaths
     runs-on: ubuntu-24.04-arm
-    needs: [ prepare ]
+    needs: [prepare]
     strategy:
       fail-fast: false
       matrix:
@@ -163,7 +163,7 @@ jobs:
   compare:
     name: Comparison
     runs-on: ubuntu-24.04-arm
-    needs: [ prepare, outpaths ]
+    needs: [prepare, outpaths]
     if: needs.prepare.outputs.targetSha
     permissions:
       issues: write # needed to create *new* labels
@@ -251,7 +251,7 @@ jobs:
 
   labels:
     name: Labels
-    needs: [ compare ]
+    needs: [compare]
     uses: ./.github/workflows/labels.yml
     permissions:
       issues: write
@@ -262,7 +262,7 @@ jobs:
     # 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 ]
+    needs: [prepare, outpaths]
     if: needs.prepare.outputs.targetSha
     uses: ./.github/workflows/reviewers.yml
     secrets: inherit

.github/workflows/lint.yml

@@ -59,7 +59,7 @@ jobs:
         with:
           merged-as-untrusted: true
 
-      - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
+      - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
         with:
           extra_nix_config: sandbox = true
 
@@ -82,7 +82,7 @@ jobs:
           merged-as-untrusted: true
           target-as-trusted: true
 
-      - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
+      - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
         with:
           extra_nix_config: sandbox = true
 

.github/workflows/periodic-merge-24h.yml

@@ -11,7 +11,7 @@ on:
   schedule:
     # * is a special character in YAML so you have to quote this string
     # Merge every 24 hours
-    - cron:  '0 0 * * *'
+    - cron: '0 0 * * *'
   workflow_dispatch:
 
 permissions: {}

.github/workflows/periodic-merge-6h.yml

@@ -11,7 +11,7 @@ on:
   schedule:
     # * is a special character in YAML so you have to quote this string
     # Merge every 6 hours
-    - cron:  '0 */6 * * *'
+    - cron: '0 */6 * * *'
   workflow_dispatch:
 
 permissions: {}

ci/default.nix

@@ -52,6 +52,21 @@ let
         # See https://github.com/NixOS/nixfmt
         programs.nixfmt.enable = true;
 
+        programs.yamlfmt = {
+          enable = true;
+          settings.formatter = {
+            retain_line_breaks = true;
+          };
+        };
+        settings.formatter.yamlfmt.excludes = [
+          # Breaks helm templating
+          "nixos/tests/k3s/k3s-test-chart/templates/*"
+          # Aligns comments with whitespace
+          "pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml"
+          # TODO: Fix formatting for auto-generated file
+          "pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml"
+        ];
+
         settings.formatter.editorconfig-checker = {
           command = "${pkgs.lib.getExe pkgs.editorconfig-checker}";
           options = [ "-disable-indent-size" ];

maintainers/maintainer-list.nix

@@ -20625,6 +20625,12 @@
     matrix = "@qyriad:katesiria.org";
     name = "Qyriad";
   };
+  r-aizawa = {
+    github = "Xantibody";
+    githubId = 109563705;
+    name = "Ryu Aizawa";
+    email = "zeku.bushinryu38@gmail.com";
+  };
   r-burns = {
     email = "rtburns@protonmail.com";
     github = "r-burns";

nixos/doc/manual/release-notes/rl-2511.section.md

@@ -48,6 +48,8 @@
 
 - The `services.siproxd` module has been removed as `siproxd` is unmaintained and broken with libosip 5.x.
 
+- `services.dwm-status.extraConfig` was replaced by [RFC0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md)-compliant [](#opt-services.dwm-status.settings), which is used to generate the config file. `services.dwm-status.order` is now moved to [](#opt-services.dwm-status.settings.order), as it's a part of the config file.
+
 - `renovate` was updated to v40. See the [upstream release notes](https://github.com/renovatebot/renovate/releases/tag/40.0.0) for breaking changes.
 
 - The `boot.readOnlyNixStore` has been removed. Control over bind mount options on `/nix/store` is now offered by the `boot.nixStoreMountOpts` option.

nixos/modules/programs/firefox.nix

@@ -74,9 +74,7 @@ in
       defaultText = lib.literalExpression "pkgs.firefox";
       relatedPackages = [
         "firefox"
-        "firefox-beta-bin"
         "firefox-bin"
-        "firefox-devedition-bin"
         "firefox-esr"
       ];
     };

nixos/modules/services/desktop-managers/cosmic.nix

@@ -140,13 +140,21 @@ in
     security.rtkit.enable = true;
     services.accounts-daemon.enable = true;
     services.displayManager.sessionPackages = [ pkgs.cosmic-session ];
-    services.geoclue2.enable = true;
-    services.geoclue2.enableDemoAgent = false;
     services.libinput.enable = true;
     services.upower.enable = true;
     # Required for screen locker
     security.pam.services.cosmic-greeter = { };
 
+    # geoclue2 stuff
+    services.geoclue2.enable = true;
+    # We _do_ use the demo agent in the `cosmic-settings-daemon` package,
+    # but this option also creates a systemd service that conflicts with the
+    # `cosmic-settings-daemon` package's geoclue2 agent. Therefore, disable it.
+    services.geoclue2.enableDemoAgent = false;
+    # As mentioned above, we do use the demo agent. And it needs to be
+    # whitelisted, otherwise it doesn't run.
+    services.geoclue2.whitelistedAgents = [ "geoclue-demo-agent" ]; # whitelist our own geoclue2 agent o
+
     # Good to have defaults
     hardware.bluetooth.enable = lib.mkDefault true;
     networking.networkmanager.enable = lib.mkDefault true;

nixos/modules/services/desktops/geoclue2.nix

@@ -8,11 +8,6 @@
 let
   cfg = config.services.geoclue2;
 
-  defaultWhitelist = [
-    "gnome-shell"
-    "io.elementary.desktop.agent-geoclue2"
-  ];
-
   appConfigModule = lib.types.submodule (
     { name, ... }:
     {
@@ -85,6 +80,16 @@ in
           that provides location information for accessing.
         '';
       };
+      whitelistedAgents = lib.mkOption {
+        type = lib.types.listOf lib.types.str;
+        default = [
+          "gnome-shell"
+          "io.elementary.desktop.agent-geoclue2"
+        ];
+        description = ''
+          Desktop IDs (without the .desktop extension) of whitelisted agents.
+        '';
+      };
 
       enableDemoAgent = lib.mkOption {
         type = lib.types.bool;
@@ -321,7 +326,10 @@ in
       {
         agent = {
           whitelist = lib.concatStringsSep ";" (
-            lib.optional cfg.enableDemoAgent "geoclue-demo-agent" ++ defaultWhitelist
+            lib.lists.unique (
+              cfg.whitelistedAgents
+              ++ lib.optionals config.services.geoclue2.enableDemoAgent [ "geoclue-demo-agent" ]
+            )
           );
         };
         network-nmea = {

nixos/modules/services/misc/dwm-status.nix

@@ -7,71 +7,80 @@
 let
   cfg = config.services.dwm-status;
 
-  order = lib.concatMapStringsSep "," (feature: ''"${feature}"'') cfg.order;
+  format = pkgs.formats.toml { };
 
-  configFile = pkgs.writeText "dwm-status.toml" ''
-    order = [${order}]
-
-    ${cfg.extraConfig}
-  '';
+  configFile = format.generate "dwm-status.toml" cfg.settings;
 in
 
 {
-
-  ###### interface
+  imports = [
+    (lib.mkRenamedOptionModule
+      [ "services" "dwm-status" "order" ]
+      [ "services" "dwm-status" "settings" "order" ]
+    )
+    (lib.mkRemovedOptionModule [
+      "services"
+      "dwm-status"
+      "extraConfig"
+    ] "Use services.dwm-status.settings instead.")
+  ];
 
   options = {
-
     services.dwm-status = {
-
       enable = lib.mkEnableOption "dwm-status user service";
 
       package = lib.mkPackageOption pkgs "dwm-status" {
         example = "dwm-status.override { enableAlsaUtils = false; }";
       };
 
-      order = lib.mkOption {
-        type = lib.types.listOf (
-          lib.types.enum [
-            "audio"
-            "backlight"
+      settings = lib.mkOption {
+        type = lib.types.submodule {
+          freeformType = format.type;
+          options.order = lib.mkOption {
+            type = lib.types.listOf (
+              lib.types.enum [
+                "audio"
+                "backlight"
+                "battery"
+                "cpu_load"
+                "network"
+                "time"
+              ]
+            );
+            default = [ ];
+            description = ''
+              List of enabled features in order.
+            '';
+          };
+        };
+        default = { };
+        example = {
+          order = [
             "battery"
             "cpu_load"
-            "network"
             "time"
-          ]
-        );
+          ];
+          time = {
+            format = "%F %a %r";
+            update_seconds = true;
+          };
+        };
         description = ''
-          List of enabled features in order.
+          Config options for dwm-status, see https://github.com/Gerschtli/dwm-status#configuration
+          for available options.
         '';
       };
-
-      extraConfig = lib.mkOption {
-        type = lib.types.lines;
-        default = "";
-        description = ''
-          Extra config in TOML format.
-        '';
-      };
-
     };
-
   };
 
-  ###### implementation
-
   config = lib.mkIf cfg.enable {
-
-    services.upower.enable = lib.mkIf (lib.elem "battery" cfg.order) true;
+    services.upower.enable = lib.mkIf (lib.elem "battery" cfg.settings.order) true;
 
     systemd.user.services.dwm-status = {
       description = "Highly performant and configurable DWM status service";
       wantedBy = [ "graphical-session.target" ];
       partOf = [ "graphical-session.target" ];
-
       serviceConfig.ExecStart = "${cfg.package}/bin/dwm-status ${configFile} --quiet";
     };
-
   };
-
 }

nixos/tests/zipline.nix

@@ -1,10 +1,13 @@
-{ lib, ... }:
+{ lib, pkgs, ... }:
 
 {
   name = "zipline";
   meta.maintainers = with lib.maintainers; [ defelo ];
 
   nodes.machine = {
+    # On x86, testing with a CPU without SSE 4.2 support
+    # to ensure native libvips is used
+    virtualisation.qemu.options = lib.mkIf pkgs.stdenv.hostPlatform.isx86 [ "-cpu core2duo" ];
     services.zipline = {
       enable = true;
       settings = {
@@ -38,7 +41,7 @@
     import re
 
     machine.wait_for_unit("zipline.service")
-    machine.wait_for_open_port(8000)
+    machine.wait_for_open_port(8000, timeout=300)
 
     resp = machine.succeed("curl zipline.local:8000/api/setup -v -X POST -H 'Content-Type: application/json' -d '{\"username\": \"administrator\", \"password\": \"password\"}' 2>&1")
     data = json.loads(resp.splitlines()[-1])

pkgs/applications/editors/vscode/extensions/default.nix

@@ -4694,8 +4694,8 @@ let
         mktplcRef = {
           name = "tabnine-vscode";
           publisher = "tabnine";
-          version = "3.287.0";
-          hash = "sha256-E4ew40NNuOW9e7ZIsJjkO/4r6gbbC2IsghFbO+n27cg=";
+          version = "3.288.0";
+          hash = "sha256-2wq7ohOIAzF2EXeSkg2ADRLMvksaIeYBDJfSbPwX9vk=";
         };
         meta = {
           license = lib.licenses.mit;

pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix

@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "vscode-pylance";
     publisher = "MS-python";
-    version = "2025.5.1";
-    hash = "sha256-6HnWqD6wTRPjkHYN6HaPHJbbK0wWk/boBtqBhuR7W7U=";
+    version = "2025.6.1";
+    hash = "sha256-rmG57PU1kwFdogaeyxUDfJ6ZOOxWFXp+RbO7hoExvG4=";
   };
 
   buildInputs = [ pyright ];

pkgs/applications/networking/browsers/firefox-bin/default.nix

@@ -14,7 +14,6 @@
   pciutils,
   pipewire,
   adwaita-icon-theme,
-  channel,
   generated,
   writeScript,
   writeText,
@@ -34,8 +33,7 @@ let
 
   inherit (generated) version sources;
 
-  binaryName =
-    if (channel == "release" || stdenv.hostPlatform.isDarwin) then "firefox" else "firefox-${channel}";
+  binaryName = "firefox";
 
   mozillaPlatforms = {
     i686-linux = "linux-i686";
@@ -68,7 +66,7 @@ let
 
   source = lib.findFirst (sourceMatches mozLocale) defaultSource sources;
 
-  pname = "firefox-${channel}-bin-unwrapped";
+  pname = "firefox-bin-unwrapped";
 in
 
 stdenv.mkDerivation {
@@ -144,7 +142,6 @@ stdenv.mkDerivation {
     updateScript = import ./update.nix {
       inherit
         pname
-        channel
         lib
         writeScript
         xidel
@@ -155,11 +152,7 @@ stdenv.mkDerivation {
         curl
         runtimeShell
         ;
-      baseUrl =
-        if channel == "developer-edition" then
-          "https://archive.mozilla.org/pub/devedition/releases/"
-        else
-          "https://archive.mozilla.org/pub/firefox/releases/";
+      baseUrl = "https://archive.mozilla.org/pub/firefox/releases/";
     };
   };
 

pkgs/applications/networking/instant-messengers/franz/generic.nix

@@ -126,7 +126,7 @@ stdenv.mkDerivation (
       wrapProgramShell $out/opt/${name}/${pname} \
         --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDependencies}" \
         --suffix PATH : ${xdg-utils}/bin \
-        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
+        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations,WebRTCPipeWireCapturer --enable-wayland-ime=true}}" \
         "''${gappsWrapperArgs[@]}"
     '';
   }

pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix

@@ -46,14 +46,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "telegram-desktop-unwrapped";
-  version = "5.15.3";
+  version = "5.15.4";
 
   src = fetchFromGitHub {
     owner = "telegramdesktop";
     repo = "tdesktop";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-ATGzh9zJezIOZ3uSm3rIV+KQ4XFWJvf5NaJ0ptjzYGc=";
+    hash = "sha256-C7mUV/Jc0OJnVXxRGVx/l2T7APOsY05t5MLW8laIwnA=";
   };
 
   postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''

pkgs/by-name/an/antora/test/minimal_working_example/antora.yml

@@ -1,4 +1,3 @@
----
 name: Antora
 
 nav:

pkgs/by-name/au/auto-editor/package.nix

@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "auto-editor";
-  version = "28.0.0";
+  version = "28.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "WyattBlue";
     repo = "auto-editor";
     tag = version;
-    hash = "sha256-9U3hDVtSuOdiGnEsKs0InV9v0UrlI3qKaBqfCtVTD0E=";
+    hash = "sha256-n+9qesm2LCTXJ+X/hDaFQ5EjN+xfnLdl6G8+Qna/cyM=";
   };
 
   postPatch = ''
@@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec {
   pythonImportsCheck = [ "auto_editor" ];
 
   meta = {
-    changelog = "https://github.com/WyattBlue/auto-editor/releases/tag/${version}";
+    changelog = "https://github.com/WyattBlue/auto-editor/releases/tag/${src.tag}";
     description = "Command line application for automatically editing video and audio by analyzing a variety of methods, most notably audio loudness";
     homepage = "https://auto-editor.com/";
     license = lib.licenses.unlicense;

pkgs/by-name/ba/basalt-monado/package.nix

@@ -1,4 +1,5 @@
 {
+  config,
   autoPatchelfHook,
   boost,
   bzip2,
@@ -21,6 +22,8 @@
   stdenv,
   tbb,
   xorg,
+  cudaPackages,
+  enableCuda ? config.cudaSupport,
 }:
 stdenv.mkDerivation {
   pname = "basalt-monado";
@@ -63,6 +66,7 @@ stdenv.mkDerivation {
     (lib.cmakeBool "BASALT_INSTANTIATIONS_DOUBLE" false)
     (lib.cmakeBool "BUILD_TESTS" false)
     (lib.cmakeFeature "EIGEN_ROOT" "${eigen}/include/eigen3")
+    (lib.optionals enableCuda "-DCUDA_TOOLKIT_ROOT_DIR=${cudaPackages.cudatoolkit}")
   ];
 
   passthru.updateScript = nix-update-script { };

pkgs/by-name/bu/burpsuite/package.nix

@@ -9,20 +9,20 @@
 }:
 
 let
-  version = "2025.5.2";
+  version = "2025.6";
 
   product =
     if proEdition then
       {
         productName = "pro";
         productDesktop = "Burp Suite Professional Edition";
-        hash = "sha256-Ln4krhqaxkRAHesnXobjlgNiHfL7ShGanex0aMeJu3o=";
+        hash = "sha256-UtxyhXaXpVp9Ynm6vnHYxr+TEnRau1ZHU563xcUmu/0=";
       }
     else
       {
         productName = "community";
         productDesktop = "Burp Suite Community Edition";
-        hash = "sha256-QfjhZR6AJ7909DbLgkjso5uh1lfucd1LLJHS38FeJXw=";
+        hash = "sha256-5kpmLkdnGxnt6bSUgAIJaXdFSmmvOffdQaAOlm9sNlo=";
       };
 
   src = fetchurl {

pkgs/by-name/cl/clingcon/package.nix

@@ -7,14 +7,14 @@
   catch2,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "clingcon";
   version = "5.2.1";
 
   src = fetchFromGitHub {
     owner = "potassco";
-    repo = pname;
-    rev = "v${version}";
+    repo = "clingcon";
+    tag = "v${finalAttrs.version}";
     sha256 = "sha256-R2kgcw8VUwhOdvPXnsahT5gnoUd5DXLqfdH++8rFoAA=";
   };
 
@@ -42,6 +42,6 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     homepage = "https://potassco.org/";
     downloadPage = "https://github.com/potassco/clingcon/releases/";
-    changelog = "https://github.com/potassco/clingcon/releases/tag/v${version}";
+    changelog = "https://github.com/potassco/clingcon/releases/tag/v${finalAttrs.version}";
   };
-}
+})

pkgs/by-name/cl/clingo/package.nix

@@ -5,14 +5,14 @@
   cmake,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "clingo";
   version = "5.8.0";
 
   src = fetchFromGitHub {
     owner = "potassco";
     repo = "clingo";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     sha256 = "sha256-VhfWGAcrq4aN5Tgz84v7vLOWexsA89vRaang58SXVyI=";
   };
 
@@ -28,4 +28,4 @@ stdenv.mkDerivation rec {
     homepage = "https://potassco.org/";
     downloadPage = "https://github.com/potassco/clingo/releases/";
   };
-}
+})

pkgs/by-name/da/datafusion-cli/package.nix

@@ -6,18 +6,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "datafusion-cli";
-  version = "47.0.0";
+  version = "48.0.0";
 
   src = fetchFromGitHub {
     name = "datafusion-cli-source";
     owner = "apache";
     repo = "arrow-datafusion";
     tag = finalAttrs.version;
-    hash = "sha256-IKG0sLF5LAS2Tch3hdzsGHwAf2k43aVvMo1a29pxza0=";
+    hash = "sha256-DkMJKZI5rOH/PGXiAXY/GtYwYvhZ2b3zKeGeD9o2AvE=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-kl2+cVQhEkRsQWO8w3WEtXAoVIqj3s3IcbRBn175yxg=";
+  cargoHash = "sha256-9uMmxP/MvFXfylKCCcZS1YEp8snF5Tds9Eh0hL6U0oE=";
 
   buildAndTestSubdir = "datafusion-cli";
 

pkgs/by-name/de/devcontainer/package.nix

@@ -19,18 +19,18 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "devcontainer";
-  version = "0.76.0";
+  version = "0.77.0";
 
   src = fetchFromGitHub {
     owner = "devcontainers";
     repo = "cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-yTXAzyvkPO/7Xg+F4+hlLkyTpGHAqW3/3scJElfDfxA=";
+    hash = "sha256-/DImAFCz46lrlVtD/Ftrytz/tqsPgtPuWhjLomlmh5k=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = "${finalAttrs.src}/yarn.lock";
-    hash = "sha256-4NaZEA00dNPHAb7pcasufKf/4b8ufwS2lNS+a0rxbv8=";
+    hash = "sha256-S4aBRGtrSVAE6Er9DZqGfpBGh8tEJVqTstWrqlAONBg=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/di/diffoscope/package.nix

@@ -106,11 +106,11 @@ in
 # Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
 python.pkgs.buildPythonApplication rec {
   pname = "diffoscope";
-  version = "297";
+  version = "298";
 
   src = fetchurl {
     url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
-    hash = "sha256-3dEZb7XZluTi+sUTgSqwLzCdNMJwekt1Em0XEDSAY/E=";
+    hash = "sha256-GakldHALDu1TXg/b0qEQD7NNK3Ljk2yQXnv5+Sr+rNw=";
   };
 
   outputs = [

pkgs/by-name/di/distrho-ports/package.nix

@@ -13,6 +13,9 @@
   meson,
   ninja,
   pkg-config,
+
+  # empty means build all available plugins
+  plugins ? [ ],
 }:
 
 let
@@ -49,7 +52,7 @@ stdenv.mkDerivation {
 
   env.NIX_CFLAGS_COMPILE = toString [ "-fpermissive" ];
 
-  postFixup = ''
+  postFixup = lib.optionalString (lib.any (x: x == "vitalium") plugins || plugins == [ ]) ''
     for file in \
       $out/lib/lv2/vitalium.lv2/vitalium.so \
       $out/lib/vst/vitalium.so \
@@ -59,11 +62,23 @@ stdenv.mkDerivation {
     done
   '';
 
+  mesonFlags = lib.optional (plugins != [ ]) (
+    lib.mesonOption "plugins" "[${lib.concatMapStringsSep "," (x: "\"${x}\"") plugins}]"
+  );
+
   meta = {
     homepage = "http://distrho.sourceforge.net/ports";
     description = "Linux audio plugins and LV2 ports";
     longDescription = ''
-      Includes:
+      You can override this package to only include some plugins like so:
+
+      ```nix
+      distrho-ports.override {
+        plugins = [ "vitalium" "swankyamp" ];
+      }
+      ```
+
+      Available plugins:
       - arctican-function
       - arctican-pilgrim
       - dexed
@@ -107,7 +122,7 @@ stdenv.mkDerivation {
       lgpl3Only
       mit
     ];
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ bandithedoge ];
     platforms = lib.systems.inspect.patternLogicalAnd lib.systems.inspect.patterns.isLinux lib.systems.inspect.patterns.isx86;
   };
 }

pkgs/by-name/ex/explex-nf/package.nix

@@ -0,0 +1,31 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchzip,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "explex-nf";
+  version = "0.0.3";
+
+  src = fetchzip {
+    url = "https://github.com/yuru7/Explex/releases/download/v${finalAttrs.version}/Explex_NF_v${finalAttrs.version}.zip";
+    hash = "sha256-X4CnYT5B7IyG1Z5Ex6CXCfX7Hz3vNb5bP+vq1Vjx8XI=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm444 ExplexConsole_NF/*.ttf -t $out/share/fonts/truetype/explex-nf-console
+    install -Dm444 Explex35Console_NF/*.ttf -t $out/share/fonts/truetype/explex-nf-35console
+
+    runHook postInstall
+  '';
+  meta = {
+    description = "Composite font of 0xProto, IBM Plex Sans JP and nerd-fonts";
+    homepage = "https://github.com/yuru7/Explex";
+    changelog = "https://github.com/yuru7/Explex/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.ofl;
+    platforms = lib.platforms.all;
+    maintainers = [ lib.maintainers.r-aizawa ];
+  };
+})

pkgs/by-name/ex/explex/package.nix

@@ -0,0 +1,33 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchzip,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "explex";
+  version = "0.0.3";
+
+  src = fetchzip {
+    url = "https://github.com/yuru7/Explex/releases/download/v${finalAttrs.version}/Explex_v${finalAttrs.version}.zip";
+    hash = "sha256-OUmzF8GrwVgFAMSEiZLvh85nsOw1a0a7B70u2cRXXO8=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm444 Explex/*.ttf -t $out/share/fonts/truetype/explex
+    install -Dm444 Explex35/*.ttf -t $out/share/fonts/truetype/explex-35
+    install -Dm444 ExplexConsole/*.ttf -t $out/share/fonts/truetype/explex-console
+    install -Dm444 Explex35Console/*.ttf -t $out/share/fonts/truetype/explex-35console
+
+    runHook postInstall
+  '';
+  meta = {
+    description = "Composite font of 0xProto and IBM Plex Sans JP";
+    homepage = "https://github.com/yuru7/Explex";
+    changelog = "https://github.com/yuru7/Explex/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.ofl;
+    platforms = lib.platforms.all;
+    maintainers = [ lib.maintainers.r-aizawa ];
+  };
+})

pkgs/by-name/fl/fleet/package.nix

@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "fleet";
-  version = "4.68.1";
+  version = "4.69.0";
 
   src = fetchFromGitHub {
     owner = "fleetdm";
     repo = "fleet";
     tag = "fleet-v${finalAttrs.version}";
-    hash = "sha256-XhnvhWjaU+McklFTsAhGEcSA+UkrYy8DgJ8ADE66U3o=";
+    hash = "sha256-3++w9AG70UMO6ProIBedhMs5q7Pk+pg8J50yIhnEzEM=";
   };
   vendorHash = "sha256-ZdkpgZbXchDp5kiEgCsSsd3/ltltSRjOuTPOhiBEloc=";
 

pkgs/by-name/fr/freecad/package.nix

@@ -13,14 +13,12 @@
   hdf5,
   libGLU,
   libredwg,
-  libsForQt5,
   libspnav,
   libXmu,
   medfile,
   mpi,
   ninja,
   ode,
-  opencascade-occt_7_6,
   opencascade-occt,
   pkg-config,
   python3Packages,
@@ -33,33 +31,32 @@
   xercesc,
   yaml-cpp,
   zlib,
-  withWayland ? false,
-  qtVersion ? 5,
-  qt5,
   qt6,
   nix-update-script,
 }:
 let
-  inherit (python3Packages)
-    boost
-    gitpython
-    ifcopenshell
-    matplotlib
-    opencamlib
-    pivy
-    ply
-    py-slvs
-    pybind11
-    pycollada
-    pyside2
-    pyside2-tools
-    pyside6
-    python
-    pyyaml
-    scipy
-    shiboken2
-    shiboken6
-    ;
+  pythonDeps =
+    with python3Packages;
+    [
+      boost
+      gitpython # for addon manager
+      matplotlib
+      opencamlib
+      pivy
+      ply # for openSCAD file support
+      py-slvs
+      pybind11
+      pycollada
+      pyside6
+      python
+      pyyaml # (at least for) PyrateWorkbench
+      scipy
+      shiboken6
+    ]
+    ++ lib.optionals ifcSupport [
+      ifcopenshell
+    ];
+
   freecad-utils = callPackage ./freecad-utils.nix { };
 in
 freecad-utils.makeCustomizable (
@@ -75,79 +72,42 @@ freecad-utils.makeCustomizable (
       fetchSubmodules = true;
     };
 
-    nativeBuildInputs =
-      [
-        cmake
-        ninja
-        pkg-config
-        gfortran
-        swig
-        doxygen
-        wrapGAppsHook3
-      ]
-      ++ lib.optionals (qtVersion == 5) [
-        pyside2-tools
-        qt5.wrapQtAppsHook
-      ]
-      ++ lib.optionals (qtVersion == 6) [ qt6.wrapQtAppsHook ];
+    nativeBuildInputs = [
+      cmake
+      ninja
+      pkg-config
+      gfortran
+      swig
+      doxygen
+      wrapGAppsHook3
+      qt6.wrapQtAppsHook
+    ];
 
     buildInputs =
       [
-        boost
         coin3d
         eigen
         fmt
-        gitpython # for addon manager
         gts
         hdf5
         libGLU
         libXmu
-        matplotlib
         medfile
         mpi
         ode
-        opencamlib
-        pivy
-        ply # for openSCAD file support
-        py-slvs
-        pybind11
-        pycollada
-        python
-        pyyaml # (at least for) PyrateWorkbench
-        scipy
         vtk
         xercesc
         yaml-cpp
         zlib
-      ]
-      ++ lib.optionals (qtVersion == 5) [
-        libsForQt5.soqt
-        opencascade-occt_7_6
-        pyside2
-        pyside2-tools
-        shiboken2
-        qt5.qtbase
-        qt5.qttools
-        qt5.qtwayland
-        qt5.qtwebengine
-        qt5.qtxmlpatterns
-      ]
-      ++ lib.optionals (qtVersion == 6) [
         opencascade-occt
-        pyside6
-        shiboken6
         qt6.qtbase
         qt6.qtsvg
         qt6.qttools
         qt6.qtwayland
         qt6.qtwebengine
       ]
-      ++ lib.optionals ifcSupport [
-        ifcopenshell
-      ]
-      ++ lib.optionals spaceNavSupport (
-        [ libspnav ] ++ lib.optionals (qtVersion == 5) [ libsForQt5.qtx11extras ]
-      );
+      ++ pythonDeps
+      ++ lib.optionals spaceNavSupport [ libspnav ];
 
     patches = [
       ./0001-NIXOS-don-t-ignore-PYTHONPATH.patch
@@ -158,54 +118,39 @@ freecad-utils.makeCustomizable (
       })
     ];
 
-    cmakeFlags =
-      [
-        "-Wno-dev" # turns off warnings which otherwise makes it hard to see what is going on
-        "-DBUILD_FLAT_MESH:BOOL=ON"
-        "-DBUILD_DRAWING=ON"
-        "-DBUILD_FLAT_MESH:BOOL=ON"
-        "-DINSTALL_TO_SITEPACKAGES=OFF"
-        "-DFREECAD_USE_PYBIND11=ON"
-      ]
-      ++ lib.optionals (qtVersion == 5) [
-        "-DBUILD_QT5=ON"
-        "-DSHIBOKEN_INCLUDE_DIR=${shiboken2}/include"
-        "-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken"
-        (
-          "-DPYSIDE_INCLUDE_DIR=${pyside2}/include"
-          + ";${pyside2}/include/PySide2/QtCore"
-          + ";${pyside2}/include/PySide2/QtWidgets"
-          + ";${pyside2}/include/PySide2/QtGui"
-        )
-        "-DPYSIDE_LIBRARY=PySide2::pyside2"
-      ]
-      ++ lib.optionals (qtVersion == 6) [
-        "-DBUILD_QT5=OFF"
-        "-DBUILD_QT6=ON"
-        "-DSHIBOKEN_INCLUDE_DIR=${shiboken6}/include"
-        "-DSHIBOKEN_LIBRARY=Shiboken6::libshiboken"
-        (
-          "-DPYSIDE_INCLUDE_DIR=${pyside6}/include"
-          + ";${pyside6}/include/PySide6/QtCore"
-          + ";${pyside6}/include/PySide6/QtWidgets"
-          + ";${pyside6}/include/PySide6/QtGui"
-        )
-        "-DPYSIDE_LIBRARY=PySide6::pyside6"
-      ];
+    cmakeFlags = [
+      "-Wno-dev" # turns off warnings which otherwise makes it hard to see what is going on
+      "-DBUILD_FLAT_MESH:BOOL=ON"
+      "-DBUILD_DRAWING=ON"
+      "-DBUILD_FLAT_MESH:BOOL=ON"
+      "-DINSTALL_TO_SITEPACKAGES=OFF"
+      "-DFREECAD_USE_PYBIND11=ON"
+      "-DBUILD_QT5=OFF"
+      "-DBUILD_QT6=ON"
+      "-DSHIBOKEN_INCLUDE_DIR=${python3Packages.shiboken6}/include"
+      "-DSHIBOKEN_LIBRARY=Shiboken6::libshiboken"
+      (
+        "-DPYSIDE_INCLUDE_DIR=${python3Packages.pyside6}/include"
+        + ";${python3Packages.pyside6}/include/PySide6/QtCore"
+        + ";${python3Packages.pyside6}/include/PySide6/QtWidgets"
+        + ";${python3Packages.pyside6}/include/PySide6/QtGui"
+      )
+      "-DPYSIDE_LIBRARY=PySide6::pyside6"
+    ];
 
     # This should work on both x86_64, and i686 linux
     preBuild = ''
       export NIX_LDFLAGS="-L${gfortran.cc.lib}/lib64 -L${gfortran.cc.lib}/lib $NIX_LDFLAGS";
     '';
 
-    preConfigure = ''
-      qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH")
-    '';
+    dontWrapGApps = true;
 
     qtWrapperArgs = [
       "--set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1"
       "--prefix PATH : ${libredwg}/bin"
-    ] ++ lib.optionals (!withWayland) [ "--set QT_QPA_PLATFORM xcb" ];
+      "--prefix PYTHONPATH : ${python3Packages.makePythonPath pythonDeps}"
+      "\${gappsWrapperArgs[@]}"
+    ];
 
     postFixup = ''
       mv $out/share/doc $out

pkgs/by-name/fr/freeswitch/package.nix

@@ -158,7 +158,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  env.NIX_CFLAGS_COMPILE = "-Wno-error";
+  env.NIX_CFLAGS_COMPILE = toString [
+    "-Wno-error"
+    # https://github.com/signalwire/freeswitch/issues/2495
+    "-Wno-incompatible-pointer-types"
+  ];
 
   # Using c++14 because of build error
   # gsm_at.h:94:32: error: ISO C++17 does not allow dynamic exception specifications

pkgs/by-name/fs/fstar/z3/default.nix

@@ -8,15 +8,17 @@
 }:
 
 let
+  z3' = z3.override { useCmakeBuild = false; };
+
   # fstar has a pretty hard dependency on certain z3 patch versions.
   # https://github.com/FStarLang/FStar/issues/3689#issuecomment-2625073641
   # We need to package all the Z3 versions it prefers here.
   fstarNewZ3Version = "4.13.3";
   fstarNewZ3 =
-    if z3.version == fstarNewZ3Version then
-      z3
+    if z3'.version == fstarNewZ3Version then
+      z3'
     else
-      z3.overrideAttrs (final: rec {
+      z3'.overrideAttrs (final: rec {
         version = fstarNewZ3Version;
         src = fetchFromGitHub {
           owner = "Z3Prover";
@@ -28,10 +30,10 @@ let
 
   fstarOldZ3Version = "4.8.5";
   fstarOldZ3 =
-    if z3.version == fstarOldZ3Version then
-      z3
+    if z3'.version == fstarOldZ3Version then
+      z3'
     else
-      z3.overrideAttrs (prev: rec {
+      z3'.overrideAttrs (prev: rec {
         version = fstarOldZ3Version;
         src = fetchFromGitHub {
           owner = "Z3Prover";

pkgs/by-name/gt/gtkextra/package.nix

@@ -1,55 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchurl,
-  pkg-config,
-  gobject-introspection,
-  file,
-  gtk2,
-  glib,
-  cairo,
-  atk,
-  pango,
-  libtiff,
-  libpng,
-  libjpeg,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "gtkextra";
-  version = "3.3.4";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/project/gtkextra/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz";
-    sha256 = "1mpihbyzhv3ymfim93l9xnxmzhwyqdba5xb4rdn5vggdg25766v5";
-  };
-
-  postPatch = ''
-    substituteInPlace configure \
-      --replace "/usr/bin/file" "${file}/bin/file"
-  '';
-
-  nativeBuildInputs = [
-    gobject-introspection
-    pkg-config
-  ];
-
-  buildInputs = [
-    gtk2
-    glib
-    cairo
-    atk
-    pango
-    libtiff
-    libpng
-    libjpeg
-  ];
-
-  meta = with lib; {
-    homepage = "https://gtkextra.sourceforge.net/";
-    description = "GtkExtra is a useful set of widgets for creating GUI's for GTK+";
-    license = licenses.lgpl2Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ tesq0 ];
-  };
-}

pkgs/by-name/hy/hyperledger-fabric/package.nix

@@ -4,15 +4,15 @@
   fetchFromGitHub,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "hyperledger-fabric";
-  version = "2.5.5";
+  version = "2.5.13";
 
   src = fetchFromGitHub {
     owner = "hyperledger";
     repo = "fabric";
-    rev = "v${version}";
-    hash = "sha256-Ev9a+d15kr6apKyGR5xTa/2I3cByyPSTW2Y+HAQk9GU=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-HLDafeDe7eXuVZ8JqGYIr5Y5YicsR3PaDX/UeSqg8Vw=";
   };
 
   vendorHash = null;
@@ -38,11 +38,11 @@ buildGoModule rec {
   ldflags = [
     "-s"
     "-w"
-    "-X github.com/hyperledger/fabric/common/metadata.Version=${version}"
-    "-X github.com/hyperledger/fabric/common/metadata.CommitSha=${src.rev}"
+    "-X github.com/hyperledger/fabric/common/metadata.Version=${finalAttrs.version}"
+    "-X github.com/hyperledger/fabric/common/metadata.CommitSha=${finalAttrs.src.tag}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "High-performance, secure, permissioned blockchain network";
     longDescription = ''
       Hyperledger Fabric is an enterprise-grade permissioned distributed ledger
@@ -52,7 +52,7 @@ buildGoModule rec {
       preserving privacy.
     '';
     homepage = "https://wiki.hyperledger.org/display/fabric";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     maintainers = [ ];
   };
-}
+})

pkgs/by-name/jw/jwx/package.nix

@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "jwx";
-  version = "3.0.2";
+  version = "3.0.6";
 
   src = fetchFromGitHub {
     owner = "lestrrat-go";
     repo = "jwx";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-IKMTRgxqGZkYK5WVWUjIrjed6ukphHzbmtXOwoJSkRo=";
+    hash = "sha256-D3HhkAEW1vxeq6bQhRLe9+i/0u6CUhR6azWwIpudhBI=";
   };
 
-  vendorHash = "sha256-mqPlub5JbD7dcMHi72xda72HQJF57uqzHaJzYOQNk+Q=";
+  vendorHash = "sha256-FjNUcNI3A97ngPZBWW+6qL0eCTd10KUGl/AzByXSZt8=";
 
   sourceRoot = "${finalAttrs.src.name}/cmd/jwx";
 

pkgs/by-name/ka/karakeep/package.nix

@@ -2,6 +2,8 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  nix-update-script,
+  testers,
   nodejs,
   node-gyp,
   inter,
@@ -15,13 +17,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "karakeep";
-  version = "0.24.1";
+  version = "0.25.0";
 
   src = fetchFromGitHub {
     owner = "karakeep-app";
     repo = "karakeep";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-eiDTNMB/CipAR3FkUqPUGYdTAC6lSxT9gRXPQJLx5YE=";
+    hash = "sha256-eAiRvesUZIwTaj7CSxtI4rkGlTkgVjbzzwjYaXlhSuo=";
   };
 
   patches = [
@@ -51,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
       '';
     };
 
-    hash = "sha256-2n61uKdT9Q1fobpHunRhC3Eql3fqsV+DcyaEGjYDOyY=";
+    hash = "sha256-yf8A0oZ0Y4A5k7gfinIU02Lbqp/ygyvIBlldS0pv5+0=";
   };
   buildPhase = ''
     runHook preBuild
@@ -124,6 +126,18 @@ stdenv.mkDerivation (finalAttrs: {
     find $out -type l ! -exec test -e {} \; -delete
   '';
 
+  passthru = {
+    tests = {
+      version = testers.testVersion {
+        package = finalAttrs.finalPackage;
+        # remove hardcoded version if upstream syncs general version with cli
+        # version
+        version = "0.23.0";
+      };
+    };
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     homepage = "https://karakeep.app/";
     description = "Self-hostable bookmark-everything app (links, notes and images) with AI-based automatic tagging and full text search";

pkgs/by-name/ka/karakeep/patches/use-local-font.patch

@@ -12,17 +12,19 @@ See similar patches:
 @@ -1,5 +1,5 @@
  import type { Metadata } from "next";
 -import { Inter } from "next/font/google";
-+import localFont from 'next/font/local';
-
++import localFont from "next/font/local";
+ import { NuqsAdapter } from "nuqs/adapters/next/app";
+ 
  import "@karakeep/tailwind-config/globals.css";
-
-@@ -13,9 +13,10 @@ import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
-
+@@ -14,9 +14,10 @@ import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
+ 
  import { clientConfig } from "@karakeep/shared/config";
-
+ 
 -const inter = Inter({
 +const inter = localFont({
    subsets: ["latin"],
    fallback: ["sans-serif"],
 +  src: "./fonts/InterVariable.ttf",
  });
+ 
+ export const metadata: Metadata = {

pkgs/by-name/ka/kazumi/package.nix

@@ -20,13 +20,13 @@
 
 flutter332.buildFlutterApplication rec {
   pname = "kazumi";
-  version = "1.7.2";
+  version = "1.7.3";
 
   src = fetchFromGitHub {
     owner = "Predidit";
     repo = "Kazumi";
     tag = version;
-    hash = "sha256-ZvpEzDMeL3QW4QdoBqi5FN0Pztof7awGhhH79ADUBS8=";
+    hash = "sha256-xsJ7kOhmySPYURTgEI0yoXMOWQRcjbFHueeqOZ7HsbE=";
   };
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;

pkgs/by-name/ka/kazumi/pubspec.lock.json

@@ -2079,6 +2079,6 @@
   },
   "sdks": {
     "dart": ">=3.7.0 <4.0.0",
-    "flutter": ">=3.32.0"
+    "flutter": ">=3.32.2"
   }
 }

pkgs/by-name/ku/kubectl-ai/package.nix

@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubectl-ai";
-  version = "0.0.11";
+  version = "0.0.12";
 
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "kubectl-ai";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ui8DpqsgJlNh3q+hq4Y7XG7yO/ZPtlffd5s4lf1zU1k=";
+    hash = "sha256-S2+WIg+sXkQ8Muu9c2IRqaqRLEbYqd0upRGGxx0awQU=";
   };
 
-  vendorHash = "sha256-gufDSIDmC8jtLgY+mg13pc5njGWxAk0osZpOh7RBsHA=";
+  vendorHash = "sha256-td693IU+Ms2pvMHDh2kMJsFwuwnx8dY6fmoE1Xwji8c=";
 
   # Build the main command
   subPackages = [ "cmd" ];

pkgs/by-name/li/libks/package.nix

@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libks";
-  version = "2.0.6";
+  version = "2.0.7";
 
   src = fetchFromGitHub {
     owner = "signalwire";
     repo = "libks";
     rev = "v${version}";
-    sha256 = "sha256-zKL+ukAdKiCC4wh55hnZpebFraIdKWDFsRfhVzhUNj0=";
+    sha256 = "sha256-fiBemt71UJgN0RryGmGiK7sob1xbdmSOArEGt5Pg5YM=";
   };
 
   patches = [

pkgs/by-name/li/lighthouse/package.nix

@@ -17,24 +17,25 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "lighthouse";
-  version = "6.0.1";
+  version = "7.0.1";
 
-  # lighthouse/common/deposit_contract/build.rs
+  # lighthouse/common/deposit_contract/build.rs, `TAG`
   depositContractSpecVersion = "0.12.1";
+  # lighthouse/common/deposit_contract/build.rs, `UNSAFE_TAG`
   testnetDepositContractSpecVersion = "0.9.2.1";
 
   src = fetchFromGitHub {
     owner = "sigp";
     repo = "lighthouse";
-    rev = "v${version}";
-    hash = "sha256-8jHNm/MGpHGOt52rLMXLMWIVn8AXqnpAr+Wvk7DH6gc=";
+    tag = "v${version}";
+    hash = "sha256-0nClqRSLwKnTNAMsvX5zzN2PbVJ51xtQv48cHSqHLAY=";
   };
 
   patches = [
     ./use-system-sqlite.patch
   ];
 
-  cargoHash = "sha256-Opkz3EVKw0M4LeWMsn1NlSw/Fg7cWVqnDJRRTPYYlLo=";
+  cargoHash = "sha256-tQVZXZzcit4seBgmW4WEyNOkLzswX/I36DphORb7w30=";
   useFetchCargoVendor = true;
 
   buildFeatures = [
@@ -98,7 +99,24 @@ rustPlatform.buildRustPackage rec {
   # All of these tests require network access
   checkFlags =
     [
-      "--skip basic"
+      "--skip tests::broadcast_should_send_to_all_bns"
+      "--skip tests::check_candidate_order"
+      "--skip tests::first_success_should_try_nodes_in_order"
+      "--skip tests::update_all_candidates_should_update_sync_status"
+      "--skip engine_api::http::test::forkchoice_updated_v1_request"
+      "--skip engine_api::http::test::forkchoice_updated_v1_with_payload_attributes_request"
+      "--skip engine_api::http::test::get_block_by_hash_request"
+      "--skip engine_api::http::test::get_block_by_number_request"
+      "--skip engine_api::http::test::get_payload_v1_request"
+      "--skip engine_api::http::test::geth_test_vectors"
+      "--skip engine_api::http::test::new_payload_v1_request"
+      "--skip test::finds_valid_terminal_block_hash"
+      "--skip test::produce_three_valid_pos_execution_blocks"
+      "--skip test::rejects_invalid_terminal_block_hash"
+      "--skip test::rejects_terminal_block_with_equal_timestamp"
+      "--skip test::rejects_unknown_terminal_block_hash"
+      "--skip test::test_forked_terminal_block"
+      "--skip test::verifies_valid_terminal_block_hash"
       "--skip deposit_tree::cache_consistency"
       "--skip deposit_tree::double_update"
       "--skip deposit_tree::updating"
@@ -109,8 +127,196 @@ rustPlatform.buildRustPackage rec {
       "--skip fast::deposit_cache_query"
       "--skip http::incrementing_deposits"
       "--skip persist::test_persist_caches"
-      "--skip service::tests::tests::test_dht_persistence"
-      "--skip time::test::test_reinsertion_updates_timeout"
+      "--skip can_read_finalized_block"
+      "--skip invalid_attestation_delayed_slot"
+      "--skip invalid_attestation_empty_bitfield"
+      "--skip invalid_attestation_future_block"
+      "--skip invalid_attestation_future_epoch"
+      "--skip invalid_attestation_inconsistent_ffg_vote"
+      "--skip invalid_attestation_past_epoch"
+      "--skip invalid_attestation_target_epoch"
+      "--skip invalid_attestation_unknown_beacon_block_root"
+      "--skip invalid_attestation_unknown_target_root"
+      "--skip invalid_block_finalized_descendant"
+      "--skip invalid_block_finalized_slot"
+      "--skip invalid_block_future_slot"
+      "--skip invalid_block_unknown_parent"
+      "--skip justified_and_finalized_blocks"
+      "--skip justified_balances"
+      "--skip justified_checkpoint_updates_with_descendent"
+      "--skip justified_checkpoint_updates_with_descendent_first_justification"
+      "--skip justified_checkpoint_updates_with_non_descendent"
+      "--skip progressive_balances_cache_attester_slashing"
+      "--skip progressive_balances_cache_proposer_slashing"
+      "--skip valid_attestation"
+      "--skip valid_attestation_skip_across_epoch"
+      "--skip weak_subjectivity_check_epoch_boundary_is_skip_slot"
+      "--skip weak_subjectivity_check_epoch_boundary_is_skip_slot_failure"
+      "--skip weak_subjectivity_check_fails_early_epoch"
+      "--skip weak_subjectivity_check_fails_incorrect_root"
+      "--skip weak_subjectivity_check_fails_late_epoch"
+      "--skip weak_subjectivity_check_passes"
+      "--skip weak_subjectivity_pass_on_startup"
+      "--skip basic"
+      "--skip returns_200_ok"
+      "--skip release_tests::attestation_aggregation_insert_get_prune"
+      "--skip release_tests::attestation_duplicate"
+      "--skip release_tests::attestation_get_max"
+      "--skip release_tests::attestation_pairwise_overlapping"
+      "--skip release_tests::attestation_rewards"
+      "--skip release_tests::cross_fork_attester_slashings"
+      "--skip release_tests::cross_fork_exits"
+      "--skip release_tests::cross_fork_proposer_slashings"
+      "--skip release_tests::duplicate_proposer_slashing"
+      "--skip release_tests::max_coverage_attester_proposer_slashings"
+      "--skip release_tests::max_coverage_different_indices_set"
+      "--skip release_tests::max_coverage_effective_balances"
+      "--skip release_tests::overlapping_max_cover_attester_slashing"
+      "--skip release_tests::prune_attester_slashing_noop"
+      "--skip release_tests::prune_proposer_slashing_noop"
+      "--skip release_tests::simple_max_cover_attester_slashing"
+      "--skip release_tests::sync_contribution_aggregation_insert_get_prune"
+      "--skip release_tests::sync_contribution_duplicate"
+      "--skip release_tests::sync_contribution_with_fewer_bits"
+      "--skip release_tests::sync_contribution_with_more_bits"
+      "--skip release_tests::test_earliest_attestation"
+      "--skip per_block_processing::tests::block_replayer_peeking_state_roots"
+      "--skip per_block_processing::tests::fork_spanning_exit"
+      "--skip per_block_processing::tests::invalid_attester_slashing_1_invalid"
+      "--skip per_block_processing::tests::invalid_attester_slashing_2_invalid"
+      "--skip per_block_processing::tests::invalid_attester_slashing_not_slashable"
+      "--skip per_block_processing::tests::invalid_bad_proposal_1_signature"
+      "--skip per_block_processing::tests::invalid_bad_proposal_2_signature"
+      "--skip per_block_processing::tests::invalid_block_header_state_slot"
+      "--skip per_block_processing::tests::invalid_block_signature"
+      "--skip per_block_processing::tests::invalid_deposit_bad_merkle_proof"
+      "--skip per_block_processing::tests::invalid_deposit_count_too_small"
+      "--skip per_block_processing::tests::invalid_deposit_deposit_count_too_big"
+      "--skip per_block_processing::tests::invalid_deposit_invalid_pub_key"
+      "--skip per_block_processing::tests::invalid_deposit_wrong_sig"
+      "--skip per_block_processing::tests::invalid_parent_block_root"
+      "--skip per_block_processing::tests::invalid_proposer_slashing_duplicate_slashing"
+      "--skip per_block_processing::tests::invalid_proposer_slashing_proposal_epoch_mismatch"
+      "--skip per_block_processing::tests::invalid_proposer_slashing_proposals_identical"
+      "--skip per_block_processing::tests::invalid_proposer_slashing_proposer_unknown"
+      "--skip per_block_processing::tests::invalid_randao_reveal_signature"
+      "--skip per_block_processing::tests::valid_4_deposits"
+      "--skip per_block_processing::tests::valid_block_ok"
+      "--skip per_block_processing::tests::valid_insert_attester_slashing"
+      "--skip per_block_processing::tests::valid_insert_proposer_slashing"
+      "--skip per_epoch_processing::tests::release_tests::altair_state_on_base_fork"
+      "--skip per_epoch_processing::tests::release_tests::base_state_on_altair_fork"
+      "--skip per_epoch_processing::tests::runs_without_error"
+      "--skip exit::custom_tests::valid"
+      "--skip exit::custom_tests::valid_three"
+      "--skip exit::tests::invalid_bad_signature"
+      "--skip exit::tests::invalid_duplicate"
+      "--skip exit::tests::invalid_exit_already_initiated"
+      "--skip exit::tests::invalid_future_exit_epoch"
+      "--skip exit::tests::invalid_not_active_after_exit_epoch"
+      "--skip exit::tests::invalid_not_active_before_activation_epoch"
+      "--skip exit::tests::invalid_too_young_by_a_lot"
+      "--skip exit::tests::invalid_too_young_by_one_epoch"
+      "--skip exit::tests::invalid_validator_unknown"
+      "--skip exit::tests::valid_genesis_epoch"
+      "--skip exit::tests::valid_previous_epoch"
+      "--skip exit::tests::valid_single_exit"
+      "--skip exit::tests::valid_three_exits"
+      "--skip iter::test::block_root_iter"
+      "--skip iter::test::state_root_iter"
+      "--skip beacon_state::committee_cache::tests::initializes_with_the_right_epoch"
+      "--skip beacon_state::committee_cache::tests::min_randao_epoch_correct"
+      "--skip beacon_state::committee_cache::tests::shuffles_for_the_right_epoch"
+      "--skip beacon_state::tests::beacon_proposer_index"
+      "--skip beacon_state::tests::cache_initialization"
+      "--skip beacon_state::tests::committees::current_epoch_committee_consistency"
+      "--skip beacon_state::tests::committees::next_epoch_committee_consistency"
+      "--skip beacon_state::tests::committees::previous_epoch_committee_consistency"
+      "--skip tests::hd_validator_creation"
+      "--skip tests::invalid_pubkey"
+      "--skip tests::keystore_validator_creation"
+      "--skip tests::keystores::check_get_set_fee_recipient"
+      "--skip tests::keystores::check_get_set_gas_limit"
+      "--skip tests::keystores::delete_concurrent_with_signing"
+      "--skip tests::keystores::delete_keystores_twice"
+      "--skip tests::keystores::delete_nonexistent_keystores"
+      "--skip tests::keystores::delete_nonexistent_remotekey"
+      "--skip tests::keystores::delete_remotekey_then_reimport_different_url"
+      "--skip tests::keystores::delete_remotekeys_twice"
+      "--skip tests::keystores::delete_then_reimport"
+      "--skip tests::keystores::delete_then_reimport_remotekeys"
+      "--skip tests::keystores::get_auth_no_token"
+      "--skip tests::keystores::get_empty_keystores"
+      "--skip tests::keystores::get_empty_remotekeys"
+      "--skip tests::keystores::get_web3_signer_keystores"
+      "--skip tests::keystores::import_and_delete_conflicting_web3_signer_keystores"
+      "--skip tests::keystores::import_invalid_slashing_protection"
+      "--skip tests::keystores::import_keystores_wrong_password"
+      "--skip tests::keystores::import_new_keystores"
+      "--skip tests::keystores::import_new_remotekeys"
+      "--skip tests::keystores::import_only_duplicate_keystores"
+      "--skip tests::keystores::import_only_duplicate_remotekeys"
+      "--skip tests::keystores::import_remote_and_local_keys"
+      "--skip tests::keystores::import_remotekey_web3signer"
+      "--skip tests::keystores::import_remotekey_web3signer_disabled"
+      "--skip tests::keystores::import_remotekey_web3signer_enabled"
+      "--skip tests::keystores::import_same_local_and_remote_keys"
+      "--skip tests::keystores::import_same_remote_and_local_keys"
+      "--skip tests::keystores::import_same_remotekey_different_url"
+      "--skip tests::keystores::import_some_duplicate_keystores"
+      "--skip tests::keystores::import_some_duplicate_remotekeys"
+      "--skip tests::keystores::import_wrong_number_of_passwords"
+      "--skip tests::keystores::migrate_all_with_slashing_protection"
+      "--skip tests::keystores::migrate_some_extra_slashing_protection"
+      "--skip tests::keystores::migrate_some_missing_slashing_protection"
+      "--skip tests::keystores::migrate_some_with_slashing_protection"
+      "--skip tests::prefer_builder_proposals_validator"
+      "--skip tests::routes_with_invalid_auth"
+      "--skip tests::simple_getters"
+      "--skip tests::validator_builder_boost_factor"
+      "--skip tests::validator_builder_boost_factor_global_builder_proposals_false"
+      "--skip tests::validator_builder_boost_factor_global_builder_proposals_true"
+      "--skip tests::validator_builder_boost_factor_global_prefer_builder_proposals_true"
+      "--skip tests::validator_builder_boost_factor_global_prefer_builder_proposals_true_override"
+      "--skip tests::validator_builder_proposals"
+      "--skip tests::validator_derived_builder_boost_factor_with_process_defaults"
+      "--skip tests::validator_enabling"
+      "--skip tests::validator_exit"
+      "--skip tests::validator_gas_limit"
+      "--skip tests::validator_graffiti"
+      "--skip tests::validator_graffiti_api"
+      "--skip tests::web3signer_validator_creation"
+      "--skip create_validators::tests::bogus_bn_url"
+      "--skip delete_validators::test::delete_multiple_validators"
+      "--skip import_validators::tests::create_one_validator"
+      "--skip import_validators::tests::create_one_validator_keystore_format"
+      "--skip import_validators::tests::create_one_validator_with_offset"
+      "--skip import_validators::tests::create_one_validator_with_offset_keystore_format"
+      "--skip import_validators::tests::create_three_validators"
+      "--skip import_validators::tests::create_three_validators_with_offset"
+      "--skip import_validators::tests::import_duplicates_when_allowed"
+      "--skip import_validators::tests::import_duplicates_when_allowed_keystore_format"
+      "--skip import_validators::tests::import_duplicates_when_disallowed"
+      "--skip import_validators::tests::import_duplicates_when_disallowed_keystore_format"
+      "--skip list_validators::test::list_all_validators"
+      "--skip move_validators::test::no_validators"
+      "--skip move_validators::test::one_validator_move_all"
+      "--skip move_validators::test::one_validator_move_all_with_password_files"
+      "--skip move_validators::test::one_validator_move_one"
+      "--skip move_validators::test::one_validator_to_non_empty_dest"
+      "--skip move_validators::test::one_validators_move_two_by_count"
+      "--skip move_validators::test::three_validators_move_all"
+      "--skip move_validators::test::three_validators_move_one"
+      "--skip move_validators::test::three_validators_move_one_by_count"
+      "--skip move_validators::test::three_validators_move_three"
+      "--skip move_validators::test::three_validators_move_two"
+      "--skip move_validators::test::three_validators_move_two_by_count"
+      "--skip move_validators::test::two_validator_move_all_and_back_again"
+      "--skip move_validators::test::two_validator_move_all_passwords_removed"
+      "--skip move_validators::test::two_validator_move_all_passwords_removed_failed_password_attempt"
+      "--skip move_validators::test::two_validators_move_all_where_one_is_a_duplicate"
+      "--skip move_validators::test::two_validators_move_one_where_one_is_a_duplicate"
+      "--skip move_validators::test::two_validators_move_one_with_identical_password_files"
     ]
     ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin) [
       "--skip subnet_service::tests::attestation_service::test_subscribe_same_subnet_several_slots_apart"

pkgs/by-name/lm/lm_sensors/package.nix

@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   bash,
   bison,
   flex,
@@ -13,7 +12,7 @@
 }:
 
 let
-  version = "3.6.0";
+  version = "3.6.2";
   tag = "V" + lib.replaceStrings [ "." ] [ "-" ] version;
 
 in
@@ -22,21 +21,12 @@ stdenv.mkDerivation {
   inherit version;
 
   src = fetchFromGitHub {
-    owner = "lm-sensors";
+    owner = "hramrach"; # openSUSE fork used by openSUSE and Gentoo
     repo = "lm-sensors";
     inherit tag;
-    hash = "sha256-9lfHCcODlS7sZMjQhK0yQcCBEoGyZOChx/oM0CU37sY=";
+    hash = "sha256-EmS9H3TQac6bHs2G8t1C2cQNAjN13zPoKDysny6aTFw=";
   };
 
-  patches = [
-    # Fix compile failure on GCC 14 with `sensord` enabled.
-    # From: https://github.com/lm-sensors/lm-sensors/pull/483
-    (fetchpatch {
-      url = "https://github.com/lm-sensors/lm-sensors/pull/483/commits/7a6170f07d05cc6601b4668f211e9389f2e75286.patch";
-      hash = "sha256-Q49quv3eXeMvY3jgZFs/F7Rljbq4YyehIDIlsgmloBQ=";
-    })
-  ];
-
   outputs = [
     "bin"
     "out"
@@ -51,13 +41,6 @@ stdenv.mkDerivation {
     ''
       substituteInPlace lib/init.c \
         --replace-fail 'ETCDIR "/sensors.d"' '"/etc/sensors.d"'
-    ''
-    # Upstream build system have knob to enable and disable building of static
-    # library, shared library is built unconditionally.
-    + lib.optionalString stdenv.hostPlatform.isStatic ''
-      sed -i 'lib/Module.mk' -e '/LIBTARGETS :=/,+1d; /-m 755/ d'
-      substituteInPlace prog/sensors/Module.mk \
-        --replace-fail 'lib/$(LIBSHBASENAME)' ""
     '';
 
   nativeBuildInputs = [
@@ -80,6 +63,8 @@ stdenv.mkDerivation {
     "MANDIR=${placeholder "man"}/share/man"
     # This is a dependency of the library.
     "ETCDIR=${placeholder "out"}/etc"
+    "BUILD_SHARED_LIB=${if stdenv.hostPlatform.isStatic then "0" else "1"}"
+    "BUILD_STATIC_LIB=${if stdenv.hostPlatform.isStatic then "1" else "0"}"
 
     "CC=${stdenv.cc.targetPrefix}cc"
     "AR=${stdenv.cc.targetPrefix}ar"
@@ -87,21 +72,15 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  # Making regexp to patch-out installing of .so symlinks from Makefile is
-  # complicated, it is easier to remove them post-install.
-  postInstall =
-    ''
-      mkdir -p $doc/share/doc/lm_sensors
-      cp -r configs doc/* $doc/share/doc/lm_sensors
-    ''
-    + lib.optionalString stdenv.hostPlatform.isStatic ''
-      rm $out/lib/*.so*
-    '';
+  postInstall = ''
+    mkdir -p $doc/share/doc/lm_sensors
+    cp -r configs doc/* $doc/share/doc/lm_sensors
+  '';
 
   meta = {
     homepage = "https://hwmon.wiki.kernel.org/lm_sensors";
-    changelog = "https://raw.githubusercontent.com/lm-sensors/lm-sensors/${tag}/CHANGES";
-    description = "Tools for reading hardware sensors";
+    changelog = "https://raw.githubusercontent.com/hramrach/lm-sensors/${tag}/CHANGES";
+    description = "Tools for reading hardware sensors - maintained fork";
     license = with lib.licenses; [
       lgpl21Plus
       gpl2Plus

pkgs/by-name/ne/nelm/package.nix

@@ -9,16 +9,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "nelm";
-  version = "1.5.0";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "werf";
     repo = "nelm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GywpByQ6GCx47VKFYPaF1fpd6A03sSTjCxSWjWhUzrc=";
+    hash = "sha256-bqVas9zF/xtL5K/7cOF/4q4weZtEBhfB5ngdAq0ZfjI=";
   };
 
-  vendorHash = "sha256-jzzIvxEJhGPb0bO5S400PGIWCEaOxQcgsybXziY652E=";
+  vendorHash = "sha256-bx8e5jV+ORnJg/35VwO7qodFjmSf7XbzTKZKp3b8hqc=";
 
   subPackages = [ "cmd/nelm" ];
 

pkgs/by-name/op/opencloud/idp-web.nix

@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
     sourceRoot = "${finalAttrs.src.name}/${finalAttrs.pnpmRoot}";
-    hash = "sha256-gFhWDYk3DcwUowZ9AQjCqHZL1oniK3YCNiG1cDGabYg=";
+    hash = "sha256-yseRO1tClLTRpQj5BzMscElUlgLEzj1u8ndT1+di2+Y=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/op/opencloud/package.nix

@@ -28,13 +28,13 @@ let
 in
 buildGoModule rec {
   pname = "opencloud";
-  version = "2.3.0";
+  version = "3.0.0";
 
   src = fetchFromGitHub {
     owner = "opencloud-eu";
     repo = "opencloud";
     tag = "v${version}";
-    hash = "sha256-IIasFyKF28ynYi8bAmx8LddF0OWB1/Hji6Ovp5pm9QE=";
+    hash = "sha256-hWd/x+HRuU39j4F2bC0RbhFJEyjlKIknAYGArcdGEoM=";
   };
 
   postPatch = ''

pkgs/by-name/op/opencloud/web.nix

@@ -9,18 +9,18 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencloud-web";
-  version = "2.4.0";
+  version = "3.0.0";
 
   src = fetchFromGitHub {
     owner = "opencloud-eu";
     repo = "web";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-64Dwkx5IEwlaIX1z6Roi6cSWB2ETBldQcNWxgWiUX18=";
+    hash = "sha256-1LcOvpVVhBkY2ek67ME2rHqdYo5Ud2oWQC6rjxQX3Ng=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-UKgtthdRnI+iR4Qn07nabQOzWZFATjIfrQfwxhKJkx8=";
+    hash = "sha256-7wwviWveMf+xnYmO05MI3XuPVZ/pcSqQi4sGjrEdjGc=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/pr/prr/package.nix

@@ -4,26 +4,29 @@
   fetchFromGitHub,
   openssl,
   pkg-config,
+  cacert,
 }:
-
 rustPlatform.buildRustPackage rec {
   pname = "prr";
-  version = "0.17.0";
+  version = "0.20.0";
 
   src = fetchFromGitHub {
     owner = "danobi";
     repo = "prr";
     rev = "v${version}";
-    hash = "sha256-siQZ3rDKv2lnn1bmisRsexWwfvmMhK+z4GZGPsrfPgc=";
+    hash = "sha256-duoC3TMgW+h5OrRCbqYPppMtnQBfS9R7ZpHQySgPRv4=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-VIJFr1HpXMC2DXt79Yb1DuLYSbo9g6zsXaNDTXjtlR4=";
+  cargoHash = "sha256-W66kbTk0IAThl2H35EYuXr6UAyWfhmV0DxpnABhppSQ=";
 
   buildInputs = [ openssl ];
 
   nativeBuildInputs = [ pkg-config ];
 
+  SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+  checkInputs = [ cacert ];
+
   meta = with lib; {
     description = "Tool that brings mailing list style code reviews to Github PRs";
     homepage = "https://github.com/danobi/prr";

pkgs/by-name/re/renderdoc/package.nix

@@ -14,6 +14,7 @@
   pcre,
   pkg-config,
   python3Packages,
+  python312Packages,
   qt5,
   stdenv,
   vulkan-loader,
@@ -23,6 +24,9 @@
 }:
 
 let
+  pythonPackages' =
+    # lib.meta.availableOn does not respect meta.broken?
+    if python3Packages.shiboken2.meta.available then python3Packages else python312Packages;
   custom_swig = fetchFromGitHub {
     owner = "baldurk";
     repo = "swig";
@@ -51,9 +55,9 @@ stdenv.mkDerivation (finalAttrs: {
     [
       libXdmcp
       libpthreadstubs
-      python3Packages.pyside2
-      python3Packages.pyside2-tools
-      python3Packages.shiboken2
+      pythonPackages'.pyside2
+      pythonPackages'.pyside2-tools
+      pythonPackages'.shiboken2
       qt5.qtbase
       qt5.qtsvg
       vulkan-loader
@@ -71,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
     makeWrapper
     pcre
     pkg-config
-    python3Packages.python
+    pythonPackages'.python
     qt5.qtx11extras
     qt5.wrapQtAppsHook
   ];
@@ -137,7 +141,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = lib.licenses.mit;
     mainProgram = "renderdoccmd";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [ pbsds ];
     platforms = lib.intersectLists lib.platforms.linux (lib.platforms.x86_64 ++ lib.platforms.i686);
   };
 })

pkgs/by-name/ro/roadrunner/package.nix

@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "roadrunner";
-  version = "2025.1.1";
+  version = "2025.1.2";
 
   src = fetchFromGitHub {
     repo = "roadrunner";
     owner = "roadrunner-server";
     tag = "v${version}";
-    hash = "sha256-HNljEsrHTbNA5/+tnquh4yO5plAj1kKTAY3P927nAEU=";
+    hash = "sha256-j/OXeKMsym09m1kh6Ox4Vy/VLJ2YI7NTcR+NerHweos=";
   };
 
   nativeBuildInputs = [
@@ -48,7 +48,7 @@ buildGoModule rec {
 
   __darwinAllowLocalNetworking = true;
 
-  vendorHash = "sha256-dnbctKxwQqfxZfKPa3ZlKjF5a/7eC5arK9RrPksSNVg=";
+  vendorHash = "sha256-Kl5YzTIgl5gza5iV9PlZ8BR5C5DANvtZ849aJtMrGSw=";
 
   meta = {
     changelog = "https://github.com/roadrunner-server/roadrunner/blob/v${version}/CHANGELOG.md";

pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix

@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "roddhjav-apparmor-rules";
-  version = "0-unstable-2025-05-27";
+  version = "0-unstable-2025-06-12";
 
   src = fetchFromGitHub {
     owner = "roddhjav";
     repo = "apparmor.d";
-    rev = "bf22a7786c39d3b56b87095bfd4479769b88ec1a";
-    hash = "sha256-J8h9LcZRxhTaZg7OU2m75upSoeD1i/abSCJQtX1WRsQ=";
+    rev = "1f7e019500a87027fd03f89e148e52b71946e4c0";
+    hash = "sha256-xw7MaPUXLZOla8LfmhdiFbf8xLke3OKh1wwBdWm9ENo=";
   };
 
   dontConfigure = true;

pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix

@@ -12,7 +12,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rust-analyzer-unwrapped";
-  version = "2025-06-02";
+  version = "2025-06-09";
   useFetchCargoVendor = true;
   cargoHash = "sha256-ewV/rccDgRR/iMSRihkG/1aZyGHoobeX2LQItdzCy68=";
 
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
     owner = "rust-lang";
     repo = "rust-analyzer";
     rev = version;
-    hash = "sha256-VwSuuRF4NvAoeHZJRRlX8zAFZ+nZyuiIvmVqBAX0Bcg=";
+    hash = "sha256-Hs0vidgwvBiBuqNjR5oCQMMGUfUYwwnyxLShg3yzhWU=";
   };
 
   cargoBuildFlags = [

pkgs/by-name/s7/s7/package.nix

@@ -19,14 +19,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "s7";
-  version = "11.2-unstable-2024-12-19";
+  version = "11.5-unstable-2025-06-14";
 
   src = fetchFromGitLab {
     domain = "cm-gitlab.stanford.edu";
     owner = "bil";
     repo = "s7";
-    rev = "a5515d455f5aca49d5275a5a35ac88935f3ad401";
-    hash = "sha256-Ik3edzpO9hIhJBZHyzL/CsTVKGbDdGVfE9pNrBeSjp8=";
+    rev = "02ac5499a1273553c344b1cba3363cef9fd18f41";
+    hash = "sha256-VqkQT5N/ggIRVL98puikMJEBwenhMGx+Fwfx99prYc4=";
   };
 
   buildInputs = [
@@ -72,6 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     cc notcurses_s7.c -o libnotcurses_s7.so \
         -O2 -I. \
+        -Wno-error=implicit-function-declaration \
         -shared \
         -lnotcurses-core \
         -fPIC

pkgs/by-name/si/simbaplusplus/package.nix

@@ -5,6 +5,7 @@
   cmake,
   llvmPackages,
   z3,
+  python3,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -33,6 +34,10 @@ stdenv.mkDerivation (finalAttrs: {
     z3
   ];
 
+  checkInputs = [
+    python3
+  ];
+
   doCheck = true;
 
   meta = {

pkgs/by-name/si/simplex-chat-desktop/package.nix

@@ -7,11 +7,11 @@
 
 let
   pname = "simplex-chat-desktop";
-  version = "6.3.4";
+  version = "6.3.5";
 
   src = fetchurl {
     url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage";
-    hash = "sha256-BE0JOcl3UbYoqzihgoqfcM1yxvxodSGdm8QaBgVhHBY=";
+    hash = "sha256-eyiEEmGauzM8fYxsbPj5egcWdK0IAgzze7XNuS+38mw=";
   };
 
   appimageContents = appimageTools.extract {

pkgs/by-name/sn/snyk/package.nix

@@ -8,7 +8,7 @@
 }:
 
 let
-  version = "1.1296.1";
+  version = "1.1297.1";
 in
 buildNpmPackage {
   pname = "snyk";
@@ -18,10 +18,10 @@ buildNpmPackage {
     owner = "snyk";
     repo = "cli";
     tag = "v${version}";
-    hash = "sha256-7eelAsZGoCVXdAIW8hyXN+s2Bz9z8Ya2v+mskYNy4Kg=";
+    hash = "sha256-/wA6bBjgz3KhTBw/JJpLM5UkRNHehVdm6ubpq92N4IY=";
   };
 
-  npmDepsHash = "sha256-3zNiFYuosyw4PBSt2NXMMOLP//XKsLHfVqiOjNSbL4A=";
+  npmDepsHash = "sha256-SzrBhY7iWGlIPNB+5ROdaxAlQSetSKc3MPBp+4nNh+o=";
 
   postPatch = ''
     substituteInPlace package.json \

pkgs/by-name/sq/sqlfluff/package.nix

@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "sqlfluff";
-  version = "3.4.0";
+  version = "3.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sqlfluff";
     repo = "sqlfluff";
     tag = version;
-    hash = "sha256-9JitD46hMgCrUx+mtSoKm/8vKd6CfPngmVsaUb9vi+Q=";
+    hash = "sha256-gtpYQvhDOxNO97YXaSHqSgUklmPJIe2ynjexTZPBUmA=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];

pkgs/by-name/ta/taler-mdb/package.nix

@@ -0,0 +1,57 @@
+{
+  lib,
+  stdenv,
+  fetchgit,
+  autoreconfHook,
+  pkg-config,
+  curl,
+  gnunet,
+  jansson,
+  libgcrypt,
+  libmicrohttpd,
+  libnfc,
+  libsodium,
+  qrencode,
+  taler-exchange,
+  taler-merchant,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "taler-mdb";
+  version = "1.0.0";
+
+  src = fetchgit {
+    url = "https://git.taler.net/taler-mdb.git";
+    tag = "v${finalAttrs.version}";
+    fetchSubmodules = true;
+    hash = "sha256-AAFnF8bN2Pnhy8OZbgA6CRHBIC6iP785HpVjPEVu+IQ=";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+
+  buildInputs = [
+    curl
+    gnunet
+    jansson
+    libgcrypt
+    libmicrohttpd
+    libnfc
+    libsodium
+    qrencode
+    taler-exchange
+    taler-merchant
+  ];
+
+  doCheck = true;
+
+  meta = {
+    homepage = "https://git.taler.net/taler-mdb.git";
+    description = "Sales integration with the Multi-Drop-Bus of Snack machines, NFC readers and QR code display";
+    license = lib.licenses.agpl3Plus;
+    teams = with lib.teams; [ ngi ];
+    maintainers = with lib.maintainers; [ ];
+    mainProgram = "taler-mdb";
+  };
+})

pkgs/by-name/tf/tfk8s/tests/sample1/input.yaml

@@ -1,4 +1,3 @@
----
 apiVersion: v1
 kind: ConfigMap
 metadata:

pkgs/by-name/ty/typstyle/package.nix

@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "typstyle";
-  version = "0.13.10";
+  version = "0.13.11";
 
   src = fetchFromGitHub {
     owner = "Enter-tainer";
     repo = "typstyle";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-q1WnpjN9Ue0yTm6q5hmcVrDj5oxUhyY71GiiVn1QcpM=";
+    hash = "sha256-fp6UcWD56wWyrk3ZTS1YksydNw0e40NV7dY7Mams3ww=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-Ov+RpV/ONjY/zc8PbIo/TXS3TzJUokaccrFfTEjpxok=";
+  cargoHash = "sha256-BkS/xfVuU3FLjEkE1KEq0K5dNoUSP4XoDkpXLa8Z5Wo=";
 
   # Disabling tests requiring network access
   checkFlags = [

pkgs/by-name/ve/vectorcode/package.nix

@@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec {
   dependencies =
     with python3Packages;
     [
-      chromadb_0
+      chromadb
       colorlog
       httpx
       json5

pkgs/by-name/vo/vokoscreen-ng/package.nix

@@ -1,25 +1,25 @@
 {
-  fetchFromGitHub,
-  gst_all_1,
   lib,
+  stdenv,
+  fetchFromGitHub,
+  pkg-config,
+  gst_all_1,
   libX11,
   pipewire,
-  pkg-config,
   pulseaudio,
   qt6,
-  stdenv,
   wayland,
 }:
 
 stdenv.mkDerivation rec {
   pname = "vokoscreen-ng";
-  version = "4.4.0";
+  version = "4.5.2";
 
   src = fetchFromGitHub {
     owner = "vkohaupt";
     repo = "vokoscreenNG";
     tag = version;
-    hash = "sha256-5rESTLIvjc/Jztc7LAPl74fxgDsam9SfBa6B5yTXb8E=";
+    hash = "sha256-oHVUkwqP7b55AzXjSuPQb4PUErZSsRpDwGxI3xmg6YA=";
   };
 
   qmakeFlags = [ "src/vokoscreenNG.pro" ];
@@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
     qt6.qmake
     qt6.wrapQtAppsHook
   ];
+
   buildInputs = [
     gst_all_1.gstreamer
     libX11
@@ -62,15 +63,15 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "User friendly Open Source screencaster for Linux and Windows";
-    license = licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     homepage = "https://github.com/vkohaupt/vokoscreenNG";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       shamilton
       dietmarw
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
     mainProgram = "vokoscreenNG";
   };
 }

pkgs/by-name/wa/wasm-tools/package.nix

@@ -6,20 +6,20 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wasm-tools";
-  version = "1.233.0";
+  version = "1.235.0";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = "wasm-tools";
     rev = "v${version}";
-    hash = "sha256-Xx5ukiMIMQSptEe035Dq6NWidU/MN/Hxg0C0y6aUCJ0=";
+    hash = "sha256-SrWmoDSz2/qSiex46CeDIgarjgGRp2KOThGP4YjglZY=";
     fetchSubmodules = true;
   };
 
   # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
   auditable = false;
   useFetchCargoVendor = true;
-  cargoHash = "sha256-OFF8tUZ5Xhc+GQ2v0gYpAogIHeXjYEDxUn+78WsuHHs=";
+  cargoHash = "sha256-j4tZupbWYcFy6M7XgDJjOKcvEYSNkQd30hvB2keVZwE=";
   cargoBuildFlags = [
     "--package"
     "wasm-tools"

pkgs/by-name/we/wealthfolio/package.nix

@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "wealthfolio";
-  version = "1.1.2";
+  version = "1.1.3";
 
   src = fetchFromGitHub {
     owner = "afadil";
     repo = "wealthfolio";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-lN7P8FPcMU9COTyKs1hswvmHIKFqrL3Svp77q4pI6+I=";
+    hash = "sha256-HxzLGo+Tu8r58q7agagapfb69yxmFOLJFqDTQVYhpUE=";
   };
 
   pnpmDeps = pnpm_9.fetchDeps {
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
       src
       cargoRoot
       ;
-    hash = "sha256-MmdvEutdkX98DgX1aVuxs4gabuMX5aM8yC4eqgvd8Q4=";
+    hash = "sha256-9qxbgVEOmSaOBL6Vo3ZufNyn9wfs/FI+Pz38BiS91S8=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/we/weasis/package.nix

@@ -2,34 +2,32 @@
   lib,
   stdenv,
   fetchzip,
-  jdk23,
+  jdk24,
   copyDesktopItems,
   makeDesktopItem,
 }:
 
 let
-  throwSystem = throw "Unsupported system: ${stdenv.system}";
-  platform =
-    {
-      "x86_64-linux" = "linux-x86-64";
-    }
-    .${stdenv.system} or throwSystem;
+  selectSystem =
+    attrs:
+    attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+  platform = selectSystem {
+    "x86_64-linux" = "linux-x86-64";
+  };
 
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "weasis";
-  version = "4.5.1";
+  version = "4.6.1";
 
   # Their build instructions indicate to use the packaging script
   src = fetchzip {
-    url = "https://github.com/nroduit/Weasis/releases/download/v${version}/weasis-native.zip";
-    hash = "sha256-aGoTSOZ1W8JHQ0+FcJ9RZ47A1LfXJOoGNmVDiUd9zxE=";
+    url = "https://github.com/nroduit/Weasis/releases/download/v${finalAttrs.version}/weasis-native.zip";
+    hash = "sha256-poBMlSjaT4Mx4CV/19S7Dzk48RsgeKrBxl9KXRDzWrc=";
     stripRoot = false;
   };
 
-  nativeBuildInputs = [
-    copyDesktopItems
-  ];
+  nativeBuildInputs = [ copyDesktopItems ];
 
   desktopItems = [
     (makeDesktopItem {
@@ -44,7 +42,7 @@ stdenv.mkDerivation rec {
       exec = "Weasis";
       icon = "Weasis";
       desktopName = "Weasis";
-      comment = meta.description;
+      comment = finalAttrs.meta.description;
     })
   ];
 
@@ -55,7 +53,7 @@ stdenv.mkDerivation rec {
   buildPhase = ''
     runHook preBuild
 
-    ./build/script/package-weasis.sh --no-installer --jdk ${jdk23}
+    ./build/script/package-weasis.sh --no-installer --jdk ${jdk24}
 
     runHook postBuild
   '';
@@ -65,7 +63,7 @@ stdenv.mkDerivation rec {
 
     mkdir -p $out/share/{applications,pixmaps}
 
-    mv weasis-${platform}-jdk${lib.versions.major jdk23.version}-${version}/Weasis/* $out/
+    mv weasis-${platform}-jdk${lib.versions.major jdk24.version}-${finalAttrs.version}/Weasis/* $out/
     mv $out/lib/*.png $out/share/pixmaps/
 
     runHook postInstall
@@ -75,7 +73,7 @@ stdenv.mkDerivation rec {
     description = "Multipurpose standalone and web-based DICOM viewer with a highly modular architecture";
     homepage = "https://weasis.org";
     # Using changelog from releases as it is more accurate
-    changelog = "https://github.com/nroduit/Weasis/releases/tag/v${version}";
+    changelog = "https://github.com/nroduit/Weasis/releases/tag/v${finalAttrs.version}";
     license = with lib.licenses; [
       asl20
       epl20
@@ -84,4 +82,4 @@ stdenv.mkDerivation rec {
     platforms = [ "x86_64-linux" ];
     mainProgram = "Weasis";
   };
-}
+})

pkgs/by-name/wi/winhelpcgi/package.nix

@@ -1,35 +0,0 @@
-{
-  stdenv,
-  fetchurl,
-  libwmf,
-  libpng12,
-  pkg-config,
-  lib,
-}:
-stdenv.mkDerivation {
-  pname = "winhelpcgi";
-  version = "1.0-rc3";
-
-  src = fetchurl {
-    url = "http://www.herdsoft.com/ftp/winhelpcgi_1.0-1.tar.gz";
-    sha256 = "sha256-9HIs50ZGoTfGixD9c/DQs0KJMQtmfsDVB8qRMnQtXNw=";
-
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-
-  buildInputs = [
-    libwmf
-    libpng12
-  ];
-
-  meta = {
-    description = "CGI module for Linux, Solaris, MacOS X and AIX to read Windows Help Files";
-    mainProgram = "winhelpcgi.cgi";
-    homepage = "http://www.herdsoft.com/linux/produkte/winhelpcgi.html";
-    license = lib.licenses.gpl2Only;
-    maintainers = [ lib.maintainers.shlevy ];
-    platforms = lib.platforms.linux;
-    broken = stdenv.hostPlatform.isAarch64;
-  };
-}

pkgs/by-name/xl/xld/package.nix

@@ -11,11 +11,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "xld";
-  version = "20240511";
+  version = "20250302";
 
   src = fetchurl {
     url = "mirror://sourceforge/xld/xld-${finalAttrs.version}.dmg";
-    hash = "sha256-8xfjAWgtSdbD8gGlkGzT8QRz7egIf4PE/rFsFEDX0+c=";
+    hash = "sha256-ADKlRw6k4yoRo1uAd+v0mGECiR+OuCdDCU8sZiGtius=";
   };
 
   buildInputs = [ undmg ];
@@ -46,7 +46,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     ];
     text = ''
       url=$(curl --silent "https://svn.code.sf.net/p/xld/code/appcast/xld-appcast_e.xml")
-      version=$(echo "$url" | xmlstarlet sel -t -v "substring-before(substring-after(//enclosure/@url, 'version='), '&')")
+      version=$(echo "$url" | xmlstarlet sel -t -v "//enclosure/@sparkle:shortVersionString")
       update-source-version xld "$version" --file=./pkgs/by-name/xl/xld/package.nix
     '';
   });

pkgs/by-name/z3/z3/fix-pkg-config-paths.patch

@@ -0,0 +1,21 @@
+diff --git a/z3.pc.cmake.in b/z3.pc.cmake.in
+index 436dd6208..dd1e179c7 100644
+--- a/z3.pc.cmake.in
++++ b/z3.pc.cmake.in
+@@ -1,13 +1,10 @@
+-prefix=@CMAKE_INSTALL_PREFIX@
+-exec_prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+-sharedlibdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@
++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+ 
+ Name: z3
+ Description: The Z3 Theorem Prover
+ Version: @Z3_VERSION@
+ 
+ Requires:
+-Libs: -L${libdir} -L${sharedlibdir} -lz3
++Libs: -L${libdir} -lz3
+ Cflags: -I${includedir}

pkgs/by-name/z3/z3/package.nix

@@ -2,46 +2,63 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  python3,
+  python3Packages,
   fixDarwinDylibNames,
   nix-update-script,
   versionCheckHook,
 
   javaBindings ? false,
   ocamlBindings ? false,
-  pythonBindings ? true,
+  pythonBindings ? (!stdenv.hostPlatform.isStatic),
   jdk ? null,
   ocaml ? null,
   findlib ? null,
   zarith ? null,
+  cmake,
+  ninja,
+  testers,
+  useCmakeBuild ? (!ocamlBindings), # TODO: remove gnu make build once cmake supports ocaml
   ...
 }:
 
-assert javaBindings -> jdk != null;
-assert ocamlBindings -> ocaml != null && findlib != null && zarith != null;
+assert pythonBindings -> !stdenv.hostPlatform.isStatic;
+assert javaBindings -> jdk != null && (!stdenv.hostPlatform.isStatic);
+assert
+  ocamlBindings
+  -> ocaml != null && findlib != null && zarith != null && (!stdenv.hostPlatform.isStatic);
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "z3";
-  version = "4.15.0";
+  version = "4.15.1";
 
   src = fetchFromGitHub {
     owner = "Z3Prover";
     repo = "z3";
     rev = "z3-${finalAttrs.version}";
-    hash = "sha256-fk3NyV6vIDXivhiNOW2Y0i5c+kzc7oBqaeBWj/JjpTM=";
+    hash = "sha256-mzU21AlKjC5406lQXfBSz/AIwo/1FThqap5JgldkAgQ=";
   };
 
+  patches = lib.optionals useCmakeBuild [
+    ./fix-pkg-config-paths.patch
+  ];
+
   strictDeps = true;
 
   nativeBuildInputs =
-    [ python3 ]
+    [ python3Packages.python ]
+    ++ lib.optionals pythonBindings [ python3Packages.setuptools ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]
     ++ lib.optionals javaBindings [ jdk ]
     ++ lib.optionals ocamlBindings [
       ocaml
       findlib
+    ]
+    ++ lib.optionals useCmakeBuild [
+      cmake
+      ninja
     ];
-  propagatedBuildInputs = [ python3.pkgs.setuptools ] ++ lib.optionals ocamlBindings [ zarith ];
+
+  propagatedBuildInputs = lib.optionals ocamlBindings [ zarith ];
   enableParallelBuilding = true;
 
   postPatch = lib.optionalString ocamlBindings ''
@@ -49,58 +66,94 @@ stdenv.mkDerivation (finalAttrs: {
     mkdir -p $OCAMLFIND_DESTDIR/stublibs
   '';
 
-  configurePhase = ''
+  configurePhase = lib.optionalString (!useCmakeBuild) ''
     runHook preConfigure
 
-    ${python3.pythonOnBuildForHost.interpreter} \
+    ${python3Packages.python.pythonOnBuildForHost.interpreter} \
       scripts/mk_make.py \
       --prefix=$out \
       ${lib.optionalString javaBindings "--java"} \
       ${lib.optionalString ocamlBindings "--ml"} \
-      ${lib.optionalString pythonBindings "--python --pypkgdir=$out/${python3.sitePackages}"}
+      ${lib.optionalString pythonBindings "--python --pypkgdir=$out/${python3Packages.python.sitePackages}"}
 
     cd build
 
     runHook postConfigure
   '';
 
+  cmakeFlags =
+    [
+      (lib.cmakeBool "Z3_BUILD_PYTHON_BINDINGS" pythonBindings)
+      (lib.cmakeBool "Z3_INSTALL_PYTHON_BINDINGS" pythonBindings)
+      (lib.cmakeBool "Z3_BUILD_JAVA_BINDINGS" javaBindings)
+      (lib.cmakeBool "Z3_INSTALL_JAVA_BINDINGS" javaBindings)
+      (lib.cmakeBool "Z3_BUILD_OCAML_BINDINGS" ocamlBindings) # FIXME: ocaml does not properly install build output on cmake
+      (lib.cmakeBool "Z3_SINGLE_THREADED" (!finalAttrs.enableParallelBuilding))
+      (lib.cmakeBool "Z3_BUILD_LIBZ3_SHARED" (!stdenv.hostPlatform.isStatic))
+      (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" (placeholder "out"))
+      (lib.cmakeBool "Z3_BUILD_TEST_EXECUTABLES" finalAttrs.doCheck)
+      (lib.cmakeBool "Z3_ENABLE_EXAMPLE_TARGETS" false)
+    ]
+    ++ lib.optionals pythonBindings [
+      (lib.cmakeFeature "CMAKE_INSTALL_PYTHON_PKG_DIR" "${placeholder "python"}/${python3Packages.python.sitePackages}")
+      (lib.cmakeFeature "Python3_EXECUTABLE" "${lib.getExe python3Packages.python}")
+    ]
+    ++ lib.optionals javaBindings [
+      (lib.cmakeFeature "Z3_JAVA_JNI_LIB_INSTALLDIR" "${placeholder "java"}/lib")
+      (lib.cmakeFeature "Z3_JAVA_JAR_INSTALLDIR" "${placeholder "java"}/share/java")
+    ];
+
   doCheck = true;
   checkPhase = ''
     runHook preCheck
 
-    make -j $NIX_BUILD_CORES test
+    ${if useCmakeBuild then "ninja test-z3" else "make test"} -j $NIX_BUILD_CORES
     ./test-z3 -a
 
     runHook postCheck
   '';
 
   postInstall =
-    ''
-      mkdir -p $dev $lib
-      mv $out/lib $lib/lib
-      mv $out/include $dev/include
-    ''
+    lib.optionalString (!useCmakeBuild) (
+      ''
+        mkdir -p $dev $lib
+        mv $out/lib $lib/lib
+        mv $out/include $dev/include
+      ''
+      + lib.optionalString pythonBindings ''
+        mkdir -p $python/lib
+        mv $lib/lib/python* $python/lib/
+
+        # need to delete the lib folder to properly link the actual lib output
+        rm -rf $python/${python3Packages.python.sitePackages}/z3/lib
+      ''
+      + lib.optionalString javaBindings ''
+        mkdir -p $java/share/java $java/lib
+        mv $lib/lib/com.microsoft.z3.jar $java/share/java
+        mv $lib/lib/libz3java* $java/lib
+      ''
+    )
     + lib.optionalString pythonBindings ''
-      mkdir -p $python/lib
-      mv $lib/lib/python* $python/lib/
-      ln -sf $lib/lib/libz3${stdenv.hostPlatform.extensions.sharedLibrary} $python/${python3.sitePackages}/z3/lib/libz3${stdenv.hostPlatform.extensions.sharedLibrary}
-    ''
-    + lib.optionalString javaBindings ''
-      mkdir -p $java/share/java
-      mv com.microsoft.z3.jar $java/share/java
-      moveToOutput "lib/libz3java.${stdenv.hostPlatform.extensions.sharedLibrary}" "$java"
+      ln -sf $lib/lib $python/${python3Packages.python.sitePackages}/z3/lib
     '';
 
   doInstallCheck = true;
-  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ] ++ lib.optionals pythonBindings [ python3Packages.pythonImportsCheckHook ];
+
+  pythonImportsCheck = [
+    "z3"
+  ];
 
   outputs =
     [
       "out"
       "lib"
       "dev"
-      "python"
     ]
+    ++ lib.optionals pythonBindings [ "python" ]
     ++ lib.optionals javaBindings [ "java" ]
     ++ lib.optionals ocamlBindings [ "ocaml" ];
 
@@ -111,6 +164,9 @@ stdenv.mkDerivation (finalAttrs: {
         "^z3-([0-9]+\\.[0-9]+\\.[0-9]+)$"
       ];
     };
+    tests = lib.optionalAttrs useCmakeBuild {
+      pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+    };
   };
 
   meta = {
@@ -125,5 +181,7 @@ stdenv.mkDerivation (finalAttrs: {
       ttuegel
       numinit
     ];
+    pkgConfigModules = lib.optionals useCmakeBuild [ "z3" ];
+    broken = useCmakeBuild && ocamlBindings;
   };
 })

pkgs/by-name/zb/zbctl/package.nix

@@ -4,20 +4,20 @@
   fetchurl,
 }:
 
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "zbctl";
-  version = "8.2.11";
+  version = "8.4.19";
 
   src =
     if stdenvNoCC.hostPlatform.system == "x86_64-darwin" then
       fetchurl {
-        url = "https://github.com/camunda/zeebe/releases/download/${version}/zbctl.darwin";
-        sha256 = "0390n6wmlmfwqf6fvw6wqg6hbrs7bm9x2cdaajlw87377lklypkf";
+        url = "https://github.com/camunda/zeebe/releases/download/${finalAttrs.version}/zbctl.darwin";
+        hash = "sha256-RuZX9TWuXBxxegLw0La0l9/6zh96V/2trJvZUoCvTKk=";
       }
     else if stdenvNoCC.hostPlatform.system == "x86_64-linux" then
       fetchurl {
-        url = "https://github.com/camunda/zeebe/releases/download/${version}/zbctl";
-        sha256 = "081hc0nynwg014lhsxxyin4rc2i9z6wh8q9i98cjjd8kgr41h096";
+        url = "https://github.com/camunda/zeebe/releases/download/${finalAttrs.version}/zbctl";
+        hash = "sha256-NTJqmcOzpOzHjrtOHBU2J3u0f7sESBeZMbb8kx3zR38=";
       }
     else
       throw "Unsupported platform ${stdenvNoCC.hostPlatform.system}";
@@ -28,9 +28,9 @@ stdenvNoCC.mkDerivation rec {
 
   installPhase = ''
     runHook preInstall
-    mkdir -p $out/bin
-    cp $src $out/bin/zbctl
-    chmod +x $out/bin/zbctl
+
+    install -Dm755 $src $out/bin/zbctl
+
     runHook postInstall
   '';
 
@@ -38,7 +38,7 @@ stdenvNoCC.mkDerivation rec {
     description = "Command line interface to interact with Camunda 8 and Zeebe";
     homepage = "https://docs.camunda.io/docs/apis-clients/cli-client/";
     downloadPage = "https://github.com/camunda/zeebe/releases";
-    changelog = "https://github.com/camunda/zeebe/releases/tag/${version}";
+    changelog = "https://github.com/camunda/zeebe/releases/tag/${finalAttrs.version}";
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.asl20;
     platforms = [
@@ -57,4 +57,4 @@ stdenvNoCC.mkDerivation rec {
     '';
     mainProgram = "zbctl";
   };
-}
+})

pkgs/by-name/zi/zim/package.nix

@@ -7,6 +7,8 @@
   gobject-introspection,
   wrapGAppsHook3,
   adwaita-icon-theme,
+  writableTmpDirAsHomeHook,
+  xvfb-run,
 }:
 
 # TODO: Declare configuration options for the following optional dependencies:
@@ -16,33 +18,43 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "zim";
-  version = "0.75.2";
+  version = "0.76.3";
 
   src = fetchurl {
     url = "https://zim-wiki.org/downloads/zim-${version}.tar.gz";
-    hash = "sha256-QIkNsFsWeNHEcXhGHHZyJDMMW2lNvdwMJLGxeCZaLdI=";
+    hash = "sha256-St8J6z8HcTj+Vb8m8T5sTZk2Fv5CSnmdG6a+CYzk6wU=";
   };
 
-  buildInputs = [
-    gtk3
-    adwaita-icon-theme
-  ];
-  propagatedBuildInputs = with python3Packages; [
-    pyxdg
-    pygobject3
-  ];
   nativeBuildInputs = [
     gobject-introspection
     wrapGAppsHook3
   ];
 
-  dontWrapGApps = true;
+  buildInputs = [
+    gtk3
+    adwaita-icon-theme
+  ];
 
-  preFixup = ''
-    makeWrapperArgs+=(--prefix XDG_DATA_DIRS : $out/share)
-    makeWrapperArgs+=(--prefix XDG_DATA_DIRS : ${adwaita-icon-theme}/share)
-    makeWrapperArgs+=(--argv0 $out/bin/.zim-wrapped)
-    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  dependencies = with python3Packages; [
+    pyxdg
+    pygobject3
+  ];
+
+  # (test.py:800): GLib-GIO-ERROR **: 20:59:45.754:
+  # No GSettings schemas are installed on the system
+  doCheck = false;
+
+  nativeCheckInputs = [
+    xvfb-run
+    writableTmpDirAsHomeHook
+  ];
+
+  checkPhase = ''
+    runHook preCheck
+
+    xvfb-run ${python3Packages.python.interpreter} test.py
+
+    runHook postCheck
   '';
 
   postInstall = ''
@@ -54,16 +66,18 @@ python3Packages.buildPythonApplication rec {
         size=''${size%.svg}
         dimensions="''${size}x''${size}"
         mkdir -p $out/share/icons/hicolor/$dimensions/apps
-        cp $img $out/share/icons/hicolor/$dimensions/apps/${pname}.png
+        cp $img $out/share/icons/hicolor/$dimensions/apps/zim.png
       done
     )
   '';
 
-  # RuntimeError: could not create GtkClipboard object
-  doCheck = false;
+  dontWrapGApps = true;
 
-  checkPhase = ''
-    ${python3Packages.python.interpreter} test.py
+  preFixup = ''
+    makeWrapperArgs+=(--prefix XDG_DATA_DIRS : $out/share)
+    makeWrapperArgs+=(--prefix XDG_DATA_DIRS : ${adwaita-icon-theme}/share)
+    makeWrapperArgs+=(--argv0 $out/bin/.zim-wrapped)
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 
   meta = {

pkgs/by-name/zi/zipline/package.nix

@@ -12,6 +12,9 @@
   versionCheckHook,
   nix-update-script,
   nixosTests,
+  node-gyp,
+  pkg-config,
+  python3,
 }:
 
 let
@@ -43,12 +46,19 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-O8RLaKff4Dj/JDeUOyf7GtcFcOu/aOuclyaZmVqVi5s=";
   };
 
-  buildInputs = [ vips ];
+  buildInputs = [
+    openssl
+    vips
+  ];
 
   nativeBuildInputs = [
     pnpm_10.configHook
     nodejs_24
     makeWrapper
+    # for sharp build:
+    node-gyp
+    pkg-config
+    python3
   ];
 
   env = environment;
@@ -56,6 +66,11 @@ stdenv.mkDerivation (finalAttrs: {
   buildPhase = ''
     runHook preBuild
 
+    # Force build of sharp against native libvips (requires running install scripts).
+    # This is necessary for supporting old CPUs (ie. without SSE 4.2 instruction set).
+    pnpm config set nodedir ${nodejs_24}
+    pnpm install --force --offline --frozen-lockfile
+
     pnpm build
 
     runHook postBuild
@@ -88,14 +103,6 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  preFixup = ''
-    find $out -name libvips-cpp.so.42 -print0 | while read -d $'\0' libvips; do
-      echo replacing libvips at $libvips
-      rm $libvips
-      ln -s ${lib.getLib vips}/lib/libvips-cpp.so.42 $libvips
-    done
-  '';
-
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/ziplinectl";
   versionCheckProgramArg = "--version";

pkgs/by-name/zs/zsync/package.nix

@@ -7,21 +7,18 @@
 
 stdenv.mkDerivation rec {
   pname = "zsync";
-  version = "0.6.2-unstable-2017-04-25";
+  version = "0.6.3-unstable-2025-05-29";
 
   src = fetchFromGitHub {
     owner = "cph6";
     repo = "zsync";
-    rev = "6cfe374f8f2310cbd624664ca98e5bb28244ba7a";
-    hash = "sha256-SnCzNDMyhMx+2JmgsrjtYDa31Ki1EWix9iBfaduDnro=";
+    rev = "a5cb28f923dd3cfdeb65e2930dd1faa727c2abf8";
+    hash = "sha256-gJs1P83AKWGipspeoFCSibZH+X6mmj3aL4+yjGO2YJo=";
   };
 
   sourceRoot = "${src.name}/c";
 
-  patches = [
-    ./remove-inexisting-rsumtest.patch
-    ./read-blocksums-declaration-fix.patch
-  ];
+  patches = [ ./remove-inexisting-rsumtest.patch ];
 
   makeFlags = [ "AR=${stdenv.cc.bintools.targetPrefix}ar" ];
 

pkgs/by-name/zs/zsync/read-blocksums-declaration-fix.patch

@@ -1,13 +0,0 @@
-diff --git a/libzsync/zsync.c b/libzsync/zsync.c
-index 793a426..783c349 100644
---- a/libzsync/zsync.c
-+++ b/libzsync/zsync.c
-@@ -116,7 +116,7 @@ struct zsync_state {
- };
- 
- static int zsync_read_blocksums(struct zsync_state *zs, FILE * f,
--                                int rsum_bytes, int checksum_bytes,
-+                                int rsum_bytes, unsigned int checksum_bytes,
-                                 int seq_matches);
- static int zsync_sha1(struct zsync_state *zs, int fh);
- static int zsync_recompress(struct zsync_state *zs);

pkgs/desktops/pantheon/apps/elementary-dock/default.nix

@@ -18,7 +18,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "elementary-dock";
-  version = "8.1.1";
+  version = "8.1.2";
 
   outputs = [
     "out"
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "elementary";
     repo = "dock";
     rev = finalAttrs.version;
-    hash = "sha256-Z6Y/UR6B4tygmetfZq5sOyn5nfq8+CmuR3NpegzCyo8=";
+    hash = "sha256-hZ1xfEBN+pGj0TxNy5dSQrYuba2I0dmXl0p65rU73H4=";
   };
 
   depsBuildBuild = [ pkg-config ];

pkgs/desktops/pantheon/desktop/gala/default.nix

@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
+  fetchpatch,
   desktop-file-utils,
   gettext,
   libxml2,
@@ -29,19 +30,26 @@
 
 stdenv.mkDerivation rec {
   pname = "gala";
-  version = "8.2.2";
+  version = "8.2.3";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    hash = "sha256-S71NryqJjWXZgyBj6q088bdjt/NnAEJ6oeUO2OMJ3Z4=";
+    hash = "sha256-6M9IWwrCaJoi7b5e4ltdyZfdT7KkOgsollHNKhLPr9U=";
   };
 
   patches = [
     # We look for plugins in `/run/current-system/sw/lib/` because
     # there are multiple plugin providers (e.g. gala and wingpanel).
     ./plugins-dir.patch
+
+    # WindowStateSaver: fix crash
+    # https://github.com/elementary/gala/pull/2443
+    (fetchpatch {
+      url = "https://github.com/elementary/gala/commit/9defe95ef412f87eb14e0efd8b87f2fde5378a76.patch";
+      hash = "sha256-P50ahXFlTLyHMT+WdHdLU2qNdMUnfXF+CjoJRchmyzw=";
+    })
   ];
 
   depsBuildBuild = [ pkg-config ];

pkgs/desktops/pantheon/desktop/wingpanel-indicators/quick-settings/default.nix

@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  fetchpatch,
   nix-update-script,
   glib,
   meson,
@@ -24,24 +23,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "wingpanel-quick-settings";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "quick-settings";
     rev = finalAttrs.version;
-    hash = "sha256-77NkzdE0Z655qeh718L4Mil6FkMxTNaEqh7DLHoldQ4=";
+    hash = "sha256-G8nwEbMMHVaT7czDG1E/AMsMdSYtmh0oiMruGr2tMdg=";
   };
 
-  patches = [
-    # Adapt to uid_t being an available type since Vala 0.56.17
-    # https://github.com/elementary/quick-settings/pull/91
-    (fetchpatch {
-      url = "https://github.com/elementary/quick-settings/commit/765a77ded353e4eedfe62a2116e252cc107cef5a.patch";
-      hash = "sha256-Q9+eLwjsHktEdVRh7LmmJKK5RcizI+lIiIgICZcILQY=";
-    })
-  ];
-
   nativeBuildInputs = [
     glib # glib-compile-resources
     meson

pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix

@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-settings-daemon";
-  version = "8.3.0";
+  version = "8.3.1";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "settings-daemon";
     rev = version;
-    sha256 = "sha256-0/G5h1eZi3qnjesrvWF6MiMX+FmpW4ys2tRUMBiUCS0=";
+    sha256 = "sha256-bYwgxUrPMDaxv/Vv+DuMUzOT1/GRcvNHZW+fjiN5Kdo=";
   };
 
   nativeBuildInputs = [

pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix

@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xdg-desktop-portal-pantheon";
-  version = "8.0.2";
+  version = "8.0.3";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "portals";
     rev = version;
-    sha256 = "sha256-/zX2OZggMYbiyTLVOuSpfQw8E4ZMr19CiiVV47zpSV0=";
+    sha256 = "sha256-UGQ5kteX/W3ncKzTXXmVL/aI0WC3eqpl5prdmj7lBD8=";
   };
 
   nativeBuildInputs = [

pkgs/development/julia-modules/tests/julia-top-n/package.yaml

@@ -1,38 +1,38 @@
-name:                julia-top-n
-version:             0.1.0.0
-license:             BSD-3-Clause
-author:              "Tom McLaughlin"
-maintainer:          "tom@codedown.io"
+name: julia-top-n
+version: 0.1.0.0
+license: BSD-3-Clause
+author: "Tom McLaughlin"
+maintainer: "tom@codedown.io"
 
 dependencies:
-- aeson
-- base >= 4.7 && < 5
-- bytestring
-- filepath
-- optparse-applicative
-- sandwich
-- string-interpolate
-- text
-- unliftio
-- vector
-- yaml
+  - aeson
+  - base >= 4.7 && < 5
+  - bytestring
+  - filepath
+  - optparse-applicative
+  - sandwich
+  - string-interpolate
+  - text
+  - unliftio
+  - vector
+  - yaml
 
 ghc-options:
-- -Wall
-- -Wcompat
-- -Widentities
-- -Wincomplete-record-updates
-- -Wincomplete-uni-patterns
-- -Wmissing-export-lists
-- -Wmissing-home-modules
-- -Wpartial-fields
-- -Wredundant-constraints
+  - -Wall
+  - -Wcompat
+  - -Widentities
+  - -Wincomplete-record-updates
+  - -Wincomplete-uni-patterns
+  - -Wmissing-export-lists
+  - -Wmissing-home-modules
+  - -Wpartial-fields
+  - -Wredundant-constraints
 
 executables:
   julia-top-n-exe:
-    main:                Main.hs
-    source-dirs:         app
+    main: Main.hs
+    source-dirs: app
     ghc-options:
-    - -threaded
-    - -rtsopts
-    - -with-rtsopts=-N
+      - -threaded
+      - -rtsopts
+      - -with-rtsopts=-N

pkgs/development/julia-modules/tests/julia-top-n/stack.yaml

@@ -3,9 +3,9 @@ resolver:
   url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/4.yaml
 
 packages:
-- .
+  - .
 
 nix:
   pure: false
   packages:
-  - zlib
+    - zlib