diff options
| -rw-r--r-- | pkgs/development/ocaml-modules/cryptokit/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/ocamlnet/configure.patch | 63 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/ocamlnet/default.nix | 8 |
3 files changed, 5 insertions, 68 deletions
diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index 1f9e2b44e00c..cfb353bfe3e5 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -4,6 +4,8 @@ let ocaml_version = (builtins.parseDrvName ocaml.name).version; in +assert stdenv.lib.versionAtLeast ocaml_version "3.12"; + stdenv.mkDerivation { name = "cryptokit-1.9"; diff --git a/pkgs/development/ocaml-modules/ocamlnet/configure.patch b/pkgs/development/ocaml-modules/ocamlnet/configure.patch deleted file mode 100644 index 38b240f3c2c4..000000000000 --- a/pkgs/development/ocaml-modules/ocamlnet/configure.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -Naur ocamlnet-3.6.3.ori/configure ocamlnet-3.6.3/configure ---- ocamlnet-3.6.3.ori/configure 2013-01-14 00:04:59.000000000 +0000 -+++ ocamlnet-3.6.3/configure 2013-06-02 21:33:08.000000000 +0000 -@@ -642,59 +642,6 @@ - exit 1 - fi - -- printf "%s" "Checking whether lablgtk2 has GMain.Io.remove... " -- mkdir -p tmp -- cat <<EOF >tmp/gtk.ml --let _ = GMain.Io.remove;; --EOF -- -- if ocamlfind ocamlc -package lablgtk2 -c tmp/gtk.ml >/dev/null 2>/dev/null; -- then -- echo "yes" -- else -- echo "no" -- echo "Your version of lablgtk2 is too old!" -- exit 1 -- fi -- -- printf "%s" "Checking whether lablgtk2 has GMain.Io.add_watch with list support... " -- mkdir -p tmp -- cat <<'EOF' >tmp/gtk.ml --open GMain.Io --let _ = (add_watch : cond:condition list -> callback:(condition list -> bool) -> ?prio:int -> channel -> id);; --exit 0 --EOF -- # Note: this newer API is never broken in the sense checked below, i.e. -- # such lablgtk2 versions do not exist. -- if ocamlfind ocamlc -package unix,lablgtk2 -linkpkg -o tmp/gtk tmp/gtk.ml >/dev/null 2>/dev/null && tmp/gtk; then -- echo "yes" -- gtk2_io_add_watch_supports_lists="-ppopt -DGTK2_IO_ADD_WATCH_SUPPORTS_LISTS" -- else -- echo "no" -- printf "%s" "Checking whether lablgtk2's GMain.Io.add_watch is broken... " -- mkdir -p tmp -- cat <<'EOF' >tmp/gtk.ml --GMain.Main.init();; --let ch = GMain.Io.channel_of_descr (Unix.stdout) in --let w = GMain.Io.add_watch -- ~cond:`OUT ~callback:(fun () -> true) ch in --(* add_watch is broken when it just returns Val_unit, and ok when it -- * returns a positive int -- *) --if (Obj.magic w : int) > 0 then -- exit 0 --else -- exit 1 --EOF -- if ocamlfind ocamlc -package unix,lablgtk2 -linkpkg -o tmp/gtk tmp/gtk.ml >/dev/null 2>/dev/null && tmp/gtk; then -- echo "no" -- else -- echo "yes" -- echo "You should apply the patch-ab-ml_glib.c to lablgtk2 to fix this!" -- exit 1 -- fi -- fi -- - for f in Makefile uq_gtk.ml uq_gtk.mli uq_gtk_helper.ml; do - rm -f src/equeue-gtk2/$f - ln -s ../equeue-gtk1/$f src/equeue-gtk2 diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index f1bf39a283d6..06e54a677334 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -5,19 +5,17 @@ let in stdenv.mkDerivation { - name = "ocamlnet-3.7.3"; + name = "ocamlnet-3.7.6"; src = fetchurl { - url = http://download.camlcity.org/download/ocamlnet-3.7.3.tar.gz; - sha256 = "0s24icyrxkqqai91rgxpf52s1fx70j7p12c8vq9vcmvdhll6kp2d"; + url = http://download.camlcity.org/download/ocamlnet-3.7.6.tar.gz; + sha256 = "0z17kxn1cyn1x5wgajw737m9rsjwji823rxdwvv8a5239xd1whji"; }; buildInputs = [ncurses ocaml findlib ocaml_pcre camlzip openssl ocaml_ssl cryptokit]; propagatedbuildInputs = [ncurses ocaml_pcre camlzip openssl ocaml_ssl cryptokit]; - patches = [ ./configure.patch ]; - createFindlibDestdir = true; dontAddPrefix = true; |