public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/apparmor: remove an IFD

Browse Source 
First because IFD (import-from-derivation) is not allowed on hydra.nixos.org,
and second because without https://github.com/NixOS/hydra/pull/825
hydra-eval-jobs crashes instead of skipping aggregated jobs which fail
(here because they required an IFD).
This commit is contained in:
Tony Olagbaiye 2020-12-03 13:45:43 +00:00 committed by Julien Moutinho
parent 05d334cfe2
commit fca06b142a
1 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nixos/modules/security/apparmor.nix
View File

@ -111,7 +111,8 @@ in
''; '';
# For aa-logprof # For aa-logprof
environment.etc."apparmor/severity.db".source = pkgs.apparmor-utils + "/etc/apparmor/severity.db"; environment.etc."apparmor/severity.db".source = pkgs.apparmor-utils + "/etc/apparmor/severity.db";
environment.etc."apparmor/logprof.conf".text = '' environment.etc."apparmor/logprof.conf".source = pkgs.runCommand "logprof.conf" {
header = ''
[settings] [settings]
# /etc/apparmor.d/ is read-only on NixOS # /etc/apparmor.d/ is read-only on NixOS
profiledir = /var/cache/apparmor/logprof profiledir = /var/cache/apparmor/logprof
@ -136,8 +137,13 @@ in
${pkgs.runtimeShell} = icnu ${pkgs.runtimeShell} = icnu
${pkgs.bashInteractive}/bin/sh = icnu ${pkgs.bashInteractive}/bin/sh = icnu
${pkgs.bashInteractive}/bin/bash = icnu ${pkgs.bashInteractive}/bin/bash = icnu
'' + head (match "^.*\\[qualifiers](.*)" # Drop the original [settings] section. '';
(readFile "${pkgs.apparmor-utils}/etc/apparmor/logprof.conf")); footer = "${pkgs.apparmor-utils}/etc/apparmor/logprof.conf";
passAsFile = [ "header" ];
} ''
cp $headerPath $out
sed -n '/\\[qualifiers\\]/,''${n;p}' $footer > $out
'';
boot.kernelParams = [ "apparmor=1" "security=apparmor" ]; boot.kernelParams = [ "apparmor=1" "security=apparmor" ];