Author: urkud
Date: Fri Dec 16 10:12:05 2011
New Revision: 30927
URL: https://nixos.org/websvn/nix/?rev=30927&sc=1
Log:
merge trunk
Added:
nixpkgs/branches/drop-kde4.5/pkgs/development/compilers/ocaml/3.12.1.nix
- copied unchanged from r30926,
nixpkgs/trunk/pkgs/development/compilers/ocaml/3.12.1.nix
nixpkgs/branches/drop-kde4.5/pkgs/development/ocaml-modules/ocamlnat/
- copied from r30926,
nixpkgs/trunk/pkgs/development/ocaml-modules/ocamlnat/
Replaced:
nixpkgs/branches/drop-kde4.5/pkgs/development/ocaml-modules/ocamlnat/default.nix
- copied unchanged from r30926,
nixpkgs/trunk/pkgs/development/ocaml-modules/ocamlnat/default.nix
Deleted:
nixpkgs/branches/drop-kde4.5/pkgs/development/compilers/ocaml/3.12.0.nix
Modified:
nixpkgs/branches/drop-kde4.5/ (props changed)
nixpkgs/branches/drop-kde4.5/pkgs/applications/graphics/xscreensaver/default.nix
(props changed)
nixpkgs/branches/drop-kde4.5/pkgs/applications/misc/xneur/0.8.nix (props
changed)
nixpkgs/branches/drop-kde4.5/pkgs/applications/networking/browsers/icecat-4/
(props changed)
nixpkgs/branches/drop-kde4.5/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/
(props changed)
nixpkgs/branches/drop-kde4.5/pkgs/applications/science/logic/hol_light/default.nix
nixpkgs/branches/drop-kde4.5/pkgs/build-support/clang-wrapper/ (props
changed)
nixpkgs/branches/drop-kde4.5/pkgs/build-support/gcc-wrapper/ (props
changed)
nixpkgs/branches/drop-kde4.5/pkgs/build-support/release/debian-build.nix
(props changed)
nixpkgs/branches/drop-kde4.5/pkgs/build-support/release/nix-build.nix
(props changed)
nixpkgs/branches/drop-kde4.5/pkgs/build-support/release/rpm-build.nix
(props changed)
nixpkgs/branches/drop-kde4.5/pkgs/build-support/release/source-tarball.nix
(props changed)
nixpkgs/branches/drop-kde4.5/pkgs/development/compilers/ghc/6.10.1.nix
(props changed)
nixpkgs/branches/drop-kde4.5/pkgs/development/compilers/ghc/6.10.2.nix
(props changed)
nixpkgs/branches/drop-kde4.5/pkgs/development/compilers/ghc/6.8.2.nix
(props changed)
nixpkgs/branches/drop-kde4.5/pkgs/development/compilers/ghc/6.8.3.nix
(props changed)
nixpkgs/branches/drop-kde4.5/pkgs/development/libraries/aterm/2.8.nix
(props changed)
nixpkgs/branches/drop-kde4.5/pkgs/development/libraries/fltk/fltk11.nix
(props changed)
nixpkgs/branches/drop-kde4.5/pkgs/development/libraries/glibc-2.9/ (props
changed)
nixpkgs/branches/drop-kde4.5/pkgs/development/libraries/goocanvas/ (props
changed)
nixpkgs/branches/drop-kde4.5/pkgs/development/libraries/pcre/default.nix
(props changed)
nixpkgs/branches/drop-kde4.5/pkgs/development/libraries/readline/readline6.nix
(props changed)
nixpkgs/branches/drop-kde4.5/pkgs/development/ocaml-modules/ounit/default.nix
nixpkgs/branches/drop-kde4.5/pkgs/development/tools/misc/autoconf/2.13.nix
(props changed)
nixpkgs/branches/drop-kde4.5/pkgs/development/tools/misc/gnum4/default.nix
(props changed)
nixpkgs/branches/drop-kde4.5/pkgs/development/tools/ocaml/findlib/default.nix
nixpkgs/branches/drop-kde4.5/pkgs/misc/tex/pgf/1.x.nix (props changed)
nixpkgs/branches/drop-kde4.5/pkgs/misc/tex/pgf/2.x.nix (props changed)
nixpkgs/branches/drop-kde4.5/pkgs/os-specific/linux/atheros/r3867.nix
(props changed)
nixpkgs/branches/drop-kde4.5/pkgs/os-specific/linux/kernel-headers/2.6.28.nix
(props changed)
nixpkgs/branches/drop-kde4.5/pkgs/os-specific/linux/kernel-headers/2.6.32.nix
(props changed)
nixpkgs/branches/drop-kde4.5/pkgs/os-specific/linux/kernel/generic.nix
(props changed)
nixpkgs/branches/drop-kde4.5/pkgs/os-specific/linux/kernel/linux-2.6.25.nix
(props changed)
nixpkgs/branches/drop-kde4.5/pkgs/os-specific/linux/kernel/linux-2.6.27.nix
(props changed)
nixpkgs/branches/drop-kde4.5/pkgs/os-specific/linux/kernel/linux-2.6.28.nix
(props changed)
nixpkgs/branches/drop-kde4.5/pkgs/os-specific/linux/kernel/linux-2.6.29.nix
(props changed)
nixpkgs/branches/drop-kde4.5/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix
(props changed)
nixpkgs/branches/drop-kde4.5/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
(props changed)
nixpkgs/branches/drop-kde4.5/pkgs/os-specific/linux/kernel/linux-2.6.33.nix
(props changed)
nixpkgs/branches/drop-kde4.5/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix
(props changed)
nixpkgs/branches/drop-kde4.5/pkgs/os-specific/linux/qemu-kvm/default.nix
(props changed)
nixpkgs/branches/drop-kde4.5/pkgs/os-specific/linux/util-linux-ng/ (props
changed)
nixpkgs/branches/drop-kde4.5/pkgs/servers/mail/dovecot/1.1.1.nix (props
changed)
nixpkgs/branches/drop-kde4.5/pkgs/shells/bash/4.1.nix (props changed)
nixpkgs/branches/drop-kde4.5/pkgs/shells/bash/4.2.nix (props changed)
nixpkgs/branches/drop-kde4.5/pkgs/stdenv/generic/setup.sh (props changed)
nixpkgs/branches/drop-kde4.5/pkgs/stdenv/linux/make-bootstrap-tools.nix
(props changed)
nixpkgs/branches/drop-kde4.5/pkgs/tools/networking/wget/default.nix (props
changed)
nixpkgs/branches/drop-kde4.5/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/branches/drop-kde4.5/pkgs/applications/science/logic/hol_light/default.nix
==============================================================================
---
nixpkgs/branches/drop-kde4.5/pkgs/applications/science/logic/hol_light/default.nix
Fri Dec 16 09:35:13 2011 (r30926)
+++
nixpkgs/branches/drop-kde4.5/pkgs/applications/science/logic/hol_light/default.nix
Fri Dec 16 10:12:05 2011 (r30927)
@@ -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
Copied:
nixpkgs/branches/drop-kde4.5/pkgs/development/compilers/ocaml/3.12.1.nix (from
r30926, nixpkgs/trunk/pkgs/development/compilers/ocaml/3.12.1.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/drop-kde4.5/pkgs/development/compilers/ocaml/3.12.1.nix
Fri Dec 16 10:12:05 2011 (r30927, copy of r30926,
nixpkgs/trunk/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;
+ };
+
+}
Copied:
nixpkgs/branches/drop-kde4.5/pkgs/development/ocaml-modules/ocamlnat/default.nix
(from r30926,
nixpkgs/trunk/pkgs/development/ocaml-modules/ocamlnat/default.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/drop-kde4.5/pkgs/development/ocaml-modules/ocamlnat/default.nix
Fri Dec 16 10:12:05 2011 (r30927, copy of r30926,
nixpkgs/trunk/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
+ ];
+ };
+}
Modified:
nixpkgs/branches/drop-kde4.5/pkgs/development/ocaml-modules/ounit/default.nix
==============================================================================
---
nixpkgs/branches/drop-kde4.5/pkgs/development/ocaml-modules/ounit/default.nix
Fri Dec 16 09:35:13 2011 (r30926)
+++
nixpkgs/branches/drop-kde4.5/pkgs/development/ocaml-modules/ounit/default.nix
Fri Dec 16 10:12:05 2011 (r30927)
@@ -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;
Modified:
nixpkgs/branches/drop-kde4.5/pkgs/development/tools/ocaml/findlib/default.nix
==============================================================================
---
nixpkgs/branches/drop-kde4.5/pkgs/development/tools/ocaml/findlib/default.nix
Fri Dec 16 09:35:13 2011 (r30926)
+++
nixpkgs/branches/drop-kde4.5/pkgs/development/tools/ocaml/findlib/default.nix
Fri Dec 16 10:12:05 2011 (r30927)
@@ -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];
Modified: nixpkgs/branches/drop-kde4.5/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/drop-kde4.5/pkgs/top-level/all-packages.nix Fri Dec
16 09:35:13 2011 (r30926)
+++ nixpkgs/branches/drop-kde4.5/pkgs/top-level/all-packages.nix Fri Dec
16 10:12:05 2011 (r30927)
@@ -2333,7 +2333,7 @@
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;
@@ -2417,9 +2417,11 @@
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;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
