Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libutil: Fix error message (backport #12758) #12783

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 28, 2025

I encountered this with a misconfigured libutil. I doubt that a non-lutimes config is viable, because tests were failing.

EDIT: I get the misconfiguration reproducibly with .#native-clangStdenv; need to look into why it happens
EDIT: nix build .#nix-everything-clangStdenv passes with this PR

Motivation

Context


Add 👍 to pull requests you find important.

The Nix maintainer team uses a GitHub project board to schedule and track reviews.


This is an automatic backport of pull request #12758 done by [Mergify](https://mergify.com).

I encountered this with a misconfigured libutil. I doubt that a
non-lutimes config is viable, because tests were failing.

(cherry picked from commit 1cffcd9)

# Conflicts:
#	src/libutil/file-system.cc
@mergify mergify bot requested a review from edolstra as a code owner March 28, 2025 17:07
@mergify mergify bot added automatic backport This PR is a backport produced by automation (does not trigger backporting) conflicts merge-queue labels Mar 28, 2025
Copy link
Contributor Author

mergify bot commented Mar 28, 2025

Cherry-pick of 1cffcd9 has failed:

On branch mergify/bp/2.24-maintenance/pr-12758
Your branch is up to date with 'origin/2.24-maintenance'.

You are currently cherry-picking commit 1cffcd91a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/libutil/file-system.cc

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@roberth
Copy link
Member

roberth commented Mar 28, 2025

Unimportant for backport

@roberth roberth closed this Mar 28, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automatic backport This PR is a backport produced by automation (does not trigger backporting) conflicts merge-queue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant