diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-01-29 12:54:20 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-01-29 12:54:20 +0100 |
| commit | 57a456112d76bad008b4393ae6ddaadc34328167 (patch) | |
| tree | ad403054bf21ac452f493249b6d53ec4aa0b732d | |
| parent | 444d0733325b755d6d6ec315ff2d6a17c8b0e319 (diff) | |
| download | nixpkgs-57a456112d76bad008b4393ae6ddaadc34328167.tar nixpkgs-57a456112d76bad008b4393ae6ddaadc34328167.tar.gz nixpkgs-57a456112d76bad008b4393ae6ddaadc34328167.tar.bz2 nixpkgs-57a456112d76bad008b4393ae6ddaadc34328167.tar.lz nixpkgs-57a456112d76bad008b4393ae6ddaadc34328167.tar.xz nixpkgs-57a456112d76bad008b4393ae6ddaadc34328167.tar.zst nixpkgs-57a456112d76bad008b4393ae6ddaadc34328167.zip | |
Revert "swig3, libapparmor: switch to bison2"
This reverts commit c4720cb200bfa611dc1800aa046c9cb7f1e6c0df.
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
1 files 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; |