Commit Graph

20871 Commits

Author SHA1 Message Date
Sergei Zimmerman
b5ec989b3f Merge pull request #15261 from obsidiansystems/backport-15252-to-2.31-maintenance
[Backport 2.31-maintenance] upload-release: disable containerd image store to preserve gzip layer compression
2026-02-17 02:16:00 +03:00
Amaan Qureshi
81f523af00 upload-release: disable containerd image store to preserve gzip layer compression
(cherry picked from commit 2ccb8a9a56)
2026-02-16 17:52:27 -05:00
internal-nix-ci[bot]
b020bbba8d Merge pull request #15065 from NixOS/backport-15062-to-2.31-maintenance
[Backport 2.31-maintenance] ci: Drop magic-nix-cache
2026-01-23 00:58:40 +00:00
Sergei Zimmerman
1c23a7f62e ci: Drop magic-nix-cache
We are now seeing. I guess we are out with the cache. When the API responds with 418 (I'm a teapot)
it seems like the only reasonable solution is to oblige.

error: unable to download 'http://127.0.0.1:37515/7ms9f25xyxavf32pvdc3vb28nzzmkbn3.narinfo': HTTP error 418
       response body:
       GitHub API error: GitHub Actions Cache throttled Magic Nix Cache. Not trying to use it again on this run.
(cherry picked from commit dae41e06e8)
2026-01-23 00:35:17 +00:00
internal-nix-ci[bot]
e26fe63e87 Merge pull request #15034 from NixOS/backport-15031-to-2.31-maintenance
[Backport 2.31-maintenance] ci: Bump magic-nix-cache to disable on 429
2026-01-21 05:13:21 +00:00
Sergei Zimmerman
ecfdb18ea8 ci: Bump magic-nix-cache to disable on 429
(cherry picked from commit 1555677cd5)
2026-01-21 04:50:11 +00:00
Eelco Dolstra
69c48df066 Bump version 2026-01-07 21:36:13 +01:00
internal-nix-ci[bot]
e4b8553d6e Merge pull request #14942 from NixOS/backport-14778-to-2.31-maintenance
[Backport 2.31-maintenance] test: add shebangs to shell.nix test scripts
2.31.3
2026-01-07 14:14:23 +00:00
Agustín Covarrubias
4fa81576cd test: add shebangs to shell.nix test scripts
Fix intermittent SIGSEGV (exit code 139) on macOS when running
  nix-shell and shebang tests inside the nix sandbox.

  The foo, bar, and ruby test scripts were created without shebangs,
  which causes intermittent crashes when executed via command
  substitution on macOS. Adding proper shebangs resolves the flakiness.

  Potentially closes: #13106

(cherry picked from commit 7b3d7eb634)
2026-01-07 13:50:15 +00:00
John Ericson
952c823960 Merge pull request #14909 from NixOS/backport-tarball-pct-decode-to-2.31-maintenance
libfetchers: Actually percentDecode path when using the path from fil…
2026-01-04 17:41:30 -05:00
internal-nix-ci[bot]
91236ddd27 Merge pull request #14915 from NixOS/backport-14729-to-2.31-maintenance
[Backport 2.31-maintenance] Fix Non-virtual interface pattern for `RestrictedStore::addDependency`
2026-01-02 15:51:49 +00:00
John Ericson
eff5b4f8d7 Fix Non-virtual interface pattern for RestrictedStore::addDependency
I didn't do things quite right in 496e43ec72:

- Forgot to remove the now-redundant `isAllowed` check.

- Called the non-virtual, not the superclass's impl, in
  `addDependencyPrep`, causing bad recursion / UB.

Doing this fixes a crash I encountered with manual testing an Nix Ninja
--- hopefully we will get Nix Ninja or similar in a NixOS test longer
term to defend against this thing happening again.

(cherry picked from commit 4652345ac3)
2026-01-02 15:23:19 +00:00
Sergei Zimmerman
c8e56b3664 libfetchers: Actually percentDecode path when using the path from file:// URI
Special characters like + e.t.c. are pct-encoded.
2026-01-02 00:50:10 +03:00
internal-nix-ci[bot]
2afdfc5836 Merge pull request #14906 from NixOS/backport-14903-to-2.31-maintenance
[Backport 2.31-maintenance] upload-release.pl: Fix up nix-channels bucket location, use awscli2
2026-01-01 21:43:48 +00:00
Sergei Zimmerman
cc13939400 upload-release.pl: Fix up nix-channels bucket location, use awscli2
I messed up and accidentally configured the S3 client to use the same
host as the nix-releases bucket, but nix-channels is us-east-1 and
nix-releases is eu-west-1.

(cherry picked from commit 0900638f1d)
2026-01-01 21:17:44 +00:00
internal-nix-ci[bot]
4c1e03676b Merge pull request #14900 from NixOS/backport-14888-to-2.31-maintenance
[Backport 2.31-maintenance] ci: GitHub releng for release automation
2026-01-01 15:08:09 +00:00
Sergei Zimmerman
e904e2cbc6 release-process: Document usage of upload-release.yml workflow
(cherry picked from commit 84ff2ef347)
2026-01-01 14:45:27 +00:00
Sergei Zimmerman
06938e909a upload-release: Only upload the newly created tag
(cherry picked from commit 3933e45d52)
2026-01-01 14:45:27 +00:00
Sergei Zimmerman
effeeb9e0a upload-release: Also push to GHCR as part of the release process
(cherry picked from commit a1569458cc)
2026-01-01 14:45:27 +00:00
Sergei Zimmerman
94311053e9 ci: Add upload-release.yml
This workflow is supposed to automate release uploads by using OIDC
for AWS setup. DockerHub still uses long-lived credentials, but that's
not fixable. In a follow-up we could set up release uploads to GHCR too.

(cherry picked from commit 4599daa10e)
2026-01-01 14:45:27 +00:00
Sergei Zimmerman
e5ec1ac162 maintainers: Document git tag signing
Previously it was only Eeclo doing releases that were signed with
B541D55301270E0BCF15CA5D8170B4726D7198DE. Other linux distributions
have the expectation (rightfully so) that our tags are signed. Let's
document this.

We could do cross-signing to make tracing the chain of trust easier
for all Nix team members [1].

[1]: https://nixos.org/community/teams/nix/

(cherry picked from commit 6cb8b58a47)
2026-01-01 14:45:27 +00:00
Sergei Zimmerman
a118c65b74 maintainers/upload-release.pl: Make more configurable
This allows for testing with a local minio deployment like:

./upload-release.pl --skip-docker --skip-git --s3-endpoint http://localhost:9000 --s3-host localhost:9000 1821360

(cherry picked from commit d19b8d5f99)
2026-01-01 14:45:27 +00:00
Sergei Zimmerman
126ee30fe3 Merge pull request #14881 from xokdvium/backport-14874-to-2.31-maintenance 2025-12-28 20:24:34 +03:00
Sergei Zimmerman
c5f83ab995 ci: Make docker-push workflow more configurable
This should allow reusing this workflow (with more tweaks)
in the releng workflow.

(cherry picked from commit c867ed6726)
2025-12-28 19:11:46 +03:00
Sergei Zimmerman
eb9b5535c9 ci: Pin actions in docker-push reusable workflow
(cherry picked from commit fb05f6de0d)
2025-12-28 19:11:45 +03:00
Sergei Zimmerman
1e1571be74 ci: Move docker_push_image into a separate workflow
Best reviewed with -w --color-moved. This just moves the code
into a separate workflow. This will allow us to reuse it in
the release job for github releng of releases.

(cherry picked from commit 745983dfc0)
2025-12-28 19:11:41 +03:00
Sergei Zimmerman
dbabe7e13a ci: Bump magic-nix-cache with post-build-hook fix
No tagged release with the fix for [^].

[^]: 578f01e147

(cherry picked from commit 4c4eb5d07f)
2025-12-28 19:06:27 +03:00
Sergei Zimmerman
a0be5be079 ci: Move magic-nix-cache-action into install-nix-action composite
This reduces duplication and pins the underlying version of magic-nix-cache,
as we already do with other actions.

(cherry picked from commit ad5c6a53b9)
2025-12-28 19:06:22 +03:00
Seth Flynn
16f93f9865 ci: allow for using the latest build of the experimental installer
Until these repos are potentially merged, this is good for dogfooding
alongside the experimental installer. It also uses the more official
`artifacts.nixos.org` endpoint to install stable releases now

More immediately though, we need a patch for the experimental installer
to really work in CI at all, and that hasn't landed in a tag yet. So,
this lets us use it right from `main`!

(cherry picked from commit 92d7381826)
2025-12-28 19:05:53 +03:00
Seth Flynn
4ed5eb89fe ci: enable use of the experimental installer
(cherry picked from commit 2cbbb63628)
2025-12-28 19:05:50 +03:00
internal-nix-ci[bot]
9fb9e6082c Merge pull request #14861 from NixOS/backport-14792-to-2.31-maintenance
[Backport 2.31-maintenance] Fix `curl` with `c-ares` failing to resolve DNS inside sandbox on macOS
2025-12-23 10:43:24 +00:00
Michael Hoang
b141e29adc Fix curl with c-ares failing to resolve DNS inside sandbox on macOS
(cherry picked from commit 7541129f04)
2025-12-23 10:07:34 +00:00
internal-nix-ci[bot]
9b597aa64f Merge pull request #14848 from NixOS/backport-14785-to-2.31-maintenance
[Backport 2.31-maintenance] libstore: include path in the world-writable error
2025-12-21 19:05:54 +00:00
yawkar
db39278d61 libstore: include path in the world-writable error
The previous error message was ambiguous about which specific directory failed the check.

This commit updates checkNotWorldWritable to return the failing path so it can be included in the error message, making debugging easier.

(cherry picked from commit a1e24fa6ce)
2025-12-21 18:37:20 +00:00
internal-nix-ci[bot]
4fecbf8a9a Merge pull request #14747 from NixOS/backport-14745-to-2.31-maintenance
[Backport 2.31-maintenance] Correct `build-dir` error in manual, link relevant settings
2025-12-09 02:01:40 +00:00
John Ericson
34c9d1a502 Correct build-dir error in manual, link relevant settings
This fixes out-of-date information that is no longer true, and makes the
up-to-date information more accessible.

(cherry picked from commit c5fa5e503a)
2025-12-09 01:32:34 +00:00
internal-nix-ci[bot]
a4f5f36509 Merge pull request #14692 from NixOS/backport-14690-to-2.31-maintenance
[Backport 2.31-maintenance] Support mdbook 0.5
2025-12-02 14:30:51 +00:00
Robert Hensing
24096ecdd5 maint: Fix lowdown override compatibility with newer nixpkgs
Use `or ""` fallback for postInstall attribute which may not exist in
newer nixpkgs versions of lowdown.

(cherry picked from commit 0aef1ddb9e)
2025-12-02 14:06:21 +00:00
Robert Hensing
f3cf58e469 maint: Remove mdbook-linkcheck and support mdbook 0.5.x
Fixes #14628

- Remove mdbook-linkcheck dependency and configuration (was blocking
  upgrades to mdbook 0.5.0+, configured with warning-policy = "ignore"
  due to false positives, and redundant with lychee-based link checking)
- Update substitute.py and anchors.jq to handle 'items' (mdbook 0.5.x)
  in addition to 'sections' (mdbook 0.4.x), as per mdbook 0.5.0
  changelog: "Book::sections was renamed to Book::items"
  https://github.com/rust-lang/mdBook/blob/master/CHANGELOG.md#05-migration-guide

(cherry picked from commit 2636f50dd4)
2025-12-02 14:06:21 +00:00
internal-nix-ci[bot]
315010c447 Merge pull request #14679 from NixOS/backport-14676-to-2.31-maintenance
[Backport 2.31-maintenance] libstore: Use makeTempPath in optimizePath_, assorted fs fixes
2025-12-01 03:23:00 +00:00
Sergei Zimmerman
f67bdae6a6 libutil: Make AutoDelete non-copyable and non-movable
This is a good precaution, since we don't want to delete
directories twice accidentally.

(cherry picked from commit 40e3f5c0a4)
2025-12-01 02:48:04 +00:00
Sergei Zimmerman
3c01ff3148 libutil: Propagate error code in createSymlink
(cherry picked from commit bf7c53f2d3)
2025-12-01 02:48:03 +00:00
Sergei Zimmerman
f5473c9624 libstore: Actually correctly call remove in case rename fails
(cherry picked from commit 1cc337bb5f)
2025-12-01 02:48:03 +00:00
Sergei Zimmerman
22c69f47b8 libstore: Use makeTempPath in optimizePath_
This was intended to be cherry-picked in 6aed9d877c,
but was left hanging. This is actually important for fixing [^]. emilazy let me know
of this bad cherry-pick and its significance.

[^]: https://github.com/NixOS/nix/issues/7273

Originally fixed by Lily Ballard <lily@ballards.net> in https://gerrit.lix.systems/c/lix/+/2100.

(cherry picked from commit d888846b68)
2025-12-01 02:48:03 +00:00
internal-nix-ci[bot]
eee5c6ee72 Merge pull request #14533 from NixOS/backport-14531-to-2.31-maintenance
[Backport 2.31-maintenance] Restore isAllowed check in ChrootLinuxDerivationBuilder
2025-11-10 20:44:23 +00:00
Sergei Zimmerman
b3e3be1e64 Restore isAllowed check in ChrootLinuxDerivationBuilder
This early return was lost in d4ef822add.

By doing some
https://en.wikipedia.org/wiki/Non-virtual_interface_pattern, we can
ensure that we don't make this mistake again --- implementations are no
longer responsible for implementing the caching/memoization mechanism.

(cherry picked from commit 496e43ec72)
2025-11-10 20:15:46 +00:00
John Ericson
5d14e91245 Merge pull request #14519 from NixOS/backport-14137-to-2.31-maintenance
[Backport 2.31-maintenance] fix(libstore/build/derivation-goal): don't assert on partially valid outputs
2025-11-09 14:29:14 -05:00
internal-nix-ci[bot]
1e92560665 Merge pull request #14523 from NixOS/backport-14515-to-2.31-maintenance
[Backport 2.31-maintenance] libexpr: Don't use nix::dirOf in prim_dirOf (fix 2.23 regression)
2025-11-09 18:07:05 +00:00
Sergei Zimmerman
3032fdbbe5 libexpr: Don't use nix::dirOf in prim_dirOf
This gets us back to pre-2.23 behavior of this primop.
Done by inlining the code of `nix::dirOf` from 2.2-maintenance.

(cherry picked from commit a33fccf55a)
2025-11-09 17:43:01 +00:00
Sergei Zimmerman
f6702e94fa tests/functional: Add tests for builtins.dirOf
These will change in the next commit to fix the silent regression from 2.23
in the handling of multiple subsequent path separators.

(cherry picked from commit 86f090837b)
2025-11-09 17:43:01 +00:00