diff --git a/.github/ISSUE_TEMPLATE/01_bug_report.yml b/.github/ISSUE_TEMPLATE/01_bug_report.yml index c44935ceaf25..e0ec7544c83b 100644 --- a/.github/ISSUE_TEMPLATE/01_bug_report.yml +++ b/.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 --- diff --git a/.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml b/.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml index 5389f6b5108c..980c7dd2bb2c 100644 --- a/.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml +++ b/.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 --- diff --git a/.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml b/.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml index 2e8c3db66047..9a6834cf9810 100644 --- a/.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml +++ b/.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 --- diff --git a/.github/ISSUE_TEMPLATE/04_build_failure.yml b/.github/ISSUE_TEMPLATE/04_build_failure.yml index 806a22b93061..4060900452a7 100644 --- a/.github/ISSUE_TEMPLATE/04_build_failure.yml +++ b/.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 --- diff --git a/.github/ISSUE_TEMPLATE/05_update_request.yml b/.github/ISSUE_TEMPLATE/05_update_request.yml index 6500aa2605c4..a0f076973d7b 100644 --- a/.github/ISSUE_TEMPLATE/05_update_request.yml +++ b/.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 --- diff --git a/.github/ISSUE_TEMPLATE/06_module_request.yml b/.github/ISSUE_TEMPLATE/06_module_request.yml index b794d18c673a..cdd7908041a5 100644 --- a/.github/ISSUE_TEMPLATE/06_module_request.yml +++ b/.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 --- diff --git a/.github/ISSUE_TEMPLATE/07_backport_request.yml b/.github/ISSUE_TEMPLATE/07_backport_request.yml index 238d75084b98..eb07f62a9ab9 100644 --- a/.github/ISSUE_TEMPLATE/07_backport_request.yml +++ b/.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 --- diff --git a/.github/ISSUE_TEMPLATE/08_documentation_request.yml b/.github/ISSUE_TEMPLATE/08_documentation_request.yml index 92eb86739f64..6879cb48083c 100644 --- a/.github/ISSUE_TEMPLATE/08_documentation_request.yml +++ b/.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 --- diff --git a/.github/ISSUE_TEMPLATE/09_unreproducible_package.yml b/.github/ISSUE_TEMPLATE/09_unreproducible_package.yml index 0542e74fa17b..bc3af9c4db47 100644 --- a/.github/ISSUE_TEMPLATE/09_unreproducible_package.yml +++ b/.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 --- diff --git a/.github/actions/get-merge-commit/action.yml b/.github/actions/get-merge-commit/action.yml index a16d289cc6e0..3766ad4f4ea0 100644 --- a/.github/actions/get-merge-commit/action.yml +++ b/.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 }} diff --git a/.github/dependabot.yml b/.github/dependabot.yml index a909ff0fdde0..900be674c46e 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,4 +4,4 @@ updates: directory: "/" schedule: interval: "weekly" - labels: [ ] + labels: [] diff --git a/.github/labeler-development-branches.yml b/.github/labeler-development-branches.yml index e0b855a07cde..5ce799c2f8d4 100644 --- a/.github/labeler-development-branches.yml +++ b/.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$' diff --git a/.github/labeler-no-sync.yml b/.github/labeler-no-sync.yml index 7464dfd71bb6..cb7e413fb5c4 100644 --- a/.github/labeler-no-sync.yml +++ b/.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 diff --git a/.github/labeler.yml b/.github/labeler.yml index f97045795fdd..c2fb60ff1b1f 100644 --- a/.github/labeler.yml +++ b/.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 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a46a382ff42d..a9efff4d4a8f 100644 --- a/.github/workflows/build.yml +++ b/.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] diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index dd7c433815dc..ea96f792c294 100644 --- a/.github/workflows/eval.yml +++ b/.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 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 3b212a18e0e0..2c2401ecdfff 100644 --- a/.github/workflows/lint.yml +++ b/.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 diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml index f56142b722b8..a76b2310492d 100644 --- a/.github/workflows/periodic-merge-24h.yml +++ b/.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: {} diff --git a/.github/workflows/periodic-merge-6h.yml b/.github/workflows/periodic-merge-6h.yml index e056d7634a5d..15a7da3db4e2 100644 --- a/.github/workflows/periodic-merge-6h.yml +++ b/.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: {} diff --git a/ci/default.nix b/ci/default.nix index cddea6453606..32e067133422 100644 --- a/ci/default.nix +++ b/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" ]; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c45018a4b839..3d3cb1386478 100644 --- a/maintainers/maintainer-list.nix +++ b/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"; diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index b69e75b3bfca..5ac8d7810c9a 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -46,6 +46,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. diff --git a/nixos/modules/services/desktop-managers/cosmic.nix b/nixos/modules/services/desktop-managers/cosmic.nix index 67a6f8625c6e..58e4a10177be 100644 --- a/nixos/modules/services/desktop-managers/cosmic.nix +++ b/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; diff --git a/nixos/modules/services/desktops/geoclue2.nix b/nixos/modules/services/desktops/geoclue2.nix index b9d423acf9f3..ec7afa03c656 100644 --- a/nixos/modules/services/desktops/geoclue2.nix +++ b/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 = { diff --git a/nixos/modules/services/misc/dwm-status.nix b/nixos/modules/services/misc/dwm-status.nix index f0df70051d48..b7031808287b 100644 --- a/nixos/modules/services/misc/dwm-status.nix +++ b/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"; }; - }; - } diff --git a/nixos/tests/zipline.nix b/nixos/tests/zipline.nix index 023c4484a810..40498db9133f 100644 --- a/nixos/tests/zipline.nix +++ b/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]) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 0f798603007c..e0ba1ade18cd 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/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; diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix index f933b986728e..b921ce256ec5 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix +++ b/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 ]; diff --git a/pkgs/applications/networking/instant-messengers/franz/generic.nix b/pkgs/applications/networking/instant-messengers/franz/generic.nix index 9c9731455daf..f7e6833ec59d 100644 --- a/pkgs/applications/networking/instant-messengers/franz/generic.nix +++ b/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[@]}" ''; } diff --git a/pkgs/by-name/an/antora/test/minimal_working_example/antora.yml b/pkgs/by-name/an/antora/test/minimal_working_example/antora.yml index 27c21228abaa..db2da079976f 100644 --- a/pkgs/by-name/an/antora/test/minimal_working_example/antora.yml +++ b/pkgs/by-name/an/antora/test/minimal_working_example/antora.yml @@ -1,4 +1,3 @@ ---- name: Antora nav: diff --git a/pkgs/by-name/au/auto-editor/package.nix b/pkgs/by-name/au/auto-editor/package.nix index fe13efa7dcad..1f47fd3fd7d6 100644 --- a/pkgs/by-name/au/auto-editor/package.nix +++ b/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; diff --git a/pkgs/by-name/ba/basalt-monado/package.nix b/pkgs/by-name/ba/basalt-monado/package.nix index c7dedf44679d..c0dc8992b955 100644 --- a/pkgs/by-name/ba/basalt-monado/package.nix +++ b/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 { }; diff --git a/pkgs/by-name/de/devcontainer/package.nix b/pkgs/by-name/de/devcontainer/package.nix index 278307f174d5..b009b4bab3a9 100644 --- a/pkgs/by-name/de/devcontainer/package.nix +++ b/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 = [ diff --git a/pkgs/by-name/di/distrho-ports/package.nix b/pkgs/by-name/di/distrho-ports/package.nix index dcee3bbadd74..f0271b3555ad 100644 --- a/pkgs/by-name/di/distrho-ports/package.nix +++ b/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; }; } diff --git a/pkgs/by-name/ex/explex-nf/package.nix b/pkgs/by-name/ex/explex-nf/package.nix new file mode 100644 index 000000000000..7eda2ab8e244 --- /dev/null +++ b/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 ]; + }; +}) diff --git a/pkgs/by-name/ex/explex/package.nix b/pkgs/by-name/ex/explex/package.nix new file mode 100644 index 000000000000..606d0842dc75 --- /dev/null +++ b/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 ]; + }; +}) diff --git a/pkgs/misc/fastly/default.nix b/pkgs/by-name/fa/fastly/package.nix similarity index 100% rename from pkgs/misc/fastly/default.nix rename to pkgs/by-name/fa/fastly/package.nix diff --git a/pkgs/by-name/fr/freeswitch/package.nix b/pkgs/by-name/fr/freeswitch/package.nix index c3c801c2c3ef..06fa719b7579 100644 --- a/pkgs/by-name/fr/freeswitch/package.nix +++ b/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 diff --git a/pkgs/by-name/li/libks/package.nix b/pkgs/by-name/li/libks/package.nix index a83011a56fa1..2e71d40abf8e 100644 --- a/pkgs/by-name/li/libks/package.nix +++ b/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 = [ diff --git a/pkgs/by-name/ne/nelm/package.nix b/pkgs/by-name/ne/nelm/package.nix index 58e034f39dd0..d976ad036d6d 100644 --- a/pkgs/by-name/ne/nelm/package.nix +++ b/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" ]; diff --git a/pkgs/by-name/ro/roadrunner/package.nix b/pkgs/by-name/ro/roadrunner/package.nix index bdb58ac03c3f..9b501b5433da 100644 --- a/pkgs/by-name/ro/roadrunner/package.nix +++ b/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"; diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix index 19b5ca52d849..6e829a05d72d 100644 --- a/pkgs/by-name/s7/s7/package.nix +++ b/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 = [ diff --git a/pkgs/by-name/tf/tfk8s/tests/sample1/input.yaml b/pkgs/by-name/tf/tfk8s/tests/sample1/input.yaml index 58ed0eb11d76..3c13923fd020 100644 --- a/pkgs/by-name/tf/tfk8s/tests/sample1/input.yaml +++ b/pkgs/by-name/tf/tfk8s/tests/sample1/input.yaml @@ -1,4 +1,3 @@ ---- apiVersion: v1 kind: ConfigMap metadata: diff --git a/pkgs/by-name/xl/xld/package.nix b/pkgs/by-name/xl/xld/package.nix index 54941de427c3..15f7f282dee1 100644 --- a/pkgs/by-name/xl/xld/package.nix +++ b/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 ''; }); diff --git a/pkgs/by-name/zi/zipline/package.nix b/pkgs/by-name/zi/zipline/package.nix index 46186f60ea81..9cf1f5508e27 100644 --- a/pkgs/by-name/zi/zipline/package.nix +++ b/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"; diff --git a/pkgs/development/julia-modules/tests/julia-top-n/package.yaml b/pkgs/development/julia-modules/tests/julia-top-n/package.yaml index 404ebc72dd67..29fbcd88c15c 100644 --- a/pkgs/development/julia-modules/tests/julia-top-n/package.yaml +++ b/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 diff --git a/pkgs/development/julia-modules/tests/julia-top-n/stack.yaml b/pkgs/development/julia-modules/tests/julia-top-n/stack.yaml index 28bbc5a5f7ef..0a4de61e7f68 100644 --- a/pkgs/development/julia-modules/tests/julia-top-n/stack.yaml +++ b/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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d8a971b5701..d7878e35c3e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2176,10 +2176,6 @@ with pkgs; espanso = espanso-wayland; }; - fastly = callPackage ../misc/fastly { - # If buildGoModule is overridden, provide a matching version of the go attribute - }; - f3d_egl = f3d.override { vtk_9 = vtk_9_egl; }; fast-cli = nodePackages.fast-cli;