Merge remote-tracking branch 'upstream/master'

pveber · Oct 1, 2012 · 9600a3a · 9600a3a
2 parents db76600 + 61144d6
commit 9600a3a
Show file tree

Hide file tree

Showing 18 changed files with 105 additions and 8 deletions.
diff --git a/packages/cmigrep.1.5/opam b/packages/cmigrep.1.5/opam
@@ -5,5 +5,8 @@ build: [
   ["%{make}%" "GODI_LIB=%{lib}%/compiler-libs"]
   ["%{make}%" "install" "GODI_BASE=%{prefix}%"]
 ]
-depends: ["ocamlfind" "compiler-libs" {= "3.12.1"} "pcre-ocaml"]
-ocaml-version: [= "3.12.1"]
+depends: [
+  "ocamlfind"
+  "compiler-libs" {= "3.12.1"}
+  "pcre-ocaml"
+]
diff --git a/packages/dyntype.0.8.5/descr b/packages/dyntype.0.8.5/descr
@@ -0,0 +1 @@
+syntax extension which makes OCaml types and values easier to manipulate programmatically
diff --git a/packages/dyntype.0.8.5/opam b/packages/dyntype.0.8.5/opam
@@ -0,0 +1,10 @@
+opam-version: "1"
+maintainer: "anil@recoil.org"
+build: [
+  ["%{make}%"]
+  ["%{make}%" "install"]
+]
+remove: [
+  ["ocamlfind" "remove" "dyntype"]
+]
+depends: ["ocamlfind" "type_conv" {= "108.00.02"}]
diff --git a/packages/dyntype.0.8.5/url b/packages/dyntype.0.8.5/url
@@ -0,0 +1,2 @@
+archive: "https://github.com/mirage/dyntype/tarball/dyntype-0.8.5"
+checksum: "d1910c5dfd835a2315d84a30b6872b66"
diff --git a/packages/lwt.2.4.2/descr b/packages/lwt.2.4.2/descr
@@ -0,0 +1,5 @@
+A cooperative threads library for OCaml
+This library is part of the Ocsigen project. See:
+
+http://ocsigen.org/lwt
+
diff --git a/packages/lwt.2.4.2/opam b/packages/lwt.2.4.2/opam
@@ -0,0 +1,20 @@
+opam-version: "1"
+maintainer: "contact@ocamlpro.com"
+build: [
+  ["./configure" "--%{conf-libev:enable}%-libev" "--%{react:enable}%-react" "--%{ssl:enable}%-ssl" "--%{base-unix:enable}%-unix" "--%{base-unix:enable}%-extra" "--%{base-threads:enable}%-preemptive"]
+  ["%{make}%" "build"]
+  ["%{make}%" "install"]
+]
+remove: [
+  ["ocamlfind" "remove" "lwt"]
+]
+depends: [
+  "ocamlfind"
+]
+depopts: [
+  "base-threads"
+  "base-unix"
+  "conf-libev"
+  "ssl"
+  "react"
+]
diff --git a/packages/lwt.2.4.2/url b/packages/lwt.2.4.2/url
@@ -0,0 +1,2 @@
+archive: "http://ocsigen.org/download/lwt-2.4.2.tar.gz"
+checksum: "0d6eeaa295d62aefaf39e034460bc7b4"
diff --git a/packages/orm.0.6.4/descr b/packages/orm.0.6.4/descr
@@ -0,0 +1,6 @@
+The ORM library provides a storage backend to persist ML values.
+
+This backend is integrated seamlessly with OCaml and currently uses
+SQLite (although other backends are easily possible). The user does
+not have to worry about writing any SQL queries manually.
+
diff --git a/packages/orm.0.6.4/opam b/packages/orm.0.6.4/opam
@@ -0,0 +1,10 @@
+opam-version: "1"
+maintainer: "anil@recoil.org"
+build: [
+  ["%{make}%"]
+  ["%{make}%" "install"]
+]
+remove: [
+  ["ocamlfind" "remove" "orm"]
+]
+depends: ["ocamlfind" "sqlite3-ocaml" "dyntype" {>= "0.8.4"}]
diff --git a/packages/orm.0.6.4/url b/packages/orm.0.6.4/url
@@ -0,0 +1,2 @@
+archive: "https://github.com/mirage/orm/tarball/orm-0.6.4"
+checksum: "3ce4a7f9c0f152c50fa64855aa0626b4"
diff --git a/packages/planck.1.0.1/opam b/packages/planck.1.0.1/opam
@@ -9,5 +9,8 @@ remove: [
   ["ocamlfind" "remove" "bind_inline"]
   ["ocamlfind" "remove" "planck"]
 ]
-depends: ["ocamlfind" "sexplib" {>= "5.2.1"} "spotlib" {= "1.0.0"}]
-ocaml-version: [= "3.12.1"]
+depends: [
+  "ocamlfind"
+  "sexplib" {>= "5.2.1"}
+  "spotlib" {= "1.0.0"}
+]
diff --git a/packages/plasma.0.6.1/descr b/packages/plasma.0.6.1/descr
@@ -0,0 +1 @@
+Distributed filesystem for large files, implemented in user space
diff --git a/packages/plasma.0.6.1/files/plasma.install b/packages/plasma.0.6.1/files/plasma.install
@@ -0,0 +1,11 @@
+bin: [
+  "src/pfs_daemon/plasmad.opt" {"plasmad"}
+  "src/pkv/plasma_kv_httpd_demo.opt" {"plasma_kv_httpd_demo"}
+  "src/pkv/plasma_kv.opt" {"plasma_kv"}
+  "src/pfs_admin/plasma_datanode_init.opt" {"plasma_datanode_init"}
+  "src/mr_framework/plasma_convert.opt" {"plasma_convert"}
+  "src/pfs_admin/plasma_admin.opt" {"plasma_admin"}
+  "src/plasmaclient/plasma.opt" {"plasma"}
+  "src/pfs_nfs3/nfs3d.opt" {"nfs3d"}
+  "src/mr_framework/mr_streaming.opt" {"mr_streaming"}
+]
diff --git a/packages/plasma.0.6.1/opam b/packages/plasma.0.6.1/opam
@@ -0,0 +1,16 @@
+opam-version: "1"
+maintainer: "contact@ocamlpro.com"
+build: [
+  ["./configure" "-bindir" "%{bin}%" "-sharedir" "%{lib}%/plasma/share"]
+  ["omake"]
+  ["omake" "install"]
+]
+depends: [
+  "ocamlfind"
+  "ocamlnet" {= "3.6.0"}
+  "cryptokit"
+  "pcre-ocaml"
+  "ocamlgraph" {= "1.8.2"}
+  "omake"
+  "xstrp4"
+]
diff --git a/packages/plasma.0.6.1/url b/packages/plasma.0.6.1/url
@@ -0,0 +1,2 @@
+archive: "http://download.camlcity.org/download/plasma-0.6.1.tar.gz"
+checksum: "d8fb26f1c2157ffccaa4fae1931d0787"
diff --git a/packages/treeprint.1.0.0/url b/packages/treeprint.1.0.0/url
@@ -1,2 +1,2 @@
 archive: "https://bitbucket.org/camlspotter/treeprint/get/1.0.0.tar.gz"
-checksum: "4b229bb958d6b9151fc94d000cc5c32d"
+checksum: "0ddfa03a181f0ce4942c4422359c0c2f"
diff --git a/packages/wdialog.2.1.3/opam b/packages/wdialog.2.1.3/opam
@@ -19,4 +19,3 @@ depends: [
   "ulex"
   "ocaml-inifiles"
 ]
-ocaml-version: [= "3.12.1"]
diff --git a/packages/why.2.31/opam b/packages/why.2.31/opam
@@ -7,5 +7,9 @@ build: [
   ["%{make}%"]
   ["%{make}%" "install"]
 ]
-depends: ["lablgtk" {= "2.14.2-oasis8"} "ocamlgraph" {= "1.8.2"} "coq" {= "8.3pl2"} "frama-c"]
-ocaml-version: [= "3.12.1"]
+depends: [
+  "lablgtk" {= "2.14.2-oasis8"}
+  "ocamlgraph" {= "1.8.2"}
+  "coq" {= "8.3pl2"}
+  "frama-c"
+]