Merge master into staging-next

2 files changed, 0 insertions, 41 deletions

diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index 97607134bb1d9..5b681ca59464d 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@@ -448,40 +448,6 @@ in
     (mkIf cfg.enable {
       environment.systemPackages    = [ pkgs.fontconfig ];
       environment.etc.fonts.source  = "${fontconfigEtc}/etc/fonts/";
-      security.apparmor.includes."abstractions/fonts" = ''
-        # fonts.conf
-        r ${pkg.out}/etc/fonts/fonts.conf,
-
-        # fontconfig default config files
-        r ${pkg.out}/etc/fonts/conf.d/*.conf,
-
-        # 00-nixos-cache.conf
-        r ${cacheConf},
-
-        # 10-nixos-rendering.conf
-        r ${renderConf},
-
-        # 50-user.conf
-        ${optionalString cfg.includeUserConf ''
-        r ${pkg.out}/etc/fonts/conf.d.bak/50-user.conf,
-        ''}
-
-        # local.conf (indirect priority 51)
-        ${optionalString (cfg.localConf != "") ''
-        r ${localConf},
-        ''}
-
-        # 52-nixos-default-fonts.conf
-        r ${defaultFontsConf},
-
-        # 53-no-bitmaps.conf
-        r ${rejectBitmaps},
-
-        ${optionalString (!cfg.allowType1) ''
-        # 53-nixos-reject-type1.conf
-        r ${rejectType1},
-        ''}
-      '';
     })
     (mkIf cfg.enable {
       fonts.fontconfig.confPackages = [ confPkg ];
diff --git a/nixos/modules/config/malloc.nix b/nixos/modules/config/malloc.nix
index 5c5752ef5153b..31a659ee83fe9 100644
--- a/nixos/modules/config/malloc.nix
+++ b/nixos/modules/config/malloc.nix
@@ -87,12 +87,5 @@ in
     environment.etc."ld-nix.so.preload".text = ''
       ${providerLibPath}
     '';
-    security.apparmor.includes = {
-      "abstractions/base" = ''
-        r /etc/ld-nix.so.preload,
-        r ${config.environment.etc."ld-nix.so.preload".source},
-        mr ${providerLibPath},
-      '';
-    };
   };
 }