public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

systemd: use tags as rev, update comment explaining updating workflow.

Browse Source
This commit is contained in:
Florian Klink 2020-08-06 12:04:28 +02:00
parent c81c10624c
commit 38044aac59
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/os-specific/linux/systemd/default.nix
View File

@ -17,19 +17,24 @@
, withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms, kexectools , withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms, kexectools
}: }:
stdenv.mkDerivation { let
version = "246"; version = "246";
in stdenv.mkDerivation {
inherit version;
pname = "systemd"; pname = "systemd";
# When updating, use https://github.com/systemd/systemd-stable tree, not the development one! # We use systemd/systemd-stable for src, and ship NixOS-specific patches inside nixpkgs directly
# Also fresh patches should be cherry-picked from that tree to our current one. # This has proven to be less error-prone than the previous systemd fork.
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "systemd"; owner = "systemd";
repo = "systemd-stable"; repo = "systemd-stable";
rev = "ae366f3acbc1a45504e9875099b17a7e1a221d03"; rev = "v${version}";
sha256 = "0zrkyxrh5rm45f2l1rnjyv229bcyzawfw7c63jqxwix75px60dyw"; sha256 = "0zrkyxrh5rm45f2l1rnjyv229bcyzawfw7c63jqxwix75px60dyw";
}; };
# If these need to be regenerated, `git am path/to/00*.patch` them into a
# systemd worktree, rebase to the more recent systemd version, and export the
# patches again via `git format-patch v${version}`.
patches = [ patches = [
./0001-Start-device-units-for-uninitialised-encrypted-devic.patch ./0001-Start-device-units-for-uninitialised-encrypted-devic.patch
./0002-Don-t-try-to-unmount-nix-or-nix-store.patch ./0002-Don-t-try-to-unmount-nix-or-nix-store.patch