commit 3c12d02b760d63efdc155200d9c47b5b39d48c83 · pyrox.dev/nixpkgs

+1

pkgs/development/libraries/libbap/default.nix

···

       45
       45
        
           maintainers = [ maintainers.maurer ];

     

       46
       46
        
           platforms = platforms.unix;

     

       47
       47
        
           license = licenses.mit;

     

       48
       48
       +
           broken = true; # Not compatible with JaneStreet libraries 0.17

     

       48
       49
        
         };

     

       49
       50
        
       }

+2 -2

pkgs/development/ocaml-modules/bap/curses_is_ncurses.patch

···

       22
       22
        
                         Bap_llvm_ogre_samples,

     

       23
       23
        
                         Bap_llvm_ogre_types

     

       24
       24
        
          CCOpt:         $cc_optimization

     

       25
       25
       -
       -  CCLib:         $llvm_lib $cxxlibs $llvm_ldflags -lcurses

     

       26
       26
       -
       +  CCLib:         $llvm_lib $cxxlibs $llvm_ldflags -lncurses

     

       25
       25
       +
       -  CCLib:         $llvm_lib $cxxlibs $llvm_ldflags -lcurses -lzstd

     

       26
       26
       +
       +  CCLib:         $llvm_lib $cxxlibs $llvm_ldflags -lncurses -lzstd

     

       27
       27
        
          CSources:      llvm_disasm.h,

     

       28
       28
        
                         llvm_disasm.c,

     

       29
       29
        
                         llvm_stubs.c,

+7 -5

pkgs/development/ocaml-modules/bap/default.nix

···

       13
       13
        
         core_kernel,

     

       14
       14
        
         ezjsonm,

     

       15
       15
        
         fileutils,

     

       16
       16
       +
         jane_rope ? null,

     

       16
       17
        
         mmap,

     

       17
       18
        
         lwt,

     

       18
       19
        
         ocamlgraph,

     
···

       27
       28
        
         frontc,

     

       28
       29
        
         ounit,

     

       29
       30
        
         ppx_jane,

     

       30
       30
       -
         parsexp,

     

       31
       31
       +
         parsexp ? null,

     

       31
       32
        
         utop,

     

       32
       33
        
         libxml2,

     

       33
       34
        
         ncurses,

     
···

       47
       48
        
       

     

       48
       49
        
         stdenv.mkDerivation rec {

     

       49
       50
        
           pname = "ocaml${ocaml.version}-bap";

     

       50
       50
       -
           version = "2.5.0";

     

       51
       51
       +
           version = "2.5.0+pr1621";

     

       51
       52
        
           src = fetchFromGitHub {

     

       52
       53
        
             owner = "BinaryAnalysisPlatform";

     

       53
       54
        
             repo = "bap";

     

       54
       54
       -
             rev = "v${version}";

     

       55
       55
       -
             sha256 = "1c30zxn0zyi0wypvjmik3fd6n6a8xjcb102qfnccn1af052bvsrd";

     

       55
       55
       +
             rev = "65c282d94e8b7028e8a986c637db3a2378a753f6";

     

       56
       56
       +
             hash = "sha256-LUZZOgG1T8xa5jLA/fDft8ofYb/Yf6QjTrl6AlLY7H0=";

     

       56
       57
        
           };

     

       57
       58
        
       

     

       58
       59
        
           sigs = fetchurl {

     
···

       95
       96
        
             core_kernel

     

       96
       97
        
             ezjsonm

     

       97
       98
        
             fileutils

     

       99
       99
       +
             jane_rope

     

       98
       100
        
             mmap

     

       99
       101
        
             lwt

     

       100
       102
        
             ocamlgraph

     
···

       132
       134
        
           ];

     

       133
       135
        
       

     

       134
       136
        
           preConfigure = ''

     

       135
       135
       -
             substituteInPlace oasis/elf-loader --replace bitstring.ppx ppx_bitstring

     

       137
       137
       +
             substituteInPlace oasis/monads --replace-warn core_kernel.rope jane_rope

     

       136
       138
        
           '';

     

       137
       139
        
       

     

       138
       140
        
           configureFlags = [

+15 -7

pkgs/development/ocaml-modules/ppx_bap/default.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         buildDunePackage,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
       -
         ppx_assert,

     

       6
       6
       -
         ppx_bench,

     

       7
       7
       -
         ppx_bin_prot,

     

       8
       8
       -
         ppx_compare,

     

       9
       9
       -
         ppx_enumerate,

     

       5
       5
       +
         fetchpatch,

     

       6
       6
       +
         ppx_assert ? null,

     

       7
       7
       +
         ppx_bench ? null,

     

       8
       8
       +
         ppx_bin_prot ? null,

     

       9
       9
       +
         ppx_compare ? null,

     

       10
       10
       +
         ppx_enumerate ? null,

     

       11
       11
       +
         ppx_expect,

     

       10
       12
        
         ppx_hash,

     

       11
       13
        
         ppx_here,

     

       12
       14
        
         ppx_optcomp,

     

       13
       15
        
         ppx_sexp_conv,

     

       14
       14
       -
         ppx_sexp_value,

     

       16
       16
       +
         ppx_sexp_value ? null,

     

       15
       17
        
       }:

     

       16
       18
        
       

     

       17
       19
        
       buildDunePackage rec {

     

       18
       20
        
         pname = "ppx_bap";

     

       19
       21
        
         version = "0.14";

     

       20
       20
       -
         duneVersion = "3";

     

       21
       22
        
       

     

       22
       23
        
         minimalOCamlVersion = "4.07";

     

       23
       24
        
       

     
···

       28
       29
        
           sha256 = "1c6rcdp8bicdiwqc2mb59cl9l2vxlp3y8hmnr9x924fq7acly248";

     

       29
       30
        
         };

     

       30
       31
        
       

     

       32
       32
       +
         # Support ppx_expect

     

       33
       33
       +
         patches = fetchpatch {

     

       34
       34
       +
           url = "https://github.com/BinaryAnalysisPlatform/ppx_bap/commit/7f197648978758fbcbf553da50d7a9248d34f7e4.patch";

     

       35
       35
       +
           hash = "sha256-oOdcA06mb0W5jDhF4nutEijy6yu/6kMjKOUcNxUSk6k=";

     

       36
       36
       +
         };

     

       37
       37
       +
       

     

       31
       38
        
         buildInputs = [

     

       32
       39
        
           ppx_optcomp

     

       33
       40
        
           ppx_sexp_value

     
···

       39
       46
        
           ppx_bin_prot

     

       40
       47
        
           ppx_compare

     

       41
       48
        
           ppx_enumerate

     

       49
       49
       +
           ppx_expect

     

       42
       50
        
           ppx_hash

     

       43
       51
        
           ppx_here

     

       44
       52
        
           ppx_sexp_conv

+4 -22

pkgs/top-level/ocaml-packages.nix

···

       80
       80
        
       

     

       81
       81
        
               backoff = callPackage ../development/ocaml-modules/backoff { };

     

       82
       82
        
       

     

       83
       83
       -
               bap = janeStreet_0_15.bap;

     

       83
       83
       +
               bap = callPackage ../development/ocaml-modules/bap {

     

       84
       84
       +
                 inherit (pkgs.llvmPackages_14) llvm;

     

       85
       85
       +
               };

     

       84
       86
        
       

     

       85
       87
        
               base64 = callPackage ../development/ocaml-modules/base64 { };

     

       86
       88
        
       

     
···

       982
       984
        
                         zstd

     

       983
       985
        
                         ;

     

       984
       986
        
                     };

     

       985
       985
       -
       

     

       986
       986
       -
                     # Packages that are not part of janestreet libraries, but still depend

     

       987
       987
       -
                     # on v0.15 are kept in this scope, too.

     

       988
       988
       -
       

     

       989
       989
       -
                     bap =

     

       990
       990
       -
                       let

     

       991
       991
       -
                         ppxlib = jsDeps.ppxlib;

     

       992
       992
       -
                         lwt_ppx = self.lwt_ppx.override { inherit ppxlib; };

     

       993
       993
       -
                         sedlex = self.sedlex.override { inherit ppxlib ppx_expect; };

     

       994
       994
       -
                       in

     

       995
       995
       -
                       callPackage ../development/ocaml-modules/bap {

     

       996
       996
       -
                         inherit (pkgs.llvmPackages_14) llvm;

     

       997
       997
       -
                         ezjsonm = self.ezjsonm.override { inherit sexplib0; };

     

       998
       998
       -
                         ppx_bitstring = self.ppx_bitstring.override { inherit ppxlib; };

     

       999
       999
       -
                         ocurl = self.ocurl.override { inherit lwt_ppx; };

     

       1000
       1000
       -
                         piqi = self.piqi.override { inherit sedlex; };

     

       1001
       1001
       -
                         piqi-ocaml = self.piqi-ocaml.override { inherit piqi; };

     

       1002
       1002
       -
                       };

     

       1003
       1003
       -
       

     

       1004
       1004
       -
                     ppx_bap = callPackage ../development/ocaml-modules/ppx_bap { };

     

       1005
       987
        
                   }

     

       1006
       988
        
                 )).overrideScope

     

       1007
       989
        
                   liftJaneStreet;

     
···

       1728
       1710
        
       

     

       1729
       1711
        
               pprint = callPackage ../development/ocaml-modules/pprint { };

     

       1730
       1712
        
       

     

       1731
       1731
       -
               ppx_bap = janeStreet_0_15.ppx_bap;

     

       1713
       1713
       +
               ppx_bap = callPackage ../development/ocaml-modules/ppx_bap { };

     

       1732
       1714
        
       

     

       1733
       1715
        
               ppx_bitstring = callPackage ../development/ocaml-modules/bitstring/ppx.nix { };

     

       1734
       1716