diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 6504fa8c4763..7d6f7ff5e92a 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -27,7 +27,7 @@ jobs: steps: # Use a GitHub App to create the PR so that CI gets triggered # The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs - - uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0 + - uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1 id: app-token with: app-id: ${{ vars.NIXPKGS_CI_APP_ID }} diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml index d8a4d215c1c7..687c7935c305 100644 --- a/.github/workflows/bot.yml +++ b/.github/workflows/bot.yml @@ -56,7 +56,7 @@ jobs: run: npm install @actions/artifact@5.0.3 bottleneck@2.19.5 # Use a GitHub App, because it has much higher rate limits: 12,500 instead of 5,000 req / hour. - - uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0 + - uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1 if: github.event_name != 'pull_request' && vars.NIXPKGS_CI_APP_ID id: app-token with: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bf48232c15c8..dca724aa467a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -104,7 +104,7 @@ jobs: if: | contains(matrix.builds, 'manual-nixos') && !cancelled() && contains(fromJSON(inputs.baseBranch).type, 'primary') - uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0 + uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 with: name: ${{ inputs.artifact-prefix }}nixos-manual-${{ matrix.name }} path: nixos-manual diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index d246f8ad061e..bd640e5f530e 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -91,7 +91,7 @@ jobs: run: gh api /rate_limit | jq - name: Discourage manual edits to certain files - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0 + uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0 with: script: | require('./trusted/ci/github-script/manual-file-edits.js')({ diff --git a/.github/workflows/comment.yml b/.github/workflows/comment.yml index dcbbc755eb8e..661f42fb130c 100644 --- a/.github/workflows/comment.yml +++ b/.github/workflows/comment.yml @@ -30,7 +30,7 @@ jobs: ci/github-script # Use the GitHub App to make sure the reaction happens with the same user who will later merge. - - uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0 + - uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1 if: github.event_name != 'pull_request' && vars.NIXPKGS_CI_APP_ID id: app-token with: diff --git a/.github/workflows/edited.yml b/.github/workflows/edited.yml index 165cad607d97..49fda6911533 100644 --- a/.github/workflows/edited.yml +++ b/.github/workflows/edited.yml @@ -36,7 +36,7 @@ jobs: # Use a GitHub App to create the PR so that CI gets triggered # The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs # We only need Pull Requests: write here, but the app is also used for backports. - - uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0 + - uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1 id: app-token with: app-id: ${{ vars.NIXPKGS_CI_APP_ID }} diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index 2ea3c91eef61..17fddddde51d 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -238,7 +238,7 @@ jobs: --out-link diff - name: Upload outpaths diff and stats - uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0 + uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 with: name: ${{ inputs.artifact-prefix }}${{ matrix.version && format('{0}-', matrix.version) || '' }}diff-${{ matrix.system }} path: diff/* @@ -279,7 +279,7 @@ jobs: --out-link combined - name: Upload the maintainer list - uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0 + uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 with: name: ${{ inputs.artifact-prefix }}maintainers path: combined/maintainers.json @@ -300,7 +300,7 @@ jobs: cat comparison/step-summary.md >> "$GITHUB_STEP_SUMMARY" - name: Upload the comparison results - uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0 + uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 with: name: ${{ inputs.artifact-prefix }}comparison path: comparison/* diff --git a/.github/workflows/periodic-merge.yml b/.github/workflows/periodic-merge.yml index 66681b2ece3a..243abce607f8 100644 --- a/.github/workflows/periodic-merge.yml +++ b/.github/workflows/periodic-merge.yml @@ -26,7 +26,7 @@ jobs: steps: # Use a GitHub App to create the PR so that CI gets triggered # The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs - - uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0 + - uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1 id: app-token with: app-id: ${{ vars.NIXPKGS_CI_APP_ID }} diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml index edf4f39b4bf6..63e2b840e622 100644 --- a/.github/workflows/review.yml +++ b/.github/workflows/review.yml @@ -27,7 +27,7 @@ jobs: ci/github-script # Use the GitHub App to make sure the reaction happens with the same user who will later merge. - - uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0 + - uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1 if: github.event_name != 'pull_request' && vars.NIXPKGS_CI_APP_ID id: app-token with: diff --git a/.github/workflows/teams.yml b/.github/workflows/teams.yml index bef56a83bc1c..6fb059eeab67 100644 --- a/.github/workflows/teams.yml +++ b/.github/workflows/teams.yml @@ -19,7 +19,7 @@ jobs: steps: # Use a GitHub App to create the PR so that CI gets triggered and to # request team member lists. - - uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0 + - uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1 id: app-token with: app-id: ${{ vars.NIXPKGS_CI_APP_ID }} @@ -64,7 +64,7 @@ jobs: echo "git-string=$name <$email>" >> "$GITHUB_OUTPUT" - name: Create Pull Request - uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0 + uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1 with: token: ${{ steps.app-token.outputs.token }} add-paths: maintainers/github-teams.json diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index 53d655bfbcb8..271f7798bd86 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -129,7 +129,7 @@ - `elegant-sddm` has been updated to be Qt6 compatible. Themes for SDDM are slightly different so read the [wiki](https://wiki.nixos.org/wiki/SDDM_Themes) for more. -- `forgejo` has been updated to major version 14. For more information, see the [release blog post](https://forgejo.org/2026-01-release-v14-0/) and [full release notes](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/release-notes-published/14.0.0.md) +- `forgejo-lts` has been updated to major version 15. For more information, see the [release blog post](https://forgejo.org/2026-04-release-v15-0/) and [full release notes](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/release-notes-published/15.0.0.md) - `pulsar` has finally migrated from electron v12 to v30, backup `~/.pulsar` before upgrading. See [Pulsar on Electron 30: what it means for you](https://blog.pulsar-edit.dev/posts/20251202-savetheclocktower-pulsar-on-electron-30/). diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md index 81ddc364fd24..a62b8b5ac0ea 100644 --- a/nixos/doc/manual/release-notes/rl-2605.section.md +++ b/nixos/doc/manual/release-notes/rl-2605.section.md @@ -355,6 +355,8 @@ See . - `services.openssh.enableRecommendedAlgorithms` has been added to allow users to opt out of NixOS's curated set of recommended algorithms. This set to true by default, and thus is not a breaking change. Users may want to set this to false if they prefer upstream's default algorithms. See . +- `services.openssh.banner` has been removed. Use `services.openssh.settings.Banner` instead. + - IPVLAN interfaces can now be configured through the `networking.ipvlans` option in the networking module. - `services.caddy` now supports setting `httpPort` and `httpsPort` and opening them in the firewall via `openFirewall`. diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 9736387fd57a..36825e1d508c 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -225,6 +225,11 @@ in [ "services" "openssh" "forwardX11" ] [ "services" "openssh" "settings" "X11Forwarding" ] ) + (lib.mkRemovedOptionModule [ + "services" + "openssh" + "banner" + ] "Use services.openssh.settings.Banner instead.") ]; ###### interface @@ -404,14 +409,6 @@ in example = true; }; - banner = lib.mkOption { - type = lib.types.nullOr lib.types.lines; - default = null; - description = '' - Message to display to the remote user before authentication is allowed. - ''; - }; - enableRecommendedAlgorithms = lib.mkOption { type = lib.types.bool; default = true; @@ -722,6 +719,14 @@ in PrintMotd = lib.mkEnableOption "printing /etc/motd when a user logs in interactively" // { type = lib.types.nullOr lib.types.bool; }; + Banner = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + description = '' + The file whose contents are sent to the remote user before authentication. + ''; + example = "/etc/ssh/banner"; + }; }; } ); @@ -886,7 +891,6 @@ in services.openssh.extraConfig = lib.mkOrder 0 ( lib.concatStringsSep "\n" ( [ - "Banner ${if cfg.banner == null then "none" else pkgs.writeText "ssh_banner" cfg.banner}" "AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"}" ] ++ lib.map (port: "Port ${toString port}") cfg.ports diff --git a/nixos/modules/services/web-apps/homebox.nix b/nixos/modules/services/web-apps/homebox.nix index 570f2ee2a8ba..901d393d86ec 100644 --- a/nixos/modules/services/web-apps/homebox.nix +++ b/nixos/modules/services/web-apps/homebox.nix @@ -41,7 +41,7 @@ in HBOX_DATABASE_DRIVER = "sqlite3"; HBOX_DATABASE_SQLITE_PATH = "/var/lib/homebox/data/homebox.db?_pragma=busy_timeout=999&_pragma=journal_mode=WAL&_fk=1"; HBOX_OPTIONS_ALLOW_REGISTRATION = "false"; - HBOX_OPTIONS_CHECK_GITHUB_RELEASE = "false"; + HBOX_OPTIONS_GITHUB_RELEASE_CHECK = "false"; HBOX_MODE = "production"; HOME = "/var/lib/homebox"; TMPDIR = "/var/lib/homebox/tmp"; diff --git a/nixos/modules/services/web-servers/caddy/default.nix b/nixos/modules/services/web-servers/caddy/default.nix index 8d60ab71771e..2ff45efd4e43 100644 --- a/nixos/modules/services/web-servers/caddy/default.nix +++ b/nixos/modules/services/web-servers/caddy/default.nix @@ -435,13 +435,13 @@ in null options.services.caddy.httpPort.default ] - ) "http_port ${cfg.httpPort}"} + ) "http_port ${toString cfg.httpPort}"} ${optionalString ( !elem cfg.httpsPort [ null options.services.caddy.httpsPort.default ] - ) "https_port ${cfg.httpsPort}"} + ) "https_port ${toString cfg.httpsPort}"} log { ${cfg.logFormat} } diff --git a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix index dc0ccce421d1..6bd7b2f4aca2 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix @@ -5,7 +5,7 @@ nix-update-script, openssl, perl, - zig, + zig_0_15, pkg-config, stdenv, vimUtils, @@ -59,7 +59,7 @@ let # Allow undefined symbols on Darwin - they will be provided by Neovim's LuaJIT runtime RUSTFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-C link-arg=-undefined -C link-arg=dynamic_lookup"; - ZIG = lib.getExe zig; # zlob requires zig + ZIG = lib.getExe zig_0_15; # zlob requires zig }; }; in diff --git a/pkgs/applications/editors/vim/plugins/non-generated/vim2nix/src/addon-info.json b/pkgs/applications/editors/vim/plugins/non-generated/vim2nix/src/addon-info.json index 93ca9bc129b5..e8b0b4957e63 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/vim2nix/src/addon-info.json +++ b/pkgs/applications/editors/vim/plugins/non-generated/vim2nix/src/addon-info.json @@ -1 +1 @@ -{'dependencies': {'vim-addon-manager': {}}} +{"dependencies": {"vim-addon-manager": {}}} diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 6bdddbf9ab53..21a1386079c9 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1,6 +1,7 @@ { lib, stdenv, + config, # nixpkgs functions buildGoModule, callPackage, @@ -2805,7 +2806,10 @@ assertNoAdditions { callPackage ./nvim-treesitter-legacy/overrides.nix { } self super ); in - lib.warnOnInstantiate "nvim-treesitter-legacy is deprecated, please migrate to the new version. This will become an error in 26.11" drv; + if config.allowAliases then + lib.warnOnInstantiate "nvim-treesitter-legacy is deprecated, please migrate to the new version. This will become an error in 26.11" drv + else + drv; nvim-treesitter-pairs = super.nvim-treesitter-pairs.overrideAttrs { dependencies = [ self.nvim-treesitter-legacy ]; diff --git a/pkgs/applications/editors/vim/plugins/utils/updater.nix b/pkgs/applications/editors/vim/plugins/utils/updater.nix index 82cbb7a923ba..2ed61a25c83a 100644 --- a/pkgs/applications/editors/vim/plugins/utils/updater.nix +++ b/pkgs/applications/editors/vim/plugins/utils/updater.nix @@ -3,6 +3,7 @@ buildPythonApplication, makeWrapper, nix, + nix-prefetch-github, nix-prefetch-git, nurl, python3Packages, @@ -37,6 +38,7 @@ buildPythonApplication { makeWrapperArgs+=( --prefix PATH : "${ lib.makeBinPath [ nix + nix-prefetch-github nix-prefetch-git neovim-unwrapped nurl diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix index e66c1a1b81b4..076e1c47b070 100644 --- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "claude-code"; publisher = "anthropic"; - version = "2.1.111"; - hash = "sha256-NfmPJl/+PyJTImKsN+cES6XxJryEQW0+dUoOyZsYq4k="; + version = "2.1.112"; + hash = "sha256-ILNV8wZXgN+JmcoVqMn7NitdgBjEIqTHvWbE2D2WWn4="; }; postInstall = '' diff --git a/pkgs/applications/editors/vscode/extensions/azdavis.millet/default.nix b/pkgs/applications/editors/vscode/extensions/azdavis.millet/default.nix index e3efbbded79b..563253536441 100644 --- a/pkgs/applications/editors/vscode/extensions/azdavis.millet/default.nix +++ b/pkgs/applications/editors/vscode/extensions/azdavis.millet/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "Millet"; publisher = "azdavis"; - version = "0.14.9"; - hash = "sha256-gRXS+i02XpJSveCTq6KK8utc32JNPE+I3vSEyCqOzaE="; + version = "0.15.1"; + hash = "sha256-5V5GG7M52ohpS9Zg2TTamEjbWyXH9kllZyy7Oezy4Iw="; }; nativeBuildInputs = [ jq diff --git a/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix index be355a01c84a..54593282150a 100644 --- a/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix +++ b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix @@ -11,8 +11,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "calva"; publisher = "betterthantomorrow"; - version = "2.0.540"; - hash = "sha256-KzBO6BEWUUPpwNzyAAYpr6hBDUMkv3cl7EamfCqeOvk="; + version = "2.0.572"; + hash = "sha256-Tv4bZdfROJbnhgJ65lP+F4f2xkICr4X+P08P66Kuu7A="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/biomejs.biome/default.nix b/pkgs/applications/editors/vscode/extensions/biomejs.biome/default.nix index c346ae961c75..669c066b81d4 100644 --- a/pkgs/applications/editors/vscode/extensions/biomejs.biome/default.nix +++ b/pkgs/applications/editors/vscode/extensions/biomejs.biome/default.nix @@ -11,8 +11,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "biome"; publisher = "biomejs"; - version = "2025.10.241456"; - hash = "sha256-tihEFcDDYr/khLIcJbR5VSC/RujEvp/gcnWlokAqNBc="; + version = "2026.3.311859"; + hash = "sha256-HH+KJYY4J6nuHwQ/+DhEFsJ7P5S97UsNuoc+y7GnE00="; }; postInstall = '' diff --git a/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix b/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix index 9e6bfe06f539..36798a664240 100644 --- a/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix +++ b/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix @@ -12,26 +12,26 @@ vscode-utils.buildVscodeMarketplaceExtension { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-42JBEjdLrjg6Txo9efJltz4NXhkaIOgIg+gosA/uNYk="; + hash = "sha256-uksu5DyarhCxPBk8U4oD9FwQ9/1lXyu6J/J82KdCzwM="; }; "x86_64-darwin" = { arch = "darwin-x64"; - hash = "sha256-WU/7HBuVAcHR/z1WNXzH3xpUVDvf4pYML7LiMIqjA/U="; + hash = "sha256-OkPCfpuPzxM4j2LtnR4V6C1XphGbGEFOL7oc6y7E26g="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-JIuWbIZPWeR0pDi6Ee4jM38qqb/p/H3AvMI/Eek66BY="; + hash = "sha256-2FE0ajMBkInNg57yn+LxHHO5CqbRa92uvZLGp1uIKw0="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-p2ry5uNzmJqHEz2/aNTdUMOV+hPne4pJ+RYQ0/MBB/A="; + hash = "sha256-3GtSW0druCSS06nSStKtGsD9OQzMWD8T2nNgxhoXjc0="; }; }; in { name = "ruff"; publisher = "charliermarsh"; - version = "2026.38.0"; + version = "2026.40.0"; } // sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); diff --git a/pkgs/applications/editors/vscode/extensions/chrischinchilla.vscode-pandoc/default.nix b/pkgs/applications/editors/vscode/extensions/chrischinchilla.vscode-pandoc/default.nix index 2ec2d06cb010..b0e039616db7 100644 --- a/pkgs/applications/editors/vscode/extensions/chrischinchilla.vscode-pandoc/default.nix +++ b/pkgs/applications/editors/vscode/extensions/chrischinchilla.vscode-pandoc/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-pandoc"; publisher = "chrischinchilla"; - version = "0.7.2"; - hash = "sha256-Vq9VayQVhlz97Ml0nfBCwlF41V+TqA46jHHW7TMJLeI="; + version = "0.7.3"; + hash = "sha256-TGkNYA96mzFtUoM+XPKXJ/AM+hbiLc6Lvk5YDxFUwcI="; }; nativeBuildInputs = [ jq diff --git a/pkgs/applications/editors/vscode/extensions/continue.continue/default.nix b/pkgs/applications/editors/vscode/extensions/continue.continue/default.nix index c39c1e673750..7b6bb870f2a9 100644 --- a/pkgs/applications/editors/vscode/extensions/continue.continue/default.nix +++ b/pkgs/applications/editors/vscode/extensions/continue.continue/default.nix @@ -11,26 +11,26 @@ vscode-utils.buildVscodeMarketplaceExtension { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-YPA0+kj5ATEpPSMqdqqtG0s/hlODSmme2i2vgfUiRvI="; + hash = "sha256-/D6d0qfgl8+cTEQ5ZeMjGgo1/Uzw5BxwBdM2m0fBjNU="; }; "x86_64-darwin" = { arch = "darwin-x64"; - hash = "sha256-P/8SOKEK8y7gLPD/r88tDoMuh2AeCUd7hPA6Be7+YuU="; + hash = "sha256-jIyFt1ZLNPS4DbQLnZJ3p30AnPJz3qNFDj/rL6EdnKw="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-QqHrephuGy+gq30HhRb/zjq3yEFQ6Vf3W6x2gaobObo="; + hash = "sha256-6At96R7jSDAjvC7Bugpg4L/aHgHFQmBOdKcOTa3Y940="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-fhi3jgnl0Pu0WWHtOLEDlbgqNaGPJr6Ps3jxjhjvOBs="; + hash = "sha256-GB/QLRmtY/cVs4lrU8OFnWgztJSF8e07VADIra/et2s="; }; }; in { name = "continue"; publisher = "Continue"; - version = "1.2.11"; + version = "1.2.22"; } // sources.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index f51850b13839..f6c5c74f9395 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -191,8 +191,8 @@ let mktplcRef = { name = "bookmarks"; publisher = "alefragnani"; - version = "13.5.0"; - hash = "sha256-oKhd5BLa2wuGNrzW9yKsWWzaU5hNolw2pBcqPlql9Ro="; + version = "14.1.1"; + hash = "sha256-oy0SRapLmr8wQhYtmCcE6wkMZUXgvSsje45tEdufw5M="; }; meta = { license = lib.licenses.gpl3; @@ -203,8 +203,8 @@ let mktplcRef = { name = "project-manager"; publisher = "alefragnani"; - version = "12.8.0"; - hash = "sha256-sNiDyWdQ40Xeu7zp1ioRCi3majrPshlVbUSV2klr4r4="; + version = "13.1.0"; + hash = "sha256-6lSEMDI8yagYxuB2Lkjf9nndJ6sGIofn/XL1vghinJM="; }; meta = { license = lib.licenses.mit; @@ -291,8 +291,8 @@ let mktplcRef = { publisher = "antfu"; name = "slidev"; - version = "51.4.0"; - hash = "sha256-Z9YNMhRtW8A0hi3e77negSIw1avsbb6+L701pgv5RTY="; + version = "52.14.2"; + hash = "sha256-Y9vAbdklsnWgLjEV6sLpWiJaKf8AOES0qgM/Hx+4UE4="; }; meta = { license = lib.licenses.mit; @@ -531,8 +531,8 @@ let mktplcRef = { name = "vscode-bazel"; publisher = "bazelbuild"; - version = "0.12.0"; - sha256 = "sha256-H0MAoqEQcT/tuDbiubCf9DCHt55M5Nx6IxzU5a3l5bo="; + version = "0.14.0"; + sha256 = "sha256-JrXx/ICXQPlAKh7m6+eWWQ2bP1Nfls4PbW426PNJVBc="; }; meta = { description = "Bazel support for Visual Studio Code"; @@ -710,8 +710,8 @@ let mktplcRef = { publisher = "bmalehorn"; name = "vscode-fish"; - version = "1.0.39"; - hash = "sha256-T5wD4btQ2HSq3vB1m/qHM7VcvHfZmMD9OV93ZwxXcQg="; + version = "1.0.49"; + hash = "sha256-oG0KOvQZ2E5FroXaUT6lGw1zDSQ/bisHLMMkygbGqQE="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/bmalehorn.vscode-fish/changelog"; @@ -1145,8 +1145,8 @@ let mktplcRef = { name = "vscode-database-client2"; publisher = "cweijan"; - version = "8.4.2"; - hash = "sha256-SfvpR1ldrvo/q0nt0cLu55bzNXjwNNdqdSwBORN2Bjw="; + version = "8.4.5"; + hash = "sha256-CViXcQ8k4eTd5adFvSK4cCFJDRov09wK80QBveziom4="; }; meta = { description = "Database Client For Visual Studio Code"; @@ -1174,8 +1174,8 @@ let mktplcRef = { publisher = "DanielSanMedium"; name = "dscodegpt"; - version = "3.14.190"; - hash = "sha256-OPnDQuXge9mGiTMpOBwOBnAXI4rDru//Pks1zygkYWk="; + version = "3.17.20"; + hash = "sha256-7nJlPP1Xap0lSJz+HQmKKC9OZ5UfMCq8nf1B/bkyNXU="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/DanielSanMedium.dscodegpt/changelog"; @@ -1215,8 +1215,8 @@ let mktplcRef = { name = "flutter"; publisher = "dart-code"; - version = "3.120.0"; - hash = "sha256-P3kn4hqmIamEH6c+TAq9fAQmSomRLSRghJ4uhKnWqn4="; + version = "3.132.0"; + hash = "sha256-2R9SwNaJBKv39JLRy0IFm6/0J8Izj2DlEAat+yigIFk="; }; meta.license = lib.licenses.mit; @@ -1710,8 +1710,8 @@ let mktplcRef = { name = "dependi"; publisher = "fill-labs"; - version = "0.7.15"; - hash = "sha256-BXilurHO9WATC0PhT/scpZWEiRhJ9cSlq59opEM6wlE="; + version = "0.7.22"; + hash = "sha256-XY0fbWHGZ3Gs7wRZdtq005l2/Ucvs/EmemLjMgRma7I="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/fill-labs.dependi/changelog"; @@ -1744,8 +1744,8 @@ let mktplcRef = { name = "vscode-jest-runner"; publisher = "firsttris"; - version = "0.4.131"; - hash = "sha256-vneMRR1nHtPkK9L2WIG2nHJn8igcE45eUeiFsnvRDcM="; + version = "0.4.144"; + hash = "sha256-gKs0DNloispkKb7F6V38W5LoPk4OFPayv7MX9bQLJ2k="; }; meta = { description = "Simple way to run or debug a single (or multiple) tests from context-menu"; @@ -1813,8 +1813,8 @@ let mktplcRef = { name = "linter-gfortran"; publisher = "fortran-lang"; - version = "3.4.2025030111"; - hash = "sha256-8gw7VAgT4+724cCjQcYESPTsnckd02vdBsCzskiZLKY="; + version = "4.0.0"; + hash = "sha256-T9vhLrCMOmoXsVW9O/siwA/eAZagZoKsvinpWgIuAE0="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/fortran-lang.linter-gfortran/changelog"; @@ -1970,8 +1970,8 @@ let mktplcRef = { name = "vscode-github-actions"; publisher = "github"; - version = "0.28.0"; - hash = "sha256-9DUS1wUeK4vBw/QIqOW8R7T7ho9hmTKuu7gRnM35Ahw="; + version = "0.31.3"; + hash = "sha256-Do1z7ywF/0Do09chX0bFtkX+8Nux0fBCWfVpUagiioM="; }; meta = { description = "Visual Studio Code extension for GitHub Actions workflows and runs for github.com hosted repositories"; @@ -2162,8 +2162,8 @@ let mktplcRef = { publisher = "haskell"; name = "haskell"; - version = "2.6.1"; - hash = "sha256-44pQBHz8e1dCqZaa5+GhPr0/SUsHlaqdNMPZklKdY+Q="; + version = "2.8.0"; + hash = "sha256-Tp4Ahfp3Ma9aJtghD+mgsCBTMOP1GI1vGE5xzvHO+d4="; }; meta = { license = lib.licenses.mit; @@ -3147,8 +3147,8 @@ let mktplcRef = { name = "vscode-dotnet-runtime"; publisher = "ms-dotnettools"; - version = "2.3.7"; - hash = "sha256-Pe0rgs1vDbaOO178lB5P/Z+gqmf6LALIIZB3DntkmOc="; + version = "3.0.0"; + hash = "sha256-RA7skgj6yFZxk2XuJZtcDrI4dFrAbwODmwqSx4xWFUY="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/ms-dotnettools.vscode-dotnet-runtime/changelog"; @@ -3668,8 +3668,8 @@ let mktplcRef = { name = "ocaml-platform"; publisher = "ocamllabs"; - version = "1.32.4"; - hash = "sha256-ySJ6SLm+L2LPGbnus/skbk4WUPJ3VMXpCMEins3F8cc="; + version = "2.0.1"; + hash = "sha256-BFRGEH5a2kTSIZG3o0GkYPeZch5b7OBUN4+pKXSQ7SY="; }; }; @@ -4138,8 +4138,8 @@ let mktplcRef = { name = "metals"; publisher = "scalameta"; - version = "1.55.0"; - hash = "sha256-HdD8D8oy/VtIhDj+BQNIDx2YhZXX7VsR2+U1WrKIOoc="; + version = "1.65.0"; + hash = "sha256-Ob4F+MZI1hKi4bK8zM5kn0kjzhMklUqEB/B+hh612nU="; }; meta = { license = lib.licenses.asl20; @@ -4175,8 +4175,8 @@ let mktplcRef = { publisher = "seatonjiang"; name = "gitmoji-vscode"; - version = "1.3.0"; - hash = "sha256-vr6UKd+7g6J8XEY57sCqPpLuxNC4KOvf7nddDKaceaU="; + version = "2026.3.6"; + hash = "sha256-9SeXoMbZFjRL4vXoior76WaLmgnxfrDa3X4zXu/RMaI="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/seatonjiang.gitmoji-vscode/changelog"; @@ -4566,8 +4566,8 @@ let mktplcRef = { name = "tabnine-vscode"; publisher = "tabnine"; - version = "3.326.0"; - hash = "sha256-aPJiUfwfR9JFX3S8fFrSCV4MezGYVY4nqCF0t3Wevfc="; + version = "3.335.0"; + hash = "sha256-+OPNX/mo29ZGOBnfi9sPSxKEiDHBZ8UFlbhjtC6E1VM="; }; meta = { license = lib.licenses.mit; @@ -4703,8 +4703,8 @@ let mktplcRef = { publisher = "thenuprojectcontributors"; name = "vscode-nushell-lang"; - version = "1.10.0"; - hash = "sha256-AfClskNZwQIC67VrM8XKxF6nIbXPp576CRmls0WCKwU="; + version = "2.0.5"; + hash = "sha256-358QR9JcLWbqEb0xPv1P42a+emibOEEFRtelkBPPJgc="; }; meta.license = lib.licenses.mit; }; @@ -4769,6 +4769,8 @@ let tboby.cwtools-vscode = callPackage ./tboby.cwtools-vscode { }; + tombi-toml.tombi = callPackage ./tombi-toml.tombi { }; + tomoki1207.pdf = buildVscodeMarketplaceExtension { mktplcRef = { name = "pdf"; @@ -5023,8 +5025,8 @@ let mktplcRef = { name = "vstuc"; publisher = "VisualStudioToolsForUnity"; - version = "1.1.3"; - hash = "sha256-MQ7XW45NFhpx0kH3+O3nWXGKUzE9z+axYYQs7rER9ns="; + version = "1.2.1"; + hash = "sha256-WvEjR3cBXhCdd4FdIcTYEtifTdx0nNm3Ku0WpVrJ7hM="; }; meta = { description = "Integrates Visual Studio Code for Unity"; @@ -5170,8 +5172,8 @@ let mktplcRef = { name = "vim"; publisher = "vscodevim"; - version = "1.32.2"; - hash = "sha256-4anCgd8+D3SjO+3zfz9xrL9p8JoHNi4dux3rWLtWWDs="; + version = "1.32.4"; + hash = "sha256-+hyJZinWsa6U+s0fdrx2wUi6tOV3FNKf8O1qMMZEdkQ="; }; meta = { license = lib.licenses.mit; @@ -5194,8 +5196,8 @@ let mktplcRef = { name = "volar"; publisher = "Vue"; - version = "3.1.2"; - hash = "sha256-DgLGTxUWBSjDr9m+lfmAPteZv1mX7OOlYynCrd+zU0o="; + version = "3.2.6"; + hash = "sha256-1R5N3JjJUZ/KPYXGq/VOzbMmQj1fzrK9HrAjA8Ja2a4="; }; meta = { changelog = "https://github.com/vuejs/language-tools/blob/master/CHANGELOG.md"; diff --git a/pkgs/applications/editors/vscode/extensions/eugleo.magic-racket/default.nix b/pkgs/applications/editors/vscode/extensions/eugleo.magic-racket/default.nix index f03ccea78b82..27974e7a23fc 100644 --- a/pkgs/applications/editors/vscode/extensions/eugleo.magic-racket/default.nix +++ b/pkgs/applications/editors/vscode/extensions/eugleo.magic-racket/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "magic-racket"; publisher = "evzen-wybitul"; - version = "0.7.0"; - hash = "sha256-8q2H9VPmdIAh4VmtGjIAwUfpr1P7+zmDLGiyCNbAXBU="; + version = "0.8.0"; + hash = "sha256-yWmJFLXktsJDEDwHO8ZCXQBTw8j5bOv6TXEOO/V8mZs="; }; nativeBuildInputs = [ jq diff --git a/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix b/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix index 1b87987443c6..5e9772aefe0d 100644 --- a/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix +++ b/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix @@ -11,8 +11,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "terraform"; publisher = "hashicorp"; - version = "2.37.5"; - hash = "sha256-FmeO7RKzQb/wKO34Bues9IlYxd9O3/oCNmByIrv4+J0="; + version = "2.39.2"; + hash = "sha256-Lb20IdQcroJ/9Jn+epcIDvciFb/GDmklR9pDzrC5JbQ="; }; postInstall = '' diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix index cb2416515816..839f6a5031e9 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix @@ -84,8 +84,8 @@ buildVscodeMarketplaceExtension { mktplcRef = { name = "remote-ssh"; publisher = "ms-vscode-remote"; - version = "0.120.0"; - hash = "sha256-D9YmLKGDtIb2wGfLNRbczqL4fzLASbZC/563ewzqGV0="; + version = "0.122.0"; + hash = "sha256-apSBO3hsCSS2XTMQrqr+qqSnv3vRUJQ4U/ZOd4KlUJg="; }; postPatch = '' diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix index 08984c6be25d..da8d763b3521 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix @@ -42,15 +42,15 @@ let isDarwin = stdenv.hostPlatform.isDarwin; supported = { x86_64-linux = { - hash = "sha256-Fnio8fB7xA7fwcP6NDSV04/NRzY1bnfPlCyMmobYOUs="; + hash = "sha256-4EMCbRdPUNOmvW2c2BgdzvPLr7lWAzAKarUI9nBVBeI="; arch = "linux-x64"; }; aarch64-linux = { - hash = "sha256-0dQYD/XQ50+lo0Foh0v/9m16r2pj8Ydt9ZJCeiEIwyA="; + hash = "sha256-bjs2xNhd/dTDlhRjC5TunV8jEV187dEduLGuuX/oUnI="; arch = "linux-arm64"; }; aarch64-darwin = { - hash = "sha256-41+dCpsWySUnUdsRRM9mQlhcbYBoqCSBOY6Yz5ko18c="; + hash = "sha256-EZE9Vk1GRFNUiXCqohjNrNeZ/o5wl6tvamn6+tgoKGI="; arch = "darwin-arm64"; }; }; @@ -63,7 +63,7 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = base // { name = "cpptools"; publisher = "ms-vscode"; - version = "1.28.3"; + version = "1.31.4"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode.js-debug/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode.js-debug/default.nix index 6b516d577745..81e0cf62478b 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vscode.js-debug/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.js-debug/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, fetchNpmDeps, nodejs, + nodejs-slim, npmHooks, pkg-config, libsecret, @@ -17,19 +18,19 @@ let vsix = stdenv.mkDerivation (finalAttrs: { name = "vscode-js-debug-${finalAttrs.version}.vsix"; pname = "vscode-js-debug-vsix"; - version = "1.105.0"; + version = "1.112.0"; src = fetchFromGitHub { owner = "microsoft"; repo = "vscode-js-debug"; tag = "v${finalAttrs.version}"; - hash = "sha256-dYEINhJGrJFEq5422BEp3ups6vK0lpVW34GaYPMdfXk="; + hash = "sha256-pgDrGbx4E6r5lkdY49RyEe04YZYVXbjKAB+pY5w5w7U="; }; npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-npm-deps"; inherit (finalAttrs) src; - hash = "sha256-bBy0u6NaOAkX6vRJrRYYWUxCG6HM3h0PrzN6tZj5pVY="; + hash = "sha256-e+23PCPPQeHKxIT0nFEPumg2TvtNtpzil3XS5njHR9g="; }; makeCacheWritable = true; @@ -38,7 +39,7 @@ let ]; nativeBuildInputs = [ nodejs - nodejs.python + nodejs-slim.python npmHooks.npmConfigHook ] ++ lib.optionals stdenv.isLinux [ diff --git a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix index 65adb69074ff..e12f715bbc50 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "windows-ai-studio"; publisher = "ms-windows-ai-studio"; - version = "0.22.1"; - hash = "sha256-eUtl1x3HqpFEUGkBVb8EOHneWV7DfYHHWGmM5gOGYcg="; + version = "0.34.0"; + hash = "sha256-yOBUkFNE/6Gy675J3/PbrfkvKgJdgQVRcSEnd7rCtlU="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/prettier.prettier-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/prettier.prettier-vscode/default.nix index 37535f13c86e..2b4644a8502b 100644 --- a/pkgs/applications/editors/vscode/extensions/prettier.prettier-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/prettier.prettier-vscode/default.nix @@ -5,6 +5,7 @@ fetchNpmDeps, libsecret, nodejs, + nodejs-slim, npmHooks, pkg-config, clang_20, @@ -37,7 +38,7 @@ let nativeBuildInputs = [ nodejs - nodejs.python + nodejs-slim.python npmHooks.npmConfigHook ] ++ lib.optionals stdenv.isLinux [ diff --git a/pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix b/pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix index dcea6e40ba60..54e6a13d1b7c 100644 --- a/pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix +++ b/pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "lua"; publisher = "sumneko"; - version = "3.15.0"; - hash = "sha256-wcOo1gmWgPJJNQog2+emM05RE1fTtLqFANWfN3ExTnM="; + version = "3.18.1"; + hash = "sha256-TmQFl2+4hiu1qlGA6D+3kynC4m4kVJMoMn3b+TLZaz8="; }; # Running chmod in runtime will lock up extension diff --git a/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix b/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix index 863df7593ab3..db9db86a0813 100644 --- a/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix +++ b/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "shellcheck"; publisher = "timonwong"; - version = "0.38.3"; - sha256 = "sha256-qDispRN7jRIIsP+5lamyR+sNoOwTwl+55QftzO7WBm4="; + version = "0.39.3"; + sha256 = "sha256-A87dG+bBNCMZ8ERDGpVJIP7lXL8rfRely2Uo/ZMsgVI="; }; nativeBuildInputs = [ jq diff --git a/pkgs/applications/editors/vscode/extensions/tombi-toml.tombi/default.nix b/pkgs/applications/editors/vscode/extensions/tombi-toml.tombi/default.nix new file mode 100644 index 000000000000..bdbf9b835c12 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/tombi-toml.tombi/default.nix @@ -0,0 +1,47 @@ +{ + stdenv, + lib, + vscode-utils, +}: + +let + supported = { + x86_64-linux = { + hash = "sha256-YoB9gH84F9h6vdRbgCJGQhBmcXQ6jzrxvF2hA7gb3aI="; + arch = "linux-x64"; + }; + x86_64-darwin = { + hash = "sha256-IDJJuSLNt0SxV8LdDX0JC3P+VR6NUAfe5u8p9vI+ik8="; + arch = "darwin-x64"; + }; + aarch64-linux = { + hash = "sha256-gDufj8XYlowpKd2MQMZBsnZ2eT/pbngDlKeIFlkUKzU="; + arch = "linux-arm64"; + }; + aarch64-darwin = { + hash = "sha256-biWq6nsO4XGOMSUA9/yXMejC1wTDKsuQdPU26w0r4Lg="; + arch = "darwin-arm64"; + }; + }; + + base = + supported.${stdenv.hostPlatform.system} + or (throw "unsupported platform ${stdenv.hostPlatform.system}"); + +in + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = base // { + name = "tombi"; + publisher = "tombi-toml"; + version = "0.7.7"; + }; + meta = { + description = "TOML Language Server"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=tombi-toml.tombi"; + homepage = "https://tombi-toml.github.io/tombi/"; + license = lib.licenses.mit; + platforms = builtins.attrNames supported; + maintainers = [ lib.maintainers.m0nsterrr ]; + }; +} diff --git a/pkgs/applications/video/kodi/addons/steam-launcher/default.nix b/pkgs/applications/video/kodi/addons/steam-launcher/default.nix index 917f5147d0a1..363af6cd9721 100644 --- a/pkgs/applications/video/kodi/addons/steam-launcher/default.nix +++ b/pkgs/applications/video/kodi/addons/steam-launcher/default.nix @@ -11,13 +11,13 @@ buildKodiAddon { pname = "steam-launcher"; namespace = "script.steam.launcher"; - version = "3.5.1"; + version = "3.7.11"; src = fetchFromGitHub rec { owner = "teeedubb"; repo = owner + "-xbmc-repo"; - rev = "d5cea4b590b0ff08ac169b757946b7cb5145b983"; - sha256 = "sha256-arBMMOoHQuHRcJ7eXD1jvA45Svei7c0srcBZkdAzqY0="; + rev = "76d728bb51ad265a28d4945af99c7fa2626df624"; + sha256 = "sha256-i8plXt+Fu+O42JPo/FJI365IAUCNvWhREy2eZuG44lQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/build-support/node/build-npm-package/default.nix b/pkgs/build-support/node/build-npm-package/default.nix index 1e316d1be9c6..0645432a0df6 100644 --- a/pkgs/build-support/node/build-npm-package/default.nix +++ b/pkgs/build-support/node/build-npm-package/default.nix @@ -4,6 +4,7 @@ fetchNpmDeps, buildPackages, nodejs, + nodejs-slim, cctools, }@topLevelArgs: @@ -101,7 +102,7 @@ lib.extendMkDerivation { (if npmConfigHook != null then npmConfigHook else npmHooks.npmConfigHook) (if npmBuildHook != null then npmBuildHook else npmHooks.npmBuildHook) (if npmInstallHook != null then npmInstallHook else npmHooks.npmInstallHook) - nodejs.python + nodejs-slim.python ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; buildInputs = buildInputs ++ [ nodejs ]; diff --git a/pkgs/by-name/ac/acpica-tools/package.nix b/pkgs/by-name/ac/acpica-tools/package.nix index 4f3420a991d8..6de86685b8f0 100644 --- a/pkgs/by-name/ac/acpica-tools/package.nix +++ b/pkgs/by-name/ac/acpica-tools/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "acpica-tools"; - version = "20251212"; + version = "20260408"; src = fetchFromGitHub { owner = "acpica"; repo = "acpica"; tag = finalAttrs.version; - hash = "sha256-R2u93OzNv2/LcuxlqXBufGVv+rI3fNPMHl3VKcPn3VU="; + hash = "sha256-m6xugPmjwa/67IB8GiOd0Rasfry/vMbX0lC6OIEbyvU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/an/antigravity/information.json b/pkgs/by-name/an/antigravity/information.json index 0bd4832fc776..79cbe4f69f9a 100644 --- a/pkgs/by-name/an/antigravity/information.json +++ b/pkgs/by-name/an/antigravity/information.json @@ -1,22 +1,22 @@ { - "version": "1.22.2", + "version": "1.23.2", "vscodeVersion": "1.107.0", "sources": { "x86_64-linux": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.22.2-5206900187463680/linux-x64/Antigravity.tar.gz", - "sha256": "85c6b2decfefef2c6e0adaf161b602da7c1ecb2db6157ec0a4caffcfe4811209" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.23.2-4781536860569600/linux-x64/Antigravity.tar.gz", + "sha256": "5232a4048ff4fa15685d9a981ba4fba573e297f3efc9b76f638e794baf775725" }, "aarch64-linux": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.22.2-5206900187463680/linux-arm/Antigravity.tar.gz", - "sha256": "601fe7d97bf49fe06ebde331f1385e9e7e58269d23667808ae58256a87929a23" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.23.2-4781536860569600/linux-arm/Antigravity.tar.gz", + "sha256": "64d11085f17edc691adbe8952d59887f257d58448705dc2a19dfa23890d36df1" }, "x86_64-darwin": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.22.2-5206900187463680/darwin-x64/Antigravity.zip", - "sha256": "14686d6b15741b33abaf52b19a10f18e8427796461efa285a2fa2ddb30e0dcad" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.23.2-4781536860569600/darwin-x64/Antigravity.zip", + "sha256": "86437909f7e1c85d987b02130d3464b3d004d07904d5c893989ac3c924d11357" }, "aarch64-darwin": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.22.2-5206900187463680/darwin-arm/Antigravity.zip", - "sha256": "51e1f488da34f4e38c63806eed28a6b4bd5b583c275907945871710bed0f85d5" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.23.2-4781536860569600/darwin-arm/Antigravity.zip", + "sha256": "4a8a90feed7078dae30d1dbcb268a0497c103ba76df7012a4467587aa7cffdf8" } } } diff --git a/pkgs/by-name/at/attyx/package.nix b/pkgs/by-name/at/attyx/package.nix index e19a3ddb5de1..1d286c3813d8 100644 --- a/pkgs/by-name/at/attyx/package.nix +++ b/pkgs/by-name/at/attyx/package.nix @@ -5,7 +5,7 @@ callPackage, pkg-config, - zig, + zig_0_15, fontconfig, freetype, @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config - zig + zig_0_15 ]; buildInputs = [ diff --git a/pkgs/by-name/az/azurite/package.nix b/pkgs/by-name/az/azurite/package.nix index 1069a16f4b13..a46a7c0b8f64 100644 --- a/pkgs/by-name/az/azurite/package.nix +++ b/pkgs/by-name/az/azurite/package.nix @@ -5,7 +5,7 @@ clang_20, fetchFromGitHub, libsecret, - nodejs, + nodejs-slim, pkg-config, }: @@ -24,7 +24,7 @@ buildNpmPackage (finalAttrs: { nativeBuildInputs = [ pkg-config - nodejs.python + nodejs-slim.python ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ clang_20 ]; # clang_21 breaks @vscode/vsce's optional dependency keytar diff --git a/pkgs/by-name/ba/basex/package.nix b/pkgs/by-name/ba/basex/package.nix index c73fc6942ef4..0d6d038bf7b1 100644 --- a/pkgs/by-name/ba/basex/package.nix +++ b/pkgs/by-name/ba/basex/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "basex"; - version = "12.2"; + version = "12.3"; src = fetchurl { url = "http://files.basex.org/releases/${finalAttrs.version}/BaseX${ builtins.replaceStrings [ "." ] [ "" ] finalAttrs.version }.zip"; - hash = "sha256-zD6aYVYIrF6sZD5R6NNBSH8GGgKfDPus9zsBWtv+Oyw="; + hash = "sha256-5BLKv6lNk7keHO/5mcI1+DdCbgJa5/GtnvYEz7LtQFA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ca/canfigger/package.nix b/pkgs/by-name/ca/canfigger/package.nix index c9c7c71e35f6..d297e907d70f 100644 --- a/pkgs/by-name/ca/canfigger/package.nix +++ b/pkgs/by-name/ca/canfigger/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "canfigger"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "andy5995"; repo = "canfigger"; rev = "v${finalAttrs.version}"; - hash = "sha256-S2rEQT8wKSjJ7LFF6vcigqb9r5QR/nNUCzNdhuBNjTo="; + hash = "sha256-JphvLdBQPOu3a9DNlXTOkQyL0eFLM3FCvGZLPSvbKtA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ca/cargo-codspeed/package.nix b/pkgs/by-name/ca/cargo-codspeed/package.nix index f9f1997de085..8eed8a8dbdbb 100644 --- a/pkgs/by-name/ca/cargo-codspeed/package.nix +++ b/pkgs/by-name/ca/cargo-codspeed/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-codspeed"; - version = "4.4.1"; + version = "4.5.0"; src = fetchFromGitHub { owner = "CodSpeedHQ"; repo = "codspeed-rust"; tag = "v${finalAttrs.version}"; - hash = "sha256-1cokeZux7US+MUY1w1Z/tFC7gVcgKCZPZnkZeKLIPLo="; + hash = "sha256-2xKTn+fiRyXyH6womZPJoSpBC7nMH9+rBuoZrWL2kQU="; }; - cargoHash = "sha256-iAIYMFE81VX6WhDoWzmPt3s+hWCl37isP+tP7LlOMsg="; + cargoHash = "sha256-jN70cNOYLPtIPEji2JF8r/6zphvekRc9y0UNR3xNAUo="; nativeBuildInputs = [ curl diff --git a/pkgs/by-name/ch/cherry-studio/package.nix b/pkgs/by-name/ch/cherry-studio/package.nix index 890c5aed22e3..953ff791615d 100644 --- a/pkgs/by-name/ch/cherry-studio/package.nix +++ b/pkgs/by-name/ch/cherry-studio/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, fetchPnpmDeps, electron_40, - nodejs, + nodejs-slim, pnpm_10_29_2, pnpmConfigHook, makeWrapper, @@ -58,8 +58,8 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - nodejs - (nodejs.python.withPackages (ps: with ps; [ setuptools ])) + nodejs-slim + (nodejs-slim.python.withPackages (ps: with ps; [ setuptools ])) pnpm pnpmConfigHook makeWrapper diff --git a/pkgs/by-name/cl/claude-code-bin/manifest.json b/pkgs/by-name/cl/claude-code-bin/manifest.json index 31d434fdd9dc..51d21fd4c491 100644 --- a/pkgs/by-name/cl/claude-code-bin/manifest.json +++ b/pkgs/by-name/cl/claude-code-bin/manifest.json @@ -1,46 +1,46 @@ { - "version": "2.1.111", - "buildDate": "2026-04-16T14:30:47Z", + "version": "2.1.112", + "buildDate": "2026-04-16T18:39:33Z", "platforms": { "darwin-arm64": { "binary": "claude", - "checksum": "2620cc83dbee72c24858b3519ce5de050fef91f0d3d17b309176d61e679f95ee", + "checksum": "b05381f382754012b95984016000f7062a2f127a6a3a843afc37ebd7d4672340", "size": 203956832 }, "darwin-x64": { "binary": "claude", - "checksum": "16d897d570c93b83d100a16a7a33ca3adbd43b1b0f818ab66bef1a364b2460a6", + "checksum": "a2a7fea41acee4c889b30132dd490ac00b1cb86c6e25755a224d91b1cba97734", "size": 205442640 }, "linux-arm64": { "binary": "claude", - "checksum": "99376866bf7ec367142d3be548c17184a79f30a97318441ee9a00f78e51246e7", + "checksum": "1015ef5747767cdac58376de4ec990253dcac49314d54e19750d5512fa7422f6", "size": 236128832 }, "linux-x64": { "binary": "claude", - "checksum": "5d4df970040b0f83aac434ae540b409126a4778a379e8c9b4c793560e3bfa060", - "size": 235842176 + "checksum": "57be9406d3e5cae259552790bf7288dd6496675430ec93dbed76a33a57580d3d", + "size": 235846272 }, "linux-arm64-musl": { "binary": "claude", - "checksum": "39f1d4b9c328ced97dae1de8ca000769e935e15aaa89f54f4c6663016c834ff5", + "checksum": "dcf16fc8ab6e4b504af6c66d5e5afc113a9a5da2a9d7e555cac0b301873a84f6", "size": 228854208 }, "linux-x64-musl": { "binary": "claude", - "checksum": "cb789bbf32c90aa7b658f0cf1cedd7116b45afc5e0438f6fda4af0bac5996c9f", - "size": 230107584 + "checksum": "4b629f61a1e280a5e3c22bad8e1ea3118f4aebcde7e6754f18331c500e5b3fe0", + "size": 230111680 }, "win32-x64": { "binary": "claude.exe", - "checksum": "51024dbcd60382b6fb881b5cda6754a0fe445a90d3ad02eb5f13a2733ac3262e", - "size": 245423264 + "checksum": "7eb4916245c797f89ae7905c4cd211429264ec38b1b8164b7babdfa7746eb839", + "size": 245424288 }, "win32-arm64": { "binary": "claude.exe", - "checksum": "8381c9964a39cb231e4243d5ec7bf0158719fc292de1130f7c0f07e8b3137327", - "size": 242154656 + "checksum": "79336ca966d89d844eb8b198b8423cd8f75e0407d16359c1b492cc9decbbc999", + "size": 242155680 } } } diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index abb85c32c4cb..96083b99beec 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -1,12 +1,12 @@ { "name": "@anthropic-ai/claude-code", - "version": "2.1.111", + "version": "2.1.112", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@anthropic-ai/claude-code", - "version": "2.1.111", + "version": "2.1.112", "license": "SEE LICENSE IN README.md", "bin": { "claude": "cli.js" diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index e691810491f3..89dc381fe00f 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -15,14 +15,14 @@ }: buildNpmPackage (finalAttrs: { pname = "claude-code"; - version = "2.1.111"; + version = "2.1.112"; src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz"; - hash = "sha256-K3qhZXVJ2DIKv7YL9f/CHkuUYnK0lkIR1wjEa+xeSCk="; + hash = "sha256-SJJqU7XHbu9IRGPMJNUg6oaMZiQUKqJhI2wm7BnR1gs="; }; - npmDepsHash = "sha256-6f68qUMnDk6tn+qypVi8bPtNrxbtcf15tHrgtlhEaK4="; + npmDepsHash = "sha256-bdkej9Z41GLew9wi1zdNX+Asauki3nT1+SHmBmaUIBU="; strictDeps = true; diff --git a/pkgs/by-name/cl/clouddrive2/package.nix b/pkgs/by-name/cl/clouddrive2/package.nix index 57e596fc2f22..de657e7c4447 100644 --- a/pkgs/by-name/cl/clouddrive2/package.nix +++ b/pkgs/by-name/cl/clouddrive2/package.nix @@ -11,16 +11,16 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "clouddrive2"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { url = "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v${finalAttrs.version}/clouddrive-2-${os}-${arch}-${finalAttrs.version}.tgz"; hash = { - x86_64-linux = "sha256-hDhROf+HoDhnfgFteN9DZp9KB8YW8OJtkMLJ32ZGevQ="; - aarch64-linux = "sha256-3JCIeJ51prF/Vep3VthBx+ZglR8Rlc2FjATT1bM+p+A="; - x86_64-darwin = "sha256-/q3a9RGrG5dwkyJjw4LhT0myIJFV38anzeDk7KIJ3eg="; - aarch64-darwin = "sha256-eK/Gnd1/v3Ye5SoXp9gOmu5agNMeUbO/s9cU4VAyAMA="; + x86_64-linux = "sha256-yeDxxJvBstV+vafqNF22egznqvjUZWX2hZKiJif8jvU="; + aarch64-linux = "sha256-Fdi9T0RhdnT2xGixTlNIm1qRLOA9lJUqvZw5G9+SsgQ="; + x86_64-darwin = "sha256-FuuhE3Ni5mSkTWt5yyKMsFHhM11xt4sKl7bCxAyXqKE="; + aarch64-darwin = "sha256-Y2QoWj/eTWpMfasI+ENM35Rr2P4uufl7spjwe5CWET8="; } .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/by-name/co/code-server/package.nix b/pkgs/by-name/co/code-server/package.nix index 143af0cc6731..87c5dd768006 100644 --- a/pkgs/by-name/co/code-server/package.nix +++ b/pkgs/by-name/co/code-server/package.nix @@ -10,12 +10,13 @@ git, rsync, pkg-config, - yarn, + runCommand, python3, esbuild, - nodejs_20, + nodejs_22, node-gyp, libsecret, + libkrb5, libx11, libxkbfile, ripgrep, @@ -23,14 +24,13 @@ xcbuild, quilt, nixosTests, + prefetch-npm-deps, }: let system = stdenv.hostPlatform.system; - nodejs = nodejs_20; - yarn' = yarn.override { inherit nodejs; }; - defaultYarnOpts = [ ]; + nodejs = nodejs_22; esbuild' = esbuild.override { buildGoModule = @@ -38,12 +38,12 @@ let buildGoModule ( args // rec { - version = "0.16.17"; + version = "0.27.2"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-8L8h0FaexNsb3Mj6/ohA37nYLFogo5wXkAhGztGUUsQ="; + hash = "sha256-JbJB3F1NQlmA5d0rdsLm4RVD24OPdV4QXpxW8VWbESA="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; } @@ -55,9 +55,18 @@ let mkdir -p ${path}/node_modules/esbuild/bin jq "del(.scripts.postinstall)" ${path}/node_modules/esbuild/package.json | sponge ${path}/node_modules/esbuild/package.json sed -i 's/${version}/${esbuild'.version}/g' ${path}/node_modules/esbuild/lib/main.js - ln -s -f ${esbuild'}/bin/esbuild ${path}/node_modules/esbuild/bin/esbuild + ln -s -f ${lib.getExe esbuild'} ${path}/node_modules/esbuild/bin/esbuild ''; + vscodeTarget = + { + x86_64-linux = "linux-x64"; + aarch64-linux = "linux-arm64"; + x86_64-darwin = "darwin-x64"; + aarch64-darwin = "darwin-arm64"; + } + .${system}; + # Comment from @code-asher, the code-server maintainer # See https://github.com/NixOS/nixpkgs/pull/240001#discussion_r1244303617 # @@ -74,59 +83,51 @@ let # To compute the commit when upgrading this derivation, do: # `$ git rev-parse ` where is the git revision of the `src` # Example: `$ git rev-parse v4.16.1` - commit = "1962f48b7f71772dc2c060dbaa5a6b4c0792a549"; + commit = "1c6fb2dc200eb57c5c7d612004e18a5e6ae8b0ed"; in stdenv.mkDerivation (finalAttrs: { pname = "code-server"; - version = "4.91.1"; + version = "4.115.0"; src = fetchFromGitHub { owner = "coder"; repo = "code-server"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-w0+lg/DcxKLrAz6DQGQ9+yPn42LrQ95Yn16IKNfqPvE="; + hash = "sha256-Hoi5QABYwRySGB9DNyEI6qMFYXCka3rfsE5j0Ww7Ax8="; }; - yarnCache = stdenv.mkDerivation { - name = "${finalAttrs.pname}-${finalAttrs.version}-${system}-yarn-cache"; - inherit (finalAttrs) src; - - nativeBuildInputs = [ - yarn' - git - cacert - ]; - - buildPhase = '' - runHook preBuild - - export HOME=$PWD - export GIT_SSL_CAINFO="${cacert}/etc/ssl/certs/ca-bundle.crt" - - yarn --cwd "./vendor" install --modules-folder modules --ignore-scripts --frozen-lockfile - - yarn config set yarn-offline-mirror $out - find "$PWD" -name "yarn.lock" -printf "%h\n" | \ - xargs -I {} yarn --cwd {} \ - --frozen-lockfile --ignore-scripts --ignore-platform \ - --ignore-engines --no-progress --non-interactive - - find ./lib/vscode -name "yarn.lock" -printf "%h\n" | \ - xargs -I {} yarn --cwd {} \ - --ignore-scripts --ignore-engines - - runHook postBuild - ''; - - outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - outputHash = "sha256-LCmygPid6VJqR1PCOMk/Hc6bo4nwsLwYr7O1p3FQVvQ="; - }; + nodeModules = + runCommand "code-server-node-modules" + { + inherit (finalAttrs) src; + nativeBuildInputs = finalAttrs.nativeBuildInputs ++ [ + prefetch-npm-deps + ]; + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = "sha256-nsKsbSuIMvqKT9XVPIsEN6EgvnDvB7rAuUYZDLBBO4A="; + env = { + FORCE_EMPTY_CACHE = true; + FORCE_GIT_DEPS = true; + npm_config_progress = false; + npm_config_cafile = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + }; + } + '' + runPhase unpackPhase + export HOME=$TMPDIR/home + mkdir $out + for p in $(find -name package-lock.json) + do ( + echo "Prefetching $p" + prefetch-npm-deps "$p" "$out/$(dirname $p)" + ) + done + ''; nativeBuildInputs = [ nodejs - yarn' python3 pkg-config makeWrapper @@ -134,6 +135,7 @@ stdenv.mkDerivation (finalAttrs: { rsync jq moreutils + prefetch-npm-deps quilt ]; @@ -143,6 +145,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret + libkrb5 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools @@ -165,35 +168,56 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail '$(git rev-parse HEAD)' "${commit}" substituteInPlace ./ci/build/build-release.sh \ --replace-fail '$(git rev-parse HEAD)' "${commit}" + + substituteInPlace ./lib/vscode/build/npm/postinstall.ts \ + --replace-fail "child_process.execSync('git config pull.rebase merges');" \ + "try { child_process.execSync('git config pull.rebase merges'); } catch {}" \ + --replace-fail "child_process.execSync('git config blame.ignoreRevsFile .git-blame-ignore-revs');" \ + "try { child_process.execSync('git config blame.ignoreRevsFile .git-blame-ignore-revs'); } catch {}" + ''; + + env = { + NODE_OPTIONS = "--openssl-legacy-provider --max-old-space-size=4096"; + NODE_ENV = "development"; + PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "1"; + ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + NIX_NODEJS_BUILDNPMPACKAGE = "1"; + npm_config_nodedir = nodejs; + npm_config_node_gyp = "${node-gyp}/lib/node_modules/node-gyp/bin/node-gyp.js"; + npm_config_offline = true; + npm_config_progress = false; + forceGitDeps = true; + }; + + preConfigure = '' + export HOME=$TMPDIR/home + mkdir -p $HOME + cp -R $nodeModules $TMPDIR/cache + chmod -R +w $TMPDIR/cache ''; configurePhase = '' runHook preConfigure - # run yarn offline by default - echo '--install.offline true' >> .yarnrc - - # set default yarn opts - ${lib.concatMapStrings (option: '' - yarn --offline config set ${option} - '') defaultYarnOpts} - - # set offline mirror to yarn cache we created in previous steps - yarn --offline config set yarn-offline-mirror "${finalAttrs.yarnCache}" - - # skip unnecessary electron download - export ELECTRON_SKIP_BINARY_DOWNLOAD=1 + for p in $(find -name package-lock.json -exec dirname {} \;) + do ( + echo "Setting up $p/node_modules" + cd $p + if [ -e node_modules ] + then + echo >&2 "File exists $p/node_modules" + exit 0 + fi + npm_config_cache=$TMPDIR/cache/$p npm ci --ignore-scripts + patchShebangs node_modules + ) + done # set nodedir to prevent node-gyp from downloading headers # taken from https://nixos.org/manual/nixpkgs/stable/#javascript-tool-specific mkdir -p $HOME/.node-gyp/${nodejs.version} - echo 9 > $HOME/.node-gyp/${nodejs.version}/installVersion + echo 11 > $HOME/.node-gyp/${nodejs.version}/installVersion ln -sfv ${nodejs}/include $HOME/.node-gyp/${nodejs.version} - export npm_config_nodedir=${nodejs} - - # use updated node-gyp. fixes the following error on Darwin: - # PermissionError: [Errno 1] Operation not permitted: '/usr/sbin/pkgutil' - export npm_config_node_gyp=${node-gyp}/lib/node_modules/node-gyp/bin/node-gyp.js runHook postConfigure ''; @@ -225,20 +249,11 @@ stdenv.mkDerivation (finalAttrs: { # Patch out remote download of nodejs from build script. patch -p1 -i ${./remove-node-download.patch} - # Install dependencies. - patchShebangs . - find . -name "yarn.lock" -printf "%h\n" | \ - xargs -I {} yarn --cwd {} \ - --offline --frozen-lockfile --ignore-scripts --ignore-engines patchShebangs . # Use esbuild from nixpkgs. - ${patchEsbuild "./lib/vscode/build" "0.12.6"} - ${patchEsbuild "./lib/vscode/extensions" "0.11.23"} - - # Kerberos errors while building, so remove it for now as it is not - # required. - yarn remove kerberos --cwd lib/vscode/remote --offline --frozen-lockfile --ignore-scripts --ignore-engines + ${patchEsbuild "./lib/vscode/build" "0.27.2"} + ${patchEsbuild "./lib/vscode/extensions" "0.27.2"} # Put ripgrep binary into bin, so post-install does not try to download it. find -name ripgrep -type d \ @@ -246,9 +261,14 @@ stdenv.mkDerivation (finalAttrs: { -execdir ln -s ${ripgrep}/bin/rg {}/bin/rg \; # Run post-install scripts after patching. - find ./lib/vscode \( -path "*/node_modules/*" -or -path "*/extensions/*" \) \ - -and -type f -name "yarn.lock" -printf "%h\n" | \ - xargs -I {} sh -c 'jq -e ".scripts.postinstall" {}/package.json >/dev/null && yarn --cwd {} postinstall --frozen-lockfile --offline || true' + find -name package.json -type f -exec sh -c ' + if jq -e ".scripts.postinstall" {} >/dev/null + then + echo >&2 "Running postinstall script in $(dirname {})" + npm --prefix=$(dirname {}) run postinstall + fi + exit 0 + ' \; patchShebangs . '' @@ -268,8 +288,11 @@ stdenv.mkDerivation (finalAttrs: { npm rebuild --offline --prefix lib/vscode/remote # Build code-server and VS Code. - yarn build - VERSION=${finalAttrs.version} yarn build:vscode + npm run build + VERSION=${finalAttrs.version} npm run build:vscode + + # build-release.sh expects the packaged VS Code tree to carry a node binary. + cp ${lib.getExe nodejs} ./lib/vscode-reh-web-${vscodeTarget}/node # Inject version into package.json. jq --slurp '.[0] * .[1]' ./package.json <( @@ -281,7 +304,7 @@ stdenv.mkDerivation (finalAttrs: { ) | sponge ./package.json # Create release, keeping all dependencies. - KEEP_MODULES=1 yarn release + KEEP_MODULES=1 npm run release # Prune development dependencies. We only need to do this for the root as # the VS Code build process already does this for VS Code. @@ -306,7 +329,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - prefetchYarnCache = lib.overrideDerivation finalAttrs.yarnCache (d: { + prefetchNodeModules = lib.overrideDerivation finalAttrs.nodeModules (d: { outputHash = lib.fakeSha256; }); tests = { diff --git a/pkgs/by-name/co/code-server/remove-node-download.patch b/pkgs/by-name/co/code-server/remove-node-download.patch index d19d4a2b5bf7..8974e5ba06a1 100644 --- a/pkgs/by-name/co/code-server/remove-node-download.patch +++ b/pkgs/by-name/co/code-server/remove-node-download.patch @@ -1,16 +1,18 @@ ---- ./lib/vscode/build/gulpfile.reh.js -+++ ./lib/vscode/build/gulpfile.reh.js -@@ -268,9 +268,6 @@ +--- ./lib/vscode/build/gulpfile.reh.ts ++++ ./lib/vscode/build/gulpfile.reh.ts +@@ -349,10 +349,7 @@ .pipe(util.stripSourceMappingURL()) .pipe(jsFilter.restore); - const nodePath = `.build/node/v${nodeVersion}/${platform}-${arch}`; - const node = gulp.src(`${nodePath}/**`, { base: nodePath, dot: true }); - - let web = []; +- let web: NodeJS.ReadWriteStream[] = []; ++ let web: NodeJS.ReadWriteStream[] = []; if (type === 'reh-web') { web = [ -@@ -287,7 +284,6 @@ + 'resources/server/favicon.ico', +@@ -368,7 +365,6 @@ license, sources, deps, @@ -18,11 +20,11 @@ ...web ); -@@ -385,7 +381,6 @@ - const destinationFolderName = `vscode-${type}${dashed(platform)}${dashed(arch)}`; +@@ -515,7 +511,6 @@ - const serverTaskCI = task.define(`vscode-${type}${dashed(platform)}${dashed(arch)}${dashed(minified)}-ci`, task.series( -- gulp.task(`node-${platform}-${arch}`), + const packageTasks: task.Task[] = [ + compileNativeExtensionsBuildTask, +- gulp.task(`node-${platform}-${arch}`) as task.Task, util.rimraf(path.join(BUILD_ROOT, destinationFolderName)), - packageTask(type, platform, arch, sourceFolderName, destinationFolderName) - )); + packageTask(type, platform, arch, sourceFolderName, destinationFolderName), + copyCopilotNativeDepsTaskREH(platform, arch, destinationFolderName) diff --git a/pkgs/by-name/co/cog/package.nix b/pkgs/by-name/co/cog/package.nix index 1b9fc3fb5d7b..3a07a88969f3 100644 --- a/pkgs/by-name/co/cog/package.nix +++ b/pkgs/by-name/co/cog/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "cog"; - version = "0.1.6"; + version = "0.1.8"; src = fetchFromGitHub { owner = "grafana"; repo = "cog"; tag = "v${finalAttrs.version}"; - hash = "sha256-Dbp+7+nokUUKP8GW3xqRhx3Zn1ltEndkpk1iHRRgPug="; + hash = "sha256-eIvesUCvIluSFZuiU6NI1JUrpuRGi0t2cz5uNkvE6/c="; }; - vendorHash = "sha256-KOk8SvajH98jjvoPZPC4UAsF5tXKjn1xcVq5juQXQVA="; + vendorHash = "sha256-OrFRYCWb//ga1R+QIkg4aMhQYAFOAxRPi5IvGjUL6I4="; subPackages = [ "cmd/cli" ]; diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix index 763ba2d517b3..9bc16b1d77fd 100644 --- a/pkgs/by-name/de/deno/package.nix +++ b/pkgs/by-name/de/deno/package.nix @@ -47,14 +47,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ./patches/0002-tests-replace-hardcoded-paths.patch ./patches/0003-tests-linux-no-chown.patch ./patches/0004-tests-darwin-fixes.patch - ] - ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [ - # Fix c_char mismatch on aarch64-linux - # PR at https://github.com/denoland/deno/pull/33179 - (fetchpatch { - url = "https://github.com/denoland/deno/commit/fd331552de39501d47c43dc4b0c637b969402ab1.patch"; - hash = "sha256-AIqLbTnBO2VUFiTumEZFORqSyfzB6chdvJQq8HeAM30="; - }) ]; postPatch = '' # Use patched nixpkgs libffi in order to fix https://github.com/libffi/libffi/pull/857 diff --git a/pkgs/by-name/do/dovecot/generic.nix b/pkgs/by-name/do/dovecot/generic.nix index fbdfcef9557a..69d843c21e57 100644 --- a/pkgs/by-name/do/dovecot/generic.nix +++ b/pkgs/by-name/do/dovecot/generic.nix @@ -29,6 +29,7 @@ libxcrypt, libstemmer, cyrus_sasl, + xapian, nixosTests, fetchpatch, rpcsvc-proto, @@ -80,6 +81,10 @@ stdenv.mkDerivation (finalAttrs: { libstemmer cyrus_sasl.dev ] + ++ lib.optionals (lib.versionAtLeast version "2.4") [ + # fts_flatcurve built-in + xapian + ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ systemd pam diff --git a/pkgs/by-name/ea/easytier/package.nix b/pkgs/by-name/ea/easytier/package.nix index 3cb3293cfb80..8172e56ce019 100644 --- a/pkgs/by-name/ea/easytier/package.nix +++ b/pkgs/by-name/ea/easytier/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "easytier"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "EasyTier"; repo = "EasyTier"; tag = "v${finalAttrs.version}"; - hash = "sha256-XnEfxWDKUTQFWYKtqetI7sLbOmGqw2BqpU5by1ajZGA="; + hash = "sha256-dqBIqyh1hWuO9D6IkaUjHT4sdgqJU/Ntt6q0Yc7EjLk="; }; - cargoHash = "sha256-ueDulcv7DnwvMWYayc3hzBVtldX6gg7fP7YQpdUPq7c="; + cargoHash = "sha256-fv4XDyTc3lH6zNT5S/mdwej44NVluSjL9z+yQkB0Y5c="; nativeBuildInputs = [ protobuf diff --git a/pkgs/by-name/et/etesync-dav/radicale-3-6-compat.patch b/pkgs/by-name/et/etesync-dav/radicale-3-6-compat.patch index 9e0270700c36..7cf0df7611f5 100644 --- a/pkgs/by-name/et/etesync-dav/radicale-3-6-compat.patch +++ b/pkgs/by-name/et/etesync-dav/radicale-3-6-compat.patch @@ -49,7 +49,7 @@ index 1ccc6dd..0f68561 100644 def delete(self, href=None): """Delete an item. diff --git a/etesync_dav/radicale/web.py b/etesync_dav/radicale/web.py -index 869624f..6b4c515 100644 +index 869624f..ff335a7 100644 --- a/etesync_dav/radicale/web.py +++ b/etesync_dav/radicale/web.py @@ -12,6 +12,8 @@ @@ -61,7 +61,7 @@ index 869624f..6b4c515 100644 from radicale import web from etesync_dav.mac_helpers import has_ssl -@@ -31,6 +33,8 @@ class Web(web.BaseWeb): +@@ -31,8 +33,10 @@ class Web(web.BaseWeb): environ["wsgi.url_scheme"] = "https" body = list(app(environ, start_response))[0] ret_response.append(body) @@ -69,4 +69,31 @@ index 869624f..6b4c515 100644 + ret_response.append(None) # xml_request field return tuple(ret_response) - def get(self, environ, base_prefix, path, user): +- def get(self, environ, base_prefix, path, user): ++ def get(self, environ, base_prefix, path, user, *args, **kwargs): + return self._call(environ, base_prefix, path, user) + +- def post(self, environ, base_prefix, path, user): ++ def post(self, environ, base_prefix, path, user, *args, **kwargs): + return self._call(environ, base_prefix, path, user) +diff --git a/etesync_dav/radicale_main/server.py b/etesync_dav/radicale_main/server.py +index b593661..a258f7d 100644 +--- a/etesync_dav/radicale_main/server.py ++++ b/etesync_dav/radicale_main/server.py +@@ -53,12 +53,12 @@ elif os.name == "nt": + + + class MyApplication(Application): +- def do_POST(self, environ, base_prefix, path, user): ++ def do_POST(self, environ, base_prefix, path, user, *args, **kwargs): + """Manage POST request.""" + # Dispatch .web URL to web module + if path == "/.web" or path.startswith("/.web/"): +- return self._web.post(environ, base_prefix, path, user) ++ return self._web.post(environ, base_prefix, path, user, *args, **kwargs) + +- return super().do_POST(environ, base_prefix, path, user) ++ return super().do_POST(environ, base_prefix, path, user, *args, **kwargs) + + + def format_address(address): diff --git a/pkgs/by-name/fa/fast-cli-zig/package.nix b/pkgs/by-name/fa/fast-cli-zig/package.nix index 84d25dbf3544..fa512842d3c2 100644 --- a/pkgs/by-name/fa/fast-cli-zig/package.nix +++ b/pkgs/by-name/fa/fast-cli-zig/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - zig, + zig_0_15, }: stdenv.mkDerivation (finalAttrs: { # fast-cli existed, was removed as noted in aliasses.nix on 2025-11-17. Consider to rename this package after 1 to 2 releases of nixos @@ -16,12 +16,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-KKjxKQHiSYMaGCfX1+h6DQ809xHh9Yfv8B4PXvr3CwQ="; }; - zigDeps = zig.fetchDeps { + zigDeps = zig_0_15.fetchDeps { inherit (finalAttrs) src pname version; hash = "sha256-89ig8lO5Yb9qFlJ1yL3NDDfKeZDl/CeM6qFxT40eOf8="; }; - nativeBuildInputs = [ zig.hook ]; + nativeBuildInputs = [ zig_0_15.hook ]; postConfigure = '' ln -s ${finalAttrs.zigDeps} "$ZIG_GLOBAL_CACHE_DIR/p" @@ -37,6 +37,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ dwt ]; mainProgram = "fast-cli"; - inherit (zig.meta) platforms; + inherit (zig_0_15.meta) platforms; }; }) diff --git a/pkgs/by-name/fi/fiddler-everywhere/package.nix b/pkgs/by-name/fi/fiddler-everywhere/package.nix index cebac8723083..ca840f54f3a1 100644 --- a/pkgs/by-name/fi/fiddler-everywhere/package.nix +++ b/pkgs/by-name/fi/fiddler-everywhere/package.nix @@ -8,11 +8,11 @@ let pname = "fiddler-everywhere"; - version = "7.7.2"; + version = "7.7.3"; src = fetchurl { url = "https://downloads.getfiddler.com/linux/fiddler-everywhere-${version}.AppImage"; - hash = "sha256-kxS15ymgc8qJANYUnrm8TbuFIYsGlw23pfuuKrROQyE="; + hash = "sha256-Nn84vBrXTNRFS94YTKH32p8VVXqBi5lc6t7K424Mes4="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix index 3be09f7ea9c4..1fe31e3c1d6d 100644 --- a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix +++ b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix @@ -2,7 +2,7 @@ lib, fetchFromGitHub, stdenvNoCC, - nodejs, + nodejs-slim, fetchNpmDeps, buildPackages, php85, @@ -28,8 +28,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { buildInputs = [ php ]; nativeBuildInputs = [ - nodejs - nodejs.python + nodejs-slim + nodejs-slim.npm + nodejs-slim.python buildPackages.npmHooks.npmConfigHook php.composerHooks.composerInstallHook php.packages.composer-local-repo-plugin diff --git a/pkgs/by-name/fi/firefly-iii/package.nix b/pkgs/by-name/fi/firefly-iii/package.nix index b1a0cbb09faa..af4d2d9866d3 100644 --- a/pkgs/by-name/fi/firefly-iii/package.nix +++ b/pkgs/by-name/fi/firefly-iii/package.nix @@ -2,7 +2,7 @@ lib, fetchFromGitHub, stdenvNoCC, - nodejs, + nodejs-slim, fetchNpmDeps, buildPackages, php84, @@ -25,8 +25,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { buildInputs = [ php84 ]; nativeBuildInputs = [ - nodejs - nodejs.python + nodejs-slim + nodejs-slim.python buildPackages.npmHooks.npmConfigHook php84.packages.composer php84.composerHooks2.composerInstallHook diff --git a/pkgs/by-name/fo/forgejo-cli/package.nix b/pkgs/by-name/fo/forgejo-cli/package.nix index 1a80b2158a99..dbbfd925bb2c 100644 --- a/pkgs/by-name/fo/forgejo-cli/package.nix +++ b/pkgs/by-name/fo/forgejo-cli/package.nix @@ -13,16 +13,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "forgejo-cli"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromCodeberg { owner = "forgejo-contrib"; repo = "forgejo-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-tWb5h0i3Z8qSHqFL7FofwljMdXgV1Z6x8ojut9pm6Yg="; + hash = "sha256-6qouGcqNau2aCBPYpn0hFdm8QXL1WjZvnowK4aspe/Q="; }; - cargoHash = "sha256-7gCzU7U8kIxWnwLksXIUkgfFWWjZ/0QiaHnCD+H8sGQ="; + cargoHash = "sha256-UPDhPKC/x0ccfm7Df74PtCn+Zt9ShCxf9uB5TVaYV6Y="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/fo/forgejo/generic.nix b/pkgs/by-name/fo/forgejo/generic.nix index 29bdc8b57b96..229f3483e3c9 100644 --- a/pkgs/by-name/fo/forgejo/generic.nix +++ b/pkgs/by-name/fo/forgejo/generic.nix @@ -83,14 +83,6 @@ buildGoModule rec { patches = [ ./static-root-path.patch - ] - ++ lib.optionals (lib.versionAtLeast version "14") [ - # Backport fix for flaky TestBleveDeleteIssue test from v15. - # https://codeberg.org/forgejo/forgejo/pulls/11686 - (fetchpatch { - url = "https://codeberg.org/forgejo/forgejo/commit/a32b0da87c10bb628a9d2203b700f0683e1ae966.patch"; - hash = "sha256-mY1b35aKsiLNU56Ut/qiLrYj+IR8M2W8dZQiDqkDNxg="; - }) ]; postPatch = '' substituteInPlace modules/setting/server.go --subst-var data @@ -117,7 +109,7 @@ buildGoModule rec { # https://codeberg.org/forgejo/forgejo/src/tag/v11.0.6/Makefile#L128 # https://codeberg.org/forgejo/forgejo/src/tag/v13.0.0/Makefile#L290 preCheck = '' - echo -e 'show-backend-tests:${lib.optionalString (lib.versionAtLeast version "13") " | compute-go-test-packages"}\n\t@echo ''${GO_TEST_PACKAGES}' >> Makefile + echo -e 'show-backend-tests: | compute-go-test-packages\n\t@echo ''${GO_TEST_PACKAGES}' >> Makefile getGoDirs() { make show-backend-tests } diff --git a/pkgs/by-name/fo/forgejo/lts.nix b/pkgs/by-name/fo/forgejo/lts.nix deleted file mode 100644 index 7e184b6c7d22..000000000000 --- a/pkgs/by-name/fo/forgejo/lts.nix +++ /dev/null @@ -1,11 +0,0 @@ -import ./generic.nix { - version = "11.0.12"; - hash = "sha256-akPRq8quzdx8TU8NC/uxvngEl/fl/JjM1FcVhlHxcXo="; - npmDepsHash = "sha256-2COWPQM1iKpNG2TbPIv2zXXe28tsmuVc6IhkUeORBsU="; - vendorHash = "sha256-v1UZwhgZglJvIkEfO7662lKhdO3AxH+DGN70ziWfXG0="; - lts = true; - nixUpdateExtraArgs = [ - "--override-filename" - "pkgs/by-name/fo/forgejo/lts.nix" - ]; -} diff --git a/pkgs/by-name/fo/forgejo/lts.nix b/pkgs/by-name/fo/forgejo/lts.nix new file mode 120000 index 000000000000..8d225ed3269a --- /dev/null +++ b/pkgs/by-name/fo/forgejo/lts.nix @@ -0,0 +1 @@ +package.nix \ No newline at end of file diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix index 7b60b9dd741f..78da7be18911 100644 --- a/pkgs/by-name/fo/forgejo/package.nix +++ b/pkgs/by-name/fo/forgejo/package.nix @@ -1,9 +1,9 @@ import ./generic.nix { - version = "14.0.4"; - hash = "sha256-kw3oN/Kr+SYF1vVbStaWWV59Pw75mEeF4eUYljI1f+0="; - npmDepsHash = "sha256-TjohWmdEZII0ti/T37kQ04Lkoy79VbY02hE1hxrWYx8="; - vendorHash = "sha256-Dm+aZMPjrqfHSLzkd9HHTuM8wVLtGpT2Nf5frWtYW10="; - lts = false; + version = "15.0.0"; + hash = "sha256-KAGHascGFj4X6b4BpRqQ8yCedNh0nvHfQgbzJh9fxAc="; + npmDepsHash = "sha256-AWvLcAS7EEy796kAQfiQ8sFSh/s+6zNCJEqe4qzQL3s="; + vendorHash = "sha256-bP7cykWKwNQrWm9jJT4YYAHRV66HaTwGkvhBqSHgWAA="; + lts = true; nixUpdateExtraArgs = [ "--override-filename" "pkgs/by-name/fo/forgejo/package.nix" diff --git a/pkgs/by-name/ga/gancio/package.nix b/pkgs/by-name/ga/gancio/package.nix index 26447e7ca255..f8b625dfb52a 100644 --- a/pkgs/by-name/ga/gancio/package.nix +++ b/pkgs/by-name/ga/gancio/package.nix @@ -8,7 +8,7 @@ yarnConfigHook, yarnBuildHook, yarnInstallHook, - nodejs_22, + nodejs-slim_22, pkg-config, vips, @@ -21,7 +21,7 @@ let # The latest nodejs is always used in yarn, leading to build issues when it's # different from the pinned one. - nodejs = nodejs_22; + nodejs = nodejs-slim_22; yarnConfigHook' = yarnConfigHook.override { yarn = yarn.override { inherit nodejs; }; }; diff --git a/pkgs/by-name/gd/gdb/package.nix b/pkgs/by-name/gd/gdb/package.nix index 3bc18a548c1d..361ad20350b4 100644 --- a/pkgs/by-name/gd/gdb/package.nix +++ b/pkgs/by-name/gd/gdb/package.nix @@ -76,7 +76,8 @@ stdenv.mkDerivation (finalAttrs: { postPatch = optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace gdb/darwin-nat.c \ - --replace-fail '#include "bfd/mach-o.h"' '#include "mach-o.h"' + --replace-fail '#include "bfd/mach-o.h"' '#include "mach-o.h"' \ + --replace-fail '#include "inferior.h"' $'#include "inferior.h"\n#include "gdbsupport/common-inferior.h"' '' + optionalString stdenv.hostPlatform.isMusl '' substituteInPlace sim/erc32/erc32.c --replace-fail sys/fcntl.h fcntl.h diff --git a/pkgs/by-name/ge/gemini-cli-bin/package.nix b/pkgs/by-name/ge/gemini-cli-bin/package.nix index ed6f97a515e9..2b62ae43ac5a 100644 --- a/pkgs/by-name/ge/gemini-cli-bin/package.nix +++ b/pkgs/by-name/ge/gemini-cli-bin/package.nix @@ -11,11 +11,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "gemini-cli-bin"; - version = "0.37.0"; + version = "0.38.1"; src = fetchzip { url = "https://github.com/google-gemini/gemini-cli/releases/download/v${finalAttrs.version}/gemini-cli-bundle.zip"; - hash = "sha256-JbR37CZGjZN0px+bGLQ67dbo/yyAb7BSx1v6IVuBCJc="; + hash = "sha256-+XMClLm7HGWST1MESxIVHGmgyvPPqrXGUomoiDY/eUE="; stripRoot = false; }; diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix index 3d8911c8311a..68bd5414b94a 100644 --- a/pkgs/by-name/ge/gemini-cli/package.nix +++ b/pkgs/by-name/ge/gemini-cli/package.nix @@ -15,18 +15,18 @@ buildNpmPackage (finalAttrs: { pname = "gemini-cli"; - version = "0.37.2"; + version = "0.38.1"; src = fetchFromGitHub { owner = "google-gemini"; repo = "gemini-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-jmVYARto5NoqX1DbT+jYQOTzMkeSi0Z7A5oKDN5fCnY="; + hash = "sha256-Iq/KxQ8rbLtXDbGzcZxspfFwar189H3mBWwOD4hO7HU="; }; nodejs = nodejs_22; - npmDepsHash = "sha256-Hxxi2eKDLXucZLhUswcQ3kVEKoRNbs81m6IFr+CYxzs="; + npmDepsHash = "sha256-T3fxNFvkLR7f49GQjzzTnl3VM+VUUgJfFF5d2GGe7L4="; dontPatchElf = stdenv.isDarwin; diff --git a/pkgs/by-name/he/hedgedoc/missing-hashes.json b/pkgs/by-name/he/hedgedoc/missing-hashes.json index 3d1d34028357..b48eabfb34d4 100644 --- a/pkgs/by-name/he/hedgedoc/missing-hashes.json +++ b/pkgs/by-name/he/hedgedoc/missing-hashes.json @@ -1,28 +1,28 @@ { - "@esbuild/aix-ppc64@npm:0.27.2": "9c18cc2e4a03339a55013aac05b4a3fc4b77e75715dc252d034aa3d43b754abc053a7601b95e31249f4b6e69b68db2f5e6cb04b0ed619f825f2f70daff1a78d7", - "@esbuild/android-arm64@npm:0.27.2": "a318fc9ffcdad7fda8bb521af8b17f73d93d9a94b4cca9301fbf72cf3f5a6e945edd589a47388de70f3e9582655dcf5b5bb928a11e306368fae4a9106d5143d2", - "@esbuild/android-arm@npm:0.27.2": "01114275e096b9177ad2496730087ee081d6e65a75bc087457b527c5baac5a8ccb362435f45232532bf6f97de95e1790dbce127d55abd5e4152c7214682bf4d3", - "@esbuild/android-x64@npm:0.27.2": "e92c5b6919081a14c8882f1167cf90b4e4bba745ad6e9a23428f85a1cd5e79dfa3f1d2fc943686b237e4cd09fac52ad3b3791deab6a0419ee10859284d3834aa", - "@esbuild/darwin-arm64@npm:0.27.2": "5e99db5037167bad4a095fc445b94a2ce02357870ed58b79e13ae6bc09b5cb33d7e03f925492df940f9e0ad685a889f02beec1431d8fbf4c7ced55b2f48f5659", - "@esbuild/darwin-x64@npm:0.27.2": "87f2fbc4cf11724ef805b17cbdc7b0a9498332bc4b61d55e110ecc3b09bc488b88c0bd140ea48924e9c97a2063cf7e440fef13dd56e415c46799619d61086910", - "@esbuild/freebsd-arm64@npm:0.27.2": "1ffa23243b913e377a5b09fd97ad9f089be3695aafdd893b60bb7f9be479256d8b7546f0bc96c4e61133fe7aeeaf95a8e941e82a65d99008ff82c99bdec85eee", - "@esbuild/freebsd-x64@npm:0.27.2": "44f744b289cf9e115b0adfac1905818d756dfced14213bf144d9016d96f67575ef2a55526f76e29ee775fcfec7274ba3a5e6833f35ed79a4592d3f5eac278267", - "@esbuild/linux-arm64@npm:0.27.2": "2b037d74eaff4e9b5a6076760ede873320707636a3495939687cdd0c2c7150883111273bc0a8663fa305c42f439f4748b5ad7f15a1a1ea9fa7db575d9faf2d1b", - "@esbuild/linux-arm@npm:0.27.2": "28cfc3a9ca11fc899649e7a706fb4b2ee57999bd92e86c23726b3ed0f832732411dd0aa3e2bcdb4105759f83bc4e5adc98dc195aaafce736c910db4e43694702", - "@esbuild/linux-ia32@npm:0.27.2": "ac6cc92b9be2ec6d9d483c53fc973e6381765b784a2e1b71fa93ea0cf976344c2e3e0bfda0140b0829b3ec4304d9b886692b2891e68c17d2121066d06e67f0ac", - "@esbuild/linux-loong64@npm:0.27.2": "625f5b6c2218a3acb2cff8f7f02a53ca89d13925f8932260ddad01595c6907beda4a79e4b767b1101f5971049f88d3ec6ab29cf565b4d61d9b0d7277e2cb578d", - "@esbuild/linux-mips64el@npm:0.27.2": "0c62692cb3a297b37212dfde52a861861843a716f6b3bdb73da49ba249a4c001b989ea61dc4540c430fac59ce2f8fc45035cdfac80172c5ddaf1b9df8471aecf", - "@esbuild/linux-ppc64@npm:0.27.2": "b804d2dd0a6a85fe1c731828c725731a55ab120d2cc16941d560b2e9af5c2ec51586914ce26a84a326a9d46fa61eb8bb1f843953fe29ddd43b3f3099c491b5ff", - "@esbuild/linux-riscv64@npm:0.27.2": "03e67e7207a83801363e3637f9a35fb6224ed4dc23bbf6eca41904fc42f5a6806e1e591666bf48dbf62eba97d41ff4355413b14dcb2339007b22c693374c49f6", - "@esbuild/linux-s390x@npm:0.27.2": "eb24b9c0a4a1492e4ff34a87933f6a3b348739c12f864b408144efdf949871c1fbb02a1cca741bfa11fd08aebe585d046fd3311b462ce4c795e3064ba3912469", - "@esbuild/linux-x64@npm:0.27.2": "ed1542f203329521fb1f308696c76ba59ed4a4616a24e21bf4820685362bba209d5c44c2f4e66c88dc7b7399df9ace625454d4829ee529d076ccaf61566e11cf", - "@esbuild/netbsd-arm64@npm:0.27.2": "576dd082047077b9cc41fbeffd728821a4f3b80969c1d2d6c274301122c6de2050f484fd4e946777527b8a15bd2a5ac54f85ca7ab95ea72b5345177e6a888687", - "@esbuild/netbsd-x64@npm:0.27.2": "f8994af3e2ff3c9a91e874e58698b66e6f8d4e72dbc0aaf749b74a79420954146ed053359b0a4c213918582cee187d8a371737a33cfb93e624b4d091e5a6c240", - "@esbuild/openbsd-arm64@npm:0.27.2": "f710da24beeb747ef3a11b9d99085a14f5c929f942fd9d9a05b7806d5ff1b85631bfa506eb7a6aed9fd01ec99bf91f24736f9f0e0eb6b7c0019fe0dddd2e615c", - "@esbuild/openbsd-x64@npm:0.27.2": "62670fbe1f609c5362df7b45968ded512a0860e2ad8a4715a89993abfa2f9f08a28f1294c7857d80e6d3f713639a71d291c06a961b331de67ad350032d1b8e96", - "@esbuild/openharmony-arm64@npm:0.27.2": "e279efdc18301add96ea791ba9ef117cae05346688cd521fd225a60ad166add4bc995af985058e3b6ab9e65a7c49a79108a294d6aa26a1d1685ad0db194e2c56", - "@esbuild/sunos-x64@npm:0.27.2": "7234302321d36576b5a9f027915417cddc195a67b19cdfb50e69c337ee0dd63a88be6b72d7ef299cd569d1af62e54774303d52d3d6b5e5858db975241ae467d6", - "@esbuild/win32-arm64@npm:0.27.2": "36620fddf79da3e8e527ef8331436929fa7a0b23c9b591af8f8573d80ed9c4ef45b24c6fa0abbb01d187dec497efa6c9d9d397d575afc1f28477e9ca16a48d73", - "@esbuild/win32-ia32@npm:0.27.2": "96e8c1fa0ec2b5529ead2ba703e5da7644c138b2f9b6e285c05513f0455e99b2b0dcf399f01779fb384e22810e82f892491e44402772c62d3fe094b025bbdc0f", - "@esbuild/win32-x64@npm:0.27.2": "1ed08bebd916c16003f3784276ae683ab41d34951a0c272f6e072b8067a2b4bacd6f6f75a8dcea375b8545e15891d305425cf7c8dd31f7deab56ef22cde4a1e2" + "@esbuild/aix-ppc64@npm:0.27.7": "848d1a798fb9ea6aa902c9138aaf6b45d889df39a1ff737300ea9968af3afee1000f611bc00187f5bda096d300fb25f4f883c57a2dc7296e40295f2470aa57b3", + "@esbuild/android-arm64@npm:0.27.7": "21a57ee237e1503d92c2f818c1dbf7d6f772b100fd0dfa95ea0d24be718c0c6952e915ad1f47bcc3496bb807a0a254d35d6baadc48531b684d2236f57023f1e6", + "@esbuild/android-arm@npm:0.27.7": "46a246245a024680c8b5051425fc724c846b7d36ac952cd312e71194bae07fd712aa6fa8ddd7fa648a18d665eb0bcfaf111726af7b676465cb181dff7e6a0848", + "@esbuild/android-x64@npm:0.27.7": "95c858fe95b716aabcb71a0dab9162d46859c0deb713189730ce6c2a2bc27efed2341b2d27aacc092dee7544df7b25035a12d65f30481b5b03a8358707e1a6f3", + "@esbuild/darwin-arm64@npm:0.27.7": "281897d55b71e222394f08ee519999f673778c26ac78e4dacc67262e449b9284e852dccac8d6293fd611e0a37d0c798f2ea18c65573ed251d5e04dcb01121f0d", + "@esbuild/darwin-x64@npm:0.27.7": "a6c320cda3c7c176d678c00367823259b7efc0f8638393bd0e45b4f950af15be887558c82e2d74ed9fb492a4b04f36afc1c3a3b9774aeaaa08fbf96aac6e3524", + "@esbuild/freebsd-arm64@npm:0.27.7": "8b546929340ebb3daf5b47ca24db6d6fdcf3c14a733c41ddd8ae960834a5aa60b22b341049aef39badfdfaad0081a8706d085ba892e2b23163d1d1ff52ca1dc3", + "@esbuild/freebsd-x64@npm:0.27.7": "5a4c0ccbde7fe7a6de14c8789d1f20f4cadc7980e531b090b137774b56f360ba3c50f5612f01980ab9071ae50e1bb007f44c1b04b68fd84ba07113472081e021", + "@esbuild/linux-arm64@npm:0.27.7": "741871bea9ce0a136367707cc509254fef167c5bf968706de6bff7db96ee7c672f02231cb69965e17ca0aedbd99d533275f5a695a3069cb3df0a9d2cd877847f", + "@esbuild/linux-arm@npm:0.27.7": "c2ee4ae5f6e13f8e882da4a369cc5d672ae8bf7613e35e22b54df3999e0d5aaef6d704c7dcbc473708eaeee202dd8e892c37e791bbc50a509b23ae845d18b689", + "@esbuild/linux-ia32@npm:0.27.7": "0933a68b0bdee3dd0fcd99da92c0472deb6d6225c454b88a3609e1b1ea7648b36f6b83be8a8cf41edc1f0d666b76006e270a66c7520050d278d7d73df171e86b", + "@esbuild/linux-loong64@npm:0.27.7": "9609e94b603a8a68bcd60325626d0bd35cce37e75994729d4ea264fa865db201da64c3216004656d94b1edeb8587150b1c47a1eef8ee1af9dc0d3cd6baa5ab2a", + "@esbuild/linux-mips64el@npm:0.27.7": "74ac0fe0b857b926af9057d5fa9634fc4b0b61a6fcd9c13cc2917e0e66638e2f724b8fd82024f97d524ff54ae17d0a52a0569078639aa9907f5287514aa046b1", + "@esbuild/linux-ppc64@npm:0.27.7": "7d75e59ad798631b7b7f77471fc9f545e0e6d2959a52d57b77e92d4aba81c5c57dea558d22539edc6aca92ac72112f93381e163b996df193cb5c9a1da4b4230d", + "@esbuild/linux-riscv64@npm:0.27.7": "6dca2a182f59d43057ef40b93788dfb265c3b9fff4738aa613d87c7c709d9c308f18c282b7cfc2a1c770fa4db78d3529dc50b8a9f30e415661d993b021b2cdcb", + "@esbuild/linux-s390x@npm:0.27.7": "870de4b9ff155cf5cf2ccd7b3587a6b4170550a31b621ea11dc134cd48af95f4a30f4ce868d249967eade6b3dd66e7a0af0d542c6fbba0dbc473fd0f5d3299b0", + "@esbuild/linux-x64@npm:0.27.7": "47fce66247eda2d4721c1e615f7169eb7bf6e4b6105eab7271391ce933e7d350d3d4a581b3b8a61573f70b6663268eb514e624875dc514dc56dec3a37cf7cbe3", + "@esbuild/netbsd-arm64@npm:0.27.7": "bbe0d0529fb73fd38c2cf9ebc1d1dcd5a2586b263cc4f6300d37008955f45310e842d63153e361a4447d4ca0f0a0691d62013fe60b09e4e0cd53f428ef2266f3", + "@esbuild/netbsd-x64@npm:0.27.7": "246ed4df55788aacd2d9146f51ea7fcf4715e73d32ca1b0fcb42c316fdbf21d8de03bb304205dc707942442899529e834466894faa0aa3fa40454f5622648fc6", + "@esbuild/openbsd-arm64@npm:0.27.7": "d99927053a0f8be5158da8ecde7e8a08dd0ea580ca93f006971730979681e3738f83ada4d6564a57cdd6f412e40e5a750a92f424807aa12f97c2ead52617ad41", + "@esbuild/openbsd-x64@npm:0.27.7": "1480ff755c727d056e5f37e1d2be83d36b137c9f3595911aaf1659160c2cbfea846bded0557017aaefd79a0322be5e381b168ebff3eec4af684198835504b051", + "@esbuild/openharmony-arm64@npm:0.27.7": "6aa1fd102bdfa99b3c27f558f6b5d493b47f34260cc10967c47d44b86018a307377e0c70ef51b8886c592f2a0057710a8ad7781716b0eb059d0b0657b4f7ddec", + "@esbuild/sunos-x64@npm:0.27.7": "66bff01f90a97b989c6e6fbe6f8df77a0e5b40b57b8c4d8e6c407635546eb05553de570cd4e0d4624a5a6be8a61d7e9c6e7d8bc238f8f5773a4231361c0e8745", + "@esbuild/win32-arm64@npm:0.27.7": "eb7008345c82bbd4be30bb27ae4e17346cb5014801e9d50058984e7c5e4cb509d6eae82db3c04aab16b72d3829908b32151117222c107962fe3fb0e317e55951", + "@esbuild/win32-ia32@npm:0.27.7": "b6a44b5b6bf670cbe86de063335f03faa308d5b3eabbca1f5078bba9674ea42d3d6ad9fb9601fb0c7abba65d4b4a467f20473aedb856c9544c20166c75538029", + "@esbuild/win32-x64@npm:0.27.7": "4b91237b01e7e1a5083d2df524bb2ddb13da334197681fd33ad05975c073ccc901ea6b9395453276557608e5858cc032ed12807cc156c29f4ce7d2c63e04d5a0" } diff --git a/pkgs/by-name/he/hedgedoc/package.nix b/pkgs/by-name/he/hedgedoc/package.nix index f55fa38d5f2e..a7e425f8acf5 100644 --- a/pkgs/by-name/he/hedgedoc/package.nix +++ b/pkgs/by-name/he/hedgedoc/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hedgedoc"; - version = "1.10.7"; + version = "1.10.8"; src = fetchFromGitHub { owner = "hedgedoc"; repo = "hedgedoc"; tag = finalAttrs.version; - hash = "sha256-9HbvnnvC1eWoOxPE6yW2GcULgIrXDZ4B+mt7ZYz4j/Q="; + hash = "sha256-9gKpjmE8z/9PUILCiVK1utNYKD8kscbCBKxerqTO3z4="; }; # Generate this file with: @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { offlineCache = yarn-berry_4.fetchYarnBerryDeps { inherit (finalAttrs) src missingHashes; - hash = "sha256-7QJu6HSXCNameGq/NZpq7V0VHam7qRWzQQfzkzvARs4="; + hash = "sha256-HbrkmuL1OBZZoA6o438GePId50lJrYfI7M2FsP00YGc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ho/homebox/package.nix b/pkgs/by-name/ho/homebox/package.nix index 940247bd945d..8b68f19b72a8 100644 --- a/pkgs/by-name/ho/homebox/package.nix +++ b/pkgs/by-name/ho/homebox/package.nix @@ -13,18 +13,18 @@ }: let pname = "homebox"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "sysadminsmedia"; repo = "homebox"; tag = "v${version}"; - hash = "sha256-/h+m2M+sljogw/fYbcgOrakeLErTrA87MCGHgZPIV5Y="; + hash = "sha256-mAC7n8AjsSHzO+l0ILJhf4LPAuVZ5KIYO6mXftZpVbE="; }; in buildGoModule { inherit pname version src; - vendorHash = "sha256-dFjscefpqBNTQOOZ+itVnUtYX2w/MrU8+FjDpy0AuEM="; + vendorHash = "sha256-FuZEGUduKZyTuW63z3rk8g1KE8wyx55xoNSvqbvF0PA="; modRoot = "backend"; # the goModules derivation inherits our buildInputs and buildPhases # Since we do pnpm thing in those it fails if we don't explicitly remove them @@ -42,7 +42,7 @@ buildGoModule { src = "${src}/frontend"; pnpm = pnpm_10; fetcherVersion = 3; - hash = "sha256-u1MvHGUVX3cUs3+ZUVgv8LeL8B/R/USi539NMCOZ06E="; + hash = "sha256-LrK0ijH8ahmDU4t9ckmIf1TJmybLLDRRHA67djUwRBk="; }; pnpmRoot = "../frontend"; diff --git a/pkgs/by-name/hu/huion-switcher/package.nix b/pkgs/by-name/hu/huion-switcher/package.nix index c2e8d27461dd..6fd474a1eab0 100644 --- a/pkgs/by-name/hu/huion-switcher/package.nix +++ b/pkgs/by-name/hu/huion-switcher/package.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "huion-switcher"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "whot"; repo = "huion-switcher"; tag = finalAttrs.version; - hash = "sha256-+cMvBVtJPbsJhEmOh3SEXZrVwp9Uuvx6QmUCcpenS20="; + hash = "sha256-tdXebOUTu/O1piLt9VJaR1KC2J5tzdNh2rcy80vYtZ0="; }; buildInputs = [ udev ]; @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: { udevCheckHook ]; - cargoHash = "sha256-yj55FMdf91ZG95yuMt3dQFhUjYM0/sUfFKB+W+5xEfo="; + cargoHash = "sha256-H/E3qE9ELZQPxfO6DYEGksl6mACMCYYGJ8CysBS6+/c="; postInstall = '' mv huion-switcher.{man,1} diff --git a/pkgs/by-name/hy/hyprlock/package.nix b/pkgs/by-name/hy/hyprlock/package.nix index 7c76ebd828d6..6cc042a5c152 100644 --- a/pkgs/by-name/hy/hyprlock/package.nix +++ b/pkgs/by-name/hy/hyprlock/package.nix @@ -28,13 +28,13 @@ gcc15Stdenv.mkDerivation (finalAttrs: { pname = "hyprlock"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprlock"; rev = "v${finalAttrs.version}"; - hash = "sha256-qxR0w0wC6Bv96C/Kzx3mL1bUS8ejwhIm7eVVR9AA88c="; + hash = "sha256-/r7jqBLcm3NSkqVYk8AE8b/qWKo8AKgzX3y2yLZeGvg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/je/jenkins/package.nix b/pkgs/by-name/je/jenkins/package.nix index 191a07ec7995..5d2c0ef05987 100644 --- a/pkgs/by-name/je/jenkins/package.nix +++ b/pkgs/by-name/je/jenkins/package.nix @@ -18,11 +18,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "jenkins"; - version = "2.541.3"; + version = "2.555.1"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${finalAttrs.version}/jenkins.war"; - hash = "sha256-AACt36hyKWMWQTek4OYKvCJ9nWBxDE3rGUgfmnUc9RI="; + hash = "sha256-Jgi6WMalbGU/Cr9axidxlJohdDffKZ3/OQg743y3vQM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/js/json-sort/package.nix b/pkgs/by-name/js/json-sort/package.nix new file mode 100644 index 000000000000..2639120b95d1 --- /dev/null +++ b/pkgs/by-name/js/json-sort/package.nix @@ -0,0 +1,39 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "json-sort"; + version = "0.1.1"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "drupol"; + repo = "json-sort"; + tag = finalAttrs.version; + hash = "sha256-U88bP1jVk5imwvSSxN16yaelzq1OhztgUA3MK4FbGnY="; + }; + + cargoHash = "sha256-jnuy00eE0/AaZXURjGRt7WPTLcVY4Hl45AuoR04gqRY="; + + dontUseCargoParallelTests = true; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Command-line tool to sort JSON object keys in-place, preserving formatting and comments"; + homepage = "https://github.com/drupol/json-sort"; + license = lib.licenses.eupl12; + mainProgram = "json-sort"; + maintainers = with lib.maintainers; [ drupol ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/ko/koffan/package.nix b/pkgs/by-name/ko/koffan/package.nix index d5d3fd88bcb4..05fa4eeb5bbe 100644 --- a/pkgs/by-name/ko/koffan/package.nix +++ b/pkgs/by-name/ko/koffan/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "koffan"; - version = "2.3.1"; + version = "2.9.0"; src = fetchFromGitHub { owner = "PanSalut"; repo = "Koffan"; tag = "v${finalAttrs.version}"; - hash = "sha256-MCc60vQtVDfnroXMbcYu9QdFfAVYF5PJfD4xE1gKroE="; + hash = "sha256-GZmw4UoHoCeLhzAn0GWXR6c/61bYxtngGC2cND+XS5c="; }; - vendorHash = "sha256-9QNqW1Cif5sNuI5rvM5JoBTdEwWWXROcmMOVP2eOc2M="; + vendorHash = "sha256-BYehi5LQQ0MIsKG/fN3DHaQwKVmxUFrvWGrKZeKj+ow="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ko/koodo-reader/package.nix b/pkgs/by-name/ko/koodo-reader/package.nix index c1013d200b71..1a9009d5d59b 100644 --- a/pkgs/by-name/ko/koodo-reader/package.nix +++ b/pkgs/by-name/ko/koodo-reader/package.nix @@ -8,7 +8,7 @@ copyDesktopItems, cctools, makeWrapper, - nodejs, + nodejs-slim, yarnConfigHook, yarnBuildHook, wrapGAppsHook3, @@ -44,8 +44,9 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper - nodejs - (nodejs.python.withPackages (ps: [ ps.setuptools ])) + nodejs-slim + nodejs-slim.npm + (nodejs-slim.python.withPackages (ps: [ ps.setuptools ])) yarnConfigHook yarnBuildHook ] @@ -65,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { chmod -R u+w electron-dist # we need to build cpu-features with the non-electron headers first - export npm_config_nodedir=${nodejs} + export npm_config_nodedir=${nodejs-slim} npm rebuild --verbose cpu-features export npm_config_nodedir=${electron.headers} diff --git a/pkgs/by-name/li/librewolf-unwrapped/librewolf.nix b/pkgs/by-name/li/librewolf-unwrapped/librewolf.nix index 451272246c32..a1cd00a257d5 100644 --- a/pkgs/by-name/li/librewolf-unwrapped/librewolf.nix +++ b/pkgs/by-name/li/librewolf-unwrapped/librewolf.nix @@ -30,6 +30,8 @@ rec { cp ${source}/assets/search-config.json services/settings/dumps/main/search-config.json sed -i '/MOZ_SERVICES_HEALTHREPORT/ s/True/False/' browser/moz.configure + sed -i '/# This must remain last./i gkrust_features += ["glean_disable_upload"]\'$'\n' toolkit/library/rust/gkrust-features.mozbuild + cp ${source}/patches/pref-pane/category-librewolf.svg browser/themes/shared/preferences cp ${source}/patches/pref-pane/librewolf.css browser/themes/shared/preferences cp ${source}/patches/pref-pane/librewolf.inc.xhtml browser/components/preferences diff --git a/pkgs/by-name/li/librewolf-unwrapped/package.nix b/pkgs/by-name/li/librewolf-unwrapped/package.nix index a3826334a130..d279ee6ccf2c 100644 --- a/pkgs/by-name/li/librewolf-unwrapped/package.nix +++ b/pkgs/by-name/li/librewolf-unwrapped/package.nix @@ -48,5 +48,9 @@ in }).override { crashreporterSupport = false; - enableOfficialBranding = false; + # This will set `MOZILLA_OFFICIAL=1`, which is set by the mozconfig upstream, but has to + # be set manually in our case. + # This will not override the branding as `branding` is already set to the official + # Librewolf branding. + enableOfficialBranding = true; } diff --git a/pkgs/by-name/li/librewolf-unwrapped/src.json b/pkgs/by-name/li/librewolf-unwrapped/src.json index 12adef839149..ce93d8944f06 100644 --- a/pkgs/by-name/li/librewolf-unwrapped/src.json +++ b/pkgs/by-name/li/librewolf-unwrapped/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "149.0-1", + "packageVersion": "149.0.2-2", "source": { - "rev": "149.0-1", - "hash": "sha256-lf9psaFT9PMk8CozjvUqBb6hxHct2kdzcVbQDbID+0U=" + "rev": "149.0.2-2", + "hash": "sha256-rnDL98f3vwpcRmWfNuTcp2SDk6CKiOPEZFYnNsVDUa0=" }, "firefox": { - "version": "149.0", - "hash": "sha512-zdhxp3OPtw2FpwPonEh00b9EGEtMmyiQGQKty/olwZlnXnRjBrtZ1mgh5uzRfgfJm2akjYJ/OazKbDsBK5U3Gg==" + "version": "149.0.2", + "hash": "sha512-hEpG7gaOzcZrcifQiaBXrT9JRRFP6iyygNXio4PQoCL8ZiitV8Bo6jTPFZRy9jxQ6n7RKLwRoLJ/Frt7Z9fzzw==" } } diff --git a/pkgs/by-name/lk/lk-jwt-service/package.nix b/pkgs/by-name/lk/lk-jwt-service/package.nix index 48bb6edd3bba..44c019d9b691 100644 --- a/pkgs/by-name/lk/lk-jwt-service/package.nix +++ b/pkgs/by-name/lk/lk-jwt-service/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "lk-jwt-service"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "element-hq"; repo = "lk-jwt-service"; tag = "v${finalAttrs.version}"; - hash = "sha256-xL+fqWzaIP01gnJLQ+DRY7ak6DwsOnLqLM3DUGAqsVY="; + hash = "sha256-ThmQeXSzjpfPbgjvBITtracM4Hdx3gJbqhwk2OC7Y54="; }; - vendorHash = "sha256-DdZg2UHta/ivGmIPO0jK9Gz758kEK7nm4FOv1qx/AUk="; + vendorHash = "sha256-1D04GhXhGrOcRn8G+xY+3XEdgUBSWHis4DiKQ4gGNDw="; passthru.tests = nixosTests.lk-jwt-service; diff --git a/pkgs/by-name/lo/lockbook-desktop/package.nix b/pkgs/by-name/lo/lockbook-desktop/package.nix index 268e83f9e710..e63092003efb 100644 --- a/pkgs/by-name/lo/lockbook-desktop/package.nix +++ b/pkgs/by-name/lo/lockbook-desktop/package.nix @@ -18,16 +18,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "lockbook-desktop"; - version = "26.4.9"; + version = "26.4.13"; src = fetchFromGitHub { owner = "lockbook"; repo = "lockbook"; tag = finalAttrs.version; - hash = "sha256-MQobOqixxWDuHMLVk7pfIquLSA3rZNYn4MaENAoIsuM="; + hash = "sha256-KkYe07uEj/AO1rxsa4bwVsNO6iyjAFJwHeWAyMH8RPY="; }; - cargoHash = "sha256-sLfZ8c2cbXT2NXcopqKJaX1SMlsi3Zy9V+VDi6zarxs="; + cargoHash = "sha256-/FLR2IXsxBEV9Z6GSJ0MTjIZjApNUN9J2ellKiKtL74="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/lo/lockbook/package.nix b/pkgs/by-name/lo/lockbook/package.nix index fc1482437801..62f20bb4c598 100644 --- a/pkgs/by-name/lo/lockbook/package.nix +++ b/pkgs/by-name/lo/lockbook/package.nix @@ -12,16 +12,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "lockbook"; - version = "26.4.8"; + version = "26.4.13"; src = fetchFromGitHub { owner = "lockbook"; repo = "lockbook"; tag = finalAttrs.version; - hash = "sha256-dz4jloG7B/qgtYxDQki8aZiEa+fwvPrzuC9oNoObZR0="; + hash = "sha256-KkYe07uEj/AO1rxsa4bwVsNO6iyjAFJwHeWAyMH8RPY="; }; - cargoHash = "sha256-ZzKNcBWq4RnCiRY69BlCt9GFPDiSk+PxjcoTyTrLJtw="; + cargoHash = "sha256-/FLR2IXsxBEV9Z6GSJ0MTjIZjApNUN9J2ellKiKtL74="; doCheck = false; # there are no cli tests cargoBuildFlags = [ diff --git a/pkgs/by-name/lo/logseq/package.nix b/pkgs/by-name/lo/logseq/package.nix index 6c55dbaebded..abb736643a60 100644 --- a/pkgs/by-name/lo/logseq/package.nix +++ b/pkgs/by-name/lo/logseq/package.nix @@ -15,6 +15,7 @@ makeDesktopItem, makeWrapper, nodejs, + nodejs-slim, removeReferencesTo, yarnBuildHook, yarnConfigHook, @@ -148,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: { fakeGit makeWrapper nodejs - (nodejs.python.withPackages (ps: [ ps.setuptools ])) + (nodejs-slim.python.withPackages (ps: [ ps.setuptools ])) removeReferencesTo yarnBuildHook yarnConfigHook diff --git a/pkgs/by-name/od/odiff/build.zig.zon.nix b/pkgs/by-name/od/odiff/build.zig.zon.nix index 701696565c5c..8843dda633ec 100644 --- a/pkgs/by-name/od/odiff/build.zig.zon.nix +++ b/pkgs/by-name/od/odiff/build.zig.zon.nix @@ -1,165 +1,78 @@ -# generated by zon2nix (https://github.com/Cloudef/zig2nix) +# generated by zon2nix (https://github.com/nix-community/zon2nix) { - lib, linkFarm, - fetchurl, + fetchzip, fetchgit, - runCommandLocal, - zig, - name ? "zig-packages", }: -let - unpackZigArtifact = - { name, artifact }: - runCommandLocal name { nativeBuildInputs = [ zig ]; } '' - hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})" - mv "$TMPDIR/p/$hash" "$out" - chmod 755 "$out" - ''; - - fetchZig = - { - name, - url, - hash, - }: - let - artifact = fetchurl { inherit url hash; }; - in - unpackZigArtifact { inherit name artifact; }; - - fetchGitZig = - { - name, - url, - hash, - rev ? throw "rev is required, remove and regenerate the zon2json-lock file", - }: - let - parts = lib.splitString "#" url; - url_base = lib.elemAt parts 0; - url_without_query = lib.elemAt (lib.splitString "?" url_base) 0; - in - fetchgit { - inherit name rev hash; - url = url_without_query; - deepClone = false; - }; - - fetchZigArtifact = - { - name, - url, - hash, - ... - }@args: - let - parts = lib.splitString "://" url; - proto = lib.elemAt parts 0; - path = lib.elemAt parts 1; - fetcher = { - "git+http" = fetchGitZig ( - args - // { - url = "http://${path}"; - } - ); - "git+https" = fetchGitZig ( - args - // { - url = "https://${path}"; - } - ); - http = fetchZig { - inherit name hash; - url = "http://${path}"; - }; - https = fetchZig { - inherit name hash; - url = "https://${path}"; - }; - }; - in - fetcher.${proto}; -in -linkFarm name [ +linkFarm "zig-packages" [ { - name = "imgz-0.2.0-BqHzkKdnCwCNWVkntlBIrAD-_DByuc4fQQN7xy0pB-D6"; - path = fetchZigArtifact { - name = "imgz"; - url = "git+https://github.com/shreyassanthu77/imgz.git#0ab36f0649772a5dd93d9eab9e7a8a22082a9256"; - hash = "sha256-JuYja284173noSQ4r8FkUuVasw7o8eqpRdrd+p7RYRU="; - rev = "0ab36f0649772a5dd93d9eab9e7a8a22082a9256"; - }; - } - { - name = "N-V-__8AAModCAATNPKPcCapFcZFQHw0a8VjUyjAokEkvmW7"; - path = fetchZigArtifact { - name = "spng_upstream"; - url = "https://github.com/randy408/libspng/archive/refs/tags/v0.7.4.zip"; - hash = "sha256-eokGtSeXby2SYlRVg1HpKosinTLwMwBInGnzGI0xyG4="; - }; - } - { - name = "N-V-__8AAPdUlQAUAx3gzEYFfTSNog15JPi1d6S5uDyDt-qA"; - path = fetchZigArtifact { - name = "libjpeg_turbo_upstream"; - url = "https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/3.1.2.zip"; - hash = "sha256-bgBBn9o4FVDeGE2jxmIEHnvhEgL4Cj7Bd5VNVSIcJ1c="; - }; - } - { - name = "N-V-__8AAM5leQDoUCIdk0aoRB23XUlXRCDajkBojfoAcK9q"; - path = fetchZigArtifact { - name = "libtiff_upstream"; - url = "https://gitlab.com/libtiff/libtiff/-/archive/57dd777d7f4ec687e067dc51ec99877e774b57fe/libtiff-57dd777d7f4ec687e067dc51ec99877e774b57fe.tar.gz"; - hash = "sha256-ylvL3HHDXhuKy2SI/4U2BZka5w/GBqSSSOhvKp4fhd0="; - }; - } - { - name = "zlib-1.3.1-ZZQ7lbYMAAB1hTSOKSXAKAgHsfDcyWNH_37ojw5WSpgR"; - path = fetchZigArtifact { - name = "zlib"; - url = "git+https://github.com/allyourcodebase/zlib#61e7df7e996ec5a5f13a653db3c419adb340d6ef"; - hash = "sha256-Z9TlunK+ISlTPbudB63dpkGeQO+5epGdAI4qfBd9ra0="; - rev = "61e7df7e996ec5a5f13a653db3c419adb340d6ef"; + name = "N-V-__8AAAgPfAB2dLHqe8Vw--VN8ULPqqYFewfk4tobT8ov"; + path = fetchgit { + url = "https://github.com/webmproject/libwebp.git"; + rev = "23359a1039d054b6e46ca97fa8789a755457fbd5"; + hash = "sha256-CrFA9utsqHc5UE8ue6yqMTlUQCjFDpOMYPK6aB0dRd4="; }; } { name = "N-V-__8AAB0eQwD-0MdOEBmz7intriBReIsIDNlukNVoNu6o"; - path = fetchZigArtifact { - name = "zlib"; + path = fetchzip { url = "https://github.com/madler/zlib/archive/refs/tags/v1.3.1.tar.gz"; - hash = "sha256-F+iIY/NgBnKrSRgvIXKBtvxNPHYr3jYZNeQ2qVIU0Fw="; - }; - } - { - name = "zstd-1.5.7-KEItkJ8vAAC5_rRlKmLflYQ-eKXbAIQBWZNmmJtS18q0"; - path = fetchZigArtifact { - name = "zstd"; - url = "git+https://github.com/allyourcodebase/zstd.git?ref=1.5.7#01327d49cbc56dc24c20a167bb0055d7fc23de84"; - hash = "sha256-1w+hR2U9t6R4sNvUMynDsYO0sNAan2svjxjUvxT+x6A="; - rev = "01327d49cbc56dc24c20a167bb0055d7fc23de84"; + hash = "sha256-TkPLWSN5QcPlL9D0kc/yhH0/puE9bFND24aj5NVDKYs="; }; } { name = "N-V-__8AAGxifwAAGwXwvsnl_aOXFGLZTeYCu0WBhuEXr96u"; - path = fetchZigArtifact { - name = "zstd"; - url = "git+https://github.com/facebook/zstd.git?ref=v1.5.7#f8745da6ff1ad1e7bab384bd1f9d742439278e99"; - hash = "sha256-tNFWIT9ydfozB8dWcmTMuZLCQmQudTFJIkSr0aG7S44="; + path = fetchgit { + url = "https://github.com/facebook/zstd.git"; rev = "f8745da6ff1ad1e7bab384bd1f9d742439278e99"; + hash = "sha256-tNFWIT9ydfozB8dWcmTMuZLCQmQudTFJIkSr0aG7S44="; }; } { - name = "N-V-__8AAAgPfAB2dLHqe8Vw--VN8ULPqqYFewfk4tobT8ov"; - path = fetchZigArtifact { - name = "libwebp_upstream"; - url = "git+https://github.com/webmproject/libwebp.git#23359a1039d054b6e46ca97fa8789a755457fbd5"; - hash = "sha256-CrFA9utsqHc5UE8ue6yqMTlUQCjFDpOMYPK6aB0dRd4="; - rev = "23359a1039d054b6e46ca97fa8789a755457fbd5"; + name = "N-V-__8AAM5leQDoUCIdk0aoRB23XUlXRCDajkBojfoAcK9q"; + path = fetchzip { + url = "https://gitlab.com/libtiff/libtiff/-/archive/57dd777d7f4ec687e067dc51ec99877e774b57fe/libtiff-57dd777d7f4ec687e067dc51ec99877e774b57fe.tar.gz"; + hash = "sha256-k3vR3acwdiPw8rwI/U7QKX//8lWZgDypBA2ARabFJHo="; + }; + } + { + name = "N-V-__8AAModCAATNPKPcCapFcZFQHw0a8VjUyjAokEkvmW7"; + path = fetchzip { + url = "https://github.com/randy408/libspng/archive/refs/tags/v0.7.4.zip"; + hash = "sha256-BiRuPQEKVJYYgfUsglIuxrBoJBFiQ0ygQmAFrVvCz4Q="; + }; + } + { + name = "N-V-__8AAPdUlQAUAx3gzEYFfTSNog15JPi1d6S5uDyDt-qA"; + path = fetchzip { + url = "https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/3.1.2.zip"; + hash = "sha256-tmeWLJxieV42f9ljSpKJoLER4QOYQLsLFC7jW54YZAk="; + }; + } + { + name = "imgz-0.2.0-BqHzkKdnCwCNWVkntlBIrAD-_DByuc4fQQN7xy0pB-D6"; + path = fetchgit { + url = "https://github.com/shreyassanthu77/imgz.git"; + rev = "0ab36f0649772a5dd93d9eab9e7a8a22082a9256"; + hash = "sha256-JuYja284173noSQ4r8FkUuVasw7o8eqpRdrd+p7RYRU="; + }; + } + { + name = "zlib-1.3.1-ZZQ7lbYMAAB1hTSOKSXAKAgHsfDcyWNH_37ojw5WSpgR"; + path = fetchgit { + url = "https://github.com/allyourcodebase/zlib"; + rev = "61e7df7e996ec5a5f13a653db3c419adb340d6ef"; + hash = "sha256-Z9TlunK+ISlTPbudB63dpkGeQO+5epGdAI4qfBd9ra0="; + }; + } + { + name = "zstd-1.5.7-KEItkJ8vAAC5_rRlKmLflYQ-eKXbAIQBWZNmmJtS18q0"; + path = fetchgit { + url = "https://github.com/allyourcodebase/zstd.git"; + rev = "01327d49cbc56dc24c20a167bb0055d7fc23de84"; + hash = "sha256-1w+hR2U9t6R4sNvUMynDsYO0sNAan2svjxjUvxT+x6A="; }; } ] diff --git a/pkgs/by-name/op/openems/boost-1.89.patch b/pkgs/by-name/op/openems/boost-1.89.patch new file mode 100644 index 000000000000..b9d5ffeaf231 --- /dev/null +++ b/pkgs/by-name/op/openems/boost-1.89.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index caeac56..64c1e18 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -123,7 +123,6 @@ link_directories(${HDF5_LIBRARIES}) + # boost + find_package(Boost 1.46 COMPONENTS + thread +- system + date_time + serialization + chrono diff --git a/pkgs/by-name/op/openems/package.nix b/pkgs/by-name/op/openems/package.nix index d336bf62f538..76cbebac14b4 100644 --- a/pkgs/by-name/op/openems/package.nix +++ b/pkgs/by-name/op/openems/package.nix @@ -44,6 +44,8 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/thliebig/openEMS/commit/e02e2a8414355482145240e4c2b2464d7a26dd9e.patch"; hash = "sha256-y3pvim/8XUKF5k7shj0D+8P6tdfSZ3E/gxTogbRtxdo="; }) + # boost 1.89 removed the boost_system stub library + ./boost-1.89.patch ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/op/opentabletdriver/package.nix b/pkgs/by-name/op/opentabletdriver/package.nix index ea6735f171dc..d435bdc16f36 100644 --- a/pkgs/by-name/op/opentabletdriver/package.nix +++ b/pkgs/by-name/op/opentabletdriver/package.nix @@ -97,7 +97,7 @@ buildDotnetModule (finalAttrs: { mv $out/bin/OpenTabletDriver.Daemon $out/bin/otd-daemon mv $out/bin/OpenTabletDriver.UX.Gtk $out/bin/otd-gui - install -Dm644 $src/OpenTabletDriver.UX/Assets/otd.png -t $out/share/pixmaps + install -Dm644 $src/OpenTabletDriver.UX/Assets/otd.png -t $out/share/icons # Generate udev rules from source mkdir -p $out/lib/udev/rules.d diff --git a/pkgs/by-name/op/openvscode-server/package.nix b/pkgs/by-name/op/openvscode-server/package.nix index 55375fa981ab..074d42c058e5 100644 --- a/pkgs/by-name/op/openvscode-server/package.nix +++ b/pkgs/by-name/op/openvscode-server/package.nix @@ -11,6 +11,7 @@ pkg-config, runCommand, nodejs_22, + nodejs-slim_22, node-gyp, libsecret, libkrb5, @@ -100,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ nodejs - nodejs.python + nodejs-slim_22.python pkg-config makeWrapper git diff --git a/pkgs/by-name/os/osrm-backend/package.nix b/pkgs/by-name/os/osrm-backend/package.nix index c165663b89a3..9e7282fe669c 100644 --- a/pkgs/by-name/os/osrm-backend/package.nix +++ b/pkgs/by-name/os/osrm-backend/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch2, cmake, pkg-config, bzip2, @@ -18,23 +17,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "osrm-backend"; - version = "6.0.0"; + version = "26.4.0"; src = fetchFromGitHub { owner = "Project-OSRM"; repo = "osrm-backend"; - tag = "V${finalAttrs.version}"; - hash = "sha256-R2Sx+DbT6gROI8X1fkxqOGbMqgmsnNiw2rUX6gSZuTs="; + tag = "v${finalAttrs.version}"; + hash = "sha256-DV0oy++PrOwbybFEFRWnNxGfYshgsqDaHrHuVoTlIXE="; }; - patches = [ - (fetchpatch2 { - name = "Fix-build-with-Boost-1.89.0.patch"; - url = "https://github.com/Project-OSRM/osrm-backend/commit/a2e159d0d4f6b3922ee0cb058a800230cf90642e.patch?full_index=1"; - hash = "sha256-c+4Ll660jHLnFolehCpZQLca4pmyVsBfjwSY1BHBh40="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config @@ -70,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://project-osrm.org/"; description = "Open Source Routing Machine computes shortest paths in a graph. It was designed to run well with map data from the Openstreetmap Project"; - changelog = "https://github.com/Project-OSRM/osrm-backend/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + changelog = "https://github.com/Project-OSRM/osrm-backend/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ erictapen ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/ow/owi/package.nix b/pkgs/by-name/ow/owi/package.nix index 76acc5d52089..7a516efd3dd7 100644 --- a/pkgs/by-name/ow/owi/package.nix +++ b/pkgs/by-name/ow/owi/package.nix @@ -15,14 +15,14 @@ let in ocamlPackages.buildDunePackage { pname = "owi"; - version = "0.2-unstable-2026-04-01"; + version = "0.2-unstable-2026-04-08"; src = fetchFromGitHub { owner = "ocamlpro"; repo = "owi"; - rev = "f109b9a448771c2877d8f52b38a01edb4c0591b1"; + rev = "8357ccd5a43d1e2f9d5648a96286c6b8e6b59b37"; fetchSubmodules = true; - hash = "sha256-Ubw7LCum/lNgBphCHo8FdW1qRMU1lKX1c9eIKxRv56I="; + hash = "sha256-4QOUX8iwn826g2rB2fwsFZhrzViZsKONXa5yxCFPT/8="; }; nativeBuildInputs = with ocamlPackages; [ diff --git a/pkgs/by-name/ox/oxwm/package.nix b/pkgs/by-name/ox/oxwm/package.nix index 89fa968e1bdb..c6872949943b 100644 --- a/pkgs/by-name/ox/oxwm/package.nix +++ b/pkgs/by-name/ox/oxwm/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - zig, + zig_0_15, pkg-config, libx11, libxft, @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - zig.hook + zig_0_15.hook pkg-config ]; diff --git a/pkgs/by-name/pe/peergos/package.nix b/pkgs/by-name/pe/peergos/package.nix index 850192c2131b..bfdb217698fb 100644 --- a/pkgs/by-name/pe/peergos/package.nix +++ b/pkgs/by-name/pe/peergos/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, ant, - jdk, + jdk25, openjdk8-bootstrap, jre, stripJavaArchivesHook, @@ -14,13 +14,13 @@ let tweetnacl = stdenv.mkDerivation { pname = "tweetnacl"; - version = "0-unstable-2020-02-12"; + version = "0-unstable-2025-11-06"; src = fetchFromGitHub { owner = "ianopolous"; repo = "tweetnacl-java"; - rev = "6d1bde81ea63051750cda40422b62e478b85d2b0"; - hash = "sha256-BDWzDpUBi4UuvxFwA9ton+RtHOzDcWql1ti+cdvhzks="; + rev = "0cf99e1921b79eb91bc4c27cc15a27e325dbdb75"; + hash = "sha256-RyyC3/XhOhL7UxtPd2WODJgG6mPqkF/KDtvoa8PKWEM="; }; postPatch = '' @@ -41,18 +41,19 @@ let in stdenv.mkDerivation rec { pname = "peergos"; - version = "1.22.0"; + version = "1.24.0"; + src = fetchFromGitHub { owner = "Peergos"; repo = "web-ui"; rev = "v${version}"; - hash = "sha256-0/kLWX3IbVH5FnffIER/VK2PJpJXOyBECc1upvEcWHI="; + hash = "sha256-qZUYtiqEoYs7gal164Qnum83xgRq/wPXz7cLiuqM278="; fetchSubmodules = true; }; nativeBuildInputs = [ ant - jdk + jdk25 stripJavaArchivesHook makeWrapper ]; diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix index 9908e2f860bc..53c11960ccd8 100644 --- a/pkgs/by-name/ph/phpunit/package.nix +++ b/pkgs/by-name/ph/phpunit/package.nix @@ -8,16 +8,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "phpunit"; - version = "13.1.1"; + version = "13.1.5"; src = fetchFromGitHub { owner = "sebastianbergmann"; repo = "phpunit"; tag = finalAttrs.version; - hash = "sha256-M6O+jfS2B3QUPJoxrVHW8PmeTw77D+oDoLkDstyJ5Vs="; + hash = "sha256-ulOpOQUU6uSqQr1F8BHpb0ad+4c4JrN0cK8H9n4y0Lw="; }; - vendorHash = "sha256-vpUVKV8+Ymoir8YmyoyRqdvQnUtYp1+HmjEuPGtxRy0="; + vendorHash = "sha256-5Va/2Px2jwieeY44BlsscOWmGozcj/jGqAhIm81BCCY="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pk/pkl-lsp/package.nix b/pkgs/by-name/pk/pkl-lsp/package.nix index b3645dbbe16a..30baa5d1030e 100644 --- a/pkgs/by-name/pk/pkl-lsp/package.nix +++ b/pkgs/by-name/pk/pkl-lsp/package.nix @@ -7,7 +7,7 @@ makeBinaryWrapper, nix-update-script, versionCheckHook, - zig, + zig_0_15, }: let @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail 'val jdkVersion: Int = 22' \ 'val jdkVersion: Int = ${lib.versions.major jdk.version}' \ --replace-fail 'val executable: Path get() = installDir.resolve(if (os.isWindows) "zig.exe" else "zig")' \ - 'val executable: Path get() = java.nio.file.Path.of("${lib.getExe zig}")' \ + 'val executable: Path get() = java.nio.file.Path.of("${lib.getExe zig_0_15}")' \ substituteInPlace build.gradle.kts \ --replace-fail 'dependsOn(setupTreeSitterRepo)' "" \ @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ gradleOverlay makeBinaryWrapper - zig + zig_0_15 ]; mitmCache = gradle.fetchDeps { diff --git a/pkgs/by-name/pr/protonplus/package.nix b/pkgs/by-name/pr/protonplus/package.nix index 23145b3ae290..6bb3430fdc81 100644 --- a/pkgs/by-name/pr/protonplus/package.nix +++ b/pkgs/by-name/pr/protonplus/package.nix @@ -20,13 +20,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "protonplus"; - version = "0.5.17"; + version = "0.5.19"; src = fetchFromGitHub { owner = "Vysp3r"; repo = "protonplus"; tag = "v${finalAttrs.version}"; - hash = "sha256-RusqseGVmHw9mWerKo1ooGRx1WZqWhaBPTpcqZsQ7ME="; + hash = "sha256-tE5qOga63dvbs9J9EX8XahzTZQVT+7T6+TsGPAiLbio="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/qs/qsv/package.nix b/pkgs/by-name/qs/qsv/package.nix index 4a79efdfe70f..3eb96885a7e8 100644 --- a/pkgs/by-name/qs/qsv/package.nix +++ b/pkgs/by-name/qs/qsv/package.nix @@ -15,7 +15,7 @@ withUi ? true, buildFeatures ? # enable all features except self_update by default - # https://github.com/dathere/qsv/blob/19.0.0/Cargo.toml#L370 + # https://github.com/dathere/qsv/blob/19.1.0/Cargo.toml#L370 [ "apply" "feature_capable" @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "qsv"; - version = "19.0.0"; + version = "19.1.0"; inherit buildFeatures; @@ -41,10 +41,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "dathere"; repo = "qsv"; rev = finalAttrs.version; - hash = "sha256-/v1dP+9YIhIbqpOYCOseMZLNCpqz/FzVs6gynjlH53k="; + hash = "sha256-R3Bv0Jkq5esLQSXbhk9m3Xr9K6EmqMtc3iDF7yRspJ0="; }; - cargoHash = "sha256-oswPJRzbvVnhrDLQQceKwgJ3Klza1G6dT4eQvpAy+8Y="; + cargoHash = "sha256-Wk5OVUKVWHvhWc1ItJcOafY75Pd8ucA3XAGUR//mtqg="; buildInputs = [ file diff --git a/pkgs/by-name/ra/rattler-build/package.nix b/pkgs/by-name/ra/rattler-build/package.nix index 8fb1a0cffe8f..ddee6bf15594 100644 --- a/pkgs/by-name/ra/rattler-build/package.nix +++ b/pkgs/by-name/ra/rattler-build/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rattler-build"; - version = "0.61.4"; + version = "0.62.2"; src = fetchFromGitHub { owner = "prefix-dev"; repo = "rattler-build"; tag = "v${finalAttrs.version}"; - hash = "sha256-wW2NVfEMFQaQZG9hAhw5I/lR5Ay1nTs49FTa4c1LL0M="; + hash = "sha256-nFXtbY2gVrS7zLTcCMOJLyL79Xi7Zw463OtoGL4zUYI="; }; - cargoHash = "sha256-yRPr1ENHkN7XqRgy937iE7gAvcWDXyqwHXOUhU6S/Pg="; + cargoHash = "sha256-dOXCwbasxqbcInm3YeYxDOckEDrQte9NESKUjf9zslk="; doCheck = false; # test requires network access diff --git a/pkgs/by-name/re/redisinsight/package.nix b/pkgs/by-name/re/redisinsight/package.nix index 9e60587cda32..88cba1ea6928 100644 --- a/pkgs/by-name/re/redisinsight/package.nix +++ b/pkgs/by-name/re/redisinsight/package.nix @@ -9,7 +9,7 @@ copyDesktopItems, dart-sass, makeWrapper, - nodejs_20, + nodejs-slim_20, pkg-config, yarnConfigHook, @@ -19,7 +19,7 @@ }: let - nodejs = nodejs_20; + nodejs = nodejs-slim_20; in stdenv.mkDerivation (finalAttrs: { pname = "redisinsight"; diff --git a/pkgs/by-name/ri/river-ultitile/build.zig.zon.nix b/pkgs/by-name/ri/river-ultitile/build.zig.zon.nix index 12ed09927d06..059e1411a333 100644 --- a/pkgs/by-name/ri/river-ultitile/build.zig.zon.nix +++ b/pkgs/by-name/ri/river-ultitile/build.zig.zon.nix @@ -1,96 +1,13 @@ -# generated by zon2nix (https://github.com/Cloudef/zig2nix) +# generated by zon2nix (https://github.com/nix-community/zon2nix) -{ - lib, - linkFarm, - fetchurl, - fetchgit, - runCommandLocal, - zig, - name ? "zig-packages", -}: +{ linkFarm, fetchzip }: -let - unpackZigArtifact = - { name, artifact }: - runCommandLocal name { nativeBuildInputs = [ zig ]; } '' - hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})" - mv "$TMPDIR/p/$hash" "$out" - chmod 755 "$out" - ''; - - fetchZig = - { - name, - url, - hash, - }: - let - artifact = fetchurl { inherit url hash; }; - in - unpackZigArtifact { inherit name artifact; }; - - fetchGitZig = - { - name, - url, - hash, - rev ? throw "rev is required, remove and regenerate the zon2json-lock file", - }: - let - parts = lib.splitString "#" url; - url_base = lib.elemAt parts 0; - url_without_query = lib.elemAt (lib.splitString "?" url_base) 0; - in - fetchgit { - inherit name rev hash; - url = url_without_query; - deepClone = false; - }; - - fetchZigArtifact = - { - name, - url, - hash, - ... - }@args: - let - parts = lib.splitString "://" url; - proto = lib.elemAt parts 0; - path = lib.elemAt parts 1; - fetcher = { - "git+http" = fetchGitZig ( - args - // { - url = "http://${path}"; - } - ); - "git+https" = fetchGitZig ( - args - // { - url = "https://${path}"; - } - ); - http = fetchZig { - inherit name hash; - url = "http://${path}"; - }; - https = fetchZig { - inherit name hash; - url = "https://${path}"; - }; - }; - in - fetcher.${proto}; -in -linkFarm name [ +linkFarm "zig-packages" [ { name = "wayland-0.3.0-lQa1kjPIAQDmhGYpY-zxiRzQJFHQ2VqhJkQLbKKdt5wl"; - path = fetchZigArtifact { - name = "wayland"; + path = fetchzip { url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.3.0.tar.gz"; - hash = "sha256-xU8IrETSFOKKQQMgwVyRKLwGaek4USaKXg49S9oHSTQ="; + hash = "sha256-ydEavD9z20wRwn9ZVX56ZI2T5i1tnm3LupVxfa30o84="; }; } ] diff --git a/pkgs/by-name/rs/rstudio/package.nix b/pkgs/by-name/rs/rstudio/package.nix index a532f4e27a33..77838da0eec0 100644 --- a/pkgs/by-name/rs/rstudio/package.nix +++ b/pkgs/by-name/rs/rstudio/package.nix @@ -17,7 +17,7 @@ git, jdk, makeWrapper, - nodejs, + nodejs-slim, npmHooks, xcbuild, yarn, @@ -135,7 +135,7 @@ stdenv.mkDerivation (finalAttrs: { ant jdk - nodejs + nodejs-slim yarn yarnConfigHook zip @@ -145,7 +145,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (!server) [ makeWrapper - (nodejs.python.withPackages (ps: [ ps.setuptools ])) + (nodejs-slim.python.withPackages (ps: [ ps.setuptools ])) npmHooks.npmConfigHook ]; @@ -289,8 +289,8 @@ stdenv.mkDerivation (finalAttrs: { RSTUDIO_INSTALLED_NODE_VERSION="22.21.1" mkdir -p dependencies/common/node - ln -s ${nodejs} dependencies/common/node/$RSTUDIO_NODE_VERSION - ln -s ${nodejs} dependencies/common/node/$RSTUDIO_INSTALLED_NODE_VERSION-installed + ln -s ${nodejs-slim} dependencies/common/node/$RSTUDIO_NODE_VERSION + ln -s ${nodejs-slim} dependencies/common/node/$RSTUDIO_INSTALLED_NODE_VERSION-installed '' + lib.optionalString (!server) '' diff --git a/pkgs/by-name/sc/scala-cli/sources.json b/pkgs/by-name/sc/scala-cli/sources.json index 6915ac49d239..48c27a2e56d3 100644 --- a/pkgs/by-name/sc/scala-cli/sources.json +++ b/pkgs/by-name/sc/scala-cli/sources.json @@ -1,21 +1,21 @@ { - "version": "1.12.5", + "version": "1.13.0", "assets": { "aarch64-darwin": { "asset": "scala-cli-aarch64-apple-darwin.gz", - "sha256": "1sylwkki7qzqa3ksissic2h9jd2s9bw07mqd25jkc1npcagmn9n5" + "sha256": "05sqnabjflqf7d8qay9zfa17zr4cibjvnzdd2xgh329gax3hv41j" }, "aarch64-linux": { "asset": "scala-cli-aarch64-pc-linux.gz", - "sha256": "07w90ld5vs2mcbjlcj4cv6gif7wvz87zlsxn74nzqdy26fmb7k13" + "sha256": "0ahc0q650q4jq21b2y59ml53943d5ky3967kb9iglli9y7cv7ih3" }, "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "1fy97chlgg77sbq2bxpyvpbzxdflj441v01a0qx6ip8ymz043kyq" + "sha256": "0qlrag15yqppi6s857dhbrnmp7bxwpf1w1czfbvq2iz0djbh5w54" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "102pvpyk8sgr3sr8b6i8q7p9c6z59cldphnj193nr6hk7bmgxmi1" + "sha256": "12sbskk7f2pivclwpqaz1p618hrnj2mi0wyf3lccv7w8yk3898xi" } } } diff --git a/pkgs/by-name/sm/smtp4dev/package.nix b/pkgs/by-name/sm/smtp4dev/package.nix index 5a5242481e10..688c80cb603b 100644 --- a/pkgs/by-name/sm/smtp4dev/package.nix +++ b/pkgs/by-name/sm/smtp4dev/package.nix @@ -3,7 +3,7 @@ stdenv, buildDotnetModule, fetchFromGitHub, - nodejs, + nodejs-slim, npmHooks, fetchNpmDeps, dotnetCorePackages, @@ -23,8 +23,9 @@ buildDotnetModule (finalAttrs: { patches = [ ./smtp4dev-npm-packages.patch ]; nativeBuildInputs = [ - nodejs - nodejs.python + nodejs-slim + nodejs-slim.npm + nodejs-slim.python npmHooks.npmConfigHook stdenv.cc # c compiler is needed for compiling npm-deps ]; diff --git a/pkgs/by-name/vs/vsce/package.nix b/pkgs/by-name/vs/vsce/package.nix index 2a44db230520..5c6713883364 100644 --- a/pkgs/by-name/vs/vsce/package.nix +++ b/pkgs/by-name/vs/vsce/package.nix @@ -5,7 +5,7 @@ fetchFromGitHub, pkg-config, libsecret, - nodejs, + nodejs-slim, clang_20, versionCheckHook, nix-update-script, @@ -30,7 +30,7 @@ buildNpmPackage (finalAttrs: { nativeBuildInputs = [ pkg-config - nodejs.python + nodejs-slim.python ] ++ lib.optionals stdenv.isDarwin [ clang_20 ]; # clang_21 breaks @vscode/vsce's optional dependency keytar diff --git a/pkgs/by-name/ya/yazi/plugins/clipboard/default.nix b/pkgs/by-name/ya/yazi/plugins/clipboard/default.nix new file mode 100644 index 000000000000..eb7b05160709 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/clipboard/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "clipboard.yazi"; + version = "0-unstable-2026-02-10"; + + src = fetchFromGitHub { + owner = "XYenon"; + repo = "clipboard.yazi"; + rev = "3b9681091b783d6bc5d07172afd6159060a7db63"; + hash = "sha256-8p2RC8F8JH1K36HebJM58stHX+lFLD+KYQxfdJm06y0="; + }; + + meta = { + description = "Clipboard sync plugin for Yazi that copies yanked file paths to the system clipboard"; + homepage = "https://github.com/XYenon/clipboard.yazi"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ xyenon ]; + }; +} diff --git a/pkgs/by-name/ya/yazi/plugins/yafg/default.nix b/pkgs/by-name/ya/yazi/plugins/yafg/default.nix new file mode 100644 index 000000000000..9caad715c4a2 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/yafg/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "yafg.yazi"; + version = "0-unstable-2026-01-10"; + + src = fetchFromGitHub { + owner = "XYenon"; + repo = "yafg.yazi"; + rev = "dd03b133d6cd1ff92368360558da193517169f9e"; + hash = "sha256-xTZ+6KRr85A4QpPWAE9QN1AnUVnCw/tvRvsWOmmayao="; + }; + + meta = { + description = "Fuzzy find and grep plugin for Yazi file manager with interactive ripgrep and fzf search"; + homepage = "https://github.com/XYenon/yafg.yazi"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ xyenon ]; + }; +} diff --git a/pkgs/by-name/zi/zigfetch/package.nix b/pkgs/by-name/zi/zigfetch/package.nix index 7b30fbe27fe4..dd8dd632c55a 100644 --- a/pkgs/by-name/zi/zigfetch/package.nix +++ b/pkgs/by-name/zi/zigfetch/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - zig, + zig_0_15, pciutils, apple-sdk, replaceVars, @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ - zig + zig_0_15 ]; buildInputs = [ @@ -43,6 +43,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ heisfer ]; mainProgram = "zigfetch"; - inherit (zig.meta) platforms; + inherit (zig_0_15.meta) platforms; }; }) diff --git a/pkgs/by-name/zs/zsh/package.nix b/pkgs/by-name/zs/zsh/package.nix index cd90c2a472a6..fda96e5f40e5 100644 --- a/pkgs/by-name/zs/zsh/package.nix +++ b/pkgs/by-name/zs/zsh/package.nix @@ -16,13 +16,9 @@ nixosTests, }: -let - version = "5.9"; -in - -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "zsh"; - inherit version; + version = "5.9"; outputs = [ "out" "doc" @@ -31,7 +27,7 @@ stdenv.mkDerivation { ]; src = fetchurl { - url = "mirror://sourceforge/zsh/zsh-${version}.tar.xz"; + url = "mirror://sourceforge/zsh/zsh-${finalAttrs.version}.tar.xz"; sha256 = "sha256-m40ezt1bXoH78ZGOh2dSp92UjgXBoNuhCrhjhC1FrNU="; }; @@ -162,9 +158,9 @@ stdenv.mkDerivation { } mv $out/etc/zshenv $out/etc/zshenv_zwc_is_used - rm $out/bin/zsh-${version} + rm $out/bin/zsh-${finalAttrs.version} mkdir -p $out/share/doc/ - mv $out/share/zsh/htmldoc $out/share/doc/zsh-$version + mv $out/share/zsh/htmldoc $out/share/doc/zsh-${finalAttrs.version} ''; # XXX: patch zsh to take zwc if newer _or equal_ @@ -198,4 +194,4 @@ stdenv.mkDerivation { inherit (nixosTests) oh-my-zsh; }; }; -} +}) diff --git a/pkgs/by-name/zs/zsnow/package.nix b/pkgs/by-name/zs/zsnow/package.nix index 61f5488d0e20..72a118b686ba 100644 --- a/pkgs/by-name/zs/zsnow/package.nix +++ b/pkgs/by-name/zs/zsnow/package.nix @@ -1,6 +1,6 @@ { lib, - zig, + zig_0_15, stdenv, fetchFromGitHub, pkg-config, @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - zig + zig_0_15 pkg-config wayland-scanner ]; diff --git a/pkgs/development/compilers/ocaml/4.14.nix b/pkgs/development/compilers/ocaml/4.14.nix index ff658b382de3..2f8e06691eb3 100644 --- a/pkgs/development/compilers/ocaml/4.14.nix +++ b/pkgs/development/compilers/ocaml/4.14.nix @@ -3,4 +3,11 @@ import ./generic.nix { minor_version = "14"; patch_version = "3"; sha256 = "sha256-pdWDuPurnqe/bPly75w45/7ay/9tt6NOMQURXTQ+sGk="; + + patches = [ + { + url = "https://github.com/ocaml/ocaml/commit/929f9aa7c00b45acf2d42f3f127b4ee28f926407.patch"; + hash = "sha256-zeYT+JM71aUcl0sOG2ByjMpp3JPs7kDJ6BKcrZjzoDM="; + } + ]; } diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix index 512cfa80d424..079b539948da 100644 --- a/pkgs/development/compilers/zig/default.nix +++ b/pkgs/development/compilers/zig/default.nix @@ -4,6 +4,7 @@ llvmPackages_18, llvmPackages_19, llvmPackages_20, + llvmPackages_21, zigVersions ? { }, }: let @@ -20,6 +21,10 @@ let llvmPackages = llvmPackages_20; hash = "sha256-u3pEMcYN71d83MJh14vtzU4DJXnMHu/Jw86d9XvwKE8="; }; + "0.16.0" = { + llvmPackages = llvmPackages_21; + hash = "sha256-2sTMhaasyrKoBnyH/hQrNCbi0Vh6HekIrpE4XkyQulQ="; + }; } // zigVersions; diff --git a/pkgs/development/compilers/zig/generic.nix b/pkgs/development/compilers/zig/generic.nix index 69ecd4b21a6f..f311672ad09e 100644 --- a/pkgs/development/compilers/zig/generic.nix +++ b/pkgs/development/compilers/zig/generic.nix @@ -67,6 +67,8 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; + __structuredAttrs = true; + # On Darwin, Zig calls std.zig.system.darwin.macos.detect during the build, # which parses /System/Library/CoreServices/SystemVersion.plist and # /System/Library/CoreServices/.SystemVersionPlatform.plist to determine the diff --git a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix index a3164a34c03c..086238bf1f1e 100644 --- a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "azure-mgmt-keyvault"; - version = "13.0.0"; + version = "14.0.1"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_keyvault"; inherit version; - hash = "sha256-VsEpBObZrEn4hkg+UOP2Ndi/Q6SJ6zL6e0gy8yPTlsc="; + hash = "sha256-0UGoCErkx8W9HK/spJqPP768WNxbxSkPMi6nPYswfvc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix index 58528f09af9b..25850b7ed4b2 100644 --- a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "azure-mgmt-netapp"; - version = "14.0.1"; + version = "15.0.0"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_netapp"; inherit version; - hash = "sha256-P5ZE9oPOO8oLorpyPTdsc7/f4QMQxsl8PoA1Eag/5ng="; + hash = "sha256-0wp5YQK1BFvnmIHaXPMxs0XiXQ9akjWXGYOh2uUc84k="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/bidsschematools/default.nix b/pkgs/development/python-modules/bidsschematools/default.nix index 3585e372d7e5..ad6ee3c4fe9b 100644 --- a/pkgs/development/python-modules/bidsschematools/default.nix +++ b/pkgs/development/python-modules/bidsschematools/default.nix @@ -8,19 +8,19 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bidsschematools"; - version = "1.2.1"; + version = "1.2.2"; pyproject = true; src = fetchFromGitHub { owner = "bids-standard"; repo = "bids-specification"; - tag = "schema-${version}"; - hash = "sha256-BK31NSq4WiQiM/GLxaL8bmce25RRS6ZJvOW7PhS6ByQ="; + tag = "schema-${finalAttrs.version}"; + hash = "sha256-6s5j+aHMiLzDK5X48sD6hVzXpGYWSRX9J3sljt4iqZw="; }; - sourceRoot = "${src.name}/tools/schemacode"; + sourceRoot = "${finalAttrs.src.name}/tools/schemacode"; build-system = [ pdm-backend @@ -42,4 +42,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ wegank ]; }; -} +}) diff --git a/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py b/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py index 1a54775d1dd2..154c0190455f 100644 --- a/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py +++ b/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py @@ -16,7 +16,6 @@ import sys import time import traceback import urllib.error -import urllib.parse import urllib.request import xml.etree.ElementTree as ET from dataclasses import asdict, dataclass @@ -26,7 +25,7 @@ from multiprocessing.dummy import Pool from pathlib import Path from tempfile import NamedTemporaryFile from typing import Any, Callable -from urllib.parse import urljoin, urlparse +from urllib.parse import urljoin, urlparse, urlsplit import git from packaging.version import InvalidVersion, parse as parse_version @@ -407,7 +406,7 @@ class RepoGitHub(Repo): response_url = req.geturl() if url != response_url: new_owner, new_name = ( - urllib.parse.urlsplit(response_url).path.strip("/").split("/")[:2] + urlsplit(response_url).path.strip("/").split("/")[:2] ) new_repo = RepoGitHub(owner=new_owner, repo=new_name, branch=self.branch) @@ -421,10 +420,11 @@ class RepoGitHub(Repo): return sha256 def prefetch_github(self, ref: str) -> str: - cmd = ["nix-prefetch-url", "--unpack", self.url(f"archive/{ref}.tar.gz")] + cmd = ["nix-prefetch-github", self.owner, self.repo, "--rev", ref, "--json"] log.debug("Running %s", cmd) data = subprocess.check_output(cmd) - return data.strip().decode("utf-8") + loaded = json.loads(data) + return loaded["hash"] def as_nix(self, plugin: "Plugin") -> str: if plugin.has_submodules: diff --git a/pkgs/development/python-modules/uiprotect/default.nix b/pkgs/development/python-modules/uiprotect/default.nix index 531f1f4e727c..c89e92739902 100644 --- a/pkgs/development/python-modules/uiprotect/default.nix +++ b/pkgs/development/python-modules/uiprotect/default.nix @@ -38,14 +38,14 @@ buildPythonPackage (finalAttrs: { pname = "uiprotect"; - version = "10.2.3"; + version = "10.2.6"; pyproject = true; src = fetchFromGitHub { owner = "uilibs"; repo = "uiprotect"; tag = "v${finalAttrs.version}"; - hash = "sha256-vEpdGUl2eceF32U8HcCrOVGxsdM0AdcV3v5Ya1ej7Mk="; + hash = "sha256-6QU+K5TGmZ0Me2QWVyECGhHYZ0d1t4h+kZfTsKlHV5s="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/tools/zls/default.nix b/pkgs/development/tools/zls/default.nix index 9e6e2b4eb207..c11969c66225 100644 --- a/pkgs/development/tools/zls/default.nix +++ b/pkgs/development/tools/zls/default.nix @@ -3,6 +3,7 @@ stdenv, zig_0_14, zig_0_15, + zig_0_16, fetchFromGitHub, callPackage, }: @@ -11,6 +12,15 @@ let common = finalAttrs: _: { pname = "zls"; + strictDeps = true; + + zigBuildFlags = [ + "--system" + "${finalAttrs.deps}" + ]; + + __structuredAttrs = true; + meta = { description = "Zig LSP implementation + Zig Language Server"; mainProgram = "zls"; @@ -38,11 +48,9 @@ lib.mapAttrs (_: extension: stdenv.mkDerivation (lib.extends common extension)) hash = "sha256-A5Mn+mfIefOsX+eNBRHrDVkqFDVrD3iXDNsUL4TPhKo="; }; - nativeBuildInputs = [ zig_0_14 ]; + deps = callPackage ./deps_0_14.nix { }; - postConfigure = '' - ln -s ${callPackage ./deps_0_14.nix { }} $ZIG_GLOBAL_CACHE_DIR/p - ''; + nativeBuildInputs = [ zig_0_14 ]; }; zls_0_15 = finalAttrs: { @@ -56,10 +64,24 @@ lib.mapAttrs (_: extension: stdenv.mkDerivation (lib.extends common extension)) hash = "sha256-6IkRtQkn+qUHDz00QvCV/rb2yuF6xWEXug41CD8LLw8="; }; - nativeBuildInputs = [ zig_0_15 ]; + deps = callPackage ./deps_0_15.nix { }; - postConfigure = '' - ln -s ${callPackage ./deps_0_15.nix { }} $ZIG_GLOBAL_CACHE_DIR/p - ''; + nativeBuildInputs = [ zig_0_15 ]; + }; + + zls_0_16 = finalAttrs: { + version = "0.16.0"; + + src = fetchFromGitHub { + owner = "zigtools"; + repo = "zls"; + tag = finalAttrs.version; + fetchSubmodules = true; + hash = "sha256-k0xWObsw9K12BKfK+UB5TieWDFEFfBQhN1X1NO35fWk="; + }; + + deps = callPackage ./deps_0_16.nix { }; + + nativeBuildInputs = [ zig_0_16 ]; }; } diff --git a/pkgs/development/tools/zls/deps_0_16.nix b/pkgs/development/tools/zls/deps_0_16.nix new file mode 100644 index 000000000000..bfde4c321a59 --- /dev/null +++ b/pkgs/development/tools/zls/deps_0_16.nix @@ -0,0 +1,27 @@ +{ + linkFarm, + fetchzip, +}: +linkFarm "zig-packages" [ + { + name = "known_folders-0.0.0-Fy-PJk3KAACzUg2us_0JvQQmod1ZA8jBt7MuoKCihq88"; + path = fetchzip { + url = "https://github.com/ziglibs/known-folders/archive/d6d03830968cca6b7b9f24fd97ee348346a6905d.tar.gz"; + hash = "sha256-8LlAnEwuoeQuN9V5nUuh2UwXRhS5KOwDkpm6yuOfClk="; + }; + } + { + name = "diffz-0.0.1-G2tlISzNAQCldmOcINavGmF1zdt20NFPXeM8d07jp_68"; + path = fetchzip { + url = "https://github.com/ziglibs/diffz/archive/b39fe07e7fdbcf56e43ba2890b9f484f16969f90.tar.gz"; + hash = "sha256-mmgaOXFpoBYMsNdVkoFa7wJKkiXtzXIbSxRUgWLdVUc="; + }; + } + { + name = "lsp_kit-0.1.0-bi_PL3IyDACfp1xdTnkiOHEok2YpPCCCJHuuOcNzjl1D"; + path = fetchzip { + url = "https://github.com/zigtools/lsp-kit/archive/b886a2b0d5cee85ecbcc3089b863f7517cc9ff7f.tar.gz"; + hash = "sha256-367wPydvnpl9RYlTrXwk4bZ/ui9DbYjeY/VDYs7ZJRs="; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca699c5c79be..ca6ce30108ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7570,25 +7570,28 @@ with pkgs; zig_0_13 = zigPackages."0.13"; zig_0_14 = zigPackages."0.14"; zig_0_15 = zigPackages."0.15"; + zig_0_16 = zigPackages."0.16"; }) zigPackages zig_0_13 zig_0_14 zig_0_15 + zig_0_16 ; # If this is updated, the default zls version should also be updated to match the default zig version. - zig = zig_0_15; + zig = zig_0_16; zigStdenv = if stdenv.cc.isZig then stdenv else lowPrio zig.passthru.stdenv; inherit (callPackages ../development/tools/zls { }) zls_0_14 zls_0_15 + zls_0_16 ; # This should be kept updated to ensure the default zls version matches the default zig version. - zls = zls_0_15; + zls = zls_0_16; libzint = zint-qt.override { withGUI = false; };