pyrox.dev / nixpkgs
lol
fork atom

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

[staging-next] mkosi: remove systemd patches included in v255

authored by K900 and committed by GitHub f2de647d 70e275b1

+1 -14
unified split
+1 -14
pkgs/tools/virtualization/mkosi/default.nix
··· 30 let 31 # For systemd features used by mkosi, see 32 # https://github.com/systemd/mkosi/blob/19bb5e274d9a9c23891905c4bcbb8f68955a701d/action.yaml#L64-L72 33 - systemdForMkosi = (systemd.overrideAttrs (oldAttrs: { 34 - patches = oldAttrs.patches ++ [ 35 - # Enable setting a deterministic verity seed for systemd-repart. Remove when upgrading to systemd 255. 36 - (fetchpatch { 37 - url = "https://github.com/systemd/systemd/commit/81e04781106e3db24e9cf63c1d5fdd8215dc3f42.patch"; 38 - hash = "sha256-KO3poIsvdeepPmXWQXNaJJCPpmBb4sVmO+ur4om9f5k="; 39 - }) 40 - # repart: make sure rewinddir() is called before readdir() when performing rm -rf. Remove when upgrading to systemd 255. 41 - (fetchpatch { 42 - url = "https://github.com/systemd/systemd/commit/6bbb893b90e2dcb05fb310ba4608f9c9dc587845.patch"; 43 - hash = "sha256-A6cF2QAeYHGc0u0V1JMxIcV5shzf5x3Q6K+blZOWSn4="; 44 - }) 45 - ]; 46 - })).override { 47 withRepart = true; 48 withBootloader = true; 49 withSysusers = true;
··· 30 let 31 # For systemd features used by mkosi, see 32 # https://github.com/systemd/mkosi/blob/19bb5e274d9a9c23891905c4bcbb8f68955a701d/action.yaml#L64-L72 33 + systemdForMkosi = systemd.override { 34 withRepart = true; 35 withBootloader = true; 36 withSysusers = true;