Compare commits

...
Author SHA1 Message Date
internal-nix-ci[bot] 0769726d44 Merge pull request #15343 from NixOS/backport-15341-to-2.33-maintenance
[Backport 2.33-maintenance] Fix the nix-community/patsh/0.2.1 flake regression test (again)
2026-02-26 00:20:13 +00:00
Eelco Dolstra 296b8d7bb9 Fix the nix-community/patsh/0.2.1 flake regression test (again)
(cherry picked from commit 2334977863)
2026-02-25 23:39:57 +00:00
internal-nix-ci[bot] a35595c6de Merge pull request #15338 from NixOS/backport-15335-to-2.33-maintenance
[Backport 2.33-maintenance] Don't throw Interrupted from JSONLogger::write
2026-02-25 20:40:33 +00:00
dramforever e258c32fa6 libutil/logging: Use writeFullLogging in JSONLogger::write
Logging should not check for interrupts. Use the new writeFullLogging
function to write JSON output to get similar behavior to SimpleLogger.

This avoids the logger itself throwing Interrupted exceptions in
handleExceptions.

(cherry picked from commit 1210100421)
2026-02-25 19:53:11 +00:00
dramforever e2af95376a libutil/logging: Generalize writeToStderr into writeFullLogging
Generalize writeToStderr into writeFullLogging, with similar behavior
but taking an arbitrary fd, and reimplement writeToStderr with it as a
convenient wrapper.

(cherry picked from commit 473d54ed5f)
2026-02-25 19:53:11 +00:00
Sergei Zimmerman b42319aa85 Merge pull request #15259 from obsidiansystems/backport-15252-to-2.33-maintenance
[Backport 2.33-maintenance] upload-release: disable containerd image store to preserve gzip layer compression
2026-02-17 02:30:10 +03:00
Amaan Qureshi 6e88d0cf6c upload-release: disable containerd image store to preserve gzip layer compression
(cherry picked from commit 2ccb8a9a56)
2026-02-16 17:51:21 -05:00
Bernardo Meurer Costa eef8a1a5ff chore: bump version 2026-02-13 07:47:13 +00:00
4 changed files with 29 additions and 10 deletions

No files matched your search

+11
View File
@@ -39,6 +39,17 @@ jobs:
role-to-assume: "arn:aws:iam::080433136561:role/nix-release"
role-session-name: nix-release-oidc-${{ github.run_id }}
aws-region: eu-west-1
- name: Disable containerd image store
run: |
# Docker 28+ defaults to the containerd image store, which
# pushes layers uncompressed instead of gzip. OCI clients
# that only support gzip (e.g. go-containerregistry) fail
# with "gzip: invalid header". Disabling the containerd
# snapshotter restores the classic storage driver, which
# preserves gzip-compressed layers through the
# `docker load` / `docker push` pipeline.
echo '{"features":{"containerd-snapshotter":false}}' | sudo tee /etc/docker/daemon.json > /dev/null
sudo systemctl restart docker
- name: Login to Docker Hub
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
with:
+1 -1
View File
@@ -1 +1 @@
2.33.3
2.33.4
+3
View File
@@ -236,6 +236,9 @@ void Input::checkLocks(Input specified, Input & result)
if (auto prevNarHash = specified.getNarHash())
specified.attrs.insert_or_assign("narHash", prevNarHash->to_string(HashFormat::SRI, true));
if (auto narHash = result.getNarHash())
result.attrs.insert_or_assign("narHash", narHash->to_string(HashFormat::SRI, true));
for (auto & field : specified.attrs) {
auto field2 = result.attrs.find(field.first);
if (field2 != result.attrs.end() && field.second != field2->second)
+14 -9
View File
@@ -150,18 +150,23 @@ public:
Verbosity verbosity = lvlInfo;
void writeToStderr(std::string_view s)
static void writeFullLogging(Descriptor fd, std::string_view s)
{
try {
writeFull(getStandardError(), s, false);
writeFull(fd, s, false);
} catch (SystemError & e) {
/* Ignore failing writes to stderr. We need to ignore write
errors to ensure that cleanup code that logs to stderr runs
to completion if the other side of stderr has been closed
unexpectedly. */
/* Ignore failing logging writes. We need to ignore write
errors to ensure that cleanup code that writes logs runs
to completion if the other side of the logging fd has
been closed unexpectedly. */
}
}
void writeToStderr(std::string_view s)
{
writeFullLogging(getStandardError(), s);
}
std::unique_ptr<Logger> makeSimpleLogger(bool printBuildLogs)
{
return std::make_unique<SimpleLogger>(printBuildLogs);
@@ -245,15 +250,15 @@ struct JSONLogger : Logger
void write(const nlohmann::json & json)
{
auto line =
(includeNixPrefix ? "@nix " : "") + json.dump(-1, ' ', false, nlohmann::json::error_handler_t::replace);
auto line = (includeNixPrefix ? "@nix " : "")
+ json.dump(-1, ' ', false, nlohmann::json::error_handler_t::replace) + "\n";
/* Acquire a lock to prevent log messages from clobbering each
other. */
try {
auto state(_state.lock());
if (state->enabled)
writeLine(fd, line);
writeFullLogging(fd, line);
} catch (...) {
bool enabled = false;
std::swap(_state.lock()->enabled, enabled);