BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge #33222: apparmor: 2.10 -> 2.12.0

Browse source
This commit is contained in:
Vladimír Čunát 2018-01-07 11:01:43 +01:00
commit 76332855dc
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/os-specific/linux/apparmor/default.nix
View file

@ -9,8 +9,10 @@
}: }:
let let
apparmor-series = "2.10";
apparmor-version = apparmor-series; apparmor-series = "2.12";
apparmor-patchver = "0";
apparmor-version = apparmor-series + "." + apparmor-patchver;
apparmor-meta = component: with stdenv.lib; { apparmor-meta = component: with stdenv.lib; {
homepage = http://apparmor.net/; homepage = http://apparmor.net/;
@ -21,8 +23,8 @@ let
}; };
apparmor-sources = fetchurl { apparmor-sources = fetchurl {
url = "https://launchpad.net/apparmor/${apparmor-series}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz"; url = "https://launchpad.net/apparmor/${apparmor-series}/${apparmor-version}/+download/apparmor-${apparmor-series}.tar.gz";
sha256 = "1x06qmmbha9krx7880pxj2k3l8fxy3nm945xjjv735m2ax1243jd"; sha256 = "0mm0mcp0w18si9wl15drndysm7v27az2942p1xjd197shg80qawa";
}; };
prePatchCommon = '' prePatchCommon = ''
@ -96,7 +98,7 @@ let
wrapProgram $out/bin/$prog --prefix PYTHONPATH : "$out/lib/${pythonPackages.python.libPrefix}/site-packages:$PYTHONPATH" wrapProgram $out/bin/$prog --prefix PYTHONPATH : "$out/lib/${pythonPackages.python.libPrefix}/site-packages:$PYTHONPATH"
done done
for prog in aa-exec aa-notify ; do for prog in aa-notify ; do
wrapProgram $out/bin/$prog --prefix PERL5LIB : "${libapparmor}/lib/perl5:$PERL5LIB" wrapProgram $out/bin/$prog --prefix PERL5LIB : "${libapparmor}/lib/perl5:$PERL5LIB"
done done
''; '';