nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-30 11:50:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #283125 from katexochen/mkosi/remove-systemd-255-patches

Browse Source 
[staging-next] mkosi: remove systemd patches included in v255
This commit is contained in:
K900
2024-01-23 10:44:52 +03:00
committed by GitHub
parent 70e275b1cb ba4747bd8e
commit f2de647d00
1 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/tools/virtualization/mkosi/default.nix
View File

@@ -30,20 +30,7 @@
let
# For systemd features used by mkosi, see
# https://github.com/systemd/mkosi/blob/19bb5e274d9a9c23891905c4bcbb8f68955a701d/action.yaml#L64-L72
systemdForMkosi = (systemd.overrideAttrs (oldAttrs: {
patches = oldAttrs.patches ++ [
# Enable setting a deterministic verity seed for systemd-repart. Remove when upgrading to systemd 255.
(fetchpatch {
url = "https://github.com/systemd/systemd/commit/81e04781106e3db24e9cf63c1d5fdd8215dc3f42.patch";
hash = "sha256-KO3poIsvdeepPmXWQXNaJJCPpmBb4sVmO+ur4om9f5k=";
})
# repart: make sure rewinddir() is called before readdir() when performing rm -rf. Remove when upgrading to systemd 255.
(fetchpatch {
url = "https://github.com/systemd/systemd/commit/6bbb893b90e2dcb05fb310ba4608f9c9dc587845.patch";
hash = "sha256-A6cF2QAeYHGc0u0V1JMxIcV5shzf5x3Q6K+blZOWSn4=";
})
];
})).override {
systemdForMkosi = systemd.override {
withRepart = true;
withBootloader = true;
withSysusers = true;