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

Restore detailed Nix CLI version (backport #12498) #12506

Merged
merged 3 commits into from
Feb 19, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 18, 2025

... as intended.

Requirements:

  • don't build fresh libraries for each git commit
  • have git commit in the CLI

Bug:

  • echo ${version} went into the wrong file
    => use the fact that it's a symlink, not just for reading but also for writing.

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 #12498 done by [Mergify](https://mergify.com).

@mergify mergify bot requested a review from Ericson2314 as a code owner February 18, 2025 16:35
@mergify mergify bot added automatic backport This PR is a backport produced by automation (does not trigger backporting) conflicts labels Feb 18, 2025
@mergify mergify bot requested a review from edolstra as a code owner February 18, 2025 16:35
@mergify mergify bot added the merge-queue label Feb 18, 2025
Copy link
Contributor Author

mergify bot commented Feb 18, 2025

Cherry-pick of bba4e6b has failed:

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

You are currently cherry-picking commit bba4e6b06.
  (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)

Changes to be committed:
	modified:   src/libstore/globals.cc
	modified:   src/libstore/globals.hh
	modified:   src/nix/meson.build
	modified:   src/nix/package.nix

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

Cherry-pick of 3556f6b has failed:

On branch mergify/bp/2.26-maintenance/pr-12498
Your branch is ahead of 'origin/2.26-maintenance' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 3556f6bf4.
  (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)

Changes to be committed:
	modified:   src/libcmd/package.nix
	modified:   src/libexpr-c/package.nix
	modified:   src/libexpr-test-support/package.nix
	modified:   src/libexpr-tests/package.nix
	modified:   src/libexpr/package.nix
	modified:   src/libfetchers-tests/package.nix
	modified:   src/libfetchers/package.nix
	modified:   src/libflake-c/package.nix
	modified:   src/libflake-tests/package.nix
	modified:   src/libflake/package.nix
	modified:   src/libmain-c/package.nix
	modified:   src/libmain/package.nix
	modified:   src/libstore-c/package.nix
	modified:   src/libstore-test-support/package.nix
	modified:   src/libstore-tests/package.nix
	modified:   src/libstore/package.nix
	modified:   src/libutil-c/package.nix
	modified:   src/libutil-test-support/package.nix
	modified:   src/libutil-tests/package.nix
	modified:   src/libutil/package.nix
	modified:   src/nix/package.nix
	modified:   tests/functional/package.nix

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   packaging/dependencies.nix

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

@github-actions github-actions bot added new-cli Relating to the "nix" command with-tests Issues related to testing. PRs with tests have some priority fetching Networking with the outside (non-Nix) world, input locking c api Nix as a C library with a stable interface labels Feb 18, 2025
@roberth roberth force-pushed the mergify/bp/2.26-maintenance/pr-12498 branch from 4eeff1d to f7881a8 Compare February 19, 2025 00:00
... as intended.

Requirements:
- don't build fresh libraries for each git commit
- have git commit in the CLI

Bug:
- echo ${version} went into the wrong file => use the fact that it's
  a symlink, not just for reading but also for writing.

(cherry picked from commit bba4e6b)
This way it's easier to get right. See previous commit.

(cherry picked from commit 3556f6b)
(cherry picked from commit 2b5365b)
@roberth roberth force-pushed the mergify/bp/2.26-maintenance/pr-12498 branch from f7881a8 to fd06258 Compare February 19, 2025 00:04
@mergify mergify bot merged commit 8a2bb81 into 2.26-maintenance Feb 19, 2025
23 checks passed
@mergify mergify bot deleted the mergify/bp/2.26-maintenance/pr-12498 branch February 19, 2025 00:29
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) c api Nix as a C library with a stable interface conflicts fetching Networking with the outside (non-Nix) world, input locking merge-queue new-cli Relating to the "nix" command with-tests Issues related to testing. PRs with tests have some priority
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant