From 57a456112d76bad008b4393ae6ddaadc34328167 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 29 Jan 2019 12:54:20 +0100 Subject: [PATCH] Revert "swig3, libapparmor: switch to bison2" This reverts commit c4720cb200bfa611dc1800aa046c9cb7f1e6c0df. --- pkgs/top-level/all-packages.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a313bb0e18f..eeab1784f99 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9174,9 +9174,7 @@ in swig1 = callPackage ../development/tools/misc/swig { }; swig2 = callPackage ../development/tools/misc/swig/2.x.nix { }; - swig3 = callPackage ../development/tools/misc/swig/3.x.nix { - bison = bison2; - }; + swig3 = callPackage ../development/tools/misc/swig/3.x.nix { }; swig = swig3; swigWithJava = swig; @@ -14284,7 +14282,7 @@ in iucode-tool = callPackage ../os-specific/linux/microcode/iucode-tool.nix { }; - inherit (callPackages ../os-specific/linux/apparmor { python = python3; bison = bison2; }) + inherit (callPackages ../os-specific/linux/apparmor { python = python3; }) libapparmor apparmor-utils apparmor-bin-utils apparmor-parser apparmor-pam apparmor-profiles apparmor-kernel-patches;