diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-07-11 02:45:08 +0000 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-07-11 02:46:32 +0000 |
| commit | 412da3210bb017c189418994f5bc3ad9655c8deb (patch) | |
| tree | 7a13cb71b119d5699ae83b01f6efef6666a8bde9 | |
| parent | 5f3568cbce977a9d45f6de78657ced7f9295d6ee (diff) | |
| download | nixlib-412da3210bb017c189418994f5bc3ad9655c8deb.tar nixlib-412da3210bb017c189418994f5bc3ad9655c8deb.tar.gz nixlib-412da3210bb017c189418994f5bc3ad9655c8deb.tar.bz2 nixlib-412da3210bb017c189418994f5bc3ad9655c8deb.tar.lz nixlib-412da3210bb017c189418994f5bc3ad9655c8deb.tar.xz nixlib-412da3210bb017c189418994f5bc3ad9655c8deb.tar.zst nixlib-412da3210bb017c189418994f5bc3ad9655c8deb.zip | |
ocamlPackages.oasis: remove 0.4.6
4 files changed, 4 insertions, 40 deletions
diff --git a/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix b/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix index 6e988c4479a5..61b2038bfd29 100644 --- a/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix +++ b/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix @@ -1,4 +1,4 @@ -{ buildOcaml, opam, js_build_tools, ocaml_oasis_46, fetchurl } : +{ buildOcaml, opam, js_build_tools, ocaml_oasis, fetchurl } : { name, version ? "113.33.03", buildInputs ? [], hash ? "", @@ -14,7 +14,7 @@ buildOcaml (args // { hasSharedObjects = true; - buildInputs = [ ocaml_oasis_46 js_build_tools opam ] ++ buildInputs; + buildInputs = [ ocaml_oasis js_build_tools opam ] ++ buildInputs; dontAddPrefix = true; diff --git a/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix b/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix index 328ffc58bdc1..2c314f3dbdea 100644 --- a/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix +++ b/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, ocaml_oasis_46, opam}: +{ stdenv, buildOcaml, fetchurl, ocaml_oasis, opam }: buildOcaml rec { name = "js-build-tools"; @@ -13,7 +13,7 @@ buildOcaml rec { hasSharedObjects = true; - buildInputs = [ ocaml_oasis_46 opam ]; + buildInputs = [ ocaml_oasis opam ]; dontAddPrefix = true; configurePhase = "./configure --prefix $prefix"; diff --git a/pkgs/development/tools/ocaml/oasis/0.4.6.nix b/pkgs/development/tools/ocaml/oasis/0.4.6.nix deleted file mode 100644 index b5e977d623b3..000000000000 --- a/pkgs/development/tools/ocaml/oasis/0.4.6.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4 -, ocaml_data_notation, type_conv, 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 ocamlbuild 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 - ]; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index d7a6c6cb63d8..cf8f49fb427f 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -397,7 +397,6 @@ let 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 { }; |