pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #36194 from maurer/bap-1.4

BAP update to 1.4

authored by Jörg Thalheim and committed by GitHub d2850489 e0b5bdde

+21 -22
unified split
+3 -3
pkgs/development/libraries/libbap/default.nix
··· 3 4 stdenv.mkDerivation rec { 5 name = "libbap-${version}"; 6 - version = "master-2017-02-08"; 7 8 src = fetchFromGitHub { 9 owner = "BinaryAnalysisPlatform"; 10 repo = "bap-bindings"; 11 - rev = "b3da5bd5cdb3d646015ccdeb886b5ea8fd85a108"; 12 - sha256 = "0cwfyfpxbi9bm4kkpamyd7mgsm5b6j1rh217fqb5gi05wg45rkbb"; 13 }; 14 15 nativeBuildInputs = [ autoreconfHook which ];
··· 3 4 stdenv.mkDerivation rec { 5 name = "libbap-${version}"; 6 + version = "master-2018-03-01"; 7 8 src = fetchFromGitHub { 9 owner = "BinaryAnalysisPlatform"; 10 repo = "bap-bindings"; 11 + rev = "bd125c379a784d4265c2ddcf1f6e34bde2e568d4"; 12 + sha256 = "0dp90djyjc262v1b1cw5irp424a8394y86fyprdk8z741wg56m3v"; 13 }; 14 15 nativeBuildInputs = [ autoreconfHook which ];
+10 -11
pkgs/development/ocaml-modules/bap/default.nix
··· 1 - {stdenv, buildOcaml, fetchFromGitHub, fetchurl, camlp4, ocaml_oasis, bitstring, camlzip, cmdliner, core_kernel, ezjsonm, faillib, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, ulex, easy-format, xmlm, frontc, ounit, utop, which, makeWrapper, writeText, ocaml}: 2 3 buildOcaml rec { 4 name = "bap"; 5 - version = "1.2.0"; 6 src = fetchFromGitHub { 7 owner = "BinaryAnalysisPlatform"; 8 repo = "bap"; 9 rev = "v${version}"; 10 - sha256 = "0dn1gvj73pma0rsw8r50cmjddibnf42w1kbskb2vpzq0kb79jlkw"; 11 }; 12 13 sigs = fetchurl { 14 url = "https://github.com/BinaryAnalysisPlatform/bap/releases/download/v${version}/sigs.zip"; 15 - sha256 = "0mpsq2pinbrynlisnh8j3nrlamlsls7lza0bkqnm9szqjjdmcgfn"; 16 }; 17 18 createFindlibDestdir = true; ··· 28 llvm_38 29 utop ]; 30 31 - propagatedBuildInputs = [ bitstring camlzip cmdliner core_kernel ezjsonm faillib fileutils ocaml_lwt ocamlgraph ocurl re uri zarith piqi 32 piqi-ocaml uuidm frontc ounit ]; 33 34 installPhase = '' ··· 45 46 disableIda = "--disable-ida --disable-fsi-benchmark"; 47 48 - doCheck = true; 49 - 50 - checkTarget = "check test"; 51 - 52 - configureFlags = "--enable-everything --enable-tests ${disableIda} --with-llvm-config=${llvm_38}/bin/llvm-config"; 53 54 BAPBUILDFLAGS = "-j $(NIX_BUILD_CORES)"; 55 ··· 58 homepage = https://github.com/BinaryAnalysisPlatform/bap/; 59 maintainers = [ maintainers.maurer ]; 60 license = licenses.mit; 61 - broken = versionAtLeast ocaml.version "4.03"; 62 }; 63 }
··· 1 + {stdenv, buildOcaml, fetchFromGitHub, fetchurl, camlp4, ocaml_oasis, 2 + bitstring, camlzip, cmdliner, core_kernel, ezjsonm, faillib, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, ulex, easy-format, xmlm, frontc, ounit, ppx_jane, parsexp, 3 + utop, 4 + which, makeWrapper, writeText, ocaml}: 5 6 buildOcaml rec { 7 name = "bap"; 8 + version = "1.4.0"; 9 src = fetchFromGitHub { 10 owner = "BinaryAnalysisPlatform"; 11 repo = "bap"; 12 rev = "v${version}"; 13 + sha256 = "0329m65x8q5q8vgvsqgyz2vz7q6qkh2rh11j7x29hckk3fzxsf8g"; 14 }; 15 16 sigs = fetchurl { 17 url = "https://github.com/BinaryAnalysisPlatform/bap/releases/download/v${version}/sigs.zip"; 18 + sha256 = "0k761w82zkmi5dwsfqq61dbjnb8mmmpb2xwp7vp85xs14g5fjz19"; 19 }; 20 21 createFindlibDestdir = true; ··· 31 llvm_38 32 utop ]; 33 34 + propagatedBuildInputs = [ bitstring camlzip cmdliner ppx_jane core_kernel ezjsonm faillib fileutils ocaml_lwt ocamlgraph ocurl re uri zarith piqi parsexp 35 piqi-ocaml uuidm frontc ounit ]; 36 37 installPhase = '' ··· 48 49 disableIda = "--disable-ida --disable-fsi-benchmark"; 50 51 + configureFlags = "--enable-everything ${disableIda} --with-llvm-config=${llvm_38}/bin/llvm-config"; 52 53 BAPBUILDFLAGS = "-j $(NIX_BUILD_CORES)"; 54 ··· 57 homepage = https://github.com/BinaryAnalysisPlatform/bap/; 58 maintainers = [ maintainers.maurer ]; 59 license = licenses.mit; 60 + broken = versionOlder ocaml.version "4.03"; 61 }; 62 }
+3 -3
pkgs/development/python-modules/bap/default.nix
··· 2 3 buildPythonPackage rec { 4 pname = "bap"; 5 - version = "1.1.0"; 6 name = "${pname}-${version}"; 7 src = fetchFromGitHub { 8 owner = "BinaryAnalysisPlatform"; 9 repo = "bap-python"; 10 - rev = "v${version}"; 11 - sha256 = "0wd46ksxscgb2dci69sbndzxs6drq5cahraqq42cdk114hkrsxs3"; 12 }; 13 14 propagatedBuildInputs = [bap requests];
··· 2 3 buildPythonPackage rec { 4 pname = "bap"; 5 + version = "1.3.1"; 6 name = "${pname}-${version}"; 7 src = fetchFromGitHub { 8 owner = "BinaryAnalysisPlatform"; 9 repo = "bap-python"; 10 + rev = "${version}"; 11 + sha256 = "1ahkrmcn7qaivps1gar8wd9mq2qqyx6zzvznf5r9rr05h17x5lbp"; 12 }; 13 14 propagatedBuildInputs = [bap requests];
+2 -2
pkgs/development/tools/ocaml/jbuilder/default.nix
··· 2 3 stdenv.mkDerivation rec { 4 name = "jbuilder-${version}"; 5 - version = "1.0+beta18"; 6 src = fetchFromGitHub { 7 owner = "ocaml"; 8 repo = "dune"; 9 rev = "${version}"; 10 - sha256 = "1xw4i5qd2ndnddzb8b14fb52qxnjpr3lr9wx3mprv4f294kdg0l6"; 11 }; 12 13 buildInputs = [ ocaml ];
··· 2 3 stdenv.mkDerivation rec { 4 name = "jbuilder-${version}"; 5 + version = "1.0+beta17"; 6 src = fetchFromGitHub { 7 owner = "ocaml"; 8 repo = "dune"; 9 rev = "${version}"; 10 + sha256 = "04pyry459hp2r2s9m5xkcq1glzp20ddz5wb1w8nzp3zgygy0431x"; 11 }; 12 13 buildInputs = [ ocaml ];
+1 -1
pkgs/top-level/all-packages.nix
··· 9460 libb2 = callPackage ../development/libraries/libb2 { }; 9461 9462 libbap = callPackage ../development/libraries/libbap { 9463 - inherit (ocamlPackages_4_02) bap ocaml findlib ctypes; 9464 }; 9465 9466 libbass = (callPackage ../development/libraries/audio/libbass { }).bass;
··· 9460 libb2 = callPackage ../development/libraries/libb2 { }; 9461 9462 libbap = callPackage ../development/libraries/libbap { 9463 + inherit (ocamlPackages) bap ocaml findlib ctypes; 9464 }; 9465 9466 libbass = (callPackage ../development/libraries/audio/libbass { }).bass;
+1 -1
pkgs/top-level/ocaml-packages.nix
··· 54 55 base64 = callPackage ../development/ocaml-modules/base64 { }; 56 57 - bap = callPackage ../development/ocaml-modules/bap { cmdliner = cmdliner_0_9; }; 58 59 batteries = callPackage ../development/ocaml-modules/batteries { }; 60
··· 54 55 base64 = callPackage ../development/ocaml-modules/base64 { }; 56 57 + bap = callPackage ../development/ocaml-modules/bap { }; 58 59 batteries = callPackage ../development/ocaml-modules/batteries { }; 60
+1 -1
pkgs/top-level/python-packages.nix
··· 184 backports_csv = callPackage ../development/python-modules/backports_csv {}; 185 186 bap = callPackage ../development/python-modules/bap { 187 - bap = pkgs.ocamlPackages_4_02.bap; 188 }; 189 190 bash_kernel = callPackage ../development/python-modules/bash_kernel { };
··· 184 backports_csv = callPackage ../development/python-modules/backports_csv {}; 185 186 bap = callPackage ../development/python-modules/bap { 187 + bap = pkgs.ocamlPackages.bap; 188 }; 189 190 bash_kernel = callPackage ../development/python-modules/bash_kernel { };