Merge trunk

Conflicts:
1. cmake upgrade: use 2.8.7
2. openssl: left FreeBSD-asm patch.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31245

6 files changed, 29 insertions, 24 deletions

diff --git a/pkgs/development/libraries/fltk/fltk11.nix b/pkgs/development/libraries/fltk/fltk13.nix
index 118b24ec317f..d3d89e6a9074 100644
--- a/pkgs/development/libraries/fltk/fltk11.nix
+++ b/pkgs/development/libraries/fltk/fltk13.nix
@@ -3,17 +3,18 @@
 
 let inherit (composableDerivation) edf; in
 
+let version = "1.3.0"; in
 composableDerivation.composableDerivation {} {
-  name = "fltk-1.1.10";
+  name = "fltk-${version}";
 
   src = fetchurl {
-    url = http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/1.1.10/fltk-1.1.10-source.tar.bz2;
-    sha256 = "16mic69a48y3ybijml754x38djxxb25rn8441p9qsssqy8ms5b9p";
+    url = "ftp://ftp.easysw.com/pub/fltk/${version}/fltk-${version}-source.tar.gz";
+    sha256 = "075j6ljx4dfg9rnkardn24y0f26ylpakm0yylg6a9kllha07c1lr";
   };
 
   propagatedBuildInputs = [ x11 inputproto libXi freeglut ];
 
-  buildInputs = [ pkgconfig ];
+  buildNativeInputs = [ pkgconfig ];
 
   flags =
     # this could be tidied up (?).. eg why does it require freeglut without glSupport?
diff --git a/pkgs/development/libraries/haskell/monad-control/default.nix b/pkgs/development/libraries/haskell/monad-control/0.3.1.nix
index bf4ca6d00423..bf4ca6d00423 100644
--- a/pkgs/development/libraries/haskell/monad-control/default.nix
+++ b/pkgs/development/libraries/haskell/monad-control/0.3.1.nix
diff --git a/pkgs/development/libraries/libkvkontakte/default.nix b/pkgs/development/libraries/libkvkontakte/default.nix
new file mode 100644
index 000000000000..a56f5784b4d5
--- /dev/null
+++ b/pkgs/development/libraries/libkvkontakte/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchgit, qjson, kdelibs }:
+
+stdenv.mkDerivation {
+  name = "libkvkonatkte-1.0-pre20120103";
+
+  src = fetchgit {
+    url = git://anongit.kde.org/libkvkontakte;
+    rev = "4024f69cf54625dbe5dc2e2d811a996774a669ff";
+    sha256 = "0ryvjfrsws845k9s76715xid48y01h0ynb5wdx6ln8cm5z5wqj61";
+  };
+
+  buildInputs = [ qjson kdelibs ];
+
+  meta = {
+    homepage = https://projects.kde.org/projects/extragear/libs/libkvkontakte;
+    description = "KDE library for interaction with vkontakte.ru social network via its open API";
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+    inherit (kdelibs.meta) platforms;
+  };
+}
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 52fd0cc6b05e..c2e02a635e78 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -6,11 +6,6 @@ let
   opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ]
     (throw "openssl needs its platform name cross building" null)
     stdenv.cross;
-
-  hurdGNUSourcePatch = fetchurl {
-    url = http://patch-tracker.debian.org/patch/series/dl/openssl/1.0.0e-2.1/gnu_source.patch;
-    sha256 = "0zp4x8bql92fbqywnigqfsfj2vvabb66wv6g6zgzh0y6js1ic4pn";
-  };
 in
 
 stdenv.mkDerivation {
@@ -60,17 +55,6 @@ stdenv.mkDerivation {
       export configureFlags="--libdir=lib --cross-compile-prefix=${stdenv.cross.config}- shared ${opensslCrossSystem}"
     '';
 
-    patches = stdenv.lib.optionals (opensslCrossSystem == "hurd-x86") [
-      # OpenSSL only defines _GNU_SOURCE on Linux, but we need it on GNU
-      hurdGNUSourcePatch
-
-      # Use the target settings from Debian's "debian-hurd-i386" target.
-      # see http://patch-tracker.debian.org/patch/series/view/openssl/1.0.0e-2.1/debian-targets.patch
-      # In particular, this sets the shared library extension properly so that
-      # make install succeeds
-      ./hurd-target.patch
-    ];
-
     postInstall = ''
       # Openssl installs readonly files, which otherwise we can't strip.
       # This could at some stdenv hash change be put out of crossAttrs, too
diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix
index 88902627f4ec..255d91981050 100644
--- a/pkgs/development/libraries/ortp/default.nix
+++ b/pkgs/development/libraries/ortp/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "ortp-0.16.4";
+  name = "ortp-0.18.0";
 
   src = fetchurl {
     url = "mirror://savannah/linphone/ortp/sources/${name}.tar.gz";
-    sha256 = "0yb835l9spic4518ghb28jlwc0ihqjzpd0bgysgjf7z3bbg7km90";
+    sha256 = "1cgx9xid0abk3cad3xjdvx7p9whinlhrviphyrd9zkhhx7ddkih2";
   };
 
   meta = {
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 249e441be5db..53e27836d73a 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -7,7 +7,7 @@ with stdenv.lib;
 let
   os = stdenv.lib.optionalString;
   majorVersion = "2.8";
-  minorVersion = "6";
+  minorVersion = "7";
   version = "${majorVersion}.${minorVersion}";
 in
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
-    sha256 = "13kjfpgsrsygz693bzaf2pf9avzr1r56r6znn3zqaz9nmj0rp6g6";
+    sha256 = "17zmxh0gyis6w05d2km0swlvy94h3w10jgra0fpa5qcg7l2j628k";
   };
 
   patches =