Commit 7203a0e9 authored by Franz Pletz's avatar Franz Pletz Committed by GitHub
Browse files

Merge pull request #18576 from maurer/oasis 

oasis: 0.4.6 -> 0.4.7
parents b12debc0 3e816486

pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix

+2 −2
Original line number Diff line number Diff line 
{ buildOcaml, opam, js_build_tools, ocaml_oasis, fetchurl } :

{ buildOcaml, opam, js_build_tools, ocaml_oasis_46, fetchurl } :



{ name, version ? "113.33.03", buildInputs ? [],

  hash ? "",
@@ -14,7 +14,7 @@ buildOcaml (args // { 


  hasSharedObjects = true;



  buildInputs = [ ocaml_oasis js_build_tools opam ] ++ buildInputs;

  buildInputs = [ ocaml_oasis_46 js_build_tools opam ] ++ buildInputs;



  dontAddPrefix = true;

pkgs/development/ocaml-modules/janestreet/js-build-tools.nix

+2 −2
Original line number Diff line number Diff line 
{stdenv, buildOcaml, fetchurl, ocaml_oasis, opam}:

{stdenv, buildOcaml, fetchurl, ocaml_oasis_46, opam}:



buildOcaml rec {

  name = "js-build-tools";
@@ -13,7 +13,7 @@ buildOcaml rec { 


  hasSharedObjects = true;



  buildInputs = [ ocaml_oasis opam ];

  buildInputs = [ ocaml_oasis_46 opam ];



  dontAddPrefix = true;

  configurePhase = "./configure --prefix $prefix";

pkgs/development/tools/ocaml/oasis/0.4.6.nix

0 → 100644
+34 −0
Original line number Diff line number Diff line 
{stdenv, fetchurl, ocaml, findlib, ocaml_data_notation, type_conv, camlp4,

 ocamlmod, ocamlify, ounit, expect}:



stdenv.mkDerivation {

  name = "ocaml-oasis-0.4.6";



  src = fetchurl {

    url = http://forge.ocamlcore.org/frs/download.php/1604/oasis-0.4.6.tar.gz;

    sha256 = "1yxv3ckkf87nz0cyll0yy1kd295j5pv3jqwkfrr1y65wkz5vw90k";

  };



  createFindlibDestdir = true;



  buildInputs =

    [

      ocaml findlib type_conv ocamlmod ocamlify ounit camlp4

    ];



  propagatedBuildInputs = [ ocaml_data_notation ];



  configurePhase = "ocaml setup.ml -configure --prefix $out";

  buildPhase     = "ocaml setup.ml -build";

  installPhase   = "ocaml setup.ml -install";



  meta = with stdenv.lib; {

    homepage = http://oasis.forge.ocamlcore.org/;

    description = "Configure, build and install system for OCaml projects";

    license = licenses.lgpl21;

    platforms = ocaml.meta.platforms or [];

    maintainers = with maintainers; [

      vbgl z77z

    ];

  };

}

pkgs/development/tools/ocaml/oasis/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -2,11 +2,11 @@ 
 ocamlmod, ocamlify, ounit, expect}:



stdenv.mkDerivation {

  name = "ocaml-oasis-0.4.6";

  name = "ocaml-oasis-0.4.7";



  src = fetchurl {

    url = http://forge.ocamlcore.org/frs/download.php/1604/oasis-0.4.6.tar.gz;

    sha256 = "1yxv3ckkf87nz0cyll0yy1kd295j5pv3jqwkfrr1y65wkz5vw90k";

    url = http://forge.ocamlcore.org/frs/download.php/1635/oasis-0.4.6.tar.gz;

    sha256 = "13crvqiy0hhlnm4qfyxq2jjvs11ldxf15c4g9q91k1x3wj04pg2l";

  };



  createFindlibDestdir = true;

pkgs/top-level/all-packages.nix

+1 −0
Original line number Diff line number Diff line
@@ -5366,6 +5366,7 @@ in 
    ocamlnet = callPackage ../development/ocaml-modules/ocamlnet { };















    ocaml_oasis = callPackage ../development/tools/ocaml/oasis { };













    ocaml_oasis_46 = callPackage ../development/tools/ocaml/oasis/0.4.6.nix { };





























    ocaml_optcomp = callPackage ../development/ocaml-modules/optcomp { };