Unverified Commit 8420bae6 authored by Owen Lynch's avatar Owen Lynch Committed by GitHub
Browse files

ber_metaocaml: 111 -> 114 (#303529)

parent f74d0ada

pkgs/development/compilers/ocaml/ber-metaocaml.nix

+4 −15
Original line number Diff line number Diff line
@@ -9,9 +9,9 @@ let 
   x11deps = [ libX11 xorgproto ];

   inherit (lib) optionals;



   baseOcamlBranch  = "4.11";

   baseOcamlBranch  = "4.14";

   baseOcamlVersion = "${baseOcamlBranch}.1";

   metaocamlPatch   = "111";

   metaocamlPatch   = "114";

in



stdenv.mkDerivation rec {
@@ -20,12 +20,12 @@ stdenv.mkDerivation rec { 


  src = fetchurl {

    url = "https://caml.inria.fr/pub/distrib/ocaml-${baseOcamlBranch}/ocaml-${baseOcamlVersion}.tar.gz";

    sha256 = "sha256-3Yi2OFvZLgrZInMuKMxoyHd4QXcOoAPCC9FS9dtEFc4=";

    sha256 = "sha256-GDl53JwJyw9YCiMraFMaCbAlqmKLjY1ydEnxRv1vX+4=";

  };



  metaocaml = fetchurl {

    url = "http://okmij.org/ftp/ML/ber-metaocaml-${metaocamlPatch}.tar.gz";

    sha256 = "sha256-hDb0w0ZCm0hCz8jktZKmr/7gPSfBoKPT/cc7sPjt0yE=";

    sha256 = "sha256-vvq3xI4jSAsrXcDk97TPbFDYgO9NcQeN/yBcUbcb/y0=";

  };



  x11env = buildEnv { name = "x11env"; paths = x11deps; };
@@ -38,17 +38,6 @@ stdenv.mkDerivation rec { 
  dontStrip = true;

  buildInputs = [ ncurses ] ++ optionals useX11 x11deps;



  patches = [

    # glibc 2.34 changed SIGSTKSZ from a #define'd integer to an

    # expression involving a function call.  This broke all code that

    # used SIGSTKSZ as the size of a statically-allocated array.  This

    # patch is also applied by the ocaml/4.07.nix expression.

    (fetchpatch {

      url = "https://github.com/ocaml/ocaml/commit/dd28ac0cf4365bd0ea1bcc374cbc5e95a6f39bea.patch";

      sha256 = "sha256-OmyovAu+8sgg3n5YD29Cytx3u/9PO2ofMsmrwiKUxks=";

    })

  ];



  postConfigure = ''

    tar -xvzf $metaocaml

    cd ${pname}-${version}