diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-05 06:00:55 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-05 06:00:55 +0000 |
commit | da4d99e016fdaac92c67847482dc6682abfde8bc (patch) | |
tree | 5643e4504c819c1686e36976b68f7b84e89b258f /pkgs/os-specific/linux | |
parent | c2088a45896220dffcebaecd2f7b4ae3db48309b (diff) | |
parent | b425c7dbf9a4a2406c9dadc2e8946f3bf4cc70a4 (diff) | |
download | nixpkgs-da4d99e016fdaac92c67847482dc6682abfde8bc.tar nixpkgs-da4d99e016fdaac92c67847482dc6682abfde8bc.tar.gz nixpkgs-da4d99e016fdaac92c67847482dc6682abfde8bc.tar.bz2 nixpkgs-da4d99e016fdaac92c67847482dc6682abfde8bc.tar.lz nixpkgs-da4d99e016fdaac92c67847482dc6682abfde8bc.tar.xz nixpkgs-da4d99e016fdaac92c67847482dc6682abfde8bc.tar.zst nixpkgs-da4d99e016fdaac92c67847482dc6682abfde8bc.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r-- | pkgs/os-specific/linux/lxcfs/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix index 70d84d6311c..96477c5f442 100644 --- a/pkgs/os-specific/linux/lxcfs/default.nix +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { changelog = "https://linuxcontainers.org/lxcfs/news/"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ mic92 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 809bf48be1e..44c595de0e4 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -785,6 +785,6 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/systemd/systemd/issues/20600#issuecomment-912338965 broken = stdenv.hostPlatform.isStatic; priority = 10; - maintainers = with maintainers; [ flokli kloenk mic92 ]; + maintainers = with maintainers; [ flokli kloenk ]; }; }) |