colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ocamlPackages.oasis: remove 0.4.6

Browse Source
This commit is contained in:
Vincent Laporte 2017-07-11 02:45:08 +00:00
parent 5f3568cbce
commit 412da3210b
4 changed files with 4 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix
View File

@ -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;

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

@ -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";

35
pkgs/development/tools/ocaml/oasis/0.4.6.nix
View File

@ -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
];
};
}

1
pkgs/top-level/ocaml-packages.nix
View File

@ -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 { };