systemd: fetch regression patch

main
Jörg Thalheim 2 years ago
parent aafb1c159c
commit 1b025cde78

@ -12,7 +12,11 @@ in {
systemd-vaultd = makeTest' (import ./systemd-vaultd-test.nix); systemd-vaultd = makeTest' (import ./systemd-vaultd-test.nix);
unittests = makeTest' { unittests = makeTest' {
name = "unittests"; name = "unittests";
nodes.server = {}; nodes.server = {
imports = [
../modules/systemd-vaultd.nix
];
};
testScript = '' testScript = ''
start_all() start_all()

@ -53,17 +53,6 @@
}; };
}; };
systemd.package = pkgs.systemd.overrideAttrs (old: {
patches =
old.patches
++ [
(pkgs.fetchpatch {
url = "https://github.com/Mic92/systemd/commit/93a2921a81cab3be9b7eacab6b0095c96a0ae9e2.patch";
sha256 = "sha256-7WlhMLE7sfD3Cxn6n6R1sUNzUOvas7XMyabi3bsq7jM=";
})
];
});
services.vault.agents.default.settings = { services.vault.agents.default.settings = {
vault = { vault = {
address = "http://localhost:8200"; address = "http://localhost:8200";

@ -4,9 +4,9 @@
pkgs, pkgs,
lib, lib,
coreutils, coreutils,
systemd,
}: let }: let
systemd-vaultd = pkgs.callPackage ../../default.nix {}; systemd-vaultd = pkgs.callPackage ../../default.nix {};
systemd = pkgs.callPackage ../pkgs/systemd.nix {};
in in
writeShellScript "unittests" '' writeShellScript "unittests" ''
set -eu -o pipefail set -eu -o pipefail

@ -10,6 +10,8 @@ in {
./vault-secrets.nix ./vault-secrets.nix
]; ];
systemd.package = pkgs.callPackage ../pkgs/systemd.nix {};
systemd.sockets.systemd-vaultd = { systemd.sockets.systemd-vaultd = {
description = "systemd-vaultd socket"; description = "systemd-vaultd socket";
wantedBy = ["sockets.target"]; wantedBy = ["sockets.target"];

@ -0,0 +1,19 @@
{
systemd,
fetchpatch,
}:
systemd.overrideAttrs (old: {
patches =
old.patches
++ [
(fetchpatch {
url = "https://github.com/Mic92/systemd/commit/93a2921a81cab3be9b7eacab6b0095c96a0ae9e2.patch";
sha256 = "sha256-7WlhMLE7sfD3Cxn6n6R1sUNzUOvas7XMyabi3bsq7jM=";
})
# included in next release: https://github.com/systemd/systemd/pull/25721
(fetchpatch {
url = "https://github.com/systemd/systemd/commit/39ed2f02d0a00505fce34ce4281cc6e4f016ec6b.patch";
sha256 = "sha256-RD8GhOxzNNgC0KKThRaeF2uP8Y+Tt7kVSDtf1ukUwcI=";
})
];
})
Loading…
Cancel
Save