Skip to content

Bump root nixpkgs to nixos-unstable 2026-10-30 - #1431

Merged
AnthonyRonning merged 3 commits into
masterfrom
chore/nixpkgs-bump
Nov 2, 2026
Merged

AnthonyRonning merged 3 commits into
masterfrom
chore/nixpkgs-bump

Conversation

@AnthonyRonning

@AnthonyRonning AnthonyRonning commented Nov 2, 2026 •

Copy link
Copy Markdown
Contributor

Summary

Bumps the root flake's nixpkgs from 5912c17 (2026-01-07) to 1c89083 (nixos-unstable, 2026-10-30). Replaces #1430, which overrode libsoup alone and forced WebKitGTK, GTK, Qt and GStreamer to compile from source in every Linux shell.

  • libsoup 3.6.5 → 3.8.0, which fixes CVE-2026-102556 through -102560 (WebSocket heap overflows) in the Linux AppImage's bundled copy. WebKitGTK 2.54.1 comes prebuilt from cache.nixos.org.
  • x86_64-darwin dropped. Nixpkgs 26.11 no longer supports it. The flake lists x86_64-linux, aarch64-linux and aarch64-darwin. The universal Mac app still cross-compiles its Intel half on arm64.
  • bun stays on 1.3.5. Nixpkgs now ships 1.4.2. An overlay keeps versions.bun and the Windows setup-bun pin in agreement.
  • coreutils 9.12 quotes names with spaces in md5sum --check output. The deb normalization test accepts both forms. The generated md5sums file is unchanged (checked by hand).
  • stdenv.isLinux/isDarwin → stdenv.hostPlatform.* to clear the new deprecation warnings. The remaining warnings come from rust-overlay.

The proxy, SDK, Agent and OpenSecret flakes keep their own locks and aren't touched.

Validation (local, aarch64-darwin)

  • nix flake check --no-build --all-systems: all systems evaluate.
  • nix flake check with builds: every aarch64-darwin check passes (toolchain, workflows, ci-scripts, release-gates, release-metadata, pages, pcr-compatibility).
  • nix build --dry-run of the x86_64-linux desktop-linux, ci and default shells: the only source builds are our own small wrappers, the Rust toolchain unpack, actionlint and the bun zip. No WebKitGTK, GTK or Qt.
  • Pre-commit components research_frontend, research_rust, auth, updates and agent_updates pass. repo was run through nix flake check instead: on the macOS host, its deb fixture fails the same way on master (LLVM ar), and it passes inside the Nix sandbox.

Still needed

  • Linux lanes and ci:package packaging in CI (label added). After that, confirm the AppImage bundles libsoup 3.8.0.
  • A Linux desktop smoke test of the AppImage before release.

🤖 Generated with Claude Code


View with [code]smith Autofix with [code]smith
Need help on this PR? Tag @codesmith-bot with what you need.

Moves the root flake's nixpkgs from 5912c17 (2026-01-07) to 1c89083
(2026-10-30). This picks up libsoup 3.8.0 (fixes CVE-2026-102556
through CVE-2026-102560 in the Linux AppImage's bundled copy) with
WebKitGTK 2.54.1 prebuilt in cache.nixos.org.

- Nixpkgs 26.11 dropped x86_64-darwin, so the flake lists its systems
  explicitly. The universal Mac app still cross-compiles its Intel half
  from aarch64-darwin.
- Pin bun back to 1.3.5 (versions.bun and setup-bun's Windows pin);
  nixpkgs now ships 1.4.2.
- coreutils 9.12 quotes names with spaces in md5sum --check output; the
  deb normalization test accepts both forms. The generated md5sums file
  is unchanged.
- Switch stdenv.isLinux/isDarwin to the hostPlatform forms.

The proxy, SDK, Agent and OpenSecret flakes keep their own locks.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@AnthonyRonning AnthonyRonning added the ci:package Build unsigned packages on this PR label Nov 2, 2026
@github-actions

github-actions Bot commented Nov 2, 2026 •

Copy link
Copy Markdown
Contributor

Maple Auth development preview: https://10c93f25.maple-auth-dev.pages.dev

Commit: 8bd629f48274dfca5bf941d32242077e8e04136c

Uses development services. Cloudflare Access applies. Provider OAuth is not configured for PR URLs; use the stable Auth Dev host for OAuth rehearsal.

@github-actions

github-actions Bot commented Nov 2, 2026 •

Copy link
Copy Markdown
Contributor

Maple development preview: https://16df2be8.maple-ca8.pages.dev

Commit: 8bd629f48274dfca5bf941d32242077e8e04136c

Uses development API, billing, flags and PCR configuration. Cloudflare Access applies.

The nixpkgs bump moves bubblewrap 0.11 -> 0.12, which refuses to mount
on a symlink destination. On Ubuntu 24.04 /bin is a symlink to usr/bin,
so AppImage bundling failed with "Can't mount on symlink destination
/bin". There /bin already resolves into the /usr bind, whose bin holds
bash and sh, so only bind /bin when it is a real directory.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@AnthonyRonning

Copy link
Copy Markdown
Contributor Author

Pushed 432ffbe: bubblewrap 0.12 (from the bump) refuses to mount on a symlink, and on Ubuntu 24.04 /bin is a symlink to usr/bin, so AppImage bundling failed with Can't mount on symlink destination /bin. The bundling wrapper now binds /bin only where it's a real directory; on merged-/usr hosts it already resolves into the /usr bind.

research-desktop-linux now passes (8m32s). In the CI AppImage (Maple_3.4.7_amd64.AppImage), the only libsoup-3.0.so.0 is built from /nix/store/…-libsoup-3.8.0. The bundled WebKit sandbox bwrap is now 0.12 as well, so a Linux runtime smoke test is still needed before release.

@AnthonyRonning

Copy link
Copy Markdown
Contributor Author

@w3irdrobot can you try this on your debian machine when you have a chance? Im assuming x86

w3irdrobot
w3irdrobot previously approved these changes Nov 2, 2026

@w3irdrobot w3irdrobot left a comment •

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good PR — clean nixpkgs bump, all CI lanes green including the Linux packaging lanes, and the bwrap merged-/usr fix is sound (the /usr bind stages bash/sh, so the #!/bin/bash wrapper shebangs still resolve).

Two small suggestions, neither blocking:

  1. The bun overlay hardcodes version = "1.3.5" and the release URLs even though versions.bun exists in the same let scope. Since Nix is lazy, version = versions.bun; plus templated URLs would keep a single source of truth and avoid a confusing version/hash mismatch on the next bun bump.
  2. The comment in test_linux_rpm_packaging.py says "coreutils 9.9+" while the PR description says 9.12 — worth aligning.

Review follow-up: the bun overlay now takes its version and release URLs
from versions.bun (the dev shell derivations are unchanged), and the
md5sum quoting note names coreutils 9.11, where the change landed.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@AnthonyRonning

Copy link
Copy Markdown
Contributor Author

@w3irdrobot thanks, both taken in 8bd629f:

  1. The bun overlay now uses versions.bun for its version and release URLs. The ci dev shell derivations are byte-identical on all three systems, so nothing rebuilds.
  2. Good catch. coreutils NEWS puts the --check quoting change in 9.11, not 9.9, so the comment now says 9.11+. The PR body's 9.12 is the version the bump lands on.

@w3irdrobot

Copy link
Copy Markdown
Contributor

Both fixes verified — the overlay now derives from versions.bun and evaluates to the same bun-1.3.5 derivation, and the coreutils comment is sorted. All CI green on the latest commit. Looks good to merge.

@w3irdrobot w3irdrobot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Re-approving after the follow-up fixes — verified both changes, all CI green. Good to merge.

@AnthonyRonning
AnthonyRonning marked this pull request as ready for review November 2, 2026 22:10
@AnthonyRonning

Copy link
Copy Markdown
Contributor Author

Thanks!

@AnthonyRonning
AnthonyRonning merged commit 6132c2b into master Nov 2, 2026
28 checks passed
@AnthonyRonning
AnthonyRonning deleted the chore/nixpkgs-bump branch November 2, 2026 22:10
w3irdrobot added a commit that referenced this pull request Nov 5, 2026
The 3.4.7 Linux .deb, .rpm and AppImage fail to start on Ubuntu 24.04 and
Mint 22 with "version `GLIBC_2.43' not found" (#1453). The Linux release
links `maple` against the Nix shell's glibc and then patches in the system
ELF interpreter, so whatever glibc nixpkgs carries becomes the floor the
package needs. The nixpkgs bump in #1431 moved that glibc from 2.40 to
2.44, and libm now binds acosf/atan2f to GLIBC_2.43. 3.4.5 and 3.4.6 only
worked because glibc 2.40 added no symbol the app used.

Link against an explicit floor instead, the way the Agent app already
does: cargo-zigbuild's zig cc wrapper with `-target x86_64-linux-gnu.2.39`
(Ubuntu 24.04, the oldest supported distribution). The linker and C
compiler are set through Cargo's target.<host> environment so tauri-cli's
own cargo builds honour them without changing the target/release layout.
Executables link with the Nix loader while they build and run under the
build's Nix LD_LIBRARY_PATH; the existing sanitize step gives the packaged
executable the system loader back. The wrapper runs on the Nix bash and
pins zig and rustc so cargo-zigbuild never probes PATH, python or
`$RUSTC_WRAPPER rustc` from inside sccache's server.

Add scripts/ci/elf_glibc_floor.py, which parses the ELF version needs
and fails when a file needs a GLIBC_x.y above the floor, naming the
symbols. The build runs it on target/release/maple before bundling and the
.deb, .rpm, AppImage and Research Dev RPM verifiers run it on every
packaged copy, so a nixpkgs bump cannot raise the requirement silently.

Verified with the research-desktop-linux lane locally: the packaged
`maple` needs at most GLIBC_2.39 (pidfd_spawnp from std) with the system
interpreter, where the 3.4.7 release needs GLIBC_2.43.

Not covered: the AppImage's bundled Nix WebKitGTK libraries need
GLIBC_2.44 themselves, so the AppImage still needs a separate decision
(bundle glibc, or pin the Linux runtime closure).

Fixes #1453

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
AnthonyRonning pushed a commit that referenced this pull request Nov 5, 2026
…1454)

* Link Research Linux packages against glibc 2.39 and verify the floor

The 3.4.7 Linux .deb, .rpm and AppImage fail to start on Ubuntu 24.04 and
Mint 22 with "version `GLIBC_2.43' not found" (#1453). The Linux release
links `maple` against the Nix shell's glibc and then patches in the system
ELF interpreter, so whatever glibc nixpkgs carries becomes the floor the
package needs. The nixpkgs bump in #1431 moved that glibc from 2.40 to
2.44, and libm now binds acosf/atan2f to GLIBC_2.43. 3.4.5 and 3.4.6 only
worked because glibc 2.40 added no symbol the app used.

Link against an explicit floor instead, the way the Agent app already
does: cargo-zigbuild's zig cc wrapper with `-target x86_64-linux-gnu.2.39`
(Ubuntu 24.04, the oldest supported distribution). The linker and C
compiler are set through Cargo's target.<host> environment so tauri-cli's
own cargo builds honour them without changing the target/release layout.
Executables link with the Nix loader while they build and run under the
build's Nix LD_LIBRARY_PATH; the existing sanitize step gives the packaged
executable the system loader back. The wrapper runs on the Nix bash and
pins zig and rustc so cargo-zigbuild never probes PATH, python or
`$RUSTC_WRAPPER rustc` from inside sccache's server.

Add scripts/ci/elf_glibc_floor.py, which parses the ELF version needs
and fails when a file needs a GLIBC_x.y above the floor, naming the
symbols. The build runs it on target/release/maple before bundling and the
.deb, .rpm, AppImage and Research Dev RPM verifiers run it on every
packaged copy, so a nixpkgs bump cannot raise the requirement silently.

Verified with the research-desktop-linux lane locally: the packaged
`maple` needs at most GLIBC_2.39 (pidfd_spawnp from std) with the system
interpreter, where the 3.4.7 release needs GLIBC_2.43.

Not covered: the AppImage's bundled Nix WebKitGTK libraries need
GLIBC_2.44 themselves, so the AppImage still needs a separate decision
(bundle glibc, or pin the Linux runtime closure).

Fixes #1453

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>

* Keep C hardening under the zig glibc floor and handle loader ABI markers

Review of #1454 found that linking through zig cc dropped the C hardening
nixpkgs' compiler wrapper applied: zig does not read NIX_HARDENING_ENABLE,
so C dependencies such as ring were built without the stack protector or
_FORTIFY_SOURCE.

Give C and C++ dependencies the wrapper's flags explicitly
(LINUX_C_HARDENING_FLAGS) through CFLAGS, CXXFLAGS and their CMake
equivalents, the variables the reproducible-build path remaps already use.
In the rebuilt `maple` the stack canary checks go from 22 back to 761
(567 in the 3.4.5 release) and the fortified glibc imports return.

zig's compiler-rt supplies __stack_chk_fail and several __*_chk functions
statically, so the stack protector leaves no import to assert. The ELF
check therefore gains --require-fortify: a packaged `maple` must import at
least one fortified glibc function, which is the evidence that the flags
reached the C dependencies. The package verifiers and the pre-bundle check
use it, and it rejects the build this PR first produced.

Also stop the check crashing on GLIBC_ABI_* loader markers. They are not
numbered releases and distributions backport them, so each known marker
names the first release whose every build defines it and any other counts
as above the floor. Ubuntu 24.04's glibc defines only GLIBC_ABI_DT_RELR,
so a file needing GLIBC_ABI_GNU2_TLS is reported by name.

Verified with the research-desktop-linux lane locally and by launching
the resulting .deb on Ubuntu 24.04.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>

* Declare the AppImage's glibc floor and say so at start-up

The glibc 2.39 floor fixes `maple`, which is all the .deb and .rpm carry.
The AppImage also bundles Nix-built WebKitGTK, GTK and GStreamer while
taking libc from the host. Of its 628 ELF files, 44 need more than glibc
2.39 and ten need 2.44, WebKitGTK and JavaScriptCore among them. Those
cannot be relinked, so the AppImage cannot run on Ubuntu 24.04 whatever
`maple` itself needs, and until now failed there in the dynamic loader
with a missing symbol version.

Make that floor explicit instead of accidental:

- LINUX_APPIMAGE_GLIBC_FLOOR (2.44) declares the newest glibc any bundled
  file needs.
- AppRun sources a new maple-glibc-floor.sh hook before any bundled
  runtime hook. On a host below the floor it explains the requirement,
  points to the .deb and .rpm (glibc 2.39 and newer) and exits, with a
  best-effort desktop dialog for launches without a terminal. A host that
  reports no glibc version is not refused, and
  MAPLE_APPIMAGE_SKIP_GLIBC_CHECK=1 overrides the check.
- AppImage verification scans every bundled ELF file and fails when the
  bundle needs more than the declared floor, when nothing needs it, or
  when AppRun announces another floor. A nixpkgs bump that moves the
  requirement therefore has to change the constant in the same change.

elf_glibc_floor.py gains --summary and --exact for that scan, and learns
the two loader markers glibc 2.43 introduced (GLIBC_ABI_GNU2_TLS,
GLIBC_ABI_DT_X86_64_PLT).

Verified with the research-desktop-linux lane locally: the built AppImage
prints the message and exits 1 on Ubuntu 24.04, Ubuntu 26.04, Debian 13
and Fedora 43, and starts on Ubuntu 26.10.

This does not stop the updater from replacing a working AppImage on a host
below the floor; that needs a separate change to the update metadata.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>

---------

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>

This branch was successfully deployed

2 active deployments
pages-pr-1431 — 8bd629f4 Deployed Nov 2, 2026 by github-actions[bot]
auth-pages-pr-1431 — 8bd629f4 Deployed Nov 2, 2026 by github-actions[bot]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci:package Build unsigned packages on this PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants