Merge #239185: apparmor: 3.1.5 -> 3.1.6

...into staging

+4 -4
+4 -4
pkgs/os-specific/linux/apparmor/default.nix
··· 22 22 }: 23 23 24 24 let 25 - apparmor-version = "3.1.5"; 25 + apparmor-version = "3.1.6"; 26 26 27 27 apparmor-meta = component: with lib; { 28 28 homepage = "https://apparmor.net/"; 29 29 description = "A mandatory access control system - ${component}"; 30 - license = licenses.gpl2; 31 - maintainers = with maintainers; [ julm thoughtpolice ]; 30 + license = with licenses; [ gpl2Only lgpl21Only ]; 31 + maintainers = with maintainers; [ julm thoughtpolice ajs124 ]; 32 32 platforms = platforms.linux; 33 33 }; 34 34 ··· 36 36 owner = "apparmor"; 37 37 repo = "apparmor"; 38 38 rev = "v${apparmor-version}"; 39 - hash = "sha256-nqIRs2REbSQNKglEEjAO/YSZc6r2ks128sUNq61gRWE="; 39 + hash = "sha256-VPgRmmQv+kgLduc6RTu9gotyjT6OImUXsPeatgG7m9E="; 40 40 }; 41 41 42 42 aa-teardown = writeShellScript "aa-teardown" ''