Author: urkud
Date: Fri Dec 16 22:57:21 2011
New Revision: 30947
URL: https://nixos.org/websvn/nix/?rev=30947&sc=1
Log:
merge trunk
A few conflicts due to renames
Added:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ocaml/3.12.1.nix
- copied unchanged from r30946,
nixpkgs/trunk/pkgs/development/compilers/ocaml/3.12.1.nix
nixpkgs/branches/stdenv-updates/pkgs/development/ocaml-modules/ocamlnat/
- copied from r30946,
nixpkgs/trunk/pkgs/development/ocaml-modules/ocamlnat/
Replaced:
nixpkgs/branches/stdenv-updates/pkgs/development/ocaml-modules/ocamlnat/default.nix
- copied unchanged from r30946,
nixpkgs/trunk/pkgs/development/ocaml-modules/ocamlnat/default.nix
Deleted:
nixpkgs/branches/stdenv-updates/pkgs/applications/misc/filelight/
nixpkgs/branches/stdenv-updates/pkgs/desktops/kde-4.5/
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ocaml/3.12.0.nix
Modified:
nixpkgs/branches/stdenv-updates/ (props changed)
nixpkgs/branches/stdenv-updates/pkgs/applications/audio/amarok/default.nix
nixpkgs/branches/stdenv-updates/pkgs/applications/graphics/xscreensaver/default.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/applications/misc/kde-wacomtablet/default.nix
nixpkgs/branches/stdenv-updates/pkgs/applications/misc/krusader/default.nix
nixpkgs/branches/stdenv-updates/pkgs/applications/misc/rsibreak/default.nix
nixpkgs/branches/stdenv-updates/pkgs/applications/misc/xneur/0.8.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/applications/misc/yakuake/default.nix
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/icecat-4/
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/rekonq/default.nix
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/sync/akunambol/default.nix
nixpkgs/branches/stdenv-updates/pkgs/applications/science/logic/hol_light/default.nix
nixpkgs/branches/stdenv-updates/pkgs/build-support/clang-wrapper/ (props
changed)
nixpkgs/branches/stdenv-updates/pkgs/build-support/gcc-wrapper/ (props
changed)
nixpkgs/branches/stdenv-updates/pkgs/build-support/release/debian-build.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/build-support/release/nix-build.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/build-support/release/rpm-build.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/build-support/release/source-tarball.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/data/misc/shared-desktop-ontologies/default.nix
nixpkgs/branches/stdenv-updates/pkgs/desktops/kde-4.7/kdelibs.nix
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/6.10.1.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/6.10.2.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/6.8.2.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/6.8.3.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/head.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/aterm/2.8.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/fltk/fltk11.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.9/
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/goocanvas/
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/pcre/default.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/polkit-qt-1/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/readline/readline6.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/ocaml-modules/ounit/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/autoconf/2.13.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/gnum4/default.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/tools/ocaml/findlib/default.nix
nixpkgs/branches/stdenv-updates/pkgs/misc/tex/pgf/1.x.nix (props changed)
nixpkgs/branches/stdenv-updates/pkgs/misc/tex/pgf/2.x.nix (props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/atheros/r3867.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/2.6.28.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/2.6.32.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/default.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/generic.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.25.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.27.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.28.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.29.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.33.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/qemu-kvm/default.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/util-linux/ (props
changed)
nixpkgs/branches/stdenv-updates/pkgs/servers/mail/dovecot/1.1.1.nix (props
changed)
nixpkgs/branches/stdenv-updates/pkgs/shells/bash/default.nix (props
changed)
nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/setup.sh (props
changed)
nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/make-bootstrap-tools.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/tools/networking/wget/default.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
nixpkgs/branches/stdenv-updates/pkgs/top-level/haskell-packages.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/applications/audio/amarok/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/applications/audio/amarok/default.nix
Fri Dec 16 22:33:28 2011 (r30946)
+++ nixpkgs/branches/stdenv-updates/pkgs/applications/audio/amarok/default.nix
Fri Dec 16 22:57:21 2011 (r30947)
@@ -1,6 +1,7 @@
-{ stdenv, fetchurl, lib, cmake, qt4, qtscriptgenerator, perl, gettext, curl
-, libxml2, mysql, taglib, taglib_extras, loudmouth , kdelibs, automoc4, phonon
-, strigi, soprano, qca2, libmtp, liblastfm, libgpod, pkgconfig }:
+{ stdenv, fetchurl, lib, qtscriptgenerator, perl, gettext, curl
+, libxml2, mysql, taglib, taglib_extras, loudmouth , kdelibs
+, qca2, libmtp, liblastfm, libgpod, pkgconfig, automoc4, phonon
+, strigi, soprano }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
@@ -14,7 +15,7 @@
};
QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins";
- buildInputs = [ cmake qt4 qtscriptgenerator perl stdenv.gcc.libc gettext curl
+ buildInputs = [ qtscriptgenerator stdenv.gcc.libc gettext curl
libxml2 mysql taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi
soprano qca2 libmtp liblastfm libgpod pkgconfig ];
Modified:
nixpkgs/branches/stdenv-updates/pkgs/applications/misc/kde-wacomtablet/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/applications/misc/kde-wacomtablet/default.nix
Fri Dec 16 22:33:28 2011 (r30946)
+++
nixpkgs/branches/stdenv-updates/pkgs/applications/misc/kde-wacomtablet/default.nix
Fri Dec 16 22:57:21 2011 (r30947)
@@ -1,18 +1,20 @@
-{ stdenv, fetchurl, automoc4, cmake, kdelibs }:
+{ stdenv, fetchurl, kdelibs, gettext }:
stdenv.mkDerivation rec {
- name = "wacomtablet-1.2.5";
+ name = "wacomtablet-1.3.5";
src = fetchurl {
- url = "http://kde-apps.org/CONTENT/content-files/114856-${name}.tar.gz";;
- sha256 = "11hfab6sqmhvd0m1grc9m9yfi0p7rk0bycj9wqgkgbc8cwgps6sf";
+ url =
"http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-v1.3.5.tar.bz2";;
+ sha256 = "0dgsp3izx2v44f6j8mhxc6zybjn5sj9038w6b4v2fgix47fri0ja";
};
- buildInputs = [ automoc4 cmake kdelibs ];
+ buildInputs = [ kdelibs ];
+
+ buildNativeInputs = [ gettext ];
meta = with stdenv.lib; {
description = "KDE Wacom graphic tablet configuration tool";
- license = "GPLv2";
+ license = licenses.gpl2Plus;
homepage =
http://kde-apps.org/content/show.php/wacom+tablet?content=114856;
platforms = platforms.linux;
maintainers = [ maintainers.goibhniu maintainers.urkud ];
Modified:
nixpkgs/branches/stdenv-updates/pkgs/applications/misc/krusader/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/applications/misc/krusader/default.nix
Fri Dec 16 22:33:28 2011 (r30946)
+++ nixpkgs/branches/stdenv-updates/pkgs/applications/misc/krusader/default.nix
Fri Dec 16 22:57:21 2011 (r30947)
@@ -1,12 +1,12 @@
-{stdenv, fetchurl, cmake, qt4, perl, gettext, kdelibs, kde_baseapps, automoc4,
phonon}:
+{stdenv, fetchurl, gettext, kdelibs, kde_baseapps}:
stdenv.mkDerivation rec {
- name = "krusader-2.2.0-beta1";
+ name = "krusader-2.4.0-beta1";
src = fetchurl {
url = "mirror://sourceforge/krusader/${name}.tar.bz2";
- sha256 = "0rbk0hw8p1bb03w74gspljbzhvpbs3dcr6ckp38gh5r80mcmqfbs";
+ sha256 = "1q1m4cjzz2m41pdpxnwrsiczc7990785b700lv64midjjgjnr7j6";
};
- buildInputs = [ cmake qt4 perl gettext kdelibs automoc4 phonon kde_baseapps
];
+ buildInputs = [ gettext kdelibs kde_baseapps ];
meta = {
description = "Norton/Total Commander clone for KDE";
license = "GPL";
Modified:
nixpkgs/branches/stdenv-updates/pkgs/applications/misc/rsibreak/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/applications/misc/rsibreak/default.nix
Fri Dec 16 22:33:28 2011 (r30946)
+++ nixpkgs/branches/stdenv-updates/pkgs/applications/misc/rsibreak/default.nix
Fri Dec 16 22:57:21 2011 (r30947)
@@ -1,12 +1,20 @@
-{ stdenv, fetchurl, cmake, kdelibs, kdebase_workspace }:
+{ stdenv, fetchurl, kdelibs, kdebase_workspace, gettext }:
stdenv.mkDerivation rec {
- name = "rsibreak-0.10";
+ name = "rsibreak-0.11";
src = fetchurl {
- url = "http://www.rsibreak.org/files/${name}.tar.bz2";;
- sha256 = "02vvwmzhvc9jfrzmnfn3cygx63yx7g360lcslwj1vikzkg834ik0";
+ url = "${meta.homepage}/files/${name}.tar.bz2";
+ sha256 = "1yrf73r8mixskh8b531wb8dfs9z7rrw010xsrflhjhjmqh94h8mw";
};
- buildInputs = [ cmake kdelibs kdebase_workspace ];
+ buildNativeInputs = [ gettext ];
+
+ buildInputs = [ kdelibs kdebase_workspace ];
+
+ meta = {
+ homepage = http://www.rsibreak.org/;
+ description = "Repetitive Strain Injury prevention";
+ inherit (kdelibs.meta) platforms maintainers;
+ };
}
Modified:
nixpkgs/branches/stdenv-updates/pkgs/applications/misc/yakuake/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/applications/misc/yakuake/default.nix
Fri Dec 16 22:33:28 2011 (r30946)
+++ nixpkgs/branches/stdenv-updates/pkgs/applications/misc/yakuake/default.nix
Fri Dec 16 22:57:21 2011 (r30947)
@@ -1,14 +1,20 @@
-{ stdenv, fetchurl, kdelibs, cmake, gettext, perl, automoc4, qt4, phonon }:
+{ stdenv, fetchurl, kdelibs, gettext }:
-stdenv.mkDerivation rec {
- name = "yakuake-2.9.7";
+let
+ pname = "yakuake";
+ version = "2.9.8";
+in
+stdenv.mkDerivation {
+ name = "${pname}-${version}";
src = fetchurl {
- url = "http://download.berlios.de/yakuake/${name}.tar.bz2";;
- sha256 = "0azzvbh3jwz8yhn6gqd46ya7589sadfjyysw230vlf0zlfipdlvd";
+ url =
"mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.bz2";
+ sha256 = "0a9x3nmala8nl4xl3h7rcd76f5j7b7r74jc5cfbayc6jgkjdynd3";
};
- buildInputs = [ kdelibs cmake gettext perl automoc4 qt4 phonon ];
+ buildInputs = [ kdelibs ];
+
+ buildNativeInputs = [ gettext ];
meta = {
homepage = http://yakuake.kde.org;
Modified:
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/rekonq/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/rekonq/default.nix
Fri Dec 16 22:33:28 2011 (r30946)
+++
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/rekonq/default.nix
Fri Dec 16 22:57:21 2011 (r30947)
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, perl
-, gettext}:
+{ stdenv, fetchurl, kdelibs, gettext}:
stdenv.mkDerivation rec {
- name = "rekonq-0.7.0";
- passthru = { inherit stdenv; };
+ name = "rekonq-0.8.1";
src = fetchurl {
url = "mirror://sf/rekonq/${name}.tar.bz2";
- sha256 = "14gi8ic53jkam2v52zp4p965dw6pqhjm3xhqssm5vimx7hp0kc1w";
+ sha256 = "0zwvdk66q9iphdkrhn850p9f0h8lads9qx3v6dnq15gfk793nz4h";
};
- buildInputs = [ cmake qt4 kdelibs automoc4 phonon perl gettext ];
+ buildInputs = [ kdelibs ];
+
+ buildNativeInputs = [ gettext ];
meta = with stdenv.lib; {
platforms = platforms.linux;
Modified:
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/sync/akunambol/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/sync/akunambol/default.nix
Fri Dec 16 22:33:28 2011 (r30946)
+++
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/sync/akunambol/default.nix
Fri Dec 16 22:57:21 2011 (r30947)
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, cmake, kdelibs, kdepimlibs, automoc4, funambol,liblikeback
}:
+{ stdenv, fetchgit, kdepimlibs, funambol, liblikeback }:
stdenv.mkDerivation rec {
name = "akunambol-20110304";
@@ -9,7 +9,7 @@
sha256 = "1d2x42lbw32qyawri7z0mrbafz36r035w5bxjpq51awyqjwkbb2d";
};
- buildInputs = [ cmake automoc4 kdelibs kdepimlibs funambol liblikeback ];
+ buildInputs = [ kdepimlibs funambol liblikeback ];
KDEDIRS = liblikeback;
patches = [ ./non-latin.diff ];
Modified:
nixpkgs/branches/stdenv-updates/pkgs/applications/science/logic/hol_light/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/applications/science/logic/hol_light/default.nix
Fri Dec 16 22:33:28 2011 (r30946)
+++
nixpkgs/branches/stdenv-updates/pkgs/applications/science/logic/hol_light/default.nix
Fri Dec 16 22:57:21 2011 (r30947)
@@ -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
Modified:
nixpkgs/branches/stdenv-updates/pkgs/data/misc/shared-desktop-ontologies/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/data/misc/shared-desktop-ontologies/default.nix
Fri Dec 16 22:33:28 2011 (r30946)
+++
nixpkgs/branches/stdenv-updates/pkgs/data/misc/shared-desktop-ontologies/default.nix
Fri Dec 16 22:57:21 2011 (r30947)
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake }:
stdenv.mkDerivation rec {
- name = "shared-desktop-ontologies-0.8.0";
+ name = "shared-desktop-ontologies-0.8.1";
src = fetchurl {
url = "mirror://sourceforge/oscaf/${name}.tar.bz2";
- sha256 = "0wf4gli2akkqbl944lqjjy2hvcfagq6zzmdg7fkzr61p6vw7nk82";
+ sha256 = "0w6rhhfjl5r6gv2jw3nc1sj5l4fxz4s1wv0iclcrak3wa5vyy6h3";
};
buildInputs = [ cmake ];
Modified: nixpkgs/branches/stdenv-updates/pkgs/desktops/kde-4.7/kdelibs.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/desktops/kde-4.7/kdelibs.nix Fri Dec
16 22:33:28 2011 (r30946)
+++ nixpkgs/branches/stdenv-updates/pkgs/desktops/kde-4.7/kdelibs.nix Fri Dec
16 22:57:21 2011 (r30947)
@@ -3,7 +3,7 @@
, xz, openexr, avahi, kerberos, acl, attr, shared_desktop_ontologies,
libXScrnSaver
, automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt
, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1
-, getopt, udev, herqq, phonon, gettext
+, getopt, udev, herqq, phonon
}:
kde {
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/head.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/head.nix
Fri Dec 16 22:33:28 2011 (r30946)
+++ nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/head.nix
Fri Dec 16 22:57:21 2011 (r30947)
@@ -1,19 +1,17 @@
-{stdenv, fetchurl, ghc, perl, gmp, ncurses}:
+{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
stdenv.mkDerivation rec {
- version = "7.3.20110910";
+ version = "7.3.20111212";
name = "ghc-${version}";
- # TODO: Does this have to be here, or can it go to meta?
- homepage = "http://haskell.org/ghc";;
-
src = fetchurl {
- url = "${homepage}/dist/current/dist/${name}-src.tar.bz2";
- sha256 = "1y8ixh6vcbqxqddc872kjfzxj94q4dhyaprdv7kv2yzwgp49qza5";
+ url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2";;
+ sha256 = "1i8zw3qaihzbgygdlip9d5g5321wv1yhashf8nrinwgy5649rsyf";
};
- buildInputs = [ghc perl gmp ncurses];
+ buildInputs = [ghc perl gmp ncurses] ++
+ (if stdenv.isDarwin then [darwinInstallNameToolUtility] else []);
buildMK = ''
libraries/integer-gmp_CONFIGURE_OPTS +=
--configure-option=--with-gmp-libraries="${gmp}/lib"
@@ -22,6 +20,7 @@
preConfigure = ''
echo "${buildMK}" > mk/build.mk
+ sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
'';
configureFlags=[
@@ -33,11 +32,12 @@
stripDebugFlags=["-S" "--keep-file-symbols"];
meta = {
- inherit homepage;
+ homepage = "http://haskell.org/ghc";;
description = "The Glasgow Haskell Compiler";
maintainers = [
stdenv.lib.maintainers.marcweber
stdenv.lib.maintainers.andres
+ stdenv.lib.maintainers.simons
];
platforms = ghc.meta.platforms;
};
Copied:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ocaml/3.12.1.nix
(from r30946, nixpkgs/trunk/pkgs/development/compilers/ocaml/3.12.1.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ocaml/3.12.1.nix
Fri Dec 16 22:57:21 2011 (r30947, copy of r30946,
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;
+ };
+
+}
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/polkit-qt-1/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/polkit-qt-1/default.nix
Fri Dec 16 22:33:28 2011 (r30946)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/polkit-qt-1/default.nix
Fri Dec 16 22:57:21 2011 (r30947)
@@ -1,18 +1,18 @@
{ stdenv, fetchurl, cmake, qt4, pkgconfig, polkit, automoc4, glib }:
stdenv.mkDerivation rec {
- name = "polkit-qt-1-0.99.0";
+ name = "polkit-qt-1-0.103.0";
src = fetchurl {
url = "mirror://kde/stable/apps/KDE4.x/admin/${name}.tar.bz2";
- sha256 = "02m710q34aapbmnz1p6qwgkk5xjmm239zdl3lvjg77dh3j0w5i3r";
+ sha256 = "0k17sb70ywk94dmncnkyig03sg1hcfbhi5wlc77xf3rxirmmccif";
};
patches = [ ./polkit-install.patch ];
- buildInputs = [ cmake qt4 automoc4 ];
-
- propagatedBuildInputs = [ polkit glib ];
+ buildNativeInputs = [ cmake automoc4 ];
+
+ propagatedBuildInputs = [ polkit glib qt4 ];
meta = {
description = "A Qt wrapper around PolKit";
Copied:
nixpkgs/branches/stdenv-updates/pkgs/development/ocaml-modules/ocamlnat/default.nix
(from r30946,
nixpkgs/trunk/pkgs/development/ocaml-modules/ocamlnat/default.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/ocaml-modules/ocamlnat/default.nix
Fri Dec 16 22:57:21 2011 (r30947, copy of r30946,
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/stdenv-updates/pkgs/development/ocaml-modules/ounit/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/ocaml-modules/ounit/default.nix
Fri Dec 16 22:33:28 2011 (r30946)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/ocaml-modules/ounit/default.nix
Fri Dec 16 22:57:21 2011 (r30947)
@@ -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/stdenv-updates/pkgs/development/tools/ocaml/findlib/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/tools/ocaml/findlib/default.nix
Fri Dec 16 22:33:28 2011 (r30946)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/tools/ocaml/findlib/default.nix
Fri Dec 16 22:57:21 2011 (r30947)
@@ -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/stdenv-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Fri Dec
16 22:33:28 2011 (r30946)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Fri Dec
16 22:57:21 2011 (r30947)
@@ -2232,7 +2232,8 @@
# Reasonably current HEAD snapshot. Should *always* be lowPrio.
haskellPackages_ghcHEAD =
haskellPackagesFun ../development/compilers/ghc/head.nix
- ghc6121Binary (x : x.ghcHEADPrefs) false false lowPrio;
+ (haskellPackages_ghc704.ghcWithPackages (self : [ self.alex self.happy
]))
+ (x : x.ghcHEADPrefs) false false lowPrio;
haxeDist = import ../development/compilers/haxe {
inherit fetchurl sourceFromHead stdenv lib ocaml zlib makeWrapper neko;
@@ -2332,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;
@@ -2416,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;
@@ -8003,9 +8006,6 @@
kde4 = recurseIntoAttrs pkgs.kde47;
- # TODO: merge with branches/drop-kde4.5 if you want to remove KDE SC 4.5
- # This branch removes kde45 and quite a few compatibility hacks
- kde45 = kdePackagesFor pkgs.kde45 "4.5";
kde47 = kdePackagesFor pkgs.kde47 "4.7";
kdePackagesFor = self: version:
@@ -8030,9 +8030,6 @@
digikam = callPackage ../applications/graphics/digikam { };
- filelight = if kde4 ? filelight then kde4.filelight
- else callPackage ../applications/misc/filelight { };
-
k3b = callPackage ../applications/misc/k3b { };
kadu = callPackage ../applications/networking/instant-messengers/kadu {
};
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/haskell-packages.nix Fri Dec
16 22:33:28 2011 (r30946)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/haskell-packages.nix Fri Dec
16 22:57:21 2011 (r30947)
@@ -89,8 +89,8 @@
ghc703Prefs = super : super // super.haskellPlatformDefaults_2011_2_0_1
super;
ghc704Prefs = super : super // super.haskellPlatformDefaults_2011_2_0_1
super; # link
ghc721Prefs = super : super // super.haskellPlatformDefaults_future super;
- ghc722Prefs = super : super // super.haskellPlatformDefaults_future super;
- ghcHEADPrefs = super : super // super.haskellPlatformDefaults_future super;
# link
+ ghc722Prefs = super : super // super.haskellPlatformDefaults_future super;
#link
+ ghcHEADPrefs = super : super // super.haskellPlatformDefaults_HEAD super;
# GHC and its wrapper
#
@@ -142,9 +142,9 @@
HUnit = self.HUnit_1_2_2_3; # 7.2 ok, 7.3 ok
network = self.network_2_3_0_8; # 7.2 ok, 7.3 ok
OpenGL = self.OpenGL_2_2_3_0; # 7.2 ok, 7.3 ok
- parallel = self.parallel_3_1_0_1; # 7.2 ok, 7.3 ok
+ parallel = self.parallel_3_2_0_0; # 7.2 ok, 7.3 ok
parsec = self.parsec_3_1_2; # 7.2 ok, 7.3 ok
- QuickCheck = self.QuickCheck_2_4_0_1; # 7.2 ok, 7.3 ok
+ QuickCheck = self.QuickCheck_2_4_1_1; # 7.2 ok, 7.3 ok
regexBase = self.regexBase_0_93_2; # 7.2 ok, 7.3 ok
regexCompat = self.regexCompat_0_93_1; # 7.2 ok, 7.3 ok
regexPosix = self.regexPosix_0_94_4; # 7.2 ok, 7.3 ok
@@ -169,6 +169,11 @@
mtl1 = self.mtl_1_1_1_1; # 7.2 ok, 7.3 ok
};
+ haskellPlatformDefaults_HEAD =
+ self : self.haskellPlatformDefaults_future self // {
+ deepseq = null; # apparently a core library in ghc-7.3
+ };
+
haskellPlatformArgs_2011_2_0_1 = self : {
inherit (self) cabal ghc;
cgi = self.cgi_3001_1_7_4;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
