From 74c3fc3085365b2d27e38194042cb3f824c5c512 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Fri, 16 Dec 2011 07:44:29 +0000 Subject: Update HOL Light to rev 114 svn path=/nixpkgs/trunk/; revision=30922 --- .../science/logic/hol_light/default.nix | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 3f161b5249d73..209ba934b9efe 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -1,20 +1,22 @@ {stdenv, fetchsvn, writeScript, ocaml, findlib, camlp5}: -stdenv.mkDerivation rec { - name = "hol_light-20111106"; - src = fetchsvn { - url = http://hol-light.googlecode.com/svn/trunk; - rev = "112"; - sha256 = "6c7b39ea024b2e8042c1a22a01f778caedaaf82189c9f2c1cfa8c08707151129"; - }; - - buildInputs = [ ocaml findlib camlp5 ]; - +let start_script = '' #!/bin/sh cd "$out/lib/hol_light" exec ${ocaml}/bin/ocaml -I "$(ocamlfind query camlp5)" -init make.ml ''; +in + +stdenv.mkDerivation { + name = "hol_light-20111204"; + src = fetchsvn { + url = http://hol-light.googlecode.com/svn/trunk; + rev = "114"; + sha256 = "a9203a0118caf5d0ca7621abafab4af6245e1c1ae6ba628ead7c6f69aa86d9d3"; + }; + + buildInputs = [ ocaml findlib camlp5 ]; buildPhase = '' make pa_j.ml -- cgit 1.4.1 From 9819d7b26acc721d468d625176037f428a37311c Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Fri, 16 Dec 2011 08:11:19 +0000 Subject: Update OCaml 3.12.0 to 3.12.1 svn path=/nixpkgs/trunk/; revision=30923 --- pkgs/development/compilers/ocaml/3.12.0.nix | 59 ----------------------------- pkgs/development/compilers/ocaml/3.12.1.nix | 59 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 60 insertions(+), 60 deletions(-) delete mode 100644 pkgs/development/compilers/ocaml/3.12.0.nix create mode 100644 pkgs/development/compilers/ocaml/3.12.1.nix diff --git a/pkgs/development/compilers/ocaml/3.12.0.nix b/pkgs/development/compilers/ocaml/3.12.0.nix deleted file mode 100644 index 6b58dccc9d560..0000000000000 --- a/pkgs/development/compilers/ocaml/3.12.0.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ stdenv, fetchurl, ncurses, x11 }: - -let - useX11 = stdenv.system != "armv5tel-linux"; - useNativeCompilers = stdenv.system != "armv5tel-linux"; - inherit (stdenv.lib) optionals optionalString; -in - -stdenv.mkDerivation rec { - - name = "ocaml-3.12.0"; - - src = fetchurl { - url = "http://caml.inria.fr/pub/distrib/ocaml-3.12/${name}.tar.bz2"; - sha256 = "0fzczy1s38ihlvghngn4l4n7gnyywnwd7c172276bjcy41b1g08p"; - }; - - prefixKey = "-prefix "; - configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ]; - buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; - buildInputs = [ncurses] ++ optionals useX11 [ x11 ]; - installTargets = "install" + optionalString useNativeCompilers " installopt"; - patchPhase = '' - CAT=$(type -tp cat) - sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang - ''; - postBuild = '' - ensureDir $out/include - ln -sv $out/lib/ocaml/caml $out/include/caml - ''; - - meta = { - homepage = http://caml.inria.fr/ocaml; - licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; - description = "Objective Caml, the most popular variant of the Caml language"; - - longDescription = - '' Objective Caml is the most popular variant of the Caml language. - From a language standpoint, it extends the core Caml language with a - fully-fledged object-oriented layer, as well as a powerful module - system, all connected by a sound, polymorphic type system featuring - type inference. - - The Objective Caml system is an industrial-strength implementation - of this language, featuring a high-performance native-code compiler - (ocamlopt) for 9 processor architectures (IA32, PowerPC, AMD64, - Alpha, Sparc, Mips, IA64, HPPA, StrongArm), as well as a bytecode - compiler (ocamlc) and an interactive read-eval-print loop (ocaml) - for quick development and portability. The Objective Caml - distribution includes a comprehensive standard library, a replay - debugger (ocamldebug), lexer (ocamllex) and parser (ocamlyacc) - generators, a pre-processor pretty-printer (camlp4) and a - documentation generator (ocamldoc). - ''; - - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - }; - -} diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix new file mode 100644 index 0000000000000..eaf1f55e281bc --- /dev/null +++ b/pkgs/development/compilers/ocaml/3.12.1.nix @@ -0,0 +1,59 @@ +{ stdenv, fetchurl, ncurses, x11 }: + +let + useX11 = stdenv.system != "armv5tel-linux"; + useNativeCompilers = stdenv.system != "armv5tel-linux"; + inherit (stdenv.lib) optionals optionalString; +in + +stdenv.mkDerivation rec { + + name = "ocaml-3.12.1"; + + src = fetchurl { + url = "http://caml.inria.fr/pub/distrib/ocaml-3.12/${name}.tar.bz2"; + sha256 = "13cmhkh7s6srnlvhg3s9qzh3a5dbk2m9qr35jzq922sylwymdkzd"; + }; + + prefixKey = "-prefix "; + configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ]; + buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; + buildInputs = [ncurses] ++ optionals useX11 [ x11 ]; + installTargets = "install" + optionalString useNativeCompilers " installopt"; + patchPhase = '' + CAT=$(type -tp cat) + sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang + ''; + postBuild = '' + ensureDir $out/include + ln -sv $out/lib/ocaml/caml $out/include/caml + ''; + + meta = { + homepage = http://caml.inria.fr/ocaml; + licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; + description = "OCaml, the most popular variant of the Caml language"; + + longDescription = + '' + OCaml is the most popular variant of the Caml language. From a + language standpoint, it extends the core Caml language with a + fully-fledged object-oriented layer, as well as a powerful module + system, all connected by a sound, polymorphic type system featuring + type inference. + + The OCaml system is an industrial-strength implementation of this + language, featuring a high-performance native-code compiler (ocamlopt) + for 9 processor architectures (IA32, PowerPC, AMD64, Alpha, Sparc, + Mips, IA64, HPPA, StrongArm), as well as a bytecode compiler (ocamlc) + and an interactive read-eval-print loop (ocaml) for quick development + and portability. The OCaml distribution includes a comprehensive + standard library, a replay debugger (ocamldebug), lexer (ocamllex) and + parser (ocamlyacc) generators, a pre-processor pretty-printer (camlp4) + and a documentation generator (ocamldoc). + ''; + + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2254eea3633a..15e4a859feb58 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2333,7 +2333,7 @@ let ocaml_3_11_1 = callPackage ../development/compilers/ocaml/3.11.1.nix { }; - ocaml_3_12_0 = lowPrio (callPackage ../development/compilers/ocaml/3.12.0.nix { }); + ocaml_3_12_1 = lowPrio (callPackage ../development/compilers/ocaml/3.12.1.nix { }); mkOcamlPackages = ocaml: self: let callPackage = newScope self; in rec { inherit ocaml; -- cgit 1.4.1 From ef32f76d6e61c180c64c6492f581cfe36067c0fa Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Fri, 16 Dec 2011 09:13:47 +0000 Subject: Update OUnit to version 1.1.0 svn path=/nixpkgs/trunk/; revision=30924 --- pkgs/development/ocaml-modules/ounit/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/ounit/default.nix b/pkgs/development/ocaml-modules/ounit/default.nix index b6d14383d5e55..8f21ba649bf7c 100644 --- a/pkgs/development/ocaml-modules/ounit/default.nix +++ b/pkgs/development/ocaml-modules/ounit/default.nix @@ -2,22 +2,19 @@ let ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "1.0.3"; in stdenv.mkDerivation { - name = "ounit-${version}"; + name = "ounit-1.1.0"; src = fetchurl { - url = "http://www.xs4all.nl/~mmzeeman/ocaml/ounit-${version}.tar.gz"; - sha256 = "1n7ylrbi2m00gn0kjg5zxnyzxki8v1dy31fcz3vh1xnwcx6hii97"; + url = http://forge.ocamlcore.org/frs/download.php/495/ounit-1.1.0.tar.gz; + sha256 = "12vybg9xlw5c8ip23p8cljfzhkdsm25482sf1yh46fcqq8p2jmqx"; }; buildInputs = [ocaml findlib]; - configurePhase = "true"; # Skip configure - - buildFlags = "all allopt"; + dontAddPrefix = true; doCheck = true; -- cgit 1.4.1 From 82fabd62624d91f4ad39c6ec26427aa8a0e340d6 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Fri, 16 Dec 2011 09:22:31 +0000 Subject: Update ocaml-findlib to version 1.2.7 svn path=/nixpkgs/trunk/; revision=30925 --- pkgs/development/tools/ocaml/findlib/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index a8000d2cf0e1b..70fb45a197958 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -2,15 +2,14 @@ let ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "1.2.6"; in stdenv.mkDerivation { - name = "ocaml-findlib-${version}"; + name = "ocaml-findlib-1.2.7"; src = fetchurl { - url = "http://download.camlcity.org/download/findlib-${version}.tar.gz"; - sha256 = "1b6z5lylsjxxaifw2yc21cs0dc84zqi4q57sgwg4j8k3m60ivpxs"; + url = http://download.camlcity.org/download/findlib-1.2.7.tar.gz; + sha256 = "16q2avr48hd7vwz3bwvjw39dva86mdwa05drcwz32fwbwhlv2869"; }; buildInputs = [m4 ncurses ocaml]; -- cgit 1.4.1 From b41da3c8dff4f804485bd9bf411149c4048c25ca Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Fri, 16 Dec 2011 09:35:13 +0000 Subject: Add ocamlnat (native toplevel for OCaml) svn path=/nixpkgs/trunk/; revision=30926 --- .../development/ocaml-modules/ocamlnat/default.nix | 40 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 ++-- 2 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/ocaml-modules/ocamlnat/default.nix diff --git a/pkgs/development/ocaml-modules/ocamlnat/default.nix b/pkgs/development/ocaml-modules/ocamlnat/default.nix new file mode 100644 index 0000000000000..a8e0f28628a4e --- /dev/null +++ b/pkgs/development/ocaml-modules/ocamlnat/default.nix @@ -0,0 +1,40 @@ +{stdenv, fetchurl, ocaml, findlib, ounit}: + +stdenv.mkDerivation { + name = "ocamlnat-0.1.1"; + + src = fetchurl { + url = http://benediktmeurer.de/files/source/ocamlnat-0.1.1.tar.bz2; + sha256 = "0dyvy0j6f47laxhnadvm71z1py9hz9zd49hamf6bij99cggb2ij1"; + }; + + buildInputs = [ocaml findlib ounit]; + + prefixKey = "--prefix "; + + doCheck = true; + + checkTarget = "test"; + + createFindlibDestdir = true; + + meta = { + description = "OCaml native toplevel"; + homepage = http://benediktmeurer.de/ocamlnat/; + license = "QPL"; + longDescription = '' + The ocamlnat project provides a new native code OCaml toplevel + ocamlnat, which is mostly compatible to the byte code toplevel ocaml, + but up to 100 times faster. It is based on the optimizing native code + compiler, the native runtime and an earlier prototype by Alain + Frisch. It is build upon Just-In-Time techniques and currently + supports Unix-like systems (i.e. Linux, BSD or Mac OS X) running on + x86 or x86-64 processors. Support for additional architectures and + operating systems is planned, but not yet available. + ''; + platforms = ocaml.meta.platforms; + maintainers = [ + stdenv.lib.maintainers.z77z + ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15e4a859feb58..6c46ebdb6c079 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2417,9 +2417,11 @@ let ocamlPackages = recurseIntoAttrs ocamlPackages_3_11_1; ocamlPackages_3_10_0 = mkOcamlPackages ocaml_3_10_0 pkgs.ocamlPackages_3_10_0; ocamlPackages_3_11_1 = mkOcamlPackages ocaml_3_11_1 pkgs.ocamlPackages_3_11_1; - ocamlPackages_3_12_0 = mkOcamlPackages ocaml_3_12_0 pkgs.ocamlPackages_3_12_0; + ocamlPackages_3_12_1 = mkOcamlPackages ocaml_3_12_1 pkgs.ocamlPackages_3_12_1; - opa = let callPackage = newScope pkgs.ocamlPackages_3_12_0; in callPackage ../development/compilers/opa { }; + opa = let callPackage = newScope pkgs.ocamlPackages_3_12_1; in callPackage ../development/compilers/opa { }; + + ocamlnat = let callPackage = newScope pkgs.ocamlPackages_3_12_1; in callPackage ../development/ocaml-modules/ocamlnat { }; opencxx = callPackage ../development/compilers/opencxx { gcc = gcc33; -- cgit 1.4.1