Inject the repository commit id in boot menu entries #228
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| # SPDX-FileCopyrightText: 2026 Antoine Eiche <antoine.eiche@lewocorp.eu> | ||
| # | ||
| # SPDX-License-Identifier: MIT | ||
|
|
||
| # nixos-rebuild is wrapped to add the repository HEAD commit id to the added boot menu entry. | ||
| # Note the derivation produced by this nixos-rebuild wrapper then differs from the one produced from the repository itself since it injects the commit id via builtins.getEnv. | ||
|
Contributor
There was a problem hiding this comment. Can you add a link to the nixos-rebuild wrapper produced by the repository itself and the place where it makes use of
Contributor
Author
There was a problem hiding this comment.
What do you mean? I added a link to the nixpkgs code using
Contributor
There was a problem hiding this comment.
This comment seems to say there's a different piece of code to look at. Otherwise, can you try to rework the comment? I think I have trouble understanding it after rereading a couple of review passes already. |
||
| # See https://github.com/nixos/nixpkgs/blob/ddce4d809a16b9f0614e76636063282f6fb02908/nixos/modules/misc/label.nix#L69 for details. | ||
| { | ||
| writeShellApplication, | ||
| nixos-rebuild, | ||
| git, | ||
| }: | ||
| writeShellApplication { | ||
| name = "nixos-rebuild"; | ||
| runtimeInputs = [ | ||
| nixos-rebuild | ||
| git | ||
| ]; | ||
| text = '' | ||
| if [ "$(git rev-parse --is-inside-work-tree 2>&1)" != "true" ]; then | ||
| echo "error: the current directory must be a Git repository." | ||
| exit 1 | ||
| fi | ||
| revision=$(git rev-parse HEAD) | ||
|
Contributor
There was a problem hiding this comment. What happens if this is run not in a Git repo? Can we have minimal fallback/error-handling here? |
||
| export NIXOS_LABEL_VERSION="''${revision:0:7}" | ||
| nixos-rebuild "$@" | ||
| ''; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,4 +2,4 @@ | |
| # | ||
| # SPDX-License-Identifier: MIT | ||
|
|
||
| final: prev: (import ./default.nix { inherit (final) callPackage; }) | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be called
git-aware-nixos-rebuildor something.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I finally called it
nixos-rebuild-git-aware.Actually, i'm a bit confused because in your previous comments, I had understood that you wanted to override
nixos-rebuildwhile exposing the original one via the attributenixos-rebuild-unwrapped.In this fixup commit, I do not modify the attribute
nixos-rebuildbut just add an attributenixos-rebuild-git-aware. This is much simpler.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wrote:
this doesn't say anything about the name of the attribute? shadowing meant that it should shadow the
nixos-rebuildbinary in$PATH, but you can have the attribute namednixos-rebuild-git-awareproducing abin/nixos-rebuildand having anixos-rebuild-git-aware.unwrappedattribute to get you access to the git-unaware attribute?