Merge trunk

Conflicts: 1. cmake upgrade: use 2.8.7 2. openssl: left FreeBSD-asm patch. svn path=/nixpkgs/branches/stdenv-updates/; revision=31245
2012-01-03 17:25:24 +00:00 · 2012-01-03 17:25:24 +00:00 · 2bca92e32d
parent 08761e83fc 71c6de7338
commit 2bca92e32d
25 changed files with 253 additions and 119 deletions
--- a/pkgs/applications/audio/rakarrack/default.nix
+++ b/pkgs/applications/audio/rakarrack/default.nix
@ -10,6 +10,8 @@ stdenv.mkDerivation  rec {
    sha256 = "1rpf63pdn54c4yg13k7cb1w1c7zsvl97c4qxcpz41c8l91xd55kn";
  };

+  patches = [ ./fltk-path.patch ];
+
  buildInputs = [ alsaLib alsaUtils fltk jackaudio libXft libXpm libjpeg
    libpng libsamplerate libsndfile zlib ];

--- a/pkgs/applications/audio/rakarrack/fltk-path.patch
+++ b/pkgs/applications/audio/rakarrack/fltk-path.patch
@ -0,0 +1,35 @@
+commit 47245c3fd30dc326fedd7cdae444ddcf0fd97490
+Author: holborn <holborn@users.sourceforge.net>
+Date:   Tue Apr 19 15:02:26 2011 +0100
+
+            Fix FL path
+    
+    	modified:   src/global.h
+    	modified:   src/process.C
+
+diff --git a/src/global.h b/src/global.h
+index fc74b06..3e33da9 100644
+--- a/src/global.h
+++ b/src/global.h
+@@ -176,7 +176,7 @@ return y;
+ #include <X11/xpm.h>
+ #include <jack/jack.h>
+ #include <jack/midiport.h>
+-#include <Fl/Fl_Preferences.H>
+#include <FL/Fl_Preferences.H>
+ #include "FPreset.h"
+ #include "Reverb.h"
+ #include "Chorus.h"
+diff --git a/src/process.C b/src/process.C
+index 51bbc65..c993ff8 100644
+--- a/src/process.C
+++ b/src/process.C
+@@ -28,7 +28,7 @@
+ #include <fcntl.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+-#include <Fl/Fl_Preferences.H>
+#include <FL/Fl_Preferences.H>
+ #include "global.h"
+ 
+ int Pexitprogram, preset;
--- a/pkgs/applications/audio/yoshimi/default.nix
+++ b/pkgs/applications/audio/yoshimi/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, boost, cmakeCurses, fftwSinglePrec, fltk
+{ stdenv, fetchurl, alsaLib, boost, cmake, fftwSinglePrec, fltk
 , jackaudio, libsndfile, mesa, minixml, pkgconfig, zlib }:

 assert stdenv ? glibc;
@ -12,12 +12,18 @@ stdenv.mkDerivation  rec {
    sha256 = "0y67w7y515hx2bi5gfjgsw1hdah1bdrrvcfmqyjsvn7jbd0q47v1";
  };

-  buildInputs = [ alsaLib boost cmakeCurses fftwSinglePrec fltk
-    jackaudio libsndfile mesa minixml pkgconfig zlib ];
+  buildInputs = [ alsaLib boost fftwSinglePrec fltk jackaudio libsndfile mesa
+    minixml zlib ];
+  buildNativeInputs = [ cmake pkgconfig ];

-  preConfigure = ''
-    cd src
-  '';
+  preConfigure = "cd src";
+
+  patches = [
+    (fetchurl {
+      url = http://patch-tracker.debian.org/patch/series/dl/yoshimi/0.060.10-3/02-fluid_1.3.patch;
+      sha256 = "1sywirbaaw4zhn5ypga27j02qvrvqjwv3lw8kvzyj575q4c4qnri";
+    })
+  ];

  cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.glibc}/lib/libm.so" ];

--- a/pkgs/applications/audio/zynaddsubfx/default.nix
+++ b/pkgs/applications/audio/zynaddsubfx/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, fftw, fltk, minixml, zlib }:
+{ stdenv, fetchurl, alsaLib, cmake, fftw, fltk13, minixml, pkgconfig, zlib }:

 stdenv.mkDerivation  rec {
  name = "zynaddsubfx-${version}";
@ -9,11 +9,17 @@ stdenv.mkDerivation  rec {
    sha256 = "1zn5lgh76rrbfj8d4jys2gc1j2pqrbdd18ywfdrk0s7jq4inwyfg";
  };

-  buildInputs = [ alsaLib fftw fltk minixml zlib ];
+  buildInputs = [ alsaLib fftw fltk13 minixml zlib ];
+  buildNativeInputs = [ cmake pkgconfig ];

-  preConfigure = "cd src";
+  patches = [
+    (fetchurl {
+      url = http://patch-tracker.debian.org/patch/series/dl/zynaddsubfx/2.4.0-1.2/09_fluid_1.3.patch;
+      sha256 = "06wl7fs44b24ls1fzh21596n6zzc3ywm2bcdfrkfiiwpzin3yjq6";
+    })
+  ];

-  installPhase = "mkdir -p $out/bin; cp zynaddsubfx $out/bin";
+#installPhase = "mkdir -pv $out/bin; cp -v zynaddsubfx $out/bin";

  meta = with stdenv.lib; {
    description = "high quality software synthesizer";
--- a/pkgs/applications/graphics/cinepaint/default.nix
+++ b/pkgs/applications/graphics/cinepaint/default.nix
@ -1,41 +1,32 @@
-{ stdenv, fetchcvs, cmake, pkgconfig, gtk, freetype, fontconfig, lcms, fltk,
+{ stdenv, fetchurl, cmake, pkgconfig, gtk, freetype, fontconfig, lcms,
  flex, libtiff, libjpeg, libpng, libexif, zlib, perl, libX11,
  perlXMLParser, python, pygtk, gettext, intltool, babl, gegl,
  glib, makedepend, xf86vidmodeproto, xineramaproto, libXmu, openexr,
-  mesa, libXext, libXpm, libXxf86vm, automake, autoconf, libtool } :
+  mesa, libXext, libXpm, libXxf86vm, pixman, libpthreadstubs } :

-stdenv.mkDerivation {
-  name = "cinepaint-0.25.0";
+stdenv.mkDerivation rec {
+  name = "cinepaint-1.0";

-  # The developer told me this cvs fetch is 0.25.0
-  src = fetchcvs {
-    cvsRoot = ":pserver:anonymous@cinepaint.cvs.sourceforge.net:/cvsroot/cinepaint";
-    module = "cinepaint-project";
-    date = "2008-11-06";
-    sha256 = "f5ac249628ffe04349d1bb3b1e078be0cda7575dd71d12ae74143baa006acb6d";
+  src = fetchurl {
+    url = "mirror://sourceforge/cinepaint/${name}.tgz";
+    sha256 = "02mbpsykd7sfr9h6c6gxld6i3bdwnsgvm70b5yff01gwi69w2wi7";
  };

-  buildInputs = [ cmake pkgconfig gtk freetype fontconfig lcms fltk flex libtiff
-    libjpeg libpng libexif zlib perl libX11 perlXMLParser python pygtk gettext
-    intltool babl gegl glib makedepend xf86vidmodeproto xineramaproto libXmu
-    openexr mesa libXext libXpm libXxf86vm automake autoconf libtool ];
+  buildInputs = [ gtk freetype fontconfig lcms flex libtiff libjpeg libpng
+    libexif zlib perl libX11 perlXMLParser python pygtk gettext intltool babl
+    gegl glib makedepend xf86vidmodeproto xineramaproto libXmu openexr mesa
+    libXext libXpm libXxf86vm pixman libpthreadstubs
+  ];

-  dontUseCmakeConfigure = 1;
+  buildNativeInputs = [ cmake pkgconfig ];

  NIX_CFLAGS_COMPILE = "-I.";

-  configurePhase = ''
-    cd cinepaint
-    chmod 0777 autogen.sh
-    ./autogen.sh
-    ./configure --prefix=$out
-  '';
-
  meta = {
    homepage = http://www.cinepaint.org/;
    license = "free";
    description = "Image editor which supports images over 8bpp and ICC profiles";
    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    platforms = stdenv.lib.platforms.linux;
  };
 }
--- a/pkgs/applications/graphics/dia/default.nix
+++ b/pkgs/applications/graphics/dia/default.nix
@ -1,14 +1,14 @@
 {stdenv, fetchurl_gnome, gtk, pkgconfig, perl, perlXMLParser, libxml2, gettext
 , python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool, libart_lgpl
-, withGNOME ? false, libgnomeui }:
+, withGNOME ? false, libgnomeui, xz }:

 stdenv.mkDerivation rec {
  name = src.pkgname;

  src = fetchurl_gnome {
    project = "dia";
-    major = "0"; minor = "97"; patchlevel = "1";
-    sha256 = "0hli89fdzzbshqdznxrbgyqw55qlr4z5xpn86jcg5fl7kln8pzld";
+    major = "0"; minor = "97"; patchlevel = "2"; extension = "xz";
+    sha256 = "1qgawm7rrf4wd1yc0fp39ywv8gbz4ry1s16k00dzg5w6p67lfqd7";
  };

  buildInputs =
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
      libxslt docbook_xsl libart_lgpl
    ] ++ stdenv.lib.optional withGNOME libgnomeui;

-  buildNativeInputs = [ pkgconfig intltool perl ];
+  buildNativeInputs = [ pkgconfig intltool perl xz ];

  configureFlags = stdenv.lib.optionalString withGNOME "--enable-gnome";

--- a/pkgs/applications/graphics/panotools/default.nix
+++ b/pkgs/applications/graphics/panotools/default.nix
@ -1,11 +1,11 @@
 { fetchurl, stdenv, libjpeg, libpng, libtiff, perl }:

 stdenv.mkDerivation rec {
-  name = "libpano13-2.9.17";
+  name = "libpano13-2.9.18";

  src = fetchurl {
-    url = "mirror://sourceforge/panotools/libpano13/${name}/${name}.tar.gz";
-    sha256 = "1zcrkw0xw11170mlhh9r8562gafwx3hd92wahl9xxaah5z4v0am2";
+    url = "mirror://sourceforge/panotools/${name}.tar.gz";
+    sha256 = "0wm1r9waa47n482yrl3hnphicdahr581rahgbklk0d2wy51lwpfy";
  };

  buildInputs = [ perl libjpeg libpng libtiff ];
--- a/pkgs/applications/graphics/xfig/builder.sh
+++ b/pkgs/applications/graphics/xfig/builder.sh
@ -2,6 +2,13 @@ source $stdenv/setup

 makeFlags="XAWLIB=-lXaw3d BINDIR=$out/bin XAPPLOADDIR=$out/etc/X11/app-defaults LIBDIR=$out/lib/X11 XFIGDOCDIR=$out/share/doc/xfig MANPATH=$out/man"

+# We need chmod +wx on dirs, not just chmod +w
+dontMakeSourcesWritable=1
+postUnpack() {
+	find . -type d | xargs -n1 chmod +x
+	find . -type d | xargs -n1 chmod +x
+}
+
 preBuild() {
    echo "#define XAW3D" >> Imakefile.tmp
    echo "#define XAW3D1_5E" >> Imakefile.tmp
--- a/pkgs/applications/graphics/xfig/default.nix
+++ b/pkgs/applications/graphics/xfig/default.nix
@ -1,20 +1,42 @@
 { stdenv, fetchurl, makeWrapper, imake
 , x11, libXpm, libXmu, libXi, libXp, Xaw3d, libpng, libjpeg}:

+let version = "3.2.5b"; in
 stdenv.mkDerivation {
-  name = "xfig-3.2.5-pre-alpha-5";
+  name = "xfig-${version}";

  src = fetchurl {
-    url = http://xfig.org/software/xfig/3.2.5-alpha/xfig.3.2.5-alpha5.full.tar.gz;
-    md5 = "7547b66232569e3c12e4a0639bd92629";
+    url = "http://sourceforge/mcj/xfig.${version}.full.tar.gz";
+    sha256 = "1hl5x49sgc0vap411whhcq6qhvh4xbjg7jggv7ih9pplg5nwy0aw";
  };

  builder = ./builder.sh;

-  buildInputs = [imake x11 libXpm libXmu libXi libXp Xaw3d libpng libjpeg makeWrapper];
+  buildInputs = [x11 libXpm libXmu libXi libXp Xaw3d libpng libjpeg];
+
+  buildNativeInputs = [ imake makeWrapper ];

  NIX_CFLAGS_COMPILE = "-I${libXpm}/include/X11";

+  patches =
+    let
+      debPrefix = "http://patch-tracker.debian.org/patch/series/dl/xfig/1:3.2.5.b-2";
+    in
+    [
+      (fetchurl {
+        url = "${debPrefix}/35_CVE-2010-4262.dpatch";
+        sha256 = "18741b3dbipgr55fyp5x0296za3336ylln639jw8yjcyd1call22";
+      })
+      (fetchurl {
+        url = "${debPrefix}/13_remove_extra_libs.dpatch";
+        sha256 = "0v3k30ib7xq5wfhd3yacnal4gbih7nqw0z0aycvc0hafffl97i46";
+      })
+      (fetchurl {
+        url = "${debPrefix}/36_libpng15.dpatch";
+        sha256 = "0ssmvlcpjn3iqj3l38db8j8qpqbzixlwpczq01m49r5w9l3viy8k";
+      })
+    ];
+
  meta = {
    description = "An interactive drawing tool for X11";
    homepage = http://xfig.org;
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@ -13,14 +13,14 @@ assert monotoneSupport -> (monotone != null);

 let
  name = "ikiwiki";
-  version = "3.20111107";
+  version = "3.20111229";
 in
 stdenv.mkDerivation {
  name = "${name}-${version}";

  src = fetchurl {
    url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
-    sha256 = "5b14370ec9c31138d4937eca4ba9c1f1a74515edd34071cefd0cefa37395565c";
+    sha256 = "6470d40c77ae055cfe8c5bbe2f64c765fc84f1ed2dcdd7dcc7577ae190414b89";
  };

  buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
--- a/pkgs/applications/networking/browsers/firefox/9.0.nix
+++ b/pkgs/applications/networking/browsers/firefox/9.0.nix
@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;

 rec {

-  firefoxVersion = "9.0";
+  firefoxVersion = "9.0.1";
  
-  xulVersion = "9.0"; # this attribute is used by other packages
+  xulVersion = "9.0.1"; # this attribute is used by other packages

  
  src = fetchurl {
    url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
-    sha1 = "f79324ec6205e4c23d51d8ab2e790de1b2541657";
+    sha1 = "e0748d86753eead5c0929d74158c601bf33b5db0";
  };
  
  commonConfigureFlags =
--- a/pkgs/applications/science/misc/tulip/default.nix
+++ b/pkgs/applications/science/misc/tulip/default.nix
@ -1,22 +1,18 @@
-{ fetchurl, stdenv, libxml2, freetype, mesa, glew, qt
-, autoconf, automake, libtool, cmake, makeWrapper }:
+{ fetchurl, stdenv, libxml2, freetype, mesa, glew, qt4
+, cmake, makeWrapper }:

-let version = "3.5.0"; in
+let version = "3.6.1"; in
 stdenv.mkDerivation rec {
  name = "tulip-${version}";

  src = fetchurl {
-    url = "mirror://sourceforge/auber/tulip/tulip-${version}/${name}-src.tar.gz";
-    sha256 = "0wl0wqjlifpay61pn7dxr3dl5r4a7v80f5g277p6s06ibvn2p3ln";
+    url = "mirror://sourceforge/auber/${name}-src.tar.gz";
+    sha256 = "0d76zmp7gmid4lc91zz6sp4rzxlga6vfwfqhap04326r4zl4nx1q";
  };

-  buildInputs = [ libxml2 freetype glew ]
-    ++ [ autoconf automake libtool cmake qt makeWrapper ];
-  propagagedBuildInputs = [ mesa qt ];
+  buildInputs = [ libxml2 freetype glew mesa qt4 ];

-  postInstall=''
-    wrapProgram "$out/bin/tulip"
-  '';
+  buildNativeInputs = [ cmake makeWrapper ];

  # FIXME: "make check" needs Docbook's DTD 4.4, among other things.
  doCheck = false;
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@ -46,11 +46,10 @@ rec {
  };

  gitAnnex = lib.makeOverridable (import ./git-annex) {
-    inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which;
+    inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which coreutils;
    inherit (haskellPackages) ghc MissingH utf8String pcreLight SHA dataenc
-      HTTP testpack hS3 mtl network hslogger hxt json;
+      HTTP testpack hS3 mtl network hslogger hxt json liftedBase monadControl;
    QuickCheck2 = haskellPackages.QuickCheck_2_4_0_1;
-    monadControl = haskellPackages.monadControl_OBSOLETE;
  };

  qgit = import ./qgit {
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@ -1,23 +1,23 @@
 { stdenv, fetchurl, curl, dataenc, findutils, ghc, git, hS3, hslogger, HTTP, hxt
 , ikiwiki, json, libuuid, MissingH, monadControl, mtl, network, pcreLight, perl
-, QuickCheck2, rsync, SHA, testpack, utf8String, which
+, QuickCheck2, rsync, SHA, testpack, utf8String, which, liftedBase, coreutils
 }:

 let
-  version = "3.20111203";
+  version = "3.20111231";
 in
 stdenv.mkDerivation {
  name = "git-annex-${version}";

  src = fetchurl {
    url = "http://ftp.de.debian.org/debian/pool/main/g/git-annex/git-annex_${version}.tar.gz";
-    sha256 = "236a8fa537be1738a16afcab8a7438dc567dce75a6b71b62780d31048428f74b";
+    sha256 = "4f53e7fc9560838be7efd0c90543c93ce1c7d2ba36b7754200586d845ec114f5";
  };

  buildInputs = [
    curl dataenc findutils ghc git hS3 hslogger HTTP hxt ikiwiki json
    libuuid MissingH monadControl mtl network pcreLight perl QuickCheck2
-    rsync SHA testpack utf8String which
+    rsync SHA testpack utf8String which liftedBase
  ];

  checkTarget = "test";
@ -26,6 +26,7 @@ stdenv.mkDerivation {
  preConfigure = ''
    makeFlagsArray=( PREFIX=$out )
    sed -i -e 's|#!/usr/bin/perl|#!${perl}/bin/perl|' mdwn2man
+    sed -i -e 's|"cp |"${coreutils}/bin/cp |' -e 's|"rm -f |"${coreutils}/bin/rm -f |' test.hs
  '';

  meta = {
--- a/pkgs/development/libraries/fltk/fltk13.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?
--- a/pkgs/development/libraries/haskell/monad-control/default.nix
+++ b/pkgs/development/libraries/haskell/monad-control/default.nix
--- a/pkgs/development/libraries/libkvkontakte/default.nix
+++ 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;
+  };
+}
--- 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
--- 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 = {
--- 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 =
--- a/pkgs/games/naev/default.nix
+++ b/pkgs/games/naev/default.nix
@ -1,25 +1,33 @@
-{ fetchurl, stdenv, lua5, SDL, openal, SDL_mixer, libxml2, pkgconfig, libvorbis
-, libpng, mesa, makeWrapper }:
+{ fetchurl, stdenv, SDL, openal, SDL_mixer, libxml2, pkgconfig, libvorbis
+, libpng, mesa, makeWrapper, zlib }:

+let
+  pname = "naev";
+  version = "0.5.0";
+  name = "${pname}-${version}";
+in
 stdenv.mkDerivation {
-  name = "naev-0.5.0beta1";
+  inherit name;

  srcData = fetchurl {
-    url = http://naev.googlecode.com/files/ndata-0.5.0-beta1;
-    sha256 = "0pqys1wdlxa336i9gjxfkgnq42xrbvq58ym66y0aa9xm92vr53f6";
+    url = "mirror://sourceforge/naev/ndata-${version}";
+    sha256 = "0l05xxbbys3j5h6anvann2vylhp6hnxnzwpcaydaff8fpbbyi6r6";
  };

  src = fetchurl {
-    url = http://naev.googlecode.com/files/naev-0.5.0-beta1.tar.bz2;
-    sha256 = "1nkwjclfjypgdcfbfqkiidsvi0zfjvkcj0dgnrbj1g11rr6kd3wm";
+    url = "mirror://sourceforge/naev/${name}.tar.bz2";
+    sha256 = "0gahi91lmpra0wvxsz49zwwb28q9w2v1s3y7r70252hq6v80kanb";
  };

-  buildInputs = [ SDL lua5 SDL_mixer openal libxml2 pkgconfig libvorbis
-    libpng mesa makeWrapper ];
+  buildInputs = [ SDL SDL_mixer openal libxml2 libvorbis libpng mesa zlib ];
+
+  buildNativeInputs = [ pkgconfig makeWrapper ];
+
+  NIX_CFLAGS_COMPILE="-include ${zlib}/include/zlib.h";

  postInstall = ''
    ensureDir $out/share/naev
-    cp $srcData $out/share/naev/ndata
+    cp -v $srcData $out/share/naev/ndata
    wrapProgram $out/bin/naev --add-flags $out/share/naev/ndata
  '';

--- a/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix
+++ b/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix
@ -0,0 +1,29 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+  name = "iwlwifi-5150-ucode-8.24.2.2";
+  
+  src = fetchurl {
+    url = "http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-5150-ucode-8.24.2.2.tgz";
+    sha256 = "d253e6ff6624639aded67c82df98b2bc4a66eb66400848d5614921d513540cf9";
+  };
+  
+  buildPhase = "true";
+
+  installPhase = ''
+    ensureDir "$out"
+    chmod -x *
+    cp * "$out"
+  '';
+  
+  meta = {
+    description = "Firmware for the Intel 5150 wireless card";
+
+    longDescription = ''
+      This package provides version 1 of the Intel wireless card
+      firmware.  It contains the `iwlwifi-5150-2.ucode' file.
+    '';
+
+    homepage = http://intellinuxwireless.org/;
+  };
+}
--- a/pkgs/tools/networking/networkmanagement/default.nix
+++ b/pkgs/tools/networking/networkmanagement/default.nix
@ -0,0 +1,27 @@
+{ stdenv, fetchurl, gettext, kdelibs, kde_workspace, networkmanager }:
+
+let
+  pname = "networkmanagement";
+  version = "0.8.98";
+  name = "${pname}-${version}";
+in
+stdenv.mkDerivation {
+  inherit name;
+
+  src = fetchurl {
+    url = "mirror://kde/unstable/${pname}/${version}/src/${name}.tar.bz2";
+    sha256 = "0bb8096q6yx4657jc20f50mfsjyfd1wz0npa6in030ydzm5jk3ax";
+  };
+
+  buildInputs = [ kdelibs kde_workspace networkmanager ];
+  buildNativeInputs = [ gettext ];
+
+  NIX_CFLAGS_COMPILE="-I${kde_workspace}/include/solid/control";
+
+  meta = {
+    homepage = https://projects.kde.org/projects/extragear/base/networkmanagement;
+    description = "KDE Plasmoid for controlling NetworkManager";
+    inherit (kdelibs.meta) platforms;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+  };
+}
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -3353,7 +3353,7 @@ let

  flite = callPackage ../development/libraries/flite { };

-  fltk11 = callPackage ../development/libraries/fltk/fltk11.nix { };
+  fltk13 = callPackage ../development/libraries/fltk/fltk13.nix { };

  fltk20 = callPackage ../development/libraries/fltk { };

@ -5314,6 +5314,8 @@ let

  iwlwifi5000ucode = callPackage ../os-specific/linux/firmware/iwlwifi-5000-ucode { };

+  iwlwifi5150ucode = callPackage ../os-specific/linux/firmware/iwlwifi-5150-ucode { };
+
  iwlwifi6000ucode = callPackage ../os-specific/linux/firmware/iwlwifi-6000-ucode { };

  iwlwifi6000g2aucode = callPackage ../os-specific/linux/firmware/iwlwifi-6000g2a-ucode { };
@ -6443,9 +6445,7 @@ let

  compiz_plugins_extra = callPackage ../applications/window-managers/compiz/plugins-extra.nix { };

-  cinepaint = callPackage ../applications/graphics/cinepaint {
-    fltk = fltk11;
-  };
+  cinepaint = callPackage ../applications/graphics/cinepaint { };

  codeville = builderDefsPackage (import ../applications/version-management/codeville/0.8.0.nix) {
    inherit makeWrapper;
@ -6674,7 +6674,7 @@ let

  firefoxWrapper = wrapFirefox { browser = pkgs.firefox; };

-  firefoxPkgs = pkgs.firefox80Pkgs;
+  firefoxPkgs = pkgs.firefox90Pkgs;

  firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix {
    inherit (gtkLibs) gtk pango;
@ -6869,7 +6869,7 @@ let
  homebank = callPackage ../applications/office/homebank { };

  htmldoc = callPackage ../applications/misc/htmldoc {
-    fltk = fltk11;
+    fltk = fltk13;
  };

  hugin = callPackage ../applications/graphics/hugin {
@ -7259,7 +7259,7 @@ let

  rakarrack = callPackage ../applications/audio/rakarrack {
    inherit (xorg) libXpm libXft;
-    fltk = fltk11;
+    fltk = fltk13;
  };

  rapidsvn = callPackage ../applications/version-management/rapidsvn { };
@ -7685,7 +7685,7 @@ let
  qgis = callPackage ../applications/misc/qgis {};

  yoshimi = callPackage ../applications/audio/yoshimi {
-    fltk = fltk11;
+    fltk = fltk13;
  };

  zapping = callPackage ../applications/video/zapping {
@ -7698,9 +7698,7 @@ let

  zathura = callPackage ../applications/misc/zathura { };

-  zynaddsubfx = callPackage ../applications/audio/zynaddsubfx {
-    fltk = fltk11;
-  };
+  zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { };

  ### GAMES

@ -8093,8 +8091,12 @@ let

      libktorrent = callPackage ../development/libraries/libktorrent { };

+      libkvkontakte = callPackage ../development/libraries/libkvkontakte { };
+
      liblikeback = callPackage ../development/libraries/liblikeback { };

+      networkmanagement = callPackage ../tools/networking/networkmanagement { };
+
      partitionManager = callPackage ../tools/misc/partition-manager { };

      polkit_kde_agent = callPackage ../tools/security/polkit-kde-agent { };
@ -8322,9 +8324,7 @@ let

  simgrid = callPackage ../applications/science/misc/simgrid { };

-  tulip = callPackage ../applications/science/misc/tulip {
-    qt = qt46;
-  };
+  tulip = callPackage ../applications/science/misc/tulip { };

  vite = callPackage ../applications/science/misc/vite {
    qt = qt4;
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@ -933,9 +933,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);

  MonadCatchIOTransformers = callPackage ../development/libraries/haskell/MonadCatchIO-transformers {};

-  monadControl_OBSOLETE = callPackage ../development/libraries/haskell/monad-control/0.2.0.3.nix {};
-  monadControl2 = self.monadControl_OBSOLETE;
-  monadControl = callPackage ../development/libraries/haskell/monad-control {};
+  monadControl_0_2_0_3 = callPackage ../development/libraries/haskell/monad-control/0.2.0.3.nix {};
+  monadControl_0_3_1 = callPackage ../development/libraries/haskell/monad-control/0.3.1.nix {};
+  monadControl = self.monadControl_0_3_1;

  monadLoops = callPackage ../development/libraries/haskell/monad-loops {};

@ -948,7 +948,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
  MonadRandom = callPackage ../development/libraries/haskell/MonadRandom {};

  mongoDB = callPackage ../development/libraries/haskell/mongoDB {
-    monadControl = self.monadControl2;
+    monadControl = self.monadControl_0_2_0_3;
  };

  mpppc = callPackage ../development/libraries/haskell/mpppc {};