From 0db68e5d42c4426ccc2933e982836cba0bef0b48 Mon Sep 17 00:00:00 2001 From: corpix Date: Sat, 20 Jan 2018 08:29:03 +0000 Subject: 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 --- pkgs/top-level/all-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pkgs/top-level/all-packages.nix') 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 { }; -- cgit 1.4.1