Merge #33222: apparmor: 2.10 -> 2.12.0

+7 -5
+7 -5
pkgs/os-specific/linux/apparmor/default.nix
··· 9 }: 10 11 let 12 - apparmor-series = "2.10"; 13 - apparmor-version = apparmor-series; 14 15 apparmor-meta = component: with stdenv.lib; { 16 homepage = http://apparmor.net/; ··· 21 }; 22 23 apparmor-sources = fetchurl { 24 - url = "https://launchpad.net/apparmor/${apparmor-series}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz"; 25 - sha256 = "1x06qmmbha9krx7880pxj2k3l8fxy3nm945xjjv735m2ax1243jd"; 26 }; 27 28 prePatchCommon = '' ··· 96 wrapProgram $out/bin/$prog --prefix PYTHONPATH : "$out/lib/${pythonPackages.python.libPrefix}/site-packages:$PYTHONPATH" 97 done 98 99 - for prog in aa-exec aa-notify ; do 100 wrapProgram $out/bin/$prog --prefix PERL5LIB : "${libapparmor}/lib/perl5:$PERL5LIB" 101 done 102 '';
··· 9 }: 10 11 let 12 + 13 + apparmor-series = "2.12"; 14 + apparmor-patchver = "0"; 15 + apparmor-version = apparmor-series + "." + apparmor-patchver; 16 17 apparmor-meta = component: with stdenv.lib; { 18 homepage = http://apparmor.net/; ··· 23 }; 24 25 apparmor-sources = fetchurl { 26 + url = "https://launchpad.net/apparmor/${apparmor-series}/${apparmor-version}/+download/apparmor-${apparmor-series}.tar.gz"; 27 + sha256 = "0mm0mcp0w18si9wl15drndysm7v27az2942p1xjd197shg80qawa"; 28 }; 29 30 prePatchCommon = '' ··· 98 wrapProgram $out/bin/$prog --prefix PYTHONPATH : "$out/lib/${pythonPackages.python.libPrefix}/site-packages:$PYTHONPATH" 99 done 100 101 + for prog in aa-notify ; do 102 wrapProgram $out/bin/$prog --prefix PERL5LIB : "${libapparmor}/lib/perl5:$PERL5LIB" 103 done 104 '';