public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "swig3, libapparmor: switch to bison2"

Browse Source 
This reverts commit c4720cb200bfa611dc1800aa046c9cb7f1e6c0df.
This commit is contained in:
Vladimír Čunát 2019-01-29 12:54:20 +01:00
parent 444d073332
commit 57a456112d
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/top-level/all-packages.nix
View File

@ -9174,9 +9174,7 @@ in
swig1 = callPackage ../development/tools/misc/swig { }; swig1 = callPackage ../development/tools/misc/swig { };
swig2 = callPackage ../development/tools/misc/swig/2.x.nix { }; swig2 = callPackage ../development/tools/misc/swig/2.x.nix { };
swig3 = callPackage ../development/tools/misc/swig/3.x.nix { swig3 = callPackage ../development/tools/misc/swig/3.x.nix { };
bison = bison2;
};
swig = swig3; swig = swig3;
swigWithJava = swig; swigWithJava = swig;
@ -14284,7 +14282,7 @@ in
iucode-tool = callPackage ../os-specific/linux/microcode/iucode-tool.nix { }; 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 libapparmor apparmor-utils apparmor-bin-utils apparmor-parser apparmor-pam
apparmor-profiles apparmor-kernel-patches; apparmor-profiles apparmor-kernel-patches;