diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-04-04 19:48:49 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-04 19:48:49 +0200 |
commit | b04fb3ffcdc1b736a7f294557e21fab2a501d983 (patch) | |
tree | 042f42a69ba7328d020fa45b0e0be9cf77820b75 /pkgs/top-level | |
parent | 527512e5549c237010be421b14535c95f4f907ba (diff) | |
parent | e010c25ba41a09787168afd4c343ad49a8515f56 (diff) | |
download | nixpkgs-b04fb3ffcdc1b736a7f294557e21fab2a501d983.tar nixpkgs-b04fb3ffcdc1b736a7f294557e21fab2a501d983.tar.gz nixpkgs-b04fb3ffcdc1b736a7f294557e21fab2a501d983.tar.bz2 nixpkgs-b04fb3ffcdc1b736a7f294557e21fab2a501d983.tar.lz nixpkgs-b04fb3ffcdc1b736a7f294557e21fab2a501d983.tar.xz nixpkgs-b04fb3ffcdc1b736a7f294557e21fab2a501d983.tar.zst nixpkgs-b04fb3ffcdc1b736a7f294557e21fab2a501d983.zip |
Merge pull request #24586 from maurer/bap
Add BAP to nixpkgs
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 4 |
3 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e83ef1781b8..1506ffc7d71 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8084,6 +8084,10 @@ with pkgs; libb2 = callPackage ../development/libraries/libb2 { }; + libbap = callPackage ../development/libraries/libbap { + inherit (ocamlPackages_4_02) bap ocaml findlib ctypes; + }; + libbluedevil = callPackage ../development/libraries/libbluedevil { }; libbdplus = callPackage ../development/libraries/libbdplus { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 232f1331865..cf2b676a5d4 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -51,6 +51,8 @@ let base64 = callPackage ../development/ocaml-modules/base64 { }; + bap = callPackage ../development/ocaml-modules/bap { }; + bitstring = callPackage ../development/ocaml-modules/bitstring { }; bolt = callPackage ../development/ocaml-modules/bolt { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5bb2b28d001..22a3f56a6d4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -175,6 +175,10 @@ in { # packages defined elsewhere + bap = callPackage ../development/python-modules/bap { + bap = pkgs.ocamlPackages_4_02.bap; + }; + blivet = callPackage ../development/python-modules/blivet { }; breathe = callPackage ../development/python-modules/breathe { }; |