Skip to content

systemd: use finalAttrs.version #442587

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.

Sign up for GitHub

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

Merged
nikstur merged 1 commit into from
Sep 13, 2025
Merged

systemd: use finalAttrs.version #442587

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions pkgs/os-specific/linux/systemd/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,6 @@ assert withBootloader -> withEfi;
let
wantCurl = withRemote || withImportd;

version = "257.8";

# Use the command below to update `releaseTimestamp` on every (major) version
# change. More details in the commentary at mesonFlags.
# command:
Expand All @@ -207,14 +205,15 @@ let
kbd' = if withPam then kbd else kbd.override { withVlock = false; };
in
stdenv.mkDerivation (finalAttrs: {
inherit pname version;
inherit pname;
version = "257.8";

# We use systemd/systemd-stable for src, and ship NixOS-specific patches inside nixpkgs directly
# This has proven to be less error-prone than the previous systemd fork.
src = fetchFromGitHub {
owner = "systemd";
repo = "systemd";
rev = "v${version}";
rev = "v${finalAttrs.version}";
hash = "sha256-XQ+IyRar74qQij96CKClHXW0kkPnGeKUgA8ULiWh5YY=";
};

Expand Down Expand Up @@ -456,7 +455,7 @@ stdenv.mkDerivation (finalAttrs: {
# https://github.com/systemd/systemd/blob/60e930fc3e6eb8a36fbc184773119eb8d2f30364/NEWS#L258-L266
(lib.mesonOption "time-epoch" releaseTimestamp)

(lib.mesonOption "version-tag" version)
(lib.mesonOption "version-tag" finalAttrs.version)
(lib.mesonOption "mode" "release")
(lib.mesonOption "tty-gid" "3") # tty in NixOS has gid 3
(lib.mesonOption "pamconfdir" "${placeholder "out"}/etc/pam.d")
Expand Down Expand Up @@ -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

@Prince213 Prince213 Sep 13, 2025

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)

(lib.mesonOption "sbat-distro-version" version)
(lib.mesonOption "sbat-distro-version" finalAttrs.version)

# Users
(lib.mesonOption "system-uid-max" "999")
Expand Down
Loading