diff options
Diffstat (limited to 'pkgs/development/ocaml-modules')
36 files changed, 101 insertions, 188 deletions
diff --git a/pkgs/development/ocaml-modules/camlzip/default.nix b/pkgs/development/ocaml-modules/camlzip/default.nix index 9e2ef8ef468..731d66974c6 100644 --- a/pkgs/development/ocaml-modules/camlzip/default.nix +++ b/pkgs/development/ocaml-modules/camlzip/default.nix @@ -1,9 +1,8 @@ {stdenv, fetchurl, zlib, ocaml, findlib}: let - ocaml_version = (builtins.parseDrvName ocaml.name).version; param = - if stdenv.lib.versionAtLeast ocaml_version "4.02" + if stdenv.lib.versionAtLeast ocaml.version "4.02" then { version = "1.06"; url = "1616"; @@ -45,7 +44,7 @@ stdenv.mkDerivation { inherit (param) installTargets; postInstall = '' - ln -s $out/lib/ocaml/${ocaml_version}/site-lib/{,caml}zip + ln -s $out/lib/ocaml/${ocaml.version}/site-lib/{,caml}zip ''; meta = { diff --git a/pkgs/development/ocaml-modules/camomile/0.8.2.nix b/pkgs/development/ocaml-modules/camomile/0.8.2.nix index 9f7201708af..63daf21e408 100644 --- a/pkgs/development/ocaml-modules/camomile/0.8.2.nix +++ b/pkgs/development/ocaml-modules/camomile/0.8.2.nix @@ -1,12 +1,8 @@ {stdenv, fetchurl, ocaml, findlib, camlp4}: -let - ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "0.8.2"; -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "camomile-${version}"; + version = "0.8.2"; src = fetchurl { url = "mirror://sourceforge/camomile/camomile-${version}.tar.bz2"; diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix index 11a7828f1e4..950d7f7fc8f 100644 --- a/pkgs/development/ocaml-modules/camomile/default.nix +++ b/pkgs/development/ocaml-modules/camomile/default.nix @@ -1,11 +1,8 @@ {stdenv, fetchurl, ocaml, findlib, camlp4}: -let - ocaml_version = (builtins.parseDrvName ocaml.name).version; -in - -stdenv.mkDerivation { - name = "camomile-0.8.5"; +stdenv.mkDerivation rec { + name = "camomile-${version}"; + version = "0.8.5"; src = fetchurl { url = https://github.com/yoriyuki/Camomile/releases/download/rel-0.8.5/camomile-0.8.5.tar.bz2; diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix index 80992bdfe7c..d72ff6d93d4 100644 --- a/pkgs/development/ocaml-modules/cmdliner/default.nix +++ b/pkgs/development/ocaml-modules/cmdliner/default.nix @@ -2,15 +2,14 @@ let pname = "cmdliner"; - version = "0.9.8"; - ocaml_version = (builtins.parseDrvName ocaml.name).version; in -assert stdenv.lib.versionAtLeast ocaml_version "3.12"; +assert stdenv.lib.versionAtLeast ocaml.version "3.12"; -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "ocaml-${pname}-${version}"; + version = "0.9.8"; src = fetchurl { url = "http://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz"; @@ -27,7 +26,7 @@ stdenv.mkDerivation { installPhase = '' opam-installer --script --prefix=$out ${pname}.install > install.sh sh install.sh - ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml_version}/site-lib/ + ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/ ''; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/cryptgps/default.nix b/pkgs/development/ocaml-modules/cryptgps/default.nix index 114aa7e5ffd..cb85ebce501 100644 --- a/pkgs/development/ocaml-modules/cryptgps/default.nix +++ b/pkgs/development/ocaml-modules/cryptgps/default.nix @@ -1,12 +1,8 @@ {stdenv, fetchurl, ocaml, findlib}: -let - ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "0.2.1"; -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "ocaml-cryptgps-${version}"; + version = "0.2.1"; src = fetchurl { url = "http://download.camlcity.org/download/cryptgps-0.2.1.tar.gz"; diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index a2cf545e84c..be61ad70b3d 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -1,13 +1,10 @@ {stdenv, fetchurl, zlib, ocaml, findlib, ncurses}: -let - ocaml_version = (builtins.parseDrvName ocaml.name).version; -in +assert stdenv.lib.versionAtLeast ocaml.version "3.12"; -assert stdenv.lib.versionAtLeast ocaml_version "3.12"; - -stdenv.mkDerivation { - name = "cryptokit-1.10"; +stdenv.mkDerivation rec { + name = "cryptokit-${version}"; + version = "1.10"; src = fetchurl { url = http://forge.ocamlcore.org/frs/download.php/1493/cryptokit-1.10.tar.gz; @@ -18,7 +15,7 @@ stdenv.mkDerivation { buildFlags = "setup.data build"; - preBuild = "mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib/cryptokit"; + preBuild = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/cryptokit"; meta = { homepage = "http://pauillac.inria.fr/~xleroy/software.html"; diff --git a/pkgs/development/ocaml-modules/dypgen/default.nix b/pkgs/development/ocaml-modules/dypgen/default.nix index b579c073f29..1bdcae521dd 100644 --- a/pkgs/development/ocaml-modules/dypgen/default.nix +++ b/pkgs/development/ocaml-modules/dypgen/default.nix @@ -1,13 +1,12 @@ {stdenv, fetchurl, ocaml, findlib}: let - ocaml_version = (builtins.parseDrvName ocaml.name).version; pname = "dypgen"; - version = "20120619-1"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "${pname}-${version}"; + version = "20120619-1"; src = fetchurl { url = "http://dypgen.free.fr/dypgen-20120619-1.tar.bz2"; @@ -22,7 +21,7 @@ stdenv.mkDerivation { make ''; - makeFlags = "BINDIR=$(out)/bin MANDIR=$(out)/usr/share/man/man1 DYPGENLIBDIR=$(out)/lib/ocaml/${ocaml_version}/site-lib"; + makeFlags = "BINDIR=$(out)/bin MANDIR=$(out)/usr/share/man/man1 DYPGENLIBDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib"; meta = { homepage = http://dypgen.free.fr; diff --git a/pkgs/development/ocaml-modules/expat/default.nix b/pkgs/development/ocaml-modules/expat/default.nix index b6ee0d192e3..0ecb135b4e8 100644 --- a/pkgs/development/ocaml-modules/expat/default.nix +++ b/pkgs/development/ocaml-modules/expat/default.nix @@ -1,8 +1,6 @@ {stdenv, fetchurl, ocaml, findlib, ounit, expat}: let - ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "0.9.1"; pname = "ocaml-expat"; testcase = fetchurl { url = "http://www.w3.org/TR/1998/REC-xml-19980210.xml"; @@ -11,8 +9,9 @@ let in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "${pname}-${version}"; + version = "0.9.1"; src = fetchurl { url = "http://www.xs4all.nl/~mmzeeman/ocaml/${pname}-${version}.tar.gz"; diff --git a/pkgs/development/ocaml-modules/gmetadom/default.nix b/pkgs/development/ocaml-modules/gmetadom/default.nix index f0a9387a537..0f1facd6518 100644 --- a/pkgs/development/ocaml-modules/gmetadom/default.nix +++ b/pkgs/development/ocaml-modules/gmetadom/default.nix @@ -1,14 +1,12 @@ {stdenv, fetchurl, ocaml, findlib, gdome2, libxslt, pkgconfig}: let - ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "0.2.6"; pname = "gmetadom"; - in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "${pname}-${version}"; + version = "0.2.6"; src = fetchurl { url = "mirror://sourceforge/project/${pname}/${pname}/${version}/${pname}-${version}.tar.gz"; @@ -20,7 +18,7 @@ stdenv.mkDerivation { dontDisableStatic = true; preConfigure='' - configureFlags="--with-ocaml-lib-prefix=$out/lib/ocaml/${ocaml_version}/site-lib" + configureFlags="--with-ocaml-lib-prefix=$out/lib/ocaml/${ocaml.version}/site-lib" ''; diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix index 894c93eba4d..c0b1c32553e 100644 --- a/pkgs/development/ocaml-modules/javalib/default.nix +++ b/pkgs/development/ocaml-modules/javalib/default.nix @@ -1,13 +1,12 @@ {stdenv, fetchurl, which, ocaml, findlib, camlzip, extlib, camlp4}: + let pname = "javalib"; - version = "2.3"; webpage = "http://sawja.inria.fr/"; - ocaml_version = (builtins.parseDrvName ocaml.name).version; in stdenv.mkDerivation rec { - name = "ocaml-${pname}-${version}"; + version = "2.3"; src = fetchurl { url = "https://gforge.inria.fr/frs/download.php/33090/${pname}-${version}.tar.bz2"; @@ -28,7 +27,7 @@ stdenv.mkDerivation rec { preBuild = '' make ptrees; make installptrees; - export OCAMLPATH=$out/lib/ocaml/${ocaml_version}/site-lib/:$OCAMLPATH; + export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH; ''; propagatedBuildInputs = [ camlzip extlib ]; diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index 7c273061bd1..c59f15c57ad 100644 --- a/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/pkgs/development/ocaml-modules/lablgl/default.nix @@ -1,13 +1,12 @@ {stdenv, fetchurl, ocaml, lablgtk, findlib, mesa, freeglut, camlp4 } : let - ocaml_version = (builtins.parseDrvName ocaml.name).version; pname = "lablgl"; - version = "1.05"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "${pname}-${version}"; + version = "1.05"; src = fetchurl { url = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgl-${version}.tar.gz"; @@ -22,8 +21,8 @@ stdenv.mkDerivation { preConfigure = '' substituteInPlace Makefile.config \ --subst-var-by BINDIR $out/bin \ - --subst-var-by INSTALLDIR $out/lib/ocaml/${ocaml_version}/site-lib/lablgl \ - --subst-var-by DLLDIR $out/lib/ocaml/${ocaml_version}/site-lib/lablgl \ + --subst-var-by INSTALLDIR $out/lib/ocaml/${ocaml.version}/site-lib/lablgl \ + --subst-var-by DLLDIR $out/lib/ocaml/${ocaml.version}/site-lib/lablgl \ --subst-var-by TKINCLUDES "" \ --subst-var-by XINCLUDES "" ''; @@ -33,7 +32,7 @@ stdenv.mkDerivation { buildFlags = "lib libopt glut glutopt"; postInstall = '' - cp ./META $out/lib/ocaml/${ocaml_version}/site-lib/lablgl + cp ./META $out/lib/ocaml/${ocaml.version}/site-lib/lablgl ''; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix index 3b6ff64daea..ba966b68002 100644 --- a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix +++ b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix @@ -1,13 +1,12 @@ { stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4 }: let - ocaml_version = (builtins.parseDrvName ocaml.name).version; pname = "lablgtk"; - version = "2.14.0"; in stdenv.mkDerivation (rec { name = "${pname}-${version}"; + version = "2.14.0"; src = fetchurl { url = "https://forge.ocamlcore.org/frs/download.php/561/${name}.tar.gz"; @@ -16,12 +15,12 @@ stdenv.mkDerivation (rec { buildInputs = [ ocaml findlib pkgconfig gtk2 libgnomecanvas libglade gtksourceview camlp4 ]; - configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml_version}/site-lib"; + configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib"; buildFlags = "world"; preInstall = '' - mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib - export OCAMLPATH=$out/lib/ocaml/${ocaml_version}/site-lib/:$OCAMLPATH + mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib + export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH ''; meta = { diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 0e5772632d5..93ebf4b9c92 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -1,15 +1,15 @@ {stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4}: let - ocaml_version = (builtins.parseDrvName ocaml.name).version; pname = "lablgtk"; - version = "2.18.3"; in -assert stdenv.lib.versionAtLeast ocaml_version "3.12"; +assert stdenv.lib.versionAtLeast ocaml.version "3.12"; -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "${pname}-${version}"; + version = "2.18.3"; + src = fetchurl { url = https://forge.ocamlcore.org/frs/download.php/1479/lablgtk-2.18.3.tar.gz; sha256 = "1bybn3jafxf4cx25zvn8h2xj9agn1xjbn7j3ywxxqx6az7rfnnwp"; @@ -17,12 +17,12 @@ stdenv.mkDerivation { buildInputs = [ocaml findlib pkgconfig gtk2 libgnomecanvas libglade gtksourceview camlp4]; - configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml_version}/site-lib"; + configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib"; buildFlags = "world"; preInstall = '' - mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib - export OCAMLPATH=$out/lib/ocaml/${ocaml_version}/site-lib/:$OCAMLPATH + mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib + export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH ''; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/lablgtkmathview/default.nix b/pkgs/development/ocaml-modules/lablgtkmathview/default.nix index 299d4972f02..58e93b4f837 100644 --- a/pkgs/development/ocaml-modules/lablgtkmathview/default.nix +++ b/pkgs/development/ocaml-modules/lablgtkmathview/default.nix @@ -1,14 +1,12 @@ {stdenv, fetchurl, pkgconfig, ocaml, findlib, gmetadom, gtkmathview, lablgtk }: let - ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "0.7.2"; pname = "lablgtkmathview"; - in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "${pname}-${version}"; + version = "0.7.2"; src = fetchurl { url = "http://helm.cs.unibo.it/mml-widget/sources/${pname}-${version}.tar.gz"; @@ -22,7 +20,7 @@ stdenv.mkDerivation { propagatedBuildInputs = [gtkmathview]; prePatch = '' - substituteInPlace Makefile.in --replace "PROPCC = @OCAML_LIB_DIR@" "PROPCC = ${lablgtk}/lib/ocaml/${ocaml_version}/site-lib" + substituteInPlace Makefile.in --replace "PROPCC = @OCAML_LIB_DIR@" "PROPCC = ${lablgtk}/lib/ocaml/${ocaml.version}/site-lib" ''; buildPhase = '' diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 6c0d772650c..4c99ff2b685 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,15 +1,12 @@ { stdenv, fetchzip, which, cryptopp, ocaml, findlib, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, ocaml_text, glib, camlp4, ppx_tools }: let - version = "2.5.2"; inherit (stdenv.lib) optional getVersion versionAtLeast; - ocaml_version = getVersion ocaml; in -stdenv.mkDerivation { - - +stdenv.mkDerivation rec { name = "ocaml-lwt-${version}"; + version = "2.5.2"; src = fetchzip { url = "https://github.com/ocsigen/lwt/archive/${version}.tar.gz"; @@ -21,7 +18,7 @@ stdenv.mkDerivation { propagatedBuildInputs = [ ocaml_react ocaml_ssl ocaml_text libev ]; configureFlags = [ "--enable-glib" "--enable-ssl" "--enable-react" "--enable-camlp4"] - ++ [ (if versionAtLeast ocaml_version "4.02" then "--enable-ppx" else "--disable-ppx") ]; + ++ [ (if versionAtLeast ocaml.version "4.02" then "--enable-ppx" else "--disable-ppx") ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/mlgmp/default.nix b/pkgs/development/ocaml-modules/mlgmp/default.nix index 78447796025..0c51fe71ce1 100644 --- a/pkgs/development/ocaml-modules/mlgmp/default.nix +++ b/pkgs/development/ocaml-modules/mlgmp/default.nix @@ -1,13 +1,12 @@ {stdenv, fetchurl, ocaml, findlib, gmp, mpfr, ncurses }: let - ocaml_version = (builtins.parseDrvName ocaml.name).version; pname = "mlgmp"; - version = "20120224"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "${pname}-${version}"; + version = "20120224"; src = fetchurl { url = "http://www-verimag.imag.fr/~monniaux/download/${pname}_${version}.tar.gz"; @@ -15,7 +14,7 @@ stdenv.mkDerivation { }; makeFlags = [ - "DESTDIR=$(out)/lib/ocaml/${ocaml_version}/site-lib/gmp" + "DESTDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib/gmp" ]; preConfigure = "make clean"; @@ -26,7 +25,7 @@ stdenv.mkDerivation { propagatedbuildInputs = [gmp mpfr ncurses]; postInstall = '' - cp ${./META} $out/lib/ocaml/${ocaml_version}/site-lib/gmp/META + cp ${./META} $out/lib/ocaml/${ocaml.version}/site-lib/gmp/META ''; meta = { diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix index ce3487a80a0..9eafa055b24 100644 --- a/pkgs/development/ocaml-modules/mysql/default.nix +++ b/pkgs/development/ocaml-modules/mysql/default.nix @@ -5,13 +5,12 @@ # TODO: compilazione di moduli dipendenti da zip, ssl, tcl, gtk, gtk2 let - ocaml_version = (builtins.parseDrvName ocaml.name).version; pname = "ocaml-mysql"; - version = "1.1.1"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "${pname}-${version}"; + version = "1.1.1"; src = fetchurl { url = "https://forge.ocamlcore.org/frs/download.php/870/${pname}-${version}.tar.gz"; @@ -20,7 +19,7 @@ stdenv.mkDerivation { configureFlags = [ "--prefix=$out" - "--libdir=$out/lib/ocaml/${ocaml_version}/site-lib/mysql" + "--libdir=$out/lib/ocaml/${ocaml.version}/site-lib/mysql" ]; buildInputs = [ocaml findlib camlp4 ]; diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix index ed13a56955b..f8db935b612 100644 --- a/pkgs/development/ocaml-modules/nocrypto/default.nix +++ b/pkgs/development/ocaml-modules/nocrypto/default.nix @@ -1,14 +1,10 @@ { stdenv, fetchzip, ocaml, findlib, cstruct, type_conv, zarith, ounit }: -let - version = "0.5.1"; - ocaml_version = stdenv.lib.getVersion ocaml; -in - -assert stdenv.lib.versionAtLeast ocaml_version "4.01"; +assert stdenv.lib.versionAtLeast ocaml.version "4.01"; -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "ocaml-nocrypto-${version}"; + version = "0.5.1"; src = fetchzip { url = "https://github.com/mirleft/ocaml-nocrypto/archive/${version}.tar.gz"; diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix index 8ee51ed311f..80ae140a3fc 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix @@ -1,13 +1,12 @@ {stdenv, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk_pixbuf, glib, gtk2, pango }: let - ocaml_version = (builtins.parseDrvName ocaml.name).version; pname = "ocaml-cairo"; - version = "1.2.0"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "${pname}-${version}"; + version = "1.2.0"; src = fetchurl { url = "http://cgit.freedesktop.org/cairo-ocaml/snapshot/cairo-ocaml-${version}.zip"; @@ -25,16 +24,16 @@ stdenv.mkDerivation { aclocal -I support autoconf export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE `pkg-config --cflags cairo gdk-pixbuf glib gtk+ pango`" - export LABLGTKDIR=${lablgtk}/lib/ocaml/${ocaml_version}/site-lib/lablgtk2 - cp ${lablgtk}/lib/ocaml/${ocaml_version}/site-lib/lablgtk2/pango.ml ./src - cp ${lablgtk}/lib/ocaml/${ocaml_version}/site-lib/lablgtk2/gaux.ml ./src + export LABLGTKDIR=${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2 + cp ${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2/pango.ml ./src + cp ${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2/gaux.ml ./src ''; postInstall = '' - cp META $out/lib/ocaml/${ocaml_version}/site-lib/cairo/ + cp META $out/lib/ocaml/${ocaml.version}/site-lib/cairo/ ''; - makeFlags = "INSTALLDIR=$(out)/lib/ocaml/${ocaml_version}/site-lib/cairo"; + makeFlags = "INSTALLDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib/cairo"; meta = { homepage = http://cairographics.org/cairo-ocaml; diff --git a/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/pkgs/development/ocaml-modules/ocamlfuse/default.nix index 7b63b0e166f..561d6ef0373 100644 --- a/pkgs/development/ocaml-modules/ocamlfuse/default.nix +++ b/pkgs/development/ocaml-modules/ocamlfuse/default.nix @@ -1,9 +1,5 @@ { stdenv, fetchFromGitHub, ocaml, camlidl, fuse, findlib }: -let - ocaml_version = (builtins.parseDrvName ocaml.name).version; -in - stdenv.mkDerivation rec { name = "ocamlfuse-2.7-3"; src = fetchFromGitHub { diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix index bbef4e01015..579571ef625 100644 --- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix +++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix @@ -1,12 +1,8 @@ {stdenv, fetchurl, ocaml, findlib, ocamlPackages }: -let - ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "1.8.5"; -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "ocamlgraph-${version}"; + version = "1.8.5"; src = fetchurl { url = "http://ocamlgraph.lri.fr/download/ocamlgraph-${version}.tar.gz"; @@ -22,9 +18,9 @@ stdenv.mkDerivation { # * configure looked in the wrong path # * ocaml needs that directory and the stubs directory as -I flag postPatch = '' - sed -i 's@$(DESTDIR)$(OCAMLLIB)/ocamlgraph@$(DESTDIR)/lib/ocaml/${ocaml_version}/site-lib/ocamlgraph@' Makefile.in - sed -i 's@$OCAMLLIB/lablgtk2@${ocamlPackages.lablgtk}/lib/ocaml/${ocaml_version}/site-lib/lablgtk2@' configure Makefile.in - sed -i 's@+lablgtk2@${ocamlPackages.lablgtk}/lib/ocaml/${ocaml_version}/site-lib/lablgtk2 -I ${ocamlPackages.lablgtk}/lib/ocaml/${ocaml_version}/site-lib/stublibs@' configure Makefile.in editor/Makefile + sed -i 's@$(DESTDIR)$(OCAMLLIB)/ocamlgraph@$(DESTDIR)/lib/ocaml/${ocaml.version}/site-lib/ocamlgraph@' Makefile.in + sed -i 's@$OCAMLLIB/lablgtk2@${ocamlPackages.lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2@' configure Makefile.in + sed -i 's@+lablgtk2@${ocamlPackages.lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2 -I ${ocamlPackages.lablgtk}/lib/ocaml/${ocaml.version}/site-lib/stublibs@' configure Makefile.in editor/Makefile ''; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index e67eebeb7a0..73351ea633f 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -1,10 +1,6 @@ { stdenv, fetchurl, pkgconfig, ncurses, ocaml, findlib, ocaml_pcre, camlzip , gnutls, nettle }: -let - ocaml_version = (builtins.parseDrvName ocaml.name).version; -in - stdenv.mkDerivation { name = "ocamlnet-4.1.1"; @@ -27,7 +23,7 @@ stdenv.mkDerivation { -enable-pcre -disable-gtk2 -with-nethttpd - -datadir $out/lib/ocaml/${ocaml_version}/ocamlnet + -datadir $out/lib/ocaml/${ocaml.version}/ocamlnet ) ''; diff --git a/pkgs/development/ocaml-modules/ocamlsdl/default.nix b/pkgs/development/ocaml-modules/ocamlsdl/default.nix index 8f2ffcaa9bc..a5fd2d5076d 100644 --- a/pkgs/development/ocaml-modules/ocamlsdl/default.nix +++ b/pkgs/development/ocaml-modules/ocamlsdl/default.nix @@ -1,13 +1,12 @@ {stdenv, fetchurl, ocaml, pkgconfig, findlib, SDL, SDL_image, SDL_mixer, SDL_ttf, SDL_gfx, lablgl }: let - ocaml_version = (builtins.parseDrvName ocaml.name).version; pname = "ocamlsdl"; - version = "0.9.1"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "${pname}-${version}"; + version = "0.9.1"; src = fetchurl { url = "mirror://sourceforge/project/ocamlsdl/OCamlSDL/ocamlsdl-0.9.1/ocamlsdl-0.9.1.tar.gz"; diff --git a/pkgs/development/ocaml-modules/ounit/default.nix b/pkgs/development/ocaml-modules/ounit/default.nix index d449296ab70..47f15f8c122 100644 --- a/pkgs/development/ocaml-modules/ounit/default.nix +++ b/pkgs/development/ocaml-modules/ounit/default.nix @@ -1,9 +1,5 @@ {stdenv, fetchurl, ocaml, findlib, camlp4}: -let - ocaml_version = (builtins.parseDrvName ocaml.name).version; -in - stdenv.mkDerivation { name = "ounit-2.0.0"; diff --git a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix index 40b95e09e8b..a8acee1c538 100644 --- a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix +++ b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix @@ -1,10 +1,6 @@ {stdenv, fetchurl, ocaml, findlib, type_conv, camlp4}: -let - ocaml_version = (builtins.parseDrvName ocaml.name).version; -in - -assert stdenv.lib.versionOlder "3.12" ocaml_version; +assert stdenv.lib.versionOlder "3.12" ocaml.version; stdenv.mkDerivation { name = "ocaml-sexplib-108.08.00"; diff --git a/pkgs/development/ocaml-modules/sexplib/111.25.00.nix b/pkgs/development/ocaml-modules/sexplib/111.25.00.nix index 55b09c3fdc3..a8724f23cfe 100644 --- a/pkgs/development/ocaml-modules/sexplib/111.25.00.nix +++ b/pkgs/development/ocaml-modules/sexplib/111.25.00.nix @@ -1,10 +1,6 @@ {stdenv, fetchurl, ocaml, findlib, type_conv, camlp4}: -let - ocaml_version = (builtins.parseDrvName ocaml.name).version; -in - -assert stdenv.lib.versionOlder "4.00" ocaml_version; +assert stdenv.lib.versionOlder "4.00" ocaml.version; stdenv.mkDerivation { name = "ocaml-sexplib-111.25.00"; diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix index 6eb43d07b68..e25b17fb656 100644 --- a/pkgs/development/ocaml-modules/ssl/default.nix +++ b/pkgs/development/ocaml-modules/ssl/default.nix @@ -1,12 +1,8 @@ {stdenv, fetchurl, which, openssl, ocaml, findlib}: -let - ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "0.5.2"; -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "ocaml-ssl-${version}"; + version = "0.5.2"; src = fetchurl { url = "mirror://sourceforge/project/savonet/ocaml-ssl/0.5.2/ocaml-ssl-0.5.2.tar.gz"; diff --git a/pkgs/development/ocaml-modules/type_conv/108.08.00.nix b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix index e014da8b66a..4a3d8c58f0b 100644 --- a/pkgs/development/ocaml-modules/type_conv/108.08.00.nix +++ b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix @@ -1,10 +1,6 @@ {stdenv, fetchurl, ocaml, findlib, camlp4}: -let - ocaml_version = (builtins.parseDrvName ocaml.name).version; -in - -assert stdenv.lib.versionOlder "3.12" ocaml_version; +assert stdenv.lib.versionOlder "3.12" ocaml.version; stdenv.mkDerivation { name = "ocaml-type_conv-108.08.00"; diff --git a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix index b6747a48d95..ae2b62f6b36 100644 --- a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix +++ b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix @@ -1,10 +1,6 @@ {stdenv, fetchurl, ocaml, findlib, camlp4}: -let - ocaml_version = (builtins.parseDrvName ocaml.name).version; -in - -assert stdenv.lib.versionOlder "4.00" ocaml_version; +assert stdenv.lib.versionOlder "4.00" ocaml.version; stdenv.mkDerivation { name = "ocaml-type_conv-109.60.01"; diff --git a/pkgs/development/ocaml-modules/ulex/0.8/default.nix b/pkgs/development/ocaml-modules/ulex/0.8/default.nix index eddc71aeace..288e9a6933e 100644 --- a/pkgs/development/ocaml-modules/ulex/0.8/default.nix +++ b/pkgs/development/ocaml-modules/ulex/0.8/default.nix @@ -1,14 +1,12 @@ {stdenv, fetchurl, ocaml, findlib, camlp5 }: let - ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "0.8"; pname = "ulex"; - in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "${pname}-${version}"; + version = "0.8"; src = fetchurl { url = "http://www.cduce.org/download/old/${pname}-${version}.tar.gz"; diff --git a/pkgs/development/ocaml-modules/ulex/default.nix b/pkgs/development/ocaml-modules/ulex/default.nix index 1e0632387e3..a5b9349cbe0 100644 --- a/pkgs/development/ocaml-modules/ulex/default.nix +++ b/pkgs/development/ocaml-modules/ulex/default.nix @@ -1,14 +1,12 @@ { stdenv, fetchurl, ocaml, findlib, camlp4 }: let - ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "1.1"; pname = "ulex"; - in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "${pname}-${version}"; + version = "1.1"; src = fetchurl { url = "http://www.cduce.org/download/${pname}-${version}.tar.gz"; diff --git a/pkgs/development/ocaml-modules/uucd/default.nix b/pkgs/development/ocaml-modules/uucd/default.nix index 2f19b2c17ef..7d4e4b42efb 100644 --- a/pkgs/development/ocaml-modules/uucd/default.nix +++ b/pkgs/development/ocaml-modules/uucd/default.nix @@ -1,13 +1,12 @@ { stdenv, fetchurl, ocaml, findlib, opam, xmlm, topkg }: + let pname = "uucd"; - version = "4.0.0"; webpage = "http://erratique.ch/software/${pname}"; - ocaml_version = (builtins.parseDrvName ocaml.name).version; in stdenv.mkDerivation rec { - name = "ocaml-${pname}-${version}"; + version = "4.0.0"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; @@ -25,7 +24,7 @@ stdenv.mkDerivation rec { installPhase = '' opam-installer --script --prefix=$out ${pname}.install > install.sh sh install.sh - ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml_version}/site-lib/ + ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/ ''; propagatedBuildInputs = [ xmlm ]; diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix index 4e5d73e4cb3..a407410907e 100644 --- a/pkgs/development/ocaml-modules/uunf/default.nix +++ b/pkgs/development/ocaml-modules/uunf/default.nix @@ -1,16 +1,14 @@ {stdenv, fetchurl, ocaml, findlib, opam}: let pname = "uunf"; - version = "0.9.3"; webpage = "http://erratique.ch/software/${pname}"; - ocaml_version = (builtins.parseDrvName ocaml.name).version; in -assert stdenv.lib.versionAtLeast ocaml_version "3.12"; +assert stdenv.lib.versionAtLeast ocaml.version "3.12"; stdenv.mkDerivation rec { - name = "ocaml-${pname}-${version}"; + version = "0.9.3"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; @@ -28,7 +26,7 @@ stdenv.mkDerivation rec { installPhase = '' opam-installer --script --prefix=$out ${pname}.install > install.sh sh install.sh - ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml_version}/site-lib/ + ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/ ''; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/uutf/default.nix b/pkgs/development/ocaml-modules/uutf/default.nix index 7c4cff57128..897630ccac6 100644 --- a/pkgs/development/ocaml-modules/uutf/default.nix +++ b/pkgs/development/ocaml-modules/uutf/default.nix @@ -1,16 +1,14 @@ {stdenv, fetchurl, ocaml, findlib, opam}: let pname = "uutf"; - version = "0.9.3"; webpage = "http://erratique.ch/software/${pname}"; - ocaml_version = (builtins.parseDrvName ocaml.name).version; in -assert stdenv.lib.versionAtLeast ocaml_version "3.12"; +assert stdenv.lib.versionAtLeast ocaml.version "3.12"; stdenv.mkDerivation rec { - name = "ocaml-${pname}-${version}"; + version = "0.9.3"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; @@ -28,7 +26,7 @@ stdenv.mkDerivation rec { installPhase = '' opam-installer --script --prefix=$out ${pname}.install > install.sh sh install.sh - ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml_version}/site-lib/ + ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/ ''; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/xmlm/default.nix b/pkgs/development/ocaml-modules/xmlm/default.nix index 5dedfb396d5..2f2d5b0b8be 100644 --- a/pkgs/development/ocaml-modules/xmlm/default.nix +++ b/pkgs/development/ocaml-modules/xmlm/default.nix @@ -1,16 +1,14 @@ {stdenv, fetchurl, ocaml, findlib, opam}: let pname = "xmlm"; - version = "1.2.0"; webpage = "http://erratique.ch/software/${pname}"; - ocaml_version = (builtins.parseDrvName ocaml.name).version; in -assert stdenv.lib.versionAtLeast ocaml_version "3.12"; +assert stdenv.lib.versionAtLeast ocaml.version "3.12"; stdenv.mkDerivation rec { - name = "ocaml-${pname}-${version}"; + version = "1.2.0"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; @@ -28,7 +26,7 @@ stdenv.mkDerivation rec { installPhase = '' opam-installer --script --prefix=$out ${pname}.install > install.sh sh install.sh - ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml_version}/site-lib/ + ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/ ''; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index 10a3a1602ae..458ed1683e0 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -1,10 +1,6 @@ { stdenv, fetchurl, ocaml, findlib, pkgconfig, gmp, perl }: -let - ocaml_version = (builtins.parseDrvName ocaml.name).version; -in - -assert stdenv.lib.versionAtLeast ocaml_version "3.12.1"; +assert stdenv.lib.versionAtLeast ocaml.version "3.12.1"; stdenv.mkDerivation rec { name = "zarith-${version}"; @@ -22,9 +18,9 @@ stdenv.mkDerivation rec { substituteInPlace ./z_pp.pl --replace '/usr/bin/perl' '${perl}/bin/perl' ''; configurePhase = '' - ./configure -installdir $out/lib/ocaml/${ocaml_version}/site-lib + ./configure -installdir $out/lib/ocaml/${ocaml.version}/site-lib ''; - preInstall = "mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib"; + preInstall = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib"; meta = with stdenv.lib; { description = "Fast, arbitrary precision OCaml integers"; |