Unverified Commit aecb04e7 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #219598 from wegank/obliv-c-ocaml 

obliv-c: migrate to OCaml 4.14
parents 55bb9cd6 50e35e9b

pkgs/development/compilers/obliv-c/default.nix

+4 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ stdenv.mkDerivation rec { 
  strictDeps = true;

  nativeBuildInputs = [ perl ]

  ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ]);

  buildInputs = [ ocamlPackages.num ];

  propagatedBuildInputs = [ libgcrypt ];

  src = fetchFromGitHub {

    owner = "samee";
@@ -19,6 +20,9 @@ stdenv.mkDerivation rec { 


  patches = [ ./ignore-complex-float128.patch ];



  # https://github.com/samee/obliv-c/issues/76#issuecomment-438958209

  env.OCAMLBUILD = "ocamlbuild -package num -ocamlopt 'ocamlopt -dontlink num' -ocamlc 'ocamlc -dontlink num'";



  preBuild = ''

    patchShebangs .

  '';

pkgs/top-level/all-packages.nix

+4 −2
Original line number Diff line number Diff line
@@ -15537,8 +15537,10 @@ with pkgs; 














  nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { };



























  obliv-c = callPackage ../development/compilers/obliv-c













    { stdenv = gcc10StdenvCompat; ocamlPackages = ocaml-ng.ocamlPackages_4_05; };













  obliv-c = callPackage ../development/compilers/obliv-c {













    stdenv = gcc10StdenvCompat;













    ocamlPackages = ocaml-ng.ocamlPackages_4_14;













  };





























  ocaml-ng = callPackage ./ocaml-packages.nix { };















  ocaml = ocamlPackages.ocaml;