summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorcorpix <corpix@users.noreply.github.com>2018-01-20 08:29:03 +0000
committerFrederik Rietdijk <freddyrietdijk@fridh.nl>2018-01-20 09:29:03 +0100
commit0db68e5d42c4426ccc2933e982836cba0bef0b48 (patch)
tree17791c3a57f53fb3029b2b4f3d8e3c2598db5d07 /pkgs/top-level
parentb86412d04245e3fe295340e6fa3e47a512754e19 (diff)
downloadnixlib-0db68e5d42c4426ccc2933e982836cba0bef0b48.tar
nixlib-0db68e5d42c4426ccc2933e982836cba0bef0b48.tar.gz
nixlib-0db68e5d42c4426ccc2933e982836cba0bef0b48.tar.bz2
nixlib-0db68e5d42c4426ccc2933e982836cba0bef0b48.tar.lz
nixlib-0db68e5d42c4426ccc2933e982836cba0bef0b48.tar.xz
nixlib-0db68e5d42c4426ccc2933e982836cba0bef0b48.tar.zst
nixlib-0db68e5d42c4426ccc2933e982836cba0bef0b48.zip
apparmor: updating utilities to fresh python (#34049)
* apparmor: updating utilities to fresh python

* apparmor: better way to depend on python

* apparmor: override python derivation on the top-level
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a36547af80dd..be045e1189c8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12499,8 +12499,9 @@ with pkgs;
 
   microcodeIntel = callPackage ../os-specific/linux/microcode/intel.nix { };
 
-  inherit (callPackages ../os-specific/linux/apparmor { pythonPackages = python27Packages; swig = swig2; })
-    libapparmor apparmor-pam apparmor-parser apparmor-profiles apparmor-utils;
+  inherit (callPackages ../os-specific/linux/apparmor { python = python3; })
+    libapparmor apparmor-utils apparmor-bin-utils apparmor-parser apparmor-pam
+    apparmor-profiles apparmor-kernel-patches;
 
   atop = callPackage ../os-specific/linux/atop { };