summary refs log tree commit diff
path: root/pkgs/os-specific/linux/apparmor
diff options
context:
space:
mode:
authoradisbladis <adis@blad.is>2017-12-30 14:28:40 +0100
committeradisbladis <adis@blad.is>2017-12-31 16:40:19 +0100
commitd672a9a5cd754cadcf9c2b39328f029bc22a8691 (patch)
tree80fcbe40d02a3cffeb4210d9d2dc4f469500973d /pkgs/os-specific/linux/apparmor
parenta09a320e203d3e4fa7d5f74270fefe07dd882847 (diff)
downloadnixlib-d672a9a5cd754cadcf9c2b39328f029bc22a8691.tar
nixlib-d672a9a5cd754cadcf9c2b39328f029bc22a8691.tar.gz
nixlib-d672a9a5cd754cadcf9c2b39328f029bc22a8691.tar.bz2
nixlib-d672a9a5cd754cadcf9c2b39328f029bc22a8691.tar.lz
nixlib-d672a9a5cd754cadcf9c2b39328f029bc22a8691.tar.xz
nixlib-d672a9a5cd754cadcf9c2b39328f029bc22a8691.tar.zst
nixlib-d672a9a5cd754cadcf9c2b39328f029bc22a8691.zip
apparmor: 2.10 -> 2.12.0
Diffstat (limited to 'pkgs/os-specific/linux/apparmor')
-rw-r--r--pkgs/os-specific/linux/apparmor/default.nix12
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
     '';