Skip to content

systemd: use finalAttrs.version#442587

Merged
nikstur merged 1 commit intoNixOS:masterfrom
Ma27:systemd-version
Sep 13, 2025
Merged

systemd: use finalAttrs.version#442587
nikstur merged 1 commit intoNixOS:masterfrom
Ma27:systemd-version

Conversation

@Ma27
Copy link
Member

@Ma27 Ma27 commented Sep 13, 2025

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.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.

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

Add a 👍 reaction to pull requests you find important.

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.
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. labels Sep 13, 2025
Copy link
Contributor

@LordGrimmauld LordGrimmauld left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

zero rebuilds and still evals, looks reasonable

@nixpkgs-ci nixpkgs-ci bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Sep 13, 2025
Copy link
Member

@Prince213 Prince213 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@@ -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)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about we also:

Suggested change
(lib.mesonOption "sbat-distro-pkgname" pname)
(lib.mesonOption "sbat-distro-pkgname" finalAttrs.pname)

@Prince213 Prince213 added the 8.has: clean-up This PR removes packages or removes other cruft label Sep 13, 2025
@nikstur nikstur added this pull request to the merge queue Sep 13, 2025
Merged via the queue into NixOS:master with commit fce1c45 Sep 13, 2025
33 of 36 checks passed
@nixpkgs-ci nixpkgs-ci bot added 12.approvals: 2 This PR was reviewed and approved by two persons. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels Sep 13, 2025
@Ma27 Ma27 deleted the systemd-version branch September 16, 2025 08:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: systemd Software suite that provides an array of system components for Linux operating systems. 8.has: clean-up This PR removes packages or removes other cruft 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. 12.approvals: 2 This PR was reviewed and approved by two persons.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants