From 2d61716061c6613133e9ff89d5879f43a32fcf26 Mon Sep 17 00:00:00 2001
From: Jack Cummings <jack@mudshark.org>
Date: Fri, 15 Feb 2013 18:01:37 -0800
Subject: compile fix: <stddef.h> needed for size_t

---
 pkgs/servers/mediatomb/default.nix   |  4 +++-
 pkgs/servers/mediatomb/zmm_new.patch | 13 +++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/servers/mediatomb/zmm_new.patch

(limited to 'pkgs')

diff --git a/pkgs/servers/mediatomb/default.nix b/pkgs/servers/mediatomb/default.nix
index d040a4c9a57a..e531f6160ff3 100644
--- a/pkgs/servers/mediatomb/default.nix
+++ b/pkgs/servers/mediatomb/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "1k8i5zvgik7cad7znd8358grzwh62frpqww1a5rwkldrlws3q5ii";
   };
 
+  patches = [ ./zmm_new.patch ];
+
   buildInputs = [ sqlite expat spidermonkey taglib libexif curl ffmpeg file ];
 
   configureFlags = [ "--enable-inotify" ];
@@ -21,4 +23,4 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.phreedom ];
     platforms = platforms.linux;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/servers/mediatomb/zmm_new.patch b/pkgs/servers/mediatomb/zmm_new.patch
new file mode 100644
index 000000000000..5238b42035bf
--- /dev/null
+++ b/pkgs/servers/mediatomb/zmm_new.patch
@@ -0,0 +1,13 @@
+diff -rc mediatomb-0.12.1.old/src/zmm/object.h mediatomb-0.12.1/src/zmm/object.h
+*** mediatomb-0.12.1.old/src/zmm/object.h	2010-03-25 07:58:08.000000000 -0700
+--- mediatomb-0.12.1/src/zmm/object.h	2013-02-15 17:57:02.000000000 -0800
+***************
+*** 33,38 ****
+--- 33,39 ----
+  #define __ZMM_OBJECT_H__
+  
+  #include <new> // for size_t
++ #include <stddef.h>
+  #include "atomic.h"
+  
+  namespace zmm
-- 
cgit 1.4.1


From 30e1158101738157168839ae755001c0025f882b Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 21 Feb 2013 11:28:52 -0500
Subject: kmod: Update to kmod-12

---
 pkgs/os-specific/linux/kmod/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix
index afa19491ce5e..96d756bc7d2a 100644
--- a/pkgs/os-specific/linux/kmod/default.nix
+++ b/pkgs/os-specific/linux/kmod/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, xz, zlib, pkgconfig }:
+{ stdenv, fetchurl, xz, zlib, pkgconfig, libxslt }:
 
 stdenv.mkDerivation rec {
-  name = "kmod-9";
+  name = "kmod-12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/kernel/kmod/${name}.tar.xz";
-    sha256 = "1kyfplx0gygzxp5dn81yk3cn8zzraqm497vis04r1g1dnry2c1q6";
+    sha256 = "c6189dd8c5a1e8d9224e8506bd188c0cd5dfa119fd6b7e5869b3640cbe8bf92f";
   };
 
   # Disable xz/zlib support to prevent needing them in the initrd.
   
-  buildInputs = [ pkgconfig /* xz zlib */ ];
+  buildInputs = [ pkgconfig libxslt /* xz zlib */ ];
 
   configureFlags = [ "--sysconfdir=/etc" /* "--with-xz" "--with-zlib" */ ];
 
-- 
cgit 1.4.1


From 085a51f60a2643782ae29d3c71a280d36f00be39 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Feb 2013 16:47:46 +0100
Subject: nspr: Update to 4.9.5

---
 pkgs/development/libraries/nspr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index 928e9723e081..42740ea2e1b8 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl }:
 
-let version = "4.9.4"; in
+let version = "4.9.5"; in
 
 stdenv.mkDerivation {
   name = "nspr-${version}";
 
   src = fetchurl {
     url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
-    sha256 = "196l8123gg5knxp7pgksngfcwm9k7n3qilkl725jyzz1bg3ld43l";
+    sha1 = "03885e992607e2be975f6525c6764c2167fe2eff";
   };
 
   preConfigure = "cd mozilla/nsprpub";
-- 
cgit 1.4.1


From 95ca031be961fd4d8489bd6c95ca33f6bb66a6a1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Feb 2013 17:45:20 +0100
Subject: firefox: Update to 19.0

---
 .../networking/browsers/firefox/18.0.nix           | 176 ---------------------
 .../networking/browsers/firefox/19.0.nix           | 176 +++++++++++++++++++++
 .../mozilla-plugins/flashplayer-11/default.nix     |   3 +-
 pkgs/top-level/all-packages.nix                    |   6 +-
 pkgs/top-level/release.nix                         |   2 +-
 5 files changed, 181 insertions(+), 182 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/firefox/18.0.nix
 create mode 100644 pkgs/applications/networking/browsers/firefox/19.0.nix

(limited to 'pkgs')

diff --git a/pkgs/applications/networking/browsers/firefox/18.0.nix b/pkgs/applications/networking/browsers/firefox/18.0.nix
deleted file mode 100644
index f9258792a2ec..000000000000
--- a/pkgs/applications/networking/browsers/firefox/18.0.nix
+++ /dev/null
@@ -1,176 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
-, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
-, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
-, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
-
-, # If you want the resulting program to call itself "Firefox" instead
-  # of "Shiretoko" or whatever, enable this option.  However, those
-  # binaries may not be distributed without permission from the
-  # Mozilla Foundation, see
-  # http://www.mozilla.org/foundation/trademarks/.
-  enableOfficialBranding ? false
-}:
-
-assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
-
-rec {
-
-  firefoxVersion = "18.0.2";
-
-  xulVersion = "18.0.2"; # this attribute is used by other packages
-
-
-  src = fetchurl {
-    urls = [
-        # It is better to use this url for official releases, to take load off Mozilla's ftp server.
-        "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
-        # Fall back to this url for versions not available at releases.mozilla.org.
-        "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
-    ];
-    sha1 = "fe5810d61edf6f4dc8bc477a08f9483b955f747b";
-  };
-
-  commonConfigureFlags =
-    [ "--enable-optimize"
-      #"--enable-profiling"
-      "--disable-debug"
-      "--enable-strip"
-      # "--with-system-jpeg" # Too old in nixpkgs
-      "--with-system-zlib"
-      "--with-system-bz2"
-      "--with-system-nspr"
-      # "--with-system-nss" # Too old in nixpkgs
-      # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
-      # "--enable-system-cairo" # disabled for the moment because our Cairo is too old
-      "--enable-system-sqlite"
-      "--disable-crashreporter"
-      "--disable-tests"
-      "--disable-necko-wifi" # maybe we want to enable this at some point
-      "--disable-installer"
-      "--disable-updater"
-    ];
-
-
-  xulrunner = stdenv.mkDerivation rec {
-    name = "xulrunner-${xulVersion}";
-
-    inherit src;
-
-    buildInputs =
-      [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
-        python dbus dbus_glib pango freetype fontconfig xlibs.libXi
-        xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
-        alsaLib nspr nss libnotify xlibs.pixman yasm mesa
-        xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
-        xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
-      ];
-
-    configureFlags =
-      [ "--enable-application=xulrunner"
-        "--disable-javaxpcom"
-      ] ++ commonConfigureFlags;
-
-    enableParallelBuilding = true;
-
-    preConfigure =
-      ''
-        export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}"
-
-        mkdir ../objdir
-        cd ../objdir
-        configureScript=../mozilla-release/configure
-      ''; # */
-
-    #installFlags = "SKIP_GRE_REGISTRATION=1";
-
-    postInstall = ''
-      # Fix run-mozilla.sh search
-      libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*)
-      echo libDir: $libDir
-      test -n "$libDir"
-      cd $out/bin
-      rm xulrunner
-
-      for i in $out/lib/$libDir/*; do
-          file $i;
-          if file $i | grep executable &>/dev/null; then
-              echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")";
-              chmod a+x "$out/bin/$(basename "$i")";
-          fi;
-      done
-      for i in $out/lib/$libDir/*.so; do
-          patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true
-      done
-      for i in $out/lib/$libDir/{plugin-container,xulrunner,xulrunner-stub}; do
-          wrapProgram $i --prefix LD_LIBRARY_PATH ':' "$out/lib/$libDir"
-      done
-      rm -f $out/bin/run-mozilla.sh
-    ''; # */
-
-    meta = {
-      description = "Mozilla Firefox XUL runner";
-      homepage = http://www.mozilla.com/en-US/firefox/;
-    };
-
-    passthru = { inherit gtk; version = xulVersion; };
-  };
-
-
-  firefox = stdenv.mkDerivation rec {
-    name = "firefox-${firefoxVersion}";
-
-    inherit src;
-
-    enableParallelBuilding = true;
-
-    buildInputs =
-      [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
-        dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify
-        xlibs.pixman yasm mesa sqlite file unzip pysqlite
-      ];
-
-    propagatedBuildInputs = [xulrunner];
-
-    configureFlags =
-      [ "--enable-application=browser"
-        "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
-        "--enable-chrome-format=jar"
-        "--disable-elf-hack"
-      ]
-      ++ commonConfigureFlags
-      ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
-
-    makeFlags = [
-      "SYSTEM_LIBXUL=1"
-    ];
-
-    # Hack to work around make's idea of -lbz2 dependency
-    preConfigure =
-      ''
-        find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
-          stdenv.lib.concatStringsSep ":"
-            (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
-        }' ';'
-      '';
-
-    postInstall =
-      ''
-        ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner
-        cd "$out/lib/"firefox-*
-        rm firefox
-        echo -e '#!${stdenv.shell}\nexec ${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox
-        chmod a+x firefox
-      ''; # */
-
-    meta = {
-      description = "Mozilla Firefox - the browser, reloaded";
-      homepage = http://www.mozilla.com/en-US/firefox/;
-      maintainers = [ stdenv.lib.maintainers.eelco ];
-    };
-
-    passthru = {
-      inherit gtk xulrunner nspr;
-      isFirefox3Like = true;
-    };
-  };
-}
diff --git a/pkgs/applications/networking/browsers/firefox/19.0.nix b/pkgs/applications/networking/browsers/firefox/19.0.nix
new file mode 100644
index 000000000000..a46143066c1e
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox/19.0.nix
@@ -0,0 +1,176 @@
+{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
+, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
+, freetype, fontconfig, file, alsaLib, nspr, libnotify
+, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
+
+, # If you want the resulting program to call itself "Firefox" instead
+  # of "Shiretoko" or whatever, enable this option.  However, those
+  # binaries may not be distributed without permission from the
+  # Mozilla Foundation, see
+  # http://www.mozilla.org/foundation/trademarks/.
+  enableOfficialBranding ? false
+}:
+
+assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
+
+rec {
+
+  firefoxVersion = "19.0";
+
+  xulVersion = "19.0"; # this attribute is used by other packages
+
+
+  src = fetchurl {
+    urls = [
+        # It is better to use this url for official releases, to take load off Mozilla's ftp server.
+        "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
+        # Fall back to this url for versions not available at releases.mozilla.org.
+        "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
+    ];
+    sha1 = "816d64e8c9432349cd208fd181d210c54f985351";
+  };
+
+  commonConfigureFlags =
+    [ "--enable-optimize"
+      #"--enable-profiling"
+      "--disable-debug"
+      "--enable-strip"
+      # "--with-system-jpeg" # Too old in nixpkgs
+      "--with-system-zlib"
+      "--with-system-bz2"
+      "--with-system-nspr"
+      # "--with-system-nss" # Too old in nixpkgs
+      # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
+      # "--enable-system-cairo" # disabled for the moment because our Cairo is too old
+      "--enable-system-sqlite"
+      "--disable-crashreporter"
+      "--disable-tests"
+      "--disable-necko-wifi" # maybe we want to enable this at some point
+      "--disable-installer"
+      "--disable-updater"
+    ];
+
+
+  xulrunner = stdenv.mkDerivation rec {
+    name = "xulrunner-${xulVersion}";
+
+    inherit src;
+
+    buildInputs =
+      [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
+        python dbus dbus_glib pango freetype fontconfig xlibs.libXi
+        xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
+        alsaLib nspr libnotify xlibs.pixman yasm mesa
+        xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
+        xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
+      ];
+
+    configureFlags =
+      [ "--enable-application=xulrunner"
+        "--disable-javaxpcom"
+      ] ++ commonConfigureFlags;
+
+    enableParallelBuilding = true;
+
+    preConfigure =
+      ''
+        export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}"
+
+        mkdir ../objdir
+        cd ../objdir
+        configureScript=../mozilla-release/configure
+      ''; # */
+
+    #installFlags = "SKIP_GRE_REGISTRATION=1";
+
+    postInstall = ''
+      # Fix run-mozilla.sh search
+      libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*)
+      echo libDir: $libDir
+      test -n "$libDir"
+      cd $out/bin
+      rm xulrunner
+
+      for i in $out/lib/$libDir/*; do
+          file $i;
+          if file $i | grep executable &>/dev/null; then
+              echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")";
+              chmod a+x "$out/bin/$(basename "$i")";
+          fi;
+      done
+      for i in $out/lib/$libDir/*.so; do
+          patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true
+      done
+      for i in $out/lib/$libDir/{plugin-container,xulrunner,xulrunner-stub}; do
+          wrapProgram $i --prefix LD_LIBRARY_PATH ':' "$out/lib/$libDir"
+      done
+      rm -f $out/bin/run-mozilla.sh
+    ''; # */
+
+    meta = {
+      description = "Mozilla Firefox XUL runner";
+      homepage = http://www.mozilla.com/en-US/firefox/;
+    };
+
+    passthru = { inherit gtk; version = xulVersion; };
+  };
+
+
+  firefox = stdenv.mkDerivation rec {
+    name = "firefox-${firefoxVersion}";
+
+    inherit src;
+
+    enableParallelBuilding = true;
+
+    buildInputs =
+      [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
+        dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify
+        xlibs.pixman yasm mesa sqlite file unzip pysqlite
+      ];
+
+    propagatedBuildInputs = [xulrunner];
+
+    configureFlags =
+      [ "--enable-application=browser"
+        "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
+        "--enable-chrome-format=jar"
+        "--disable-elf-hack"
+      ]
+      ++ commonConfigureFlags
+      ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
+
+    makeFlags = [
+      "SYSTEM_LIBXUL=1"
+    ];
+
+    # Hack to work around make's idea of -lbz2 dependency
+    preConfigure =
+      ''
+        find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
+          stdenv.lib.concatStringsSep ":"
+            (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
+        }' ';'
+      '';
+
+    postInstall =
+      ''
+        ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner
+        cd "$out/lib/"firefox-*
+        rm firefox
+        echo -e '#!${stdenv.shell}\nexec ${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox
+        chmod a+x firefox
+      ''; # */
+
+    meta = {
+      description = "Mozilla Firefox - the browser, reloaded";
+      homepage = http://www.mozilla.com/en-US/firefox/;
+      maintainers = [ stdenv.lib.maintainers.eelco ];
+    };
+
+    passthru = {
+      inherit gtk xulrunner nspr;
+      isFirefox3Like = true;
+    };
+  };
+}
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
index 47f99a1d555c..202dfe2b02e9 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
@@ -3,7 +3,6 @@
 , zlib
 , alsaLib
 , curl
-, nss
 , nspr
 , fontconfig
 , freetype
@@ -77,7 +76,7 @@ stdenv.mkDerivation {
   };
 
   rpath = stdenv.lib.makeLibraryPath
-    [ zlib alsaLib curl nss nspr fontconfig freetype expat libX11
+    [ zlib alsaLib curl nspr fontconfig freetype expat libX11
       libXext libXrender libXcursor libXt gtk glib pango atk cairo gdk_pixbuf
       libvdpau
     ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cafe80758314..311b1ccdf7b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7075,7 +7075,7 @@ let
 
   firefoxWrapper = wrapFirefox { browser = pkgs.firefox; };
 
-  firefoxPkgs = pkgs.firefox18Pkgs;
+  firefoxPkgs = pkgs.firefox19Pkgs;
 
   firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix {
     inherit (gnome) libIDL;
@@ -7089,12 +7089,12 @@ let
 
   firefox13Wrapper = lowPrio (wrapFirefox { browser = firefox13Pkgs.firefox; });
 
-  firefox18Pkgs = callPackage ../applications/networking/browsers/firefox/18.0.nix {
+  firefox19Pkgs = callPackage ../applications/networking/browsers/firefox/19.0.nix {
     inherit (gnome) libIDL;
     inherit (pythonPackages) pysqlite;
   };
 
-  firefox18Wrapper = lowPrio (wrapFirefox { browser = firefox18Pkgs.firefox; });
+  firefox19Wrapper = lowPrio (wrapFirefox { browser = firefox19Pkgs.firefox; });
 
   flac = callPackage ../applications/audio/flac { };
 
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index b3b58f43e1b9..9772c3531020 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -349,7 +349,7 @@ with (import ./release-lib.nix);
   };
 
   firefox36Pkgs.firefox = linux;
-  firefox18Pkgs.firefox = linux;
+  firefox19Pkgs.firefox = linux;
 
   gnome = {
     gnome_panel = linux;
-- 
cgit 1.4.1


From f9c4ce79c88af1e9b0a2a50793990e7af192db2c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Feb 2013 17:48:46 +0100
Subject: Comment out non-existent maintainer attribute

http://hydra.nixos.org/build/4191101
---
 pkgs/tools/security/aespipe/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/tools/security/aespipe/default.nix b/pkgs/tools/security/aespipe/default.nix
index b16adbea8684..36b0ccc7e09d 100644
--- a/pkgs/tools/security/aespipe/default.nix
+++ b/pkgs/tools/security/aespipe/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     description = "AES encrypting or decrypting pipe";
     homepage = http://loop-aes.sourceforge.net/aespipe.README;
     license = "GPL";
-    maintainers = stdenv.lib.maintainers.goibniu;
+    #maintainers = stdenv.lib.maintainers.goibniu;
     platforms = stdenv.lib.platforms.linux;
   };
 }
-- 
cgit 1.4.1


From 6a1c64a4699caeccad29e155697503f9d2ebc3cb Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 21 Feb 2013 11:30:32 -0500
Subject: Unmaintain v86d.

I don't use it any more, and don't even remember what it was for
---
 pkgs/os-specific/linux/v86d/default.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/os-specific/linux/v86d/default.nix b/pkgs/os-specific/linux/v86d/default.nix
index f0f7fcbb9cee..220abf88ae7a 100644
--- a/pkgs/os-specific/linux/v86d/default.nix
+++ b/pkgs/os-specific/linux/v86d/default.nix
@@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
     description = "A userspace helper that runs x86 code in an emulated environment";
     homepage = http://dev.gentoo.org/~spock/projects/uvesafb/;
     license = "BSD";
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
     platforms = [ "i686-linux" "x86_64-linux" ];
   };
 }
-- 
cgit 1.4.1


From afe3758b1b12b43ce1f47e3170266d5909d59812 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 21 Feb 2013 11:31:37 -0500
Subject: Remove myself from kernel maintainers.

I use manual config now.
---
 pkgs/os-specific/linux/kernel/generic.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index a58430401c59..48f050f98cc2 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -134,7 +134,6 @@ stdenv.mkDerivation {
     homepage = http://www.kernel.org/;
     maintainers = [
       lib.maintainers.eelco
-      lib.maintainers.shlevy
       lib.maintainers.chaoflow
     ];
     platforms = lib.platforms.linux;
-- 
cgit 1.4.1


From 754f9a44fdde56bcfa76314ba65580d420e82470 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 21 Feb 2013 12:06:03 -0500
Subject: Gummiboot: Update to 23.

Requires a corresponding change in nixos to work there.
---
 pkgs/tools/misc/gummiboot/default.nix  | 14 +++----
 pkgs/tools/misc/gummiboot/no-usr.patch | 69 +++++++++++++++++++++++++++++++---
 2 files changed, 70 insertions(+), 13 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/tools/misc/gummiboot/default.nix b/pkgs/tools/misc/gummiboot/default.nix
index 341939ea40f6..cf2fe713461f 100644
--- a/pkgs/tools/misc/gummiboot/default.nix
+++ b/pkgs/tools/misc/gummiboot/default.nix
@@ -1,21 +1,19 @@
-{ stdenv, fetchurl, gnu_efi, unzip }:
+{ stdenv, fetchurl, gnu_efi, unzip, pkgconfig, utillinux, libxslt, docbook_xsl, docbook_xml_dtd_42 }:
 
 stdenv.mkDerivation rec {
-  name = "gummiboot-16";
+  name = "gummiboot-23";
 
-  buildInputs = [ unzip ];
+  buildInputs = [ unzip pkgconfig utillinux libxslt docbook_xsl docbook_xml_dtd_42 ];
 
   patches = [ ./no-usr.patch ];
 
-  buildFlags = [
-    "GNU_EFI=${gnu_efi}"
-  ] ++ stdenv.lib.optional (stdenv.system == "i686-linux") "ARCH=ia32";
+  buildFlags = [ "GNU_EFI=${gnu_efi}" ];
 
-  installPhase = "mkdir -p $out/bin; mv gummiboot.efi $out/bin";
+  makeFlags = [ "PREFIX=$(out)" ];
 
   src = fetchurl {
     url = "http://cgit.freedesktop.org/gummiboot/snapshot/${name}.zip";
-    sha256 = "0as5svmvsbz08qgbvns77qfb36xi9lx2138ikiinqv6finzm8fi1";
+    sha256 = "1lmfk4k52ha00ppna5g7h51vhd27i9fipf5k7mc2d9jkm2480z4j";
   };
 
   meta = {
diff --git a/pkgs/tools/misc/gummiboot/no-usr.patch b/pkgs/tools/misc/gummiboot/no-usr.patch
index 7f63e20d3e9a..db9068947407 100644
--- a/pkgs/tools/misc/gummiboot/no-usr.patch
+++ b/pkgs/tools/misc/gummiboot/no-usr.patch
@@ -1,14 +1,24 @@
-diff -Naur gummiboot-16-orig/Makefile gummiboot-16/Makefile
---- gummiboot-16-orig/Makefile	2013-01-24 04:20:58.000000000 -0500
-+++ gummiboot-16/Makefile	2013-02-01 17:27:42.922371399 -0500
-@@ -1,13 +1,13 @@
- VERSION=16
+diff -Naur gummiboot-23-orig/Makefile gummiboot-23/Makefile
+--- gummiboot-23-orig/Makefile	2013-02-20 00:55:44.000000000 -0500
++++ gummiboot-23/Makefile	2013-02-21 12:00:35.783637645 -0500
+@@ -10,7 +10,8 @@
+ export E Q
  
  ARCH=$(shell $(CC) -dumpmachine | sed "s/\(-\).*$$//")
 -LIBDIR=$(shell echo $$(cd /usr/lib/$$(gcc -print-multi-os-directory); pwd))
++PREFIX=/usr
 +LIBDIR=$(GNU_EFI)/lib
  LIBEFIDIR=$(or $(wildcard $(LIBDIR)/gnuefi), $(LIBDIR))
  
+ ifeq ($(ARCH),i686)
+@@ -25,13 +26,13 @@
+ 		-mno-red-zone
+ endif
+ 
+-all: gummiboot$(MACHINE_TYPE_NAME).efi gummiboot
++all: gummiboot$(MACHINE_TYPE_NAME).efi gummiboot man
+ 
+ # ------------------------------------------------------------------------------
  CPPFLAGS = \
  	-I. \
 -	-I/usr/include/efi \
@@ -18,3 +28,52 @@ diff -Naur gummiboot-16-orig/Makefile gummiboot-16/Makefile
  
  CFLAGS = \
  	-DVERSION=$(VERSION) \
+@@ -82,6 +83,7 @@
+ 	  `pkg-config --cflags --libs blkid` \
+ 	  src/setup/setup.c \
+ 	  src/setup/efivars.c \
++	  -DPREFIX=\"$(PREFIX)\" \
+ 	  -o $@
+ 
+ # ------------------------------------------------------------------------------
+@@ -101,11 +103,11 @@
+ 	rm -f src/efi/gummiboot.o src/efi/gummiboot.so gummiboot gummiboot$(MACHINE_TYPE_NAME).efi
+ 
+ install: all
+-	mkdir -p $(DESTDIR)/usr/bin/
+-	cp gummiboot $(DESTDIR)/usr/bin
+-	mkdir -p $(DESTDIR)/usr/lib/gummiboot/
+-	cp gummiboot$(MACHINE_TYPE_NAME).efi $(DESTDIR)/usr/lib/gummiboot/
+-	[ -e gummiboot.1 ] && mkdir -p $(DESTDIR)/usr/share/man/man1/ && cp gummiboot.1 $(DESTDIR)/usr/share/man/man1/ || :
++	mkdir -p $(DESTDIR)$(PREFIX)/bin/
++	cp gummiboot $(DESTDIR)$(PREFIX)/bin
++	mkdir -p $(DESTDIR)$(PREFIX)/lib/gummiboot/
++	cp gummiboot$(MACHINE_TYPE_NAME).efi $(DESTDIR)$(PREFIX)/lib/gummiboot/
++	[ -e gummiboot.1 ] && mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1/ && cp gummiboot.1 $(DESTDIR)$(PREFIX)/share/man/man1/ || :
+ 
+ tar:
+ 	git archive --format=tar --prefix=gummiboot-$(VERSION)/ $(VERSION) | xz > gummiboot-$(VERSION).tar.xz
+diff -Naur gummiboot-23-orig/src/setup/setup.c gummiboot-23/src/setup/setup.c
+--- gummiboot-23-orig/src/setup/setup.c	2013-02-20 00:55:44.000000000 -0500
++++ gummiboot-23/src/setup/setup.c	2013-02-21 11:57:43.295324700 -0500
+@@ -736,7 +736,7 @@
+         char *p = NULL, *q = NULL, *v = NULL;
+         int r;
+ 
+-        if (asprintf(&p, "/usr/lib/gummiboot/%s", name) < 0) {
++        if (asprintf(&p, PREFIX "/lib/gummiboot/%s", name) < 0) {
+                 fprintf(stderr, "Out of memory.\n");
+                 r = -ENOMEM;
+                 goto finish;
+@@ -791,9 +791,9 @@
+                         return r;
+         }
+ 
+-        d = opendir("/usr/lib/gummiboot");
++        d = opendir(PREFIX "/lib/gummiboot");
+         if (!d) {
+-                fprintf(stderr, "Failed to open /usr/lib/gummiboot: %m\n");
++                fprintf(stderr, "Failed to open " PREFIX "/lib/gummiboot: %m\n");
+                 return -errno;
+         }
+ 
-- 
cgit 1.4.1


From 207443b1849e7b1ce65059d2fdad81db04cc75d8 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Thu, 21 Feb 2013 21:18:26 +0100
Subject: upgrade bacula

---
 pkgs/tools/backup/bacula/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix
index c6ad08768231..f0a6ade8444b 100644
--- a/pkgs/tools/backup/bacula/default.nix
+++ b/pkgs/tools/backup/bacula/default.nix
@@ -4,8 +4,8 @@ stdenv.mkDerivation {
   name = "bacula-5.0.3";
 
   src = fetchurl {
-    url = mirror://sourceforge/bacula/bacula-5.0.3.tar.gz;
-    sha256 = "1d7x6jw5x9ljbdxvcc8k635lsxcbxw9kzjyxf6l4zsdv3275j1cr";
+    url = mirror://sourceforge/bacula/bacula-5.2.13.tar.gz;
+    sha256 = "1n3sc0kd7r0afpyi708y3md0a24rbldnfcdz0syqj600pxcd9gm4";
   };
 
   buildInputs = [ sqlite zlib acl ncurses openssl readline ];
-- 
cgit 1.4.1


From 787b1500892ae03aecfc1c3a7d1ca7bae33ca9a9 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Tue, 5 Feb 2013 22:41:22 +0100
Subject: gnome2.libart_lgpl: update

---
 pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix b/pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix
index 320372786a50..7b1ccb97dc4b 100644
--- a/pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix
@@ -1,9 +1,9 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "libart_lgpl-2.3.20";
+stdenv.mkDerivation rec {
+  name = "libart_lgpl-2.3.21";
   src = fetchurl {
-    url = mirror://gnome/sources/libart_lgpl/2.3/libart_lgpl-2.3.20.tar.bz2;
-    sha256 = "0iyqsc517lj8xnidchnk0fxa6aqvss4hv8p9fk6bba86lbiillym";
+    url = "mirror://gnome/sources/libart_lgpl/2.3/${name}.tar.bz2";
+    sha256 = "1yknfkyzgz9s616is0l9gp5aray0f2ry4dw533jgzj8gq5s1xhgx";
   };
 }
-- 
cgit 1.4.1


From c2ba006ec92ae6b5fea7bfd4b1a9fabdba4c24ed Mon Sep 17 00:00:00 2001
From: Cillian de Róiste <goibhniu@fsfe.org>
Date: Thu, 21 Feb 2013 22:30:14 +0100
Subject: aespipe: Fix typo in maintainer id

---
 pkgs/tools/security/aespipe/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/tools/security/aespipe/default.nix b/pkgs/tools/security/aespipe/default.nix
index 36b0ccc7e09d..9e4b8d12712a 100644
--- a/pkgs/tools/security/aespipe/default.nix
+++ b/pkgs/tools/security/aespipe/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     description = "AES encrypting or decrypting pipe";
     homepage = http://loop-aes.sourceforge.net/aespipe.README;
     license = "GPL";
-    #maintainers = stdenv.lib.maintainers.goibniu;
+    maintainers = stdenv.lib.maintainers.goibhniu;
     platforms = stdenv.lib.platforms.linux;
   };
 }
-- 
cgit 1.4.1


From e0344da28cdac23eb452b3bc3e3d5ff4a8164b04 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Fri, 22 Feb 2013 00:02:24 +0100
Subject: update gtk c++ bindings

---
 pkgs/development/libraries/atkmm/2.22.x.nix   | 14 -----------
 pkgs/development/libraries/atkmm/default.nix  | 14 +++++++++++
 pkgs/development/libraries/glibmm/2.30.x.nix  | 24 ------------------
 pkgs/development/libraries/glibmm/default.nix | 24 ++++++++++++++++++
 pkgs/development/libraries/gtkmm/2.24.x.nix   | 36 ---------------------------
 pkgs/development/libraries/gtkmm/2.x.nix      | 36 +++++++++++++++++++++++++++
 pkgs/development/libraries/gtkmm/3.2.x.nix    | 35 --------------------------
 pkgs/development/libraries/gtkmm/3.x.nix      | 35 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix               | 18 +++++---------
 9 files changed, 115 insertions(+), 121 deletions(-)
 delete mode 100644 pkgs/development/libraries/atkmm/2.22.x.nix
 create mode 100644 pkgs/development/libraries/atkmm/default.nix
 delete mode 100644 pkgs/development/libraries/glibmm/2.30.x.nix
 create mode 100644 pkgs/development/libraries/glibmm/default.nix
 delete mode 100644 pkgs/development/libraries/gtkmm/2.24.x.nix
 create mode 100644 pkgs/development/libraries/gtkmm/2.x.nix
 delete mode 100644 pkgs/development/libraries/gtkmm/3.2.x.nix
 create mode 100644 pkgs/development/libraries/gtkmm/3.x.nix

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/atkmm/2.22.x.nix b/pkgs/development/libraries/atkmm/2.22.x.nix
deleted file mode 100644
index 66237c4c7b99..000000000000
--- a/pkgs/development/libraries/atkmm/2.22.x.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ stdenv, fetchurl, atk, glibmm, pkgconfig }:
-
-stdenv.mkDerivation rec {
-  name = "atkmm-2.22.6";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/atkmm/2.22/atkmm-2.22.6.tar.xz;
-    sha256 = "1dmf72i7jv2a2gavjiah2722bf5qk3hb97hn5dasxqxr0r8jjx0a";
-  };
-
-  propagatedBuildInputs = [ atk glibmm ];
-
-  buildNativeInputs = [ pkgconfig ];
-}
diff --git a/pkgs/development/libraries/atkmm/default.nix b/pkgs/development/libraries/atkmm/default.nix
new file mode 100644
index 000000000000..66237c4c7b99
--- /dev/null
+++ b/pkgs/development/libraries/atkmm/default.nix
@@ -0,0 +1,14 @@
+{ stdenv, fetchurl, atk, glibmm, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "atkmm-2.22.6";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/atkmm/2.22/atkmm-2.22.6.tar.xz;
+    sha256 = "1dmf72i7jv2a2gavjiah2722bf5qk3hb97hn5dasxqxr0r8jjx0a";
+  };
+
+  propagatedBuildInputs = [ atk glibmm ];
+
+  buildNativeInputs = [ pkgconfig ];
+}
diff --git a/pkgs/development/libraries/glibmm/2.30.x.nix b/pkgs/development/libraries/glibmm/2.30.x.nix
deleted file mode 100644
index 4792ae790be6..000000000000
--- a/pkgs/development/libraries/glibmm/2.30.x.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, libsigcxx }:
-
-stdenv.mkDerivation rec {
-  name = "glibmm-2.30.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/glibmm/2.30/glibmm-2.30.1.tar.xz;
-    sha256 = "15zqgx6rashyhxk89qjqq05p6m40akpgzyjk8bfb3jk68rc2nn39";
-  };
-
-  buildNativeInputs = [pkgconfig];
-  propagatedBuildInputs = [glib libsigcxx];
-
-  meta = {
-    description = "C++ interface to the GLib library";
-
-    homepage = http://gtkmm.org/;
-
-    license = "LGPLv2+";
-
-    maintainers = with stdenv.lib.maintainers; [urkud raskin];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix
new file mode 100644
index 000000000000..05efa2757568
--- /dev/null
+++ b/pkgs/development/libraries/glibmm/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, libsigcxx }:
+
+stdenv.mkDerivation rec {
+  name = "glibmm-2.34.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/glibmm/2.34/${name}.tar.xz";
+    sha256 = "1i4jsvahva2q0mig7kjnpsw0r3fnpybm8b6hzymfm2hpgqnaa9dl";
+  };
+
+  buildNativeInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ glib gdk_pixbuf libsigcxx ];
+
+  meta = {
+    description = "C++ interface to the GLib library";
+
+    homepage = http://gtkmm.org/;
+
+    license = "LGPLv2+";
+
+    maintainers = with stdenv.lib.maintainers; [urkud raskin];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/gtkmm/2.24.x.nix b/pkgs/development/libraries/gtkmm/2.24.x.nix
deleted file mode 100644
index 56d151101c5d..000000000000
--- a/pkgs/development/libraries/gtkmm/2.24.x.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, fetchurl_gnome, pkgconfig, gtk, glibmm, cairomm, pangomm, atkmm }:
-
-stdenv.mkDerivation rec {
-  name = src.pkgname;
-
-  src = fetchurl_gnome {
-    project = "gtkmm";
-    major = "2"; minor = "24"; patchlevel = "2"; extension = "xz";
-    sha256 = "0gcm91sc1a05c56kzh74l370ggj0zz8nmmjvjaaxgmhdq8lpl369";
-  };
-
-  buildNativeInputs = [pkgconfig];
-
-  propagatedBuildInputs = [ glibmm gtk atkmm cairomm pangomm ];
-
-  meta = {
-    description = "C++ interface to the GTK+ graphical user interface library";
-
-    longDescription = ''
-      gtkmm is the official C++ interface for the popular GUI library
-      GTK+.  Highlights include typesafe callbacks, and a
-      comprehensive set of widgets that are easily extensible via
-      inheritance.  You can create user interfaces either in code or
-      with the Glade User Interface designer, using libglademm.
-      There's extensive documentation, including API reference and a
-      tutorial.
-    '';
-
-    homepage = http://gtkmm.org/;
-
-    license = "LGPLv2+";
-
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix
new file mode 100644
index 000000000000..56d151101c5d
--- /dev/null
+++ b/pkgs/development/libraries/gtkmm/2.x.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl_gnome, pkgconfig, gtk, glibmm, cairomm, pangomm, atkmm }:
+
+stdenv.mkDerivation rec {
+  name = src.pkgname;
+
+  src = fetchurl_gnome {
+    project = "gtkmm";
+    major = "2"; minor = "24"; patchlevel = "2"; extension = "xz";
+    sha256 = "0gcm91sc1a05c56kzh74l370ggj0zz8nmmjvjaaxgmhdq8lpl369";
+  };
+
+  buildNativeInputs = [pkgconfig];
+
+  propagatedBuildInputs = [ glibmm gtk atkmm cairomm pangomm ];
+
+  meta = {
+    description = "C++ interface to the GTK+ graphical user interface library";
+
+    longDescription = ''
+      gtkmm is the official C++ interface for the popular GUI library
+      GTK+.  Highlights include typesafe callbacks, and a
+      comprehensive set of widgets that are easily extensible via
+      inheritance.  You can create user interfaces either in code or
+      with the Glade User Interface designer, using libglademm.
+      There's extensive documentation, including API reference and a
+      tutorial.
+    '';
+
+    homepage = http://gtkmm.org/;
+
+    license = "LGPLv2+";
+
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/gtkmm/3.2.x.nix b/pkgs/development/libraries/gtkmm/3.2.x.nix
deleted file mode 100644
index 890d4a34519d..000000000000
--- a/pkgs/development/libraries/gtkmm/3.2.x.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm }:
-
-stdenv.mkDerivation {
-  name = "gtkmm-3.2.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gtkmm/3.2/gtkmm-3.2.0.tar.xz;
-    sha256 = "1wkljr2vjvjg5mggi4rvk9k4j2kzh8lc106k2yp8gqjlhk2xm5b1";
-  };
-
-  buildNativeInputs = [ pkgconfig ];
-
-  propagatedBuildInputs = [ glibmm gtk3 atkmm cairomm pangomm ];
-
-  meta = {
-    description = "C++ interface to the GTK+ graphical user interface library";
-
-    longDescription = ''
-      gtkmm is the official C++ interface for the popular GUI library
-      GTK+.  Highlights include typesafe callbacks, and a
-      comprehensive set of widgets that are easily extensible via
-      inheritance.  You can create user interfaces either in code or
-      with the Glade User Interface designer, using libglademm.
-      There's extensive documentation, including API reference and a
-      tutorial.
-    '';
-
-    homepage = http://gtkmm.org/;
-
-    license = "LGPLv2+";
-
-    maintainers = with stdenv.lib.maintainers; [ raskin urkud ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix
new file mode 100644
index 000000000000..890d4a34519d
--- /dev/null
+++ b/pkgs/development/libraries/gtkmm/3.x.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm }:
+
+stdenv.mkDerivation {
+  name = "gtkmm-3.2.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gtkmm/3.2/gtkmm-3.2.0.tar.xz;
+    sha256 = "1wkljr2vjvjg5mggi4rvk9k4j2kzh8lc106k2yp8gqjlhk2xm5b1";
+  };
+
+  buildNativeInputs = [ pkgconfig ];
+
+  propagatedBuildInputs = [ glibmm gtk3 atkmm cairomm pangomm ];
+
+  meta = {
+    description = "C++ interface to the GTK+ graphical user interface library";
+
+    longDescription = ''
+      gtkmm is the official C++ interface for the popular GUI library
+      GTK+.  Highlights include typesafe callbacks, and a
+      comprehensive set of widgets that are easily extensible via
+      inheritance.  You can create user interfaces either in code or
+      with the Glade User Interface designer, using libglademm.
+      There's extensive documentation, including API reference and a
+      tutorial.
+    '';
+
+    homepage = http://gtkmm.org/;
+
+    license = "LGPLv2+";
+
+    maintainers = with stdenv.lib.maintainers; [ raskin urkud ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 311b1ccdf7b6..8707db525207 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3470,8 +3470,6 @@ let
 
   caelum = callPackage ../development/libraries/caelum { };
 
-  cairomm = callPackage ../development/libraries/cairomm { };
-
   scmccid = callPackage ../development/libraries/scmccid { };
 
   ccrtp = callPackage ../development/libraries/ccrtp { };
@@ -3955,31 +3953,27 @@ let
   };
 
   glib = callPackage ../development/libraries/glib/2.34.x.nix { };
-
-  glibmm = callPackage ../development/libraries/glibmm/2.30.x.nix { };
+  glibmm = callPackage ../development/libraries/glibmm { };
 
   glib_networking = callPackage ../development/libraries/glib-networking {};
 
   atk = callPackage ../development/libraries/atk/2.6.x.nix { };
-
-  atkmm = callPackage ../development/libraries/atkmm/2.22.x.nix { };
+  atkmm = callPackage ../development/libraries/atkmm { };
 
   cairo = callPackage ../development/libraries/cairo { };
+  cairomm = callPackage ../development/libraries/cairomm { };
 
   pango = callPackage ../development/libraries/pango/1.30.x.nix { };
-
   pangomm = callPackage ../development/libraries/pangomm/2.28.x.nix { };
 
   gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.26.x.nix { };
 
   gtk2 = callPackage ../development/libraries/gtk+/2.24.x.nix { };
-
+  gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.2.x.nix { });
   gtk = pkgs.gtk2;
 
-  gtkmm = callPackage ../development/libraries/gtkmm/2.24.x.nix { };
-  gtkmm3 = callPackage ../development/libraries/gtkmm/3.2.x.nix { };
-
-  gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.2.x.nix { });
+  gtkmm = callPackage ../development/libraries/gtkmm/2.x.nix { };
+  gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { };
 
   gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp {
     gtksharp = gtksharp2;
-- 
cgit 1.4.1


From 248ccf393b00636ee7078162510a58023afe842f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 22 Feb 2013 12:56:26 +0100
Subject: haskell-network: add version 2.4.1.2

---
 pkgs/development/libraries/haskell/network/2.4.1.0.nix | 15 ---------------
 pkgs/development/libraries/haskell/network/2.4.1.2.nix | 15 +++++++++++++++
 pkgs/top-level/haskell-packages.nix                    |  6 +++---
 3 files changed, 18 insertions(+), 18 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/network/2.4.1.0.nix
 create mode 100644 pkgs/development/libraries/haskell/network/2.4.1.2.nix

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/haskell/network/2.4.1.0.nix b/pkgs/development/libraries/haskell/network/2.4.1.0.nix
deleted file mode 100644
index 9d5ac3abe781..000000000000
--- a/pkgs/development/libraries/haskell/network/2.4.1.0.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ cabal, parsec }:
-
-cabal.mkDerivation (self: {
-  pname = "network";
-  version = "2.4.1.0";
-  sha256 = "0m44iqlcnpsaa3iqxb4wbx2l1k2ycxzq8v07bwz7br7yyikv16y3";
-  buildDepends = [ parsec ];
-  meta = {
-    homepage = "https://github.com/haskell/network";
-    description = "Low-level networking interface";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network/2.4.1.2.nix b/pkgs/development/libraries/haskell/network/2.4.1.2.nix
new file mode 100644
index 000000000000..4009bbd94641
--- /dev/null
+++ b/pkgs/development/libraries/haskell/network/2.4.1.2.nix
@@ -0,0 +1,15 @@
+{ cabal, parsec }:
+
+cabal.mkDerivation (self: {
+  pname = "network";
+  version = "2.4.1.2";
+  sha256 = "0f7ykdv7xbsr5m3h2ml0hw3nlbnq785m0gr624pwk2s289jwakdh";
+  buildDepends = [ parsec ];
+  meta = {
+    homepage = "https://github.com/haskell/network";
+    description = "Low-level networking interface";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 36069e8854fa..828f158376af 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -129,7 +129,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     HTTP         = self.HTTP_4000_2_8;          # 7.6 ok
     HUnit        = self.HUnit_1_2_5_1;          # 7.6 ok
     mtl          = self.mtl_2_1_2;              # 7.6 ok
-    network      = self.network_2_4_1_0;        # 7.6 ok
+    network      = self.network_2_4_1_2;        # 7.6 ok
     OpenGL       = self.OpenGL_2_6_0_1;         # 7.6 ok
     parallel     = self.parallel_3_2_0_3;       # 7.6 ok
     parsec       = self.parsec_3_1_3;           # 7.6 ok
@@ -1286,8 +1286,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   network_2_3_0_5 = callPackage ../development/libraries/haskell/network/2.3.0.5.nix {};
   network_2_3_0_13 = callPackage ../development/libraries/haskell/network/2.3.0.13.nix {};
   network_2_3_1_0 = callPackage ../development/libraries/haskell/network/2.3.1.0.nix {};
-  network_2_4_1_0 = callPackage ../development/libraries/haskell/network/2.4.1.0.nix {};
-  network = self.network_2_4_1_0;
+  network_2_4_1_2 = callPackage ../development/libraries/haskell/network/2.4.1.2.nix {};
+  network = self.network_2_4_1_2;
 
   networkConduit = callPackage ../development/libraries/haskell/network-conduit {};
 
-- 
cgit 1.4.1


From 6aa834ad6e77cffd2fddd94a65dedbd7c5340136 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 22 Feb 2013 14:41:35 +0100
Subject: haskell-happstack-server: update to version 7.1.6

---
 pkgs/development/libraries/haskell/happstack/happstack-server.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
index 4dd789b49e5a..3a0b9ab59b92 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
@@ -6,15 +6,14 @@
 
 cabal.mkDerivation (self: {
   pname = "happstack-server";
-  version = "7.1.5";
-  sha256 = "0w00y84arc8z92d1d3l6f7gh1hmkm4yrj70pnnrsaca3i603w11a";
+  version = "7.1.6";
+  sha256 = "0gifq625kclam6sgblwa8a1vhxmx8saanzlrikch0l9q0l95nfwd";
   buildDepends = [
     base64Bytestring blazeHtml extensibleExceptions filepath hslogger
     html monadControl mtl network parsec sendfile syb systemFilepath
     text threads time timeCompat transformers transformersBase
     utf8String xhtml zlib
   ];
-  jailbreak = true;
   meta = {
     homepage = "http://happstack.com";
     description = "Web related tools and services";
-- 
cgit 1.4.1


From 4b91db3ba7461dbaf646b364b995c2358040418a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 22 Feb 2013 14:41:35 +0100
Subject: haskell-hoogle: update to version 4.2.16

---
 pkgs/development/libraries/haskell/hoogle/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix
index a54802ef9b00..1e722a186dc4 100644
--- a/pkgs/development/libraries/haskell/hoogle/default.nix
+++ b/pkgs/development/libraries/haskell/hoogle/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hoogle";
-  version = "4.2.15";
-  sha256 = "0mhxdbbzq7hl5zxz3dhxyrs5q08y8hxwsm19ba0gx47qvg3znzki";
+  version = "4.2.16";
+  sha256 = "1hamwqhndrkajm4xvxxfhr2rnlmf3z2ysyfxx3y6d24jawjyqf8a";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -14,7 +14,6 @@ cabal.mkDerivation (self: {
     haskellSrcExts httpTypes parsec random safe tagsoup time
     transformers uniplate wai warp
   ];
-  jailbreak = true;
   meta = {
     homepage = "http://www.haskell.org/hoogle/";
     description = "Haskell API Search";
-- 
cgit 1.4.1


From 2569cc1286776ed18a4405f22760504e36b34717 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 22 Feb 2013 14:41:35 +0100
Subject: haskell-shakespeare-css: update to version 1.0.3

---
 pkgs/development/libraries/haskell/shakespeare-css/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
index 6ed553516b60..5016b816ff73 100644
--- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-css";
-  version = "1.0.2.1";
-  sha256 = "1ik0128gwziv1dajz2g73rk1yac0ymd1w59q3g8c9g8ibwxn9hca";
+  version = "1.0.3";
+  sha256 = "0zk4nb4v9x04vkkgbzqanfpqgw9pqinf76l7d85fzclfgwacd0bz";
   buildDepends = [ parsec shakespeare text transformers ];
   meta = {
     homepage = "http://www.yesodweb.com/book/shakespearean-templates";
-- 
cgit 1.4.1


From 59ef5ef0e822f680f8a72c9df82ec9dd2d8ec7f7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 22 Feb 2013 14:41:36 +0100
Subject: haskell-snap-server: update to version 0.9.3.3

---
 pkgs/development/libraries/haskell/snap/server.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix
index 3d25c6c215f4..c11dfe4f398f 100644
--- a/pkgs/development/libraries/haskell/snap/server.nix
+++ b/pkgs/development/libraries/haskell/snap/server.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "snap-server";
-  version = "0.9.3.1";
-  sha256 = "0wagx1zy52fi4fldbzpsvk5hpdrma9lwsip9zrrbszxf446amd53";
+  version = "0.9.3.3";
+  sha256 = "1n50xyhg4rva7ifv70825177606q87ip7f9p5kf94i9kci0kmlig";
   buildDepends = [
     attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator
     caseInsensitive enumerator MonadCatchIOTransformers mtl network
-- 
cgit 1.4.1


From efe445f5f57fd3a832323dfeece37111e233912a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 22 Feb 2013 15:03:36 +0100
Subject: xmobar: drop unnecessary override for 'stm'

---
 pkgs/top-level/haskell-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 828f158376af..ab60ca32ff0b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2017,9 +2017,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     QuickCheck = self.QuickCheck2;
   };
 
-  xmobar = callPackage ../applications/misc/xmobar {
-    stm = self.stm_2_3;
-  };
+  xmobar = callPackage ../applications/misc/xmobar {};
 
   xmonad = callPackage ../applications/window-managers/xmonad {};
 
-- 
cgit 1.4.1


From eb5ebb6063fd69d2ce321ed0619d9e6ca02d970a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 22 Feb 2013 15:04:03 +0100
Subject: network-protocol-xmpp: fix spelling of the attribute name

---
 pkgs/applications/version-management/git-and-tools/default.nix        | 2 +-
 .../version-management/git-and-tools/git-annex/default.nix            | 4 ++--
 pkgs/top-level/haskell-packages.nix                                   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 75c71f9cfdf7..b7bf00f07dd7 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -49,7 +49,7 @@ rec {
       network pcreLight SHA stm utf8String networkInfo dbus clientsession cryptoApi dataDefault
       extensibleExceptions filepath hamlet httpTypes networkMulticast text time transformers
       transformersBase wai waiLogger warp yesod yesodDefault yesodStatic testpack QuickCheck
-      SafeSemaphore networkPprotocolXmpp async dns DAV uuid Glob;
+      SafeSemaphore networkProtocolXmpp async dns DAV uuid Glob;
   };
 
   qgit = import ./qgit {
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
index 7f11462aa02e..3d11b4841738 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@@ -8,7 +8,7 @@
 , networkMulticast, pcreLight, QuickCheck, SHA, stm, text, time
 , transformers, transformersBase, utf8String, wai, waiLogger, warp
 , yesod, yesodDefault, yesodStatic, testpack, SafeSemaphore
-, networkPprotocolXmpp, async, dns, DAV, uuid, Glob
+, networkProtocolXmpp, async, dns, DAV, uuid, Glob
 }:
 
 let
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
     httpTypes IfElse json liftedBase MissingH monadControl mtl network
     networkInfo networkMulticast pcreLight QuickCheck SHA stm text time
     transformers transformersBase utf8String wai waiLogger warp yesod
-    yesodDefault yesodStatic testpack SafeSemaphore networkPprotocolXmpp
+    yesodDefault yesodStatic testpack SafeSemaphore networkProtocolXmpp
     async dns DAV uuid Glob ];
 
   checkTarget = "test";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index ab60ca32ff0b..ff8fd6a24c77 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1295,7 +1295,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   networkMulticast = callPackage ../development/libraries/haskell/network-multicast {};
 
-  networkPprotocolXmpp = callPackage ../development/libraries/haskell/network-protocol-xmpp {};
+  networkProtocolXmpp = callPackage ../development/libraries/haskell/network-protocol-xmpp {};
 
   networkTransport = callPackage ../development/libraries/haskell/network-transport {};
 
-- 
cgit 1.4.1


From c3a7017cb6a1fd7519b060c4e2e9ab2e2c79e5d7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 22 Feb 2013 16:14:36 +0100
Subject: haskell-xmlhtml: update to version 0.2.1

---
 pkgs/development/libraries/haskell/xmlhtml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/haskell/xmlhtml/default.nix b/pkgs/development/libraries/haskell/xmlhtml/default.nix
index aff309b184f0..66c1f645267a 100644
--- a/pkgs/development/libraries/haskell/xmlhtml/default.nix
+++ b/pkgs/development/libraries/haskell/xmlhtml/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xmlhtml";
-  version = "0.2.0.4";
-  sha256 = "1z40hkq9l6nw3hcnz6d1x0han7ynjkvbvjy8bl5mq7zmhk1xhmr6";
+  version = "0.2.1";
+  sha256 = "1nqkjbhpzr7zxpjvlxy6pync6zyarvjblcxg8igq75dyzk7qhafg";
   buildDepends = [
     blazeBuilder blazeHtml blazeMarkup parsec text unorderedContainers
   ];
-- 
cgit 1.4.1


From 074137a19b1472bdb6618cecda51b4802204c4a7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 22 Feb 2013 16:53:23 +0100
Subject: pkgs/build-support/cabal/default.nix: add support for running test
 suites via Cabal

Set 'doCheck = true' to enable building and running of the test suite.
---
 pkgs/build-support/cabal/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix
index a5884786b001..650807c324a2 100644
--- a/pkgs/build-support/cabal/default.nix
+++ b/pkgs/build-support/cabal/default.nix
@@ -89,7 +89,8 @@
               eval "$preConfigure"
 
               ${lib.optionalString (lib.attrByPath ["jailbreak"] false self) "${jailbreakCabal}/bin/jailbreak-cabal ${self.pname}.cabal && "
-              }for i in Setup.hs Setup.lhs; do
+              }${lib.optionalString (lib.attrByPath ["doCheck"] false self)  "configureFlags+=\" --enable-test\" && "
+	      }for i in Setup.hs Setup.lhs; do
                 test -f $i && ghc --make $i
               done
 
@@ -115,7 +116,8 @@
 
               ./Setup build
 
-              export GHC_PACKAGE_PATH=$(ghc-packages)
+              ${lib.optionalString (lib.attrByPath ["doCheck"] false self)  "./Setup test && "
+	      }export GHC_PACKAGE_PATH=$(ghc-packages)
               [ -n "$noHaddock" ] || ./Setup haddock
 
               eval "$postBuild"
-- 
cgit 1.4.1


From 0202ddea63eaee3542861b07765dfd8a85bd7d01 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 22 Feb 2013 11:08:50 -0500
Subject: Update rubygems

---
 pkgs/development/interpreters/ruby/generated.nix | 68 ++++++++++++------------
 1 file changed, 34 insertions(+), 34 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix
index 08c07a719735..ae6806a258a9 100644
--- a/pkgs/development/interpreters/ruby/generated.nix
+++ b/pkgs/development/interpreters/ruby/generated.nix
@@ -13,17 +13,17 @@ g: # Get dependencies from patched gems
     arel = g.arel_3_0_2;
     atoulme_Antwrap = g.atoulme_Antwrap_0_7_4;
     autotest_rails = g.autotest_rails_4_1_2;
-    aws_sdk = g.aws_sdk_1_8_1_2;
+    aws_sdk = g.aws_sdk_1_8_3;
     builder = g.builder_3_1_4;
-    buildr = g.buildr_1_4_9;
-    bundler = g.bundler_1_2_3;
+    buildr = g.buildr_1_4_10;
+    bundler = g.bundler_1_2_4;
     childprocess = g.childprocess_0_3_8;
     daemons = g.daemons_1_1_9;
     diff_lcs = g.diff_lcs_1_1_3;
     erubis = g.erubis_2_7_0;
     eventmachine = g.eventmachine_1_0_0;
     fakes3 = g.fakes3_0_1_5;
-    ffi = g.ffi_1_3_1;
+    ffi = g.ffi_1_4_0;
     foreman = g.foreman_0_61_0;
     highline = g.highline_1_6_2;
     hike = g.hike_1_2_1;
@@ -37,7 +37,7 @@ g: # Get dependencies from patched gems
     mail = g.mail_2_4_4;
     mime_types = g.mime_types_1_21;
     minitar = g.minitar_0_5_3;
-    multi_json = g.multi_json_1_5_1;
+    multi_json = g.multi_json_1_6_1;
     net_sftp = g.net_sftp_2_0_5;
     net_ssh = g.net_ssh_2_6_5;
     nix = g.nix_0_1_1;
@@ -61,7 +61,7 @@ g: # Get dependencies from patched gems
     rubyforge = g.rubyforge_2_0_4;
     rubyzip = g.rubyzip_0_9_9;
     sass = g.sass_3_2_5;
-    selenium_webdriver = g.selenium_webdriver_2_29_0;
+    selenium_webdriver = g.selenium_webdriver_2_30_0;
     sinatra = g.sinatra_1_3_2;
     sprockets = g.sprockets_2_2_2;
     systemu = g.systemu_2_5_2;
@@ -70,7 +70,7 @@ g: # Get dependencies from patched gems
     tilt = g.tilt_1_3_3;
     treetop = g.treetop_1_4_12;
     tzinfo = g.tzinfo_0_3_35;
-    uuid = g.uuid_2_3_6;
+    uuid = g.uuid_2_3_7;
     uuidtools = g.uuidtools_2_1_3;
     websocket = g.websocket_1_0_7;
     xml_simple = g.xml_simple_1_1_1;
@@ -171,7 +171,7 @@ installed versions.'';
         longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.'';
       };
       name = ''activesupport-3.2.12'';
-      requiredGems = [ g.i18n_0_6_1 g.multi_json_1_5_1 ];
+      requiredGems = [ g.i18n_0_6_1 g.multi_json_1_6_1 ];
       sha256 = ''1giqkprxjf5gyfyhn5nz9q8a5gi3v8irxhkpqr00zc5fw1azllsg'';
     };
     arel_3_0_2 = {
@@ -226,16 +226,16 @@ rails support and extra plugins for migrations and fixtures.'';
       requiredGems = [ g.ZenTest_4_9_0 ];
       sha256 = ''1wkb5jayb39yx0i8ly7sibygf9f9c3w24jg2z1qgm135zlb070v4'';
     };
-    aws_sdk_1_8_1_2 = {
+    aws_sdk_1_8_3 = {
       basename = ''aws_sdk'';
       meta = {
         description = ''AWS SDK for Ruby'';
         homepage = ''http://aws.amazon.com/sdkforruby'';
         longDescription = ''AWS SDK for Ruby'';
       };
-      name = ''aws-sdk-1.8.1.2'';
+      name = ''aws-sdk-1.8.3'';
       requiredGems = [ g.uuidtools_2_1_3 g.nokogiri_1_5_6 g.json_1_7_7 ];
-      sha256 = ''0z3ins8rd8v3r40sn70kg21f5di58lqjfxppl19hi3pdjxgdrr7x'';
+      sha256 = ''0ggvwiya4swyjyswfgwhzw09hap2slz7djp0svq22y7j0xci1axy'';
     };
     builder_3_0_4 = {
       basename = ''builder'';
@@ -285,7 +285,7 @@ simple to do.  Currently the following builder objects are supported:
       requiredGems = [  ];
       sha256 = ''1p0bjy1vb0zbswd6bsh5qda0f0br53p8vak8cm7hls62094r405p'';
     };
-    buildr_1_4_9 = {
+    buildr_1_4_10 = {
       basename = ''buildr'';
       meta = {
         description = ''Build like you code'';
@@ -297,20 +297,20 @@ to do, and it takes care of the rest.  But also something we can easily extend
 for those one-off tasks, with a language that's a joy to use.
 '';
       };
-      name = ''buildr-1.4.9'';
-      requiredGems = [ g.rake_0_9_2_2 g.builder_3_1_3 g.net_ssh_2_6_0 g.net_sftp_2_0_5 g.rubyzip_0_9_9 g.highline_1_6_2 g.json_pure_1_7_5 g.rubyforge_2_0_4 g.hoe_3_1_0 g.rjb_1_4_2 g.atoulme_Antwrap_0_7_4 g.diff_lcs_1_1_3 g.rspec_expectations_2_11_3 g.rspec_mocks_2_11_3 g.rspec_core_2_11_1 g.rspec_2_11_0 g.xml_simple_1_1_1 g.minitar_0_5_3 ];
-      sha256 = ''1ws8cdc7ylfq0aqbcmgwj3d8jxh8lp8zgxx0w0a7ippvvjjxb7az'';
+      name = ''buildr-1.4.10'';
+      requiredGems = [ g.rake_0_9_2_2 g.builder_3_1_3 g.net_ssh_2_6_0 g.net_sftp_2_0_5 g.rubyzip_0_9_9 g.highline_1_6_2 g.json_pure_1_7_5 g.rubyforge_2_0_4 g.hoe_3_1_0 g.rjb_1_4_2 g.atoulme_Antwrap_0_7_4 g.diff_lcs_1_1_3 g.rspec_expectations_2_11_3 g.rspec_mocks_2_11_3 g.rspec_core_2_11_1 g.rspec_2_11_0 g.xml_simple_1_1_1 g.minitar_0_5_3 g.bundler_1_2_4 ];
+      sha256 = ''1x192r8ab5zr9rlp1i9b3pi3y74f9pj2w491wkgshgwj22akh6vn'';
     };
-    bundler_1_2_3 = {
+    bundler_1_2_4 = {
       basename = ''bundler'';
       meta = {
         description = ''The best way to manage your application's dependencies'';
         homepage = ''http://gembundler.com'';
         longDescription = ''Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably'';
       };
-      name = ''bundler-1.2.3'';
+      name = ''bundler-1.2.4'';
       requiredGems = [  ];
-      sha256 = ''0bf6ync0901d9q4cg5ws4ra0qh9ssw2xgsip8dka34sbm59kav4w'';
+      sha256 = ''0p90abn29wvg6ic1230f4dj7zs55r9r772b0xq02fwqd0ry3pdgl'';
     };
     childprocess_0_3_8 = {
       basename = ''childprocess'';
@@ -320,7 +320,7 @@ for those one-off tasks, with a language that's a joy to use.
         longDescription = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.'';
       };
       name = ''childprocess-0.3.8'';
-      requiredGems = [ g.ffi_1_3_1 ];
+      requiredGems = [ g.ffi_1_4_0 ];
       sha256 = ''08rp4krw0g60567ih4w51ndlq2pg92al0dycy0bs0m3msq68nlq4'';
     };
     daemons_1_1_9 = {
@@ -412,16 +412,16 @@ using TCP/IP, especially if custom protocols are required.'';
       requiredGems = [ g.thor_0_17_0 g.builder_3_1_4 ];
       sha256 = ''1na5wrbarla6s414svqmr5spbpv6vmcgpswal444x4clcpmadhib'';
     };
-    ffi_1_3_1 = {
+    ffi_1_4_0 = {
       basename = ''ffi'';
       meta = {
         description = ''Ruby FFI'';
         homepage = ''http://wiki.github.com/ffi/ffi'';
         longDescription = ''Ruby FFI library'';
       };
-      name = ''ffi-1.3.1'';
+      name = ''ffi-1.4.0'';
       requiredGems = [  ];
-      sha256 = ''0hbrfwgaw3ilmb47lvg9gzdnnfs0q0dzp6dki7rphcvsgirhp0sb'';
+      sha256 = ''06a29qvg487yk9pyi7wzyj5700mf7s3mjdqc6dsrh0467mjj9768'';
     };
     foreman_0_61_0 = {
       basename = ''foreman'';
@@ -611,16 +611,16 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp
       requiredGems = [  ];
       sha256 = ''035vs1knnnjsb8arfp8vx75warvwcdpiljjwv38lqljai9v8fq53'';
     };
-    multi_json_1_5_1 = {
+    multi_json_1_6_1 = {
       basename = ''multi_json'';
       meta = {
         description = ''A gem to provide swappable JSON backends.'';
         homepage = ''http://github.com/intridea/multi_json'';
         longDescription = ''A gem to provide easy switching between different JSON backends, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, and OkJson.'';
       };
-      name = ''multi_json-1.5.1'';
+      name = ''multi_json-1.6.1'';
       requiredGems = [  ];
-      sha256 = ''0c2jxjg6lx811515s35vnyjl9m9rsb2adw6yj2fxgqkc7yx1fjsz'';
+      sha256 = ''0p33swcl9i97wvv0cq9jkdl8q7xbc3j07apy35vsgldnhw99krcg'';
     };
     net_sftp_2_0_5 = {
       basename = ''net_sftp'';
@@ -787,7 +787,7 @@ request helpers feature.'';
         longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.'';
       };
       name = ''rails-3.2.12'';
-      requiredGems = [ g.activesupport_3_2_12 g.actionpack_3_2_12 g.activerecord_3_2_12 g.activeresource_3_2_12 g.actionmailer_3_2_12 g.railties_3_2_12 g.bundler_1_2_3 ];
+      requiredGems = [ g.activesupport_3_2_12 g.actionpack_3_2_12 g.activerecord_3_2_12 g.activeresource_3_2_12 g.actionmailer_3_2_12 g.railties_3_2_12 g.bundler_1_2_4 ];
       sha256 = ''1jjnm74nzl5v3461c0mrbpa471yd6s8hnkmnxb64c2rm95c61wxz'';
     };
     railties_3_2_12 = {
@@ -971,16 +971,16 @@ See RDoc for a description of RDoc's markup and basic use.'';
       requiredGems = [  ];
       sha256 = ''1ys7pfadw61dm09yyk28zrssi8zsyj99fyq6bdf2xmi8yp1avs6k'';
     };
-    selenium_webdriver_2_29_0 = {
+    selenium_webdriver_2_30_0 = {
       basename = ''selenium_webdriver'';
       meta = {
         description = ''The next generation developer focused tool for automated testing of webapps'';
         homepage = ''http://selenium.googlecode.com'';
         longDescription = ''WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.'';
       };
-      name = ''selenium-webdriver-2.29.0'';
-      requiredGems = [ g.multi_json_1_5_1 g.rubyzip_0_9_9 g.childprocess_0_3_8 g.websocket_1_0_7 ];
-      sha256 = ''0c5fybp19mawq07h59b16h736pz8sz017m1pwalb6mcyliqmlwcj'';
+      name = ''selenium-webdriver-2.30.0'';
+      requiredGems = [ g.multi_json_1_6_1 g.rubyzip_0_9_9 g.childprocess_0_3_8 g.websocket_1_0_7 ];
+      sha256 = ''1ybx8v9m5y8ykbdbldd1mglz0xhg30iv0708ig0vzjl2522sg6v1'';
     };
     sinatra_1_3_2 = {
       basename = ''sinatra'';
@@ -1001,7 +1001,7 @@ See RDoc for a description of RDoc's markup and basic use.'';
         longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.'';
       };
       name = ''sprockets-2.2.2'';
-      requiredGems = [ g.hike_1_2_1 g.multi_json_1_5_1 g.rack_1_5_2 g.tilt_1_3_3 ];
+      requiredGems = [ g.hike_1_2_1 g.multi_json_1_6_1 g.rack_1_5_2 g.tilt_1_3_3 ];
       sha256 = ''15ngw3bjbyr31ygzmmdxxa30ylah6pdn8akgdy9w30vfx2vr7s7s'';
     };
     systemu_2_5_2 = {
@@ -1069,7 +1069,7 @@ See RDoc for a description of RDoc's markup and basic use.'';
       requiredGems = [  ];
       sha256 = ''1c52ndjqcxpgxhlclbxf98clcpni216xk5zgrkcd4px84riyjbmp'';
     };
-    uuid_2_3_6 = {
+    uuid_2_3_7 = {
       basename = ''uuid'';
       meta = {
         description = ''UUID generator'';
@@ -1078,9 +1078,9 @@ See RDoc for a description of RDoc's markup and basic use.'';
 (http://www.ietf.org/rfc/rfc4122.txt).
 '';
       };
-      name = ''uuid-2.3.6'';
+      name = ''uuid-2.3.7'';
       requiredGems = [ g.macaddr_1_6_1 ];
-      sha256 = ''194xznnxncfgr0nx84l11gnafvkfzr1nj1swnwas75q0ld0ri2l8'';
+      sha256 = ''04q10an3v40zwjihvdwm23fw6vl39fbkhdiwfw78a51ym9airnlp'';
     };
     uuidtools_2_1_3 = {
       basename = ''uuidtools'';
-- 
cgit 1.4.1


From 07bd695e455248d37405498b5d8c6baf3e2757ec Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 22 Feb 2013 11:12:49 -0500
Subject: Add jsduck rubygem

---
 pkgs/development/interpreters/ruby/generated.nix | 60 +++++++++++++++++++++++-
 1 file changed, 59 insertions(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix
index ae6806a258a9..68c83a8e78c0 100644
--- a/pkgs/development/interpreters/ruby/generated.nix
+++ b/pkgs/development/interpreters/ruby/generated.nix
@@ -31,8 +31,10 @@ g: # Get dependencies from patched gems
     i18n = g.i18n_0_6_1;
     journey = g.journey_1_0_4;
     jruby_pageant = g.jruby_pageant_1_1_1;
+    jsduck = g.jsduck_4_6_1;
     json = g.json_1_7_7;
     json_pure = g.json_pure_1_7_7;
+    libv8 = g.libv8_3_3_10_4_x86_64_linux;
     macaddr = g.macaddr_1_6_1;
     mail = g.mail_2_4_4;
     mime_types = g.mime_types_1_21;
@@ -42,6 +44,7 @@ g: # Get dependencies from patched gems
     net_ssh = g.net_ssh_2_6_5;
     nix = g.nix_0_1_1;
     nokogiri = g.nokogiri_1_5_6;
+    parallel = g.parallel_0_6_2;
     polyglot = g.polyglot_0_3_3;
     rack = g.rack_1_5_2;
     rack_cache = g.rack_cache_1_2;
@@ -52,6 +55,7 @@ g: # Get dependencies from patched gems
     railties = g.railties_3_2_12;
     rake = g.rake_10_0_3;
     rb_fsevent = g.rb_fsevent_0_9_3;
+    rdiscount = g.rdiscount_2_0_7;
     rdoc = g.rdoc_3_12_1;
     rjb = g.rjb_1_4_6;
     rspec = g.rspec_2_11_0;
@@ -65,6 +69,7 @@ g: # Get dependencies from patched gems
     sinatra = g.sinatra_1_3_2;
     sprockets = g.sprockets_2_2_2;
     systemu = g.systemu_2_5_2;
+    therubyracer = g.therubyracer_0_10_2;
     thin = g.thin_1_5_0;
     thor = g.thor_0_17_0;
     tilt = g.tilt_1_3_3;
@@ -75,7 +80,7 @@ g: # Get dependencies from patched gems
     websocket = g.websocket_1_0_7;
     xml_simple = g.xml_simple_1_1_1;
   };
-  gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''buildr'' ''fakes3'' ''foreman'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''thin'' ''uuid'' ];
+  gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''buildr'' ''fakes3'' ''foreman'' ''jsduck'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''thin'' ''uuid'' ];
   gems = {
     ZenTest_4_9_0 = {
       basename = ''ZenTest'';
@@ -513,6 +518,17 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
       requiredGems = [  ];
       sha256 = ''1kgqsn0bagr41gf5kbqaxbs38a7s5bm85m0pdx4qz7d70v9nc9cl'';
     };
+    jsduck_4_6_1 = {
+      basename = ''jsduck'';
+      meta = {
+        description = ''Simple JavaScript Duckumentation generator'';
+        homepage = ''https://github.com/senchalabs/jsduck'';
+        longDescription = ''Documentation generator for Sencha JS frameworks'';
+      };
+      name = ''jsduck-4.6.1'';
+      requiredGems = [ g.rdiscount_2_0_7 g.json_1_7_7 g.parallel_0_6_2 g.therubyracer_0_10_2 ];
+      sha256 = ''01bws3jfsym531znwsd6qjaymf1mrsss1bj8csvj3vhnv728qbyh'';
+    };
     json_1_7_7 = {
       basename = ''json'';
       meta = {
@@ -546,6 +562,17 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
       requiredGems = [  ];
       sha256 = ''0jxp0amx9xhka0ixnhvfgwc5ydr82hkxp81pvw32z31arx7jrwl6'';
     };
+    libv8_3_3_10_4_x86_64_linux = {
+      basename = ''libv8'';
+      meta = {
+        description = ''Distribution of the V8 JavaScript engine'';
+        homepage = ''http://github.com/fractaloop/libv8'';
+        longDescription = ''Distributes the V8 JavaScript engine in binary and source forms in order to support fast builds of The Ruby Racer'';
+      };
+      name = ''libv8-3.3.10.4-x86_64-linux'';
+      requiredGems = [  ];
+      sha256 = ''13lnmkm9z3xqyi8rlsycfd7wybv044pxcisrkyq0cx7ig91a0dmc'';
+    };
     macaddr_1_6_1 = {
       basename = ''macaddr'';
       meta = {
@@ -681,6 +708,16 @@ enough of it.'';
       requiredGems = [  ];
       sha256 = ''1235h8k242f6yi5qgb8rfcx6gp7g99djwqgrz0vb6w12pbp9kar8'';
     };
+    parallel_0_6_2 = {
+      basename = ''parallel'';
+      meta = {
+        description = ''Run any kind of code in parallel processes'';
+        homepage = ''http://github.com/grosser/parallel'';
+      };
+      name = ''parallel-0.6.2'';
+      requiredGems = [  ];
+      sha256 = ''05rdbb1jqv0179wjfj74a1739rsqv7ijf4jp1i5s6lzh878c6l6p'';
+    };
     polyglot_0_3_3 = {
       basename = ''polyglot'';
       meta = {
@@ -845,6 +882,16 @@ request helpers feature.'';
       requiredGems = [  ];
       sha256 = ''0bdnxwdxj4r1kdxfi5nszbsb126njrr81p912g64xxs2bgxd1bp1'';
     };
+    rdiscount_2_0_7 = {
+      basename = ''rdiscount'';
+      meta = {
+        description = ''Fast Implementation of Gruber's Markdown in C'';
+        homepage = ''http://github.com/rtomayko/rdiscount'';
+      };
+      name = ''rdiscount-2.0.7'';
+      requiredGems = [  ];
+      sha256 = ''1cj9dn59xqjaglvzvd1ninid62xmih74az0glqqb90n2p42s2zs1'';
+    };
     rdoc_3_12_1 = {
       basename = ''rdoc'';
       meta = {
@@ -1015,6 +1062,17 @@ See RDoc for a description of RDoc's markup and basic use.'';
       requiredGems = [  ];
       sha256 = ''0h834ajdg9w4xrijp31fn98pjfj08gi08xjvp5xh3i6hz9a25fhr'';
     };
+    therubyracer_0_10_2 = {
+      basename = ''therubyracer'';
+      meta = {
+        description = ''Embed the V8 Javascript interpreter into Ruby'';
+        homepage = ''http://github.com/cowboyd/therubyracer'';
+        longDescription = ''Call javascript code and manipulate javascript objects from ruby. Call ruby code and manipulate ruby objects from javascript.'';
+      };
+      name = ''therubyracer-0.10.2'';
+      requiredGems = [ g.libv8_3_3_10_4_x86_64_linux ];
+      sha256 = ''111hm2l613v06sy7pzjzmnyi4x11rg3c2syhnpv8fn0wnn9rdiyb'';
+    };
     thin_1_5_0 = {
       basename = ''thin'';
       meta = {
-- 
cgit 1.4.1


From 2c4d695a1bde57ed6be5af24eebf8ab0ce988678 Mon Sep 17 00:00:00 2001
From: Bjørn Forsman <bjorn.forsman@gmail.com>
Date: Fri, 22 Feb 2013 21:05:40 +0100
Subject: bacula: fix version mismatch between name and src attribute

Commit 207443b1849e7b1ce65059d2fdad81db04cc75d8 ("upgrade bacula")
updated the backula version in the src attribute but forgot to update
the version number in the name attribute.
---
 pkgs/tools/backup/bacula/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix
index f0a6ade8444b..9af44446c788 100644
--- a/pkgs/tools/backup/bacula/default.nix
+++ b/pkgs/tools/backup/bacula/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, sqlite, zlib, acl, ncurses, openssl, readline}:
 
 stdenv.mkDerivation {
-  name = "bacula-5.0.3";
+  name = "bacula-5.2.13";
 
   src = fetchurl {
     url = mirror://sourceforge/bacula/bacula-5.2.13.tar.gz;
-- 
cgit 1.4.1


From c3a55db090ba12e0ceb943c990fa8c6f66f9a51b Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 22 Feb 2013 15:24:20 -0500
Subject: bacula: Remove some duplication to avoid errors when updating.

---
 pkgs/tools/backup/bacula/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix
index 9af44446c788..5f3cb2b48d38 100644
--- a/pkgs/tools/backup/bacula/default.nix
+++ b/pkgs/tools/backup/bacula/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, sqlite, zlib, acl, ncurses, openssl, readline}:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "bacula-5.2.13";
 
   src = fetchurl {
-    url = mirror://sourceforge/bacula/bacula-5.2.13.tar.gz;
+    url = "mirror://sourceforge/bacula/${name}.tar.gz";
     sha256 = "1n3sc0kd7r0afpyi708y3md0a24rbldnfcdz0syqj600pxcd9gm4";
   };
 
-- 
cgit 1.4.1


From 71a9716fd4c4b071c1ef666d662d544c9881dbe0 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sat, 23 Feb 2013 10:51:14 +0100
Subject: offlineimap: update to 6.5.5-rc2

---
 pkgs/tools/networking/offlineimap/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
index 5a8f6b8caaea..2c2557cdc5c5 100644
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/pkgs/tools/networking/offlineimap/default.nix
@@ -1,13 +1,13 @@
 { fetchurl, buildPythonPackage }:
 
 buildPythonPackage rec {
-  version = "6.5.3";
+  version = "6.5.5-rc2";
   name = "offlineimap-${version}";
 
   src = fetchurl {
-    url = "https://github.com/spaetz/offlineimap/tarball/v${version}";
+    url = "https://github.com/OfflineIMAP/offlineimap/tarball/v${version}";
     name = "${name}.tar.bz";
-    sha256 = "8717a56e6244b47b908b23b598efb3470d74450ecd881b6d3573d8aec4a5db38";
+    sha256 = "03w3irh8pxwvivi139xm5iaj2f8vmriak1ispq9d9f84z1098pd3";
   };
 
   doCheck = false;
-- 
cgit 1.4.1


From 6b30610672a29d9206f60db79ca0a7f281efc881 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sat, 23 Feb 2013 10:55:11 +0100
Subject: offlineimap: updating license and add myself as maintainer

---
 pkgs/tools/networking/offlineimap/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
index 2c2557cdc5c5..6ecba1add761 100644
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/pkgs/tools/networking/offlineimap/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, buildPythonPackage }:
+{ pkgs, fetchurl, buildPythonPackage }:
 
 buildPythonPackage rec {
   version = "6.5.5-rc2";
@@ -15,6 +15,7 @@ buildPythonPackage rec {
   meta = {
     description = "OfflineImap synchronizes emails between two repositories, so that you can read the same mailbox from multiple computers.";
     homepage = "http://offlineimap.org";
-    license = "GPLv2+";
+    license = pkgs.lib.licenses.gpl2Plus;
+    maintainers = [ pkgs.lib.maintainers.garbas ];
   };
 }
-- 
cgit 1.4.1


From e4236f1ade9bf4471d5e5088c7c066ec0bb176d4 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sat, 23 Feb 2013 11:38:30 +0100
Subject: girara: update to 0.1.5, correct license and add myself as maintainer

---
 pkgs/applications/misc/girara/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix
index 73db728b1a63..e112427126ab 100644
--- a/pkgs/applications/misc/girara/default.nix
+++ b/pkgs/applications/misc/girara/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, gtk, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "girara-0.1.4";
+  name = "girara-0.1.5";
 
   src = fetchurl {
     url = "http://pwmt.org/projects/girara/download/${name}.tar.gz";
-    sha256 = "831cf523b131bfa1c182efbf146d68fb642fe62d22ee199caf0cd71408a85739";
+    sha256 = "1hfi3jmx8ydvrqm3h6p6py2csavh7xx0223vxyca51kjl9mfnbld";
   };
 
   buildInputs = [ pkgconfig gtk gettext ];
@@ -19,8 +19,9 @@ stdenv.mkDerivation rec {
       girara is a library that implements a GTK+ based VIM-like user interface
       that focuses on simplicity and minimalism.
     '';
-    license = "free";
+    license = stdenv.lib.licenses.zlib;
     platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
   };
 }
 
-- 
cgit 1.4.1


From 5077600d9abedefdf56cea4ee7c9022e88c9a9cd Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sat, 23 Feb 2013 11:39:32 +0100
Subject: zathura: update to 0.2.2 (also plugins), added correct license and
 myself as maintainer

---
 pkgs/applications/misc/zathura/core/default.nix        | 7 ++++---
 pkgs/applications/misc/zathura/default.nix             | 4 +++-
 pkgs/applications/misc/zathura/djvu/default.nix        | 3 ++-
 pkgs/applications/misc/zathura/pdf-poppler/default.nix | 8 +++++---
 pkgs/applications/misc/zathura/ps/default.nix          | 3 ++-
 5 files changed, 16 insertions(+), 9 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index 6c3ff038c74a..f56becf4512a 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
 
-  version = "0.2.1";
+  version = "0.2.2";
 
   name = "zathura-core-${version}";
 
   src = fetchurl {
     url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz";
-    sha256 = "075b9def201c77ca738dc9e15b252bc23c085b7c4671a1810d1d962e8d0bd790";
+    sha256 = "1ja2j9ygymr259fxf02j1vkvalypac48gpadq8fn3qbclxxj61k5";
   };
 
   buildInputs = [ pkgconfig gtk girara gettext ];
@@ -18,8 +18,9 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://pwmt.org/projects/zathura/;
     description = "A core component for zathura PDF viewer";
-    license = "free";
+    license = stdenv.lib.licenses.zlib;
     platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
 
     # Set lower priority in order to provide user with a wrapper script called
     # 'zathura' instead of real zathura executable. The wrapper will build
diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix
index 5ed445b6984d..b5e0092975c2 100644
--- a/pkgs/applications/misc/zathura/default.nix
+++ b/pkgs/applications/misc/zathura/default.nix
@@ -34,7 +34,9 @@ rec {
         is an application that provides a minimalistic and space saving interface
         as well as an easy usage that mainly focuses on keyboard interaction.
       '';
-      license = "free";
+      license = stdenv.lib.licenses.zlib;
+      platforms = stdenv.lib.platforms.linux;
+      maintainers = [ stdenv.lib.maintainers.garbas ];
     };
   };
 }
diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix
index bddb3471bfe6..9486acfef656 100644
--- a/pkgs/applications/misc/zathura/djvu/default.nix
+++ b/pkgs/applications/misc/zathura/djvu/default.nix
@@ -21,8 +21,9 @@ stdenv.mkDerivation rec {
 	  The zathura-djvu plugin adds DjVu support to zathura by using the
 	  djvulibre library.
     '';
-    license = "free";
+    license = stdenv.lib.licenses.zlib;
     platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
   };
 }
 
diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
index e0fcb0573a48..faf4e49b968b 100644
--- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, pkgconfig, zathura_core, girara, poppler, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "zathura-pdf-poppler-0.2.1";
+  version = "0.2.2";
+  name = "zathura-pdf-poppler-${version}";
 
   src = fetchurl {
     url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
-    sha256 = "1c162ea887e52f48d6dc80f8427a773768f2df2e37242dab7efddeb3d2e361cd";
+    sha256 = "0px59f0bnmb9992n3c9iyzcwd6w7vg8ga069vc8qj4726ljml4c7";
   };
 
   buildInputs = [ pkgconfig poppler gettext zathura_core girara ];
@@ -19,7 +20,8 @@ stdenv.mkDerivation rec {
       The zathura-pdf-poppler plugin adds PDF support to zathura by 
       using the poppler rendering engine.
     '';
-    license = "free";
+    license = stdenv.lib.licenses.zlib;
     platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
   };
 }
diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix
index 7f70eb952e11..7c0dd552a66c 100644
--- a/pkgs/applications/misc/zathura/ps/default.nix
+++ b/pkgs/applications/misc/zathura/ps/default.nix
@@ -21,8 +21,9 @@ stdenv.mkDerivation rec {
       The zathura-ps plugin adds PS support to zathura by using the
       libspectre library.
       '';
-    license = "free";
+    license = stdenv.lib.licenses.zlib;
     platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
   };
 }
 
-- 
cgit 1.4.1


From 0961084afb048bebc2f71f04314772119de86d2f Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@viric.name>
Date: Sat, 23 Feb 2013 15:40:20 +0100
Subject: linux 3.7, 3.8: Enabling CFG80211_WEXT (for ipw2200)

My computer with a ipw2200 nic needs that, to have the
ipw2200 driver.
---
 pkgs/os-specific/linux/kernel/linux-3.7.nix | 1 +
 pkgs/os-specific/linux/kernel/linux-3.8.nix | 1 +
 2 files changed, 2 insertions(+)

(limited to 'pkgs')

diff --git a/pkgs/os-specific/linux/kernel/linux-3.7.nix b/pkgs/os-specific/linux/kernel/linux-3.7.nix
index 9c96c2a8fd26..c1847809c062 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.7.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.7.nix
@@ -78,6 +78,7 @@ let
       ATH9K_AHB y # Ditto, AHB bus
       B43_PHY_HT y
       BCMA_HOST_PCI y
+      CFG08211_WEXT y # Without it, ipw2200 drivers don't build
 
       # Some settings to make sure that fbcondecor works - in particular,
       # disable tileblitting and the drivers that need it.
diff --git a/pkgs/os-specific/linux/kernel/linux-3.8.nix b/pkgs/os-specific/linux/kernel/linux-3.8.nix
index 58e6f28453a1..927b249a9247 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.8.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.8.nix
@@ -78,6 +78,7 @@ let
       ATH9K_AHB y # Ditto, AHB bus
       B43_PHY_HT y
       BCMA_HOST_PCI y
+      CFG08211_WEXT y # Without it, ipw2200 drivers don't build
 
       # Some settings to make sure that fbcondecor works - in particular,
       # disable tileblitting and the drivers that need it.
-- 
cgit 1.4.1


From 611df1d062a2727479e8a13f1a420510417abaac Mon Sep 17 00:00:00 2001
From: Cillian de Róiste <goibhniu@fsfe.org>
Date: Sat, 23 Feb 2013 11:53:34 +0100
Subject: Suil: update to 0.6.10

---
 pkgs/development/libraries/audio/suil/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix
index 0358e1c982c2..45253b65edba 100644
--- a/pkgs/development/libraries/audio/suil/default.nix
+++ b/pkgs/development/libraries/audio/suil/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "suil-${version}";
-  version = "0.6.4";
+  version = "0.6.10";
 
   src = fetchurl {
     url = "http://download.drobilla.net/${name}.tar.bz2";
-    sha256 = "12pz2w74rhhi6gsskfs6l71vw8qfz8906kbjf5w6jyy1x4kkdca2";
+    sha256 = "1y7zgfciphr3icamikdfv2gh8xwix5blpq4npl426399i8f4ya5y";
   };
 
   buildInputs = [ gtk lv2 pkgconfig python qt4 serd sord sratom ];
-- 
cgit 1.4.1


From def9a6c06b5e80751711c46bcd6ba6125f4ff581 Mon Sep 17 00:00:00 2001
From: Cillian de Róiste <goibhniu@fsfe.org>
Date: Sat, 23 Feb 2013 11:52:53 +0100
Subject: Ardour3: update to RC2

---
 pkgs/applications/audio/ardour/ardour3.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/audio/ardour/ardour3.nix b/pkgs/applications/audio/ardour/ardour3.nix
index cfa86af3c379..d2d2ab37d306 100644
--- a/pkgs/applications/audio/ardour/ardour3.nix
+++ b/pkgs/applications/audio/ardour/ardour3.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchsvn, alsaLib, aubio, boost, cairomm, curl, fftw
-, fftwSinglePrec, flac, glib, glibmm, gtk, gtkmm, jackaudio
+, fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jackaudio
 , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
 , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
 , libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango
 , perl, pkgconfig, python, serd, sord, sratom, suil }:
 
 let
-  # Ardour 3 Beta 5
-  rev = "13072";
+  # Ardour 3 RC2
+  rev = "14092";
 in
 
 stdenv.mkDerivation {
@@ -16,12 +16,12 @@ stdenv.mkDerivation {
   src = fetchsvn {
     url = http://subversion.ardour.org/svn/ardour2/branches/3.0;
     inherit rev;
-    sha256 = "17k990kdb5q17z6jcz5b60imvvfbjw9zfxzy9fk0vg8gd6yq7736";
+    sha256 = "1zyy74z3xcsdhrzw4g6y1qm1ai2fl3bgabscl0wn7m1kkscr9nzg";
   };
 
   buildInputs = 
     [ alsaLib aubio boost cairomm curl fftw fftwSinglePrec
-      flac glib glibmm gtk gtkmm jackaudio libgnomecanvas
+      flac glibc glibmm gtk gtkmm jackaudio libgnomecanvas
       libgnomecanvasmm liblo libmad libogg librdf librdf_raptor
       librdf_rasqal libsamplerate libsigcxx libsndfile libusb libuuid
       libxml2 libxslt lilv lv2 pango perl pkgconfig python serd sord
@@ -32,6 +32,7 @@ stdenv.mkDerivation {
     printf '#include "ardour/svn_revision.h"\nnamespace ARDOUR { const char* svn_revision = \"${rev}\"; }\n' > libs/ardour/svn_revision.cc
     sed -e 's|^#!/usr/bin/perl.*$|#!${perl}/bin/perl|g' -i tools/fmt-bindings
     sed -e 's|^#!/usr/bin/env.*$|#!${perl}/bin/perl|g' -i tools/*.pl
+    sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript
   '';
 
   configurePhase = "python waf configure --prefix=$out";
-- 
cgit 1.4.1


From ce9500ea1d4e0cb4e38916306ffc29fc92570ebf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 23 Feb 2013 20:44:13 +0100
Subject: grip: update to version 3.3.1

---
 pkgs/applications/misc/grip/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix
index 1eb9ee1186ff..0c2b957bc7ca 100644
--- a/pkgs/applications/misc/grip/default.nix
+++ b/pkgs/applications/misc/grip/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, gtk, glib, pkgconfig, libgnome, libgnomeui, vte
 , curl, cdparanoia, libid3tag, ncurses, libtool }:
 
-stdenv.mkDerivation {
-  name = "grip-3.2.0";
+stdenv.mkDerivation rec {
+  name = "grip-3.3.1";
 
   src = fetchurl {
-    url = http://prdownloads.sourceforge.net/grip/grip-3.2.0.tar.gz;
-    sha256 = "1jh5x35rq15n8ivlp9wbdx8x9mj6agf5rfdv8sd6gai851zsclas";
+    url = "mirror://sourceforge/grip/${name}.tar.gz";
+    sha256 = "1zb6zpq7qmn6bflbgfwisyg3vrjr23yi1c1kqvwndl1f0shr8qyl";
   };
 
   buildInputs = [ gtk glib pkgconfig libgnome libgnomeui vte curl cdparanoia
@@ -14,9 +14,10 @@ stdenv.mkDerivation {
 
   meta = {
     description = "GTK+-based audio CD player/ripper";
-    homepage = http://nostatic.org/grip;
+    homepage = "http://nostatic.org/grip";
     license = "GPLv2";
-    maintainers = [ stdenv.lib.maintainers.marcweber ];
-    #platforms = args.lib.platforms.linux;
+
+    maintainers = [ stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.simons ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
-- 
cgit 1.4.1


From 626cdf1cb6f5af930ebfe8c545a464507a6d87d4 Mon Sep 17 00:00:00 2001
From: Cillian de Róiste <goibhniu@fsfe.org>
Date: Sun, 24 Feb 2013 02:27:18 +0100
Subject: Ardour3 fix gtk theme engine

---
 pkgs/applications/audio/ardour/ardour3.nix | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/audio/ardour/ardour3.nix b/pkgs/applications/audio/ardour/ardour3.nix
index d2d2ab37d306..8a5a65f8ed09 100644
--- a/pkgs/applications/audio/ardour/ardour3.nix
+++ b/pkgs/applications/audio/ardour/ardour3.nix
@@ -20,12 +20,11 @@ stdenv.mkDerivation {
   };
 
   buildInputs = 
-    [ alsaLib aubio boost cairomm curl fftw fftwSinglePrec
-      flac glibc glibmm gtk gtkmm jackaudio libgnomecanvas
-      libgnomecanvasmm liblo libmad libogg librdf librdf_raptor
-      librdf_rasqal libsamplerate libsigcxx libsndfile libusb libuuid
-      libxml2 libxslt lilv lv2 pango perl pkgconfig python serd sord
-      sratom suil
+    [ alsaLib aubio boost cairomm curl fftw fftwSinglePrec flac glibc
+      glibmm gtk gtkmm jackaudio libgnomecanvas libgnomecanvasmm liblo
+      libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate
+      libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2
+      makeWrapper pango perl pkgconfig python serd sord sratom suil
     ];
 
   patchPhase = ''
@@ -39,13 +38,14 @@ stdenv.mkDerivation {
 
   buildPhase = "python waf";
 
-  installPhase = "python waf install";
-
-  postInstall = ''
-    mkdir -pv $out/gtk-2.0/2.10.0/engines
-    mv lib/ardour3/libclearlooks.so $out/gtk-2.0/2.10.0/engines/
-    wrapProgram $out/bin/ardour3 --prefix GTK_PATH : $out/gtk-2.0
-    '';
+  # For the custom ardour clearlooks gtk-engine to work, it must be
+  # moved to a directory called "engines" and added to GTK_PATH
+  installPhase = ''
+    python waf install
+    mkdir -pv $out/gtk2/engines
+    mv $out/lib/ardour3/libclearlooks.so $out/gtk2/engines/
+    wrapProgram $out/bin/ardour3 --prefix GTK_PATH : $out/gtk2
+  '';
 
   meta = with stdenv.lib; {
     description = "Multi-track hard disk recording software";
-- 
cgit 1.4.1


From 880486b2d3475f953e94d152a1d5f3601c072e44 Mon Sep 17 00:00:00 2001
From: Cillian de Róiste <goibhniu@fsfe.org>
Date: Sun, 24 Feb 2013 02:27:54 +0100
Subject: lilv: upgrade to 0.16.0

---
 pkgs/development/libraries/audio/lilv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix
index a02a6ebabac0..1baa96cd6da8 100644
--- a/pkgs/development/libraries/audio/lilv/default.nix
+++ b/pkgs/development/libraries/audio/lilv/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "lilv-${version}";
-  version = "0.14.2";
+  version = "0.16.0";
 
   src = fetchurl {
     url = "http://download.drobilla.net/${name}.tar.bz2";
-    sha256 = "0g9sg5f8xkkvsad0c6rh4j1k2b2hwsh83yg66f4qznxh43np7zlx";
+    sha256 = "1ddrcikypi7gfmj5cqn975axzrgv7mhzif4h0ni9w5b4v64rvcyg";
   };
 
   buildInputs = [ lv2 pkgconfig python serd sord sratom ];
-- 
cgit 1.4.1


From 472016f9252d40cee3f76e47068dde6cb95a894a Mon Sep 17 00:00:00 2001
From: Cillian de Róiste <goibhniu@fsfe.org>
Date: Sun, 24 Feb 2013 02:28:40 +0100
Subject: lv2: upgrade to 1.4.0

---
 pkgs/development/libraries/audio/lv2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix
index 136a825eef90..ce8ad3f9d52c 100644
--- a/pkgs/development/libraries/audio/lv2/default.nix
+++ b/pkgs/development/libraries/audio/lv2/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "lv2-${version}";
-  version = "1.0.0";
+  version = "1.4.0";
 
   src = fetchurl {
     url = "http://lv2plug.in/spec/${name}.tar.bz2";
-    sha256 = "0lfp7679wwqd49k4mjxwqslpfx5fz2q7akxqayg400zqn70whzl5";
+    sha256 = "035hlfva2mij698nj3z1mz9g4mj4z5jx9axs6ww47jgyjcq38asz";
   };
 
   buildInputs = [ gtk libsndfile pkgconfig python ];
-- 
cgit 1.4.1


From dae693c7a3406b917d5cdfb737b848969c5e6c12 Mon Sep 17 00:00:00 2001
From: Cillian de Róiste <goibhniu@fsfe.org>
Date: Sun, 24 Feb 2013 02:29:09 +0100
Subject: sratom: upgrade to 0.4.2

---
 pkgs/development/libraries/audio/sratom/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix
index b23b58a3f820..daaf780e45da 100644
--- a/pkgs/development/libraries/audio/sratom/default.nix
+++ b/pkgs/development/libraries/audio/sratom/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "sratom-${version}";
-  version = "0.2.0";
+  version = "0.4.2";
 
   src = fetchurl {
     url = "http://download.drobilla.net/${name}.tar.bz2";
-    sha256 = "12wi0ycjnn6mlddcp476wzr6k2bb4ig1489gg8h1k7v0w7d6ry1a";
+    sha256 = "16i5snknl9frz638mgr58lp11ap1xmkbrkb3l6f0ad8ddqpcjm3i";
   };
 
   buildInputs = [ lv2 pkgconfig python serd sord ];
-- 
cgit 1.4.1


From 499f539b468536a372c8d0a3fc72b6784b4331a7 Mon Sep 17 00:00:00 2001
From: Cillian de Róiste <goibhniu@fsfe.org>
Date: Sun, 24 Feb 2013 02:29:34 +0100
Subject: serd: upgrade to 0.18.2

---
 pkgs/development/libraries/serd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix
index 8deb26abc1da..63733a35b204 100644
--- a/pkgs/development/libraries/serd/default.nix
+++ b/pkgs/development/libraries/serd/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "serd-${version}";
-  version = "0.14.0";
+  version = "0.18.2";
 
   src = fetchurl {
     url = "http://download.drobilla.net/${name}.tar.bz2";
-    sha256 = "023gsw0nwn2fh2vp7v2gwsmdwk6658zfl1ihdvr9xbayfcv88wlg";
+    sha256 = "1hgajhm4iar4n2kh71pv6yr0yhipj28kds9y5mbig8izqc188gcf";
   };
 
   buildInputs = [ pcre pkgconfig python ];
-- 
cgit 1.4.1


From 60d2657f60b2e93003d78b90761cb82ae15c9f8f Mon Sep 17 00:00:00 2001
From: Cillian de Róiste <goibhniu@fsfe.org>
Date: Sun, 24 Feb 2013 02:30:02 +0100
Subject: sord: upgrade to 0.12.0

---
 pkgs/development/libraries/sord/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix
index ee9d241424c8..0f2326420cbb 100644
--- a/pkgs/development/libraries/sord/default.nix
+++ b/pkgs/development/libraries/sord/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "sord-${version}";
-  version = "0.8.0";
+  version = "0.12.0";
 
   src = fetchurl {
     url = "http://download.drobilla.net/${name}.tar.bz2";
-    sha256 = "0ncaplfr3wal9h8h3lafw0bhx34w046r7md74djgrysrm2h77pwr";
+    sha256 = "1f0wz7ynnk72hyr4jfi0lgvj90ld2va1kig8fkw30s8b903alsqj";
   };
 
   buildInputs = [ pkgconfig python serd ];
-- 
cgit 1.4.1


From b2ad9627d633f93d58a1d4556db0d34e1dfcc13c Mon Sep 17 00:00:00 2001
From: Cillian de Róiste <goibhniu@fsfe.org>
Date: Sun, 24 Feb 2013 02:30:53 +0100
Subject: oxygen-gtk: upgrade gtk2 version to 1.3.2.1

---
 pkgs/misc/themes/gtk2/oxygen-gtk/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
index 9910768b5470..185532589c6a 100644
--- a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
+++ b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
@@ -2,12 +2,12 @@
   cmake, dbus_glib, glib, gtk, gdk_pixbuf, pkgconfig, xorg }:
 
 stdenv.mkDerivation rec {
-  version = "1.1.1";
-  name = "oxygen-gtk-${version}";
+  version = "1.3.2.1";
+  name = "oxygen-gtk2-${version}";
 
   src = fetchurl {
-    url = "mirror://kde/stable/oxygen-gtk/${version}/src/${name}.tar.bz2";
-    sha256 = "66d571f08ec999f56de412f42a0395c9dc60b73adaaece96c6da6e98353fe379";
+    url = "mirror://kde/stable/oxygen-gtk2/${version}/src/${name}.tar.bz2";
+    sha256 = "19l0dhjswvm7y99pvbd3qnz37k0p5y2slljy8mm4r8awjff3v4qi";
   };
 
   buildInputs = [ cmake dbus_glib glib gtk gdk_pixbuf
-- 
cgit 1.4.1


From 8e148fa50e372db93181008889406b5ecefc1a19 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Feb 2013 10:41:44 +0100
Subject: haskell-gitit: jailbreak to fix build with recent blazehtml

---
 pkgs/development/libraries/haskell/gitit/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix
index db1b3c6c4671..b38774cd02bb 100644
--- a/pkgs/development/libraries/haskell/gitit/default.nix
+++ b/pkgs/development/libraries/haskell/gitit/default.nix
@@ -18,6 +18,7 @@ cabal.mkDerivation (self: {
     safe SHA syb tagsoup text time url utf8String xhtml xml xssSanitize
     zlib
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://gitit.net";
     description = "Wiki using happstack, git or darcs, and pandoc";
-- 
cgit 1.4.1


From c2fc8c6da33ecad97479d3055bbd6e0ecfd96295 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Feb 2013 10:42:08 +0100
Subject: cabal-dev: update to Git version to fix build with ghc 7.6.2

---
 pkgs/development/tools/haskell/cabal-dev/default.nix | 14 +++++++++-----
 pkgs/top-level/haskell-packages.nix                  |  6 +-----
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/tools/haskell/cabal-dev/default.nix b/pkgs/development/tools/haskell/cabal-dev/default.nix
index 79385bd88a96..df7f728c752d 100644
--- a/pkgs/development/tools/haskell/cabal-dev/default.nix
+++ b/pkgs/development/tools/haskell/cabal-dev/default.nix
@@ -1,15 +1,19 @@
-{ cabal, Cabal, cabalInstall, filepath, HTTP, mtl, network, tar
-, transformers, zlib
+{ cabal, fetchurl, Cabal, cabalInstall, filepath, HTTP, mtl, network, tar
+, transformers, zlib, setenv
 }:
 
 cabal.mkDerivation (self: {
   pname = "cabal-dev";
-  version = "0.9.1";
-  sha256 = "1brz0nw959jdyjrhjqy9sixsb316hjmw4pxxsybfl8vixsivdfh6";
+  version = "0.9.1-git";
+  src = fetchurl {
+    url = "https://github.com/creswick/cabal-dev/archive/54e7d93d5b309c56192c146c7a807ac3591bc464.tar.gz";
+    sha256 = "1isi02jik0vrg48l7r2mj4cf9ms6hpxxz1mmhl7s3kkxx775cxj9";
+    name = "${self.name}.tar.gz";
+  };
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-    Cabal filepath HTTP mtl network tar transformers zlib
+    Cabal filepath HTTP mtl network tar transformers zlib setenv
   ];
   buildTools = [ cabalInstall ];
   meta = {
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index ff8fd6a24c77..51b08f8c30c2 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2029,11 +2029,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   cabal2nix = callPackage ../development/tools/haskell/cabal2nix {};
 
-  cabalDev = callPackage ../development/tools/haskell/cabal-dev {
-    mtl          = self.mtl_2_0_1_0.override { transformers = self.transformers_0_2_2_0; };
-    transformers = self.transformers_0_2_2_0;
-    tar          = self.tar_0_3_2_0;
-  };
+  cabalDev = callPackage ../development/tools/haskell/cabal-dev {};
 
   cabalGhci = callPackage ../development/tools/haskell/cabal-ghci {};
 
-- 
cgit 1.4.1


From d4b8008a44fdaa0f78082632541c4052a827be55 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Feb 2013 10:44:17 +0100
Subject: haskell-tar: dropped obsolete version 0.3.2.0

---
 pkgs/development/libraries/haskell/tar/default.nix | 14 ++++++++++++++
 pkgs/development/tools/haskell/tar/0.3.2.0.nix     | 14 --------------
 pkgs/development/tools/haskell/tar/0.4.0.1.nix     | 14 --------------
 pkgs/top-level/haskell-packages.nix                |  4 +---
 4 files changed, 15 insertions(+), 31 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/tar/default.nix
 delete mode 100644 pkgs/development/tools/haskell/tar/0.3.2.0.nix
 delete mode 100644 pkgs/development/tools/haskell/tar/0.4.0.1.nix

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/haskell/tar/default.nix b/pkgs/development/libraries/haskell/tar/default.nix
new file mode 100644
index 000000000000..04257960a64c
--- /dev/null
+++ b/pkgs/development/libraries/haskell/tar/default.nix
@@ -0,0 +1,14 @@
+{ cabal, filepath, time }:
+
+cabal.mkDerivation (self: {
+  pname = "tar";
+  version = "0.4.0.1";
+  sha256 = "0vbsv7h3zgp30mlgsw156jkv1rqy5zbm98as9haf7x15hd6jf254";
+  buildDepends = [ filepath time ];
+  meta = {
+    description = "Reading, writing and manipulating \".tar\" archive files.";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/development/tools/haskell/tar/0.3.2.0.nix b/pkgs/development/tools/haskell/tar/0.3.2.0.nix
deleted file mode 100644
index 15bb647b5427..000000000000
--- a/pkgs/development/tools/haskell/tar/0.3.2.0.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ cabal, filepath }:
-
-cabal.mkDerivation (self: {
-  pname = "tar";
-  version = "0.3.2.0";
-  sha256 = "0yplrfai8bwihyn18whi0jiz1qzll9hgbc37xcy2jkr28480jba9";
-  buildDepends = [ filepath ];
-  meta = {
-    description = "Reading, writing and manipulating \".tar\" archive files.";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/tools/haskell/tar/0.4.0.1.nix b/pkgs/development/tools/haskell/tar/0.4.0.1.nix
deleted file mode 100644
index 04257960a64c..000000000000
--- a/pkgs/development/tools/haskell/tar/0.4.0.1.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ cabal, filepath, time }:
-
-cabal.mkDerivation (self: {
-  pname = "tar";
-  version = "0.4.0.1";
-  sha256 = "0vbsv7h3zgp30mlgsw156jkv1rqy5zbm98as9haf7x15hd6jf254";
-  buildDepends = [ filepath time ];
-  meta = {
-    description = "Reading, writing and manipulating \".tar\" archive files.";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 51b08f8c30c2..ae0717cdd527 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1999,9 +1999,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     haskellSrcExts = self.haskellSrcExts_1_11_1;
   };
 
-  tar_0_3_2_0 = callPackage ../development/tools/haskell/tar/0.3.2.0.nix {};
-  tar_0_4_0_1 = callPackage ../development/tools/haskell/tar/0.4.0.1.nix {};
-  tar = self.tar_0_4_0_1;
+  tar = callPackage ../development/tools/haskell/tar {};
 
   threadscope = callPackage ../development/tools/haskell/threadscope {};
 
-- 
cgit 1.4.1


From b6e9efb0b60c30d3b18f562ec03fb67fd9ca4ac9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Feb 2013 10:57:38 +0100
Subject: haskell-packages.nix: fix path to haskell 'tar' library

---
 pkgs/top-level/haskell-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index ae0717cdd527..20790e6f7d3a 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1999,7 +1999,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     haskellSrcExts = self.haskellSrcExts_1_11_1;
   };
 
-  tar = callPackage ../development/tools/haskell/tar {};
+  tar = callPackage ../development/libraries/haskell/tar {};
 
   threadscope = callPackage ../development/tools/haskell/threadscope {};
 
-- 
cgit 1.4.1


From 9fc277e0b66a9719914f29a917148d21388fa0b6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Feb 2013 11:00:52 +0100
Subject: haskell-cabal2ghci: add version 0.0.1.0

---
 .../development/tools/haskell/cabal2ghci/default.nix | 20 ++++++++++++++++++++
 pkgs/top-level/haskell-packages.nix                  |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/tools/haskell/cabal2ghci/default.nix

(limited to 'pkgs')

diff --git a/pkgs/development/tools/haskell/cabal2ghci/default.nix b/pkgs/development/tools/haskell/cabal2ghci/default.nix
new file mode 100644
index 000000000000..881328d875b6
--- /dev/null
+++ b/pkgs/development/tools/haskell/cabal2ghci/default.nix
@@ -0,0 +1,20 @@
+{ cabal, Cabal, cmdargs, stylishHaskell, systemFileio
+, systemFilepath, text, unorderedContainers, yaml
+}:
+
+cabal.mkDerivation (self: {
+  pname = "cabal2ghci";
+  version = "0.0.1.0";
+  sha256 = "0l5225gwm6j25694cp94d4z31i1p68pq6js3psbr7m204q409dr5";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    Cabal cmdargs stylishHaskell systemFileio systemFilepath text
+    unorderedContainers yaml
+  ];
+  meta = {
+    description = "A tool to generate .ghci file from .cabal";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 20790e6f7d3a..4f3cd1b5363b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2029,6 +2029,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   cabalDev = callPackage ../development/tools/haskell/cabal-dev {};
 
+  cabal2Ghci = callPackage ../development/tools/haskell/cabal2ghci {};
+
   cabalGhci = callPackage ../development/tools/haskell/cabal-ghci {};
 
   cabalInstall_0_6_2  = callPackage ../tools/package-management/cabal-install/0.6.2.nix  {};
-- 
cgit 1.4.1


From d062be36e6e1a692dd6dc91ba52125b6d1641129 Mon Sep 17 00:00:00 2001
From: Cillian de Róiste <goibhniu@fsfe.org>
Date: Sun, 24 Feb 2013 11:03:51 +0100
Subject: Calf: upgrade to the final release 0.0.19

---
 pkgs/applications/audio/calf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix
index bc7b3c57e60b..6ed4b7cce98b 100644
--- a/pkgs/applications/audio/calf/default.nix
+++ b/pkgs/applications/audio/calf/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "calf-${version}";
-  version = "0.0.19-rc7";
+  version = "0.0.19";
 
   src = fetchurl {
     url = "mirror://sourceforge/calf/${name}.tar.gz";
-    sha256 = "0515pzc7ishrq0j5hza83s0yp3x34r977h776lpky389whcyf45j";
+    sha256 = "1v1cjbxv5wg6rsa2nfz1f8r7cykcpx6jm5ccqmzx866dggiff1hi";
   };
 
   buildInputs = [ 
-- 
cgit 1.4.1


From 51c54301a6373cd28fa7bb0a683e0f50101cf0f0 Mon Sep 17 00:00:00 2001
From: Cillian de Róiste <goibhniu@fsfe.org>
Date: Sun, 24 Feb 2013 11:26:32 +0100
Subject: Add mda-lv2 audio plugins

---
 pkgs/applications/audio/mda-lv2/default.nix | 27 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/applications/audio/mda-lv2/default.nix

(limited to 'pkgs')

diff --git a/pkgs/applications/audio/mda-lv2/default.nix b/pkgs/applications/audio/mda-lv2/default.nix
new file mode 100644
index 000000000000..8b7d5527372b
--- /dev/null
+++ b/pkgs/applications/audio/mda-lv2/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, fftwSinglePrec, lv2, pkgconfig, python }:
+
+stdenv.mkDerivation rec {
+  name = "mda-lv2-${version}";
+  version = "1.0.0";
+
+  src = fetchurl {
+    url = "http://download.drobilla.net/${name}.tar.bz2";
+    sha256 = "1dbgvpz9qvlwsfkq9c0dx45bm223wwrzgiddlyln1agpns3qbf0f";
+  };
+
+  buildInputs = [ fftwSinglePrec lv2 pkgconfig python ];
+
+  configurePhase = "python waf configure --prefix=$out";
+
+  buildPhase = "python waf";
+
+  installPhase = "python waf install";
+
+  meta = with stdenv.lib; {
+    homepage = http://drobilla.net/software/mda-lv2/;
+    description = "An LV2 port of the MDA plugins by Paul Kellett";
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8707db525207..52003c176185 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7449,6 +7449,8 @@ let
 
   matchbox = callPackage ../applications/window-managers/matchbox { };
 
+  mda_lv2 = callPackage ../applications/audio/mda-lv2 { };
+
   meld = callPackage ../applications/version-management/meld {
     inherit (gnome) scrollkeeper;
     pygtk = pyGtkGlade;
-- 
cgit 1.4.1


From 17d289498fc25dfdb824eeda5ed404a5f82e1aef Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@viric.name>
Date: Sun, 24 Feb 2013 12:06:50 +0100
Subject: linux: Typo: CFG80211_WEXT

---
 pkgs/os-specific/linux/kernel/linux-3.7.nix | 2 +-
 pkgs/os-specific/linux/kernel/linux-3.8.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/os-specific/linux/kernel/linux-3.7.nix b/pkgs/os-specific/linux/kernel/linux-3.7.nix
index c1847809c062..df6387b1f812 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.7.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.7.nix
@@ -78,7 +78,7 @@ let
       ATH9K_AHB y # Ditto, AHB bus
       B43_PHY_HT y
       BCMA_HOST_PCI y
-      CFG08211_WEXT y # Without it, ipw2200 drivers don't build
+      CFG80211_WEXT y # Without it, ipw2200 drivers don't build
 
       # Some settings to make sure that fbcondecor works - in particular,
       # disable tileblitting and the drivers that need it.
diff --git a/pkgs/os-specific/linux/kernel/linux-3.8.nix b/pkgs/os-specific/linux/kernel/linux-3.8.nix
index 927b249a9247..1c59a2ff4862 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.8.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.8.nix
@@ -78,7 +78,7 @@ let
       ATH9K_AHB y # Ditto, AHB bus
       B43_PHY_HT y
       BCMA_HOST_PCI y
-      CFG08211_WEXT y # Without it, ipw2200 drivers don't build
+      CFG80211_WEXT y # Without it, ipw2200 drivers don't build
 
       # Some settings to make sure that fbcondecor works - in particular,
       # disable tileblitting and the drivers that need it.
-- 
cgit 1.4.1


From 7d5056f8a3cf76b20d9b24e6644f2fc7fdf4a0f8 Mon Sep 17 00:00:00 2001
From: Александр Цамутали <astsmtl@yandex.ru>
Date: Sun, 24 Feb 2013 18:02:53 +0400
Subject: games/unvanquished: New nixpkg.

---
 pkgs/games/unvanquished/default.nix | 68 +++++++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 70 insertions(+)
 create mode 100644 pkgs/games/unvanquished/default.nix

(limited to 'pkgs')

diff --git a/pkgs/games/unvanquished/default.nix b/pkgs/games/unvanquished/default.nix
new file mode 100644
index 000000000000..03069f9fe14e
--- /dev/null
+++ b/pkgs/games/unvanquished/default.nix
@@ -0,0 +1,68 @@
+{ stdenv, fetchurl, cmake, mesa, SDL, libjpeg, libpng, glew, libwebp, ncurses
+, gmp, curl, nettle, openal, speex, libogg, libvorbis, libtheora, xvidcore
+, makeWrapper }:
+stdenv.mkDerivation rec {
+  name = "unvanquished-${version}";
+  version = "0.12.0";
+  src = fetchurl {
+    url = "https://github.com/Unvanquished/Unvanquished/archive/v${version}.tar.gz";
+    sha256 = "0spwin0vms1zzkbgzkm423k804nqr5d54xppjbwhdnrd5fdv0gyl";
+  };
+  buildInputs = [ cmake mesa SDL libjpeg libpng glew libwebp ncurses gmp curl
+                  nettle openal speex libogg libvorbis libtheora xvidcore 
+                  makeWrapper ];
+  preConfigure = ''prefix="$prefix/opt"'';
+  postInstall = ''
+    # cp -r ../main "$prefix/Unvanquished/"
+    mkdir -p "$out/bin"
+    substituteInPlace download-pk3.sh --replace /bin/bash ${stdenv.shell}
+    cp -v download-pk3.sh "$out/bin/unvanquished-download-pk3"
+    makeWrapper "$prefix/Unvanquished/daemon" "$out/bin/unvanquished" \
+                --run '[ -f ~/.Unvanquished/main/md5sums ] &&
+                       cd ~/.Unvanquished/main/ &&
+                       md5sum --quiet -c md5sums ||
+                       unvanquished-download-pk3' \
+                --run "cd '$prefix/Unvanquished'"
+    makeWrapper "$prefix/Unvanquished/daemonded" "$out/bin/unvanquished-ded" \
+                --run '[ -f ~/.Unvanquished/main/md5sums ] &&
+                       cd ~/.Unvanquished/main/ &&
+                       md5sum --quiet -c md5sums ||
+                       unvanquished-download-pk3' \
+                --run "cd '$prefix/Unvanquished'"
+  '';
+
+  meta = {
+    description = "A FLOSS FPS combining RTS elements with a futuristic, sci-fi setting.";
+    longDescription = ''
+      Unvanquished is a free, open-source first-person shooter
+      combining real-time strategy elements with a futuristic, sci-fi
+      setting. It is available for Windows, Linux, and Mac OS X.
+
+      Features:
+
+      * Two teams
+        Play as either the technologically advanced humans or the highly
+        adaptable aliens, with a fresh gameplay experience on both
+        sides.
+
+      * Build a base
+        Construct and maintain your base with a variety of useful
+        structures, or group up with teammates to take on the other
+        team.
+
+      * Level up
+        Earn rewards for victories against the other team, whether it's
+        a deadly new weapon or access to a whole new alien form.
+
+      * Customize
+        Compatibility with Quake 3 file formats and modification tools
+        allows for extensive customization of the game and its
+        setting.
+    '';
+    homepage = http://unvanquished.net;
+    #license = "unknown";
+    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
+    # This package can take a lot of disk space, so unavailable from channel
+    #platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 52003c176185..308d5cdca9b2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8398,6 +8398,8 @@ let
     lua = lua5;
   };
 
+  unvanquished = callPackage ../games/unvanquished { };
+
   uqm = callPackage ../games/uqm { };
 
   urbanterror = callPackage ../games/urbanterror { };
-- 
cgit 1.4.1