diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-01-07 11:01:43 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-01-07 11:01:43 +0100 |
commit | 76332855dc8e975dbfd253d92dfc23836fd45422 (patch) | |
tree | 078fa4ca6be51bd0a8f53183f888a1b9cee5f6e0 | |
parent | 4b20be5096e8d731b2c1d07b78143e88dc12fca2 (diff) | |
parent | d672a9a5cd754cadcf9c2b39328f029bc22a8691 (diff) | |
download | nixlib-76332855dc8e975dbfd253d92dfc23836fd45422.tar nixlib-76332855dc8e975dbfd253d92dfc23836fd45422.tar.gz nixlib-76332855dc8e975dbfd253d92dfc23836fd45422.tar.bz2 nixlib-76332855dc8e975dbfd253d92dfc23836fd45422.tar.lz nixlib-76332855dc8e975dbfd253d92dfc23836fd45422.tar.xz nixlib-76332855dc8e975dbfd253d92dfc23836fd45422.tar.zst nixlib-76332855dc8e975dbfd253d92dfc23836fd45422.zip |
Merge #33222: apparmor: 2.10 -> 2.12.0
-rw-r--r-- | pkgs/os-specific/linux/apparmor/default.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index b576ca71d580..b026e91cc0bf 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -9,8 +9,10 @@ }: 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; { homepage = http://apparmor.net/; @@ -21,8 +23,8 @@ let }; apparmor-sources = fetchurl { - url = "https://launchpad.net/apparmor/${apparmor-series}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz"; - sha256 = "1x06qmmbha9krx7880pxj2k3l8fxy3nm945xjjv735m2ax1243jd"; + url = "https://launchpad.net/apparmor/${apparmor-series}/${apparmor-version}/+download/apparmor-${apparmor-series}.tar.gz"; + sha256 = "0mm0mcp0w18si9wl15drndysm7v27az2942p1xjd197shg80qawa"; }; prePatchCommon = '' @@ -96,7 +98,7 @@ let wrapProgram $out/bin/$prog --prefix PYTHONPATH : "$out/lib/${pythonPackages.python.libPrefix}/site-packages:$PYTHONPATH" 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" done ''; |