systemd: use finalAttrs.version#442587
Merged
nikstur merged 1 commit intoNixOS:masterfrom Sep 13, 2025
Merged
Conversation
I recently deployed systemd 257.9 to a bunch of machines as mitigation for NixOS#440073. This caused some confusion in the aftermath since we had 257.9 deployed (via an override for `systemd.package` to not rebuild the world), but `systemctl --version` still reported 257.8. This patch fixes that problem by using the final version everywhere instead of the version from the let-binding. I decided to remove the let-binding entirely to avoid re-introducing the wrong usage again.
c7bfd76 to
7ca8298
Compare
LordGrimmauld
approved these changes
Sep 13, 2025
Contributor
LordGrimmauld
left a comment
There was a problem hiding this comment.
zero rebuilds and still evals, looks reasonable
Prince213
requested changes
Sep 13, 2025
| @@ -491,7 +490,7 @@ stdenv.mkDerivation (finalAttrs: { | |||
| (lib.mesonOption "sbat-distro-summary" "NixOS") | |||
| (lib.mesonOption "sbat-distro-url" "https://nixos.org/") | |||
| (lib.mesonOption "sbat-distro-pkgname" pname) | |||
Member
There was a problem hiding this comment.
How about we also:
Suggested change
| (lib.mesonOption "sbat-distro-pkgname" pname) | |
| (lib.mesonOption "sbat-distro-pkgname" finalAttrs.pname) |
nikstur
approved these changes
Sep 13, 2025
13 tasks
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
I recently deployed systemd 257.9 to a bunch of machines as mitigation for #440073. This caused some confusion in the aftermath since we had 257.9 deployed (via an override for
systemd.packageto not rebuild the world), butsystemctl --versionstill reported 257.8.This patch fixes that problem by using the final version everywhere instead of the version from the let-binding.
I decided to remove the let-binding entirely to avoid re-introducing the wrong usage again.
Things done
passthru.tests.nixpkgs-reviewon this PR. See nixpkgs-review usage../result/bin/.Add a 👍 reaction to pull requests you find important.