From 6f5d3bec32192116d5b13e6f1f012f94434062eb Mon Sep 17 00:00:00 2001
From: Matthew Maurer <matthew.r.maurer@gmail.com>
Date: Wed, 14 Sep 2016 02:05:53 -0400
Subject: [PATCH] oasis: 0.4.6 -> 0.4.7
---
pkgs/development/tools/ocaml/oasis/0.4.6.nix | 34 +++++++++++++++++++
.../development/tools/ocaml/oasis/default.nix | 6 ++--
pkgs/top-level/all-packages.nix | 1 +
3 files changed, 38 insertions(+), 3 deletions(-)
create mode 100644 pkgs/development/tools/ocaml/oasis/0.4.6.nix
diff --git a/pkgs/development/tools/ocaml/oasis/0.4.6.nix b/pkgs/development/tools/ocaml/oasis/0.4.6.nix
new file mode 100644
index 00000000000..6dcf0522232
--- /dev/null
+++ b/pkgs/development/tools/ocaml/oasis/0.4.6.nix
@@ -0,0 +1,34 @@
+{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
+ ];
+ };
+}
diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix
index 6dcf0522232..9b69b3bb016 100644
--- a/pkgs/development/tools/ocaml/oasis/default.nix
+++ b/pkgs/development/tools/ocaml/oasis/default.nix
@@ -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;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e2ee65deae1..1e2c7a3d50f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5357,6 +5357,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 { };