Merge branch 'origin/master' into stdenv-updates.

Conflicts:
	pkgs/tools/misc/less/default.nix

lib/lists.nix

@@ -225,4 +225,5 @@ in rec {
 
   deepSeqList = xs: y: if any (x: deepSeq x false) xs then y else y;
 
+  crossLists = f: foldl (fs: args: concatMap (f: map f args) fs) [f];
 }

nixos/doc/manual/development.xml

@@ -494,7 +494,7 @@ module writers.</para>
 <variablelist>
 
   <varlistentry>
-    <term><option>etc.environment</option></term>
+    <term><option>environment.etc</option></term>
     <listitem>
       <para>This set defines files in <filename>/etc</filename>.  A
       typical use is:

nixos/modules/misc/ids.nix

@@ -108,6 +108,7 @@
       haproxy = 97;
       mongodb = 98;
       openldap = 99;
+      memcached = 100;
 
       # When adding a uid, make sure it doesn't match an existing gid.
 

nixos/modules/module-list.nix

@@ -170,6 +170,7 @@
   ./services/networking/minidlna.nix
   ./services/networking/nat.nix
   ./services/networking/networkmanager.nix
+  ./services/networking/ntopng.nix
   ./services/networking/ntpd.nix
   ./services/networking/oidentd.nix
   ./services/networking/openfire.nix

nixos/modules/services/databases/memcached.nix

@@ -68,8 +68,9 @@ in
 
   config = mkIf config.services.memcached.enable {
 
-    users.extraUsers = singleton
+    users.extraUsers.memcached =
       { name = cfg.user;
+        uid = config.ids.uids.memcached;
         description = "Memcached server user";
       };
 

nixos/modules/services/networking/ddclient.nix

@@ -86,7 +86,7 @@ in
       };
 
       web = mkOption {
-        default = "web, web=checkip.dyndns.com/, web-skip='IP Address'" ;
+        default = "web, web=checkip.dyndns.com/, web-skip='Current IP Address: '" ;
         description = "";
       };
 

nixos/modules/services/networking/ntopng.nix

@@ -0,0 +1,116 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.ntopng;
+  redisCfg = config.services.redis;
+
+  configFile = if cfg.configText != "" then
+    pkgs.writeText "ntopng.conf" ''
+      ${cfg.configText}
+    ''
+    else
+    pkgs.writeText "ntopng.conf" ''
+      ${concatStringsSep " " (map (e: "--interface=" + e) cfg.interfaces)}
+      --http-port=${toString cfg.http-port}
+      --redis=localhost:${toString redisCfg.port}
+      ${cfg.extraConfig}
+    '';
+
+in
+
+{
+
+  options = {
+
+    services.ntopng = {
+
+      enable = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Enable ntopng, a high-speed web-based traffic analysis and flow
+          collection tool.
+
+          With the default configuration, ntopng monitors all network
+          interfaces and displays its findings at http://localhost:${toString
+          cfg.http-port}. Default username and password is admin/admin.
+
+          See the ntopng(8) manual page and http://www.ntop.org/products/ntop/
+          for more info.
+
+          Note that enabling ntopng will also enable redis (key-value
+          database server) for persistent data storage.
+        '';
+      };
+
+      interfaces = mkOption {
+        default = [ "any" ];
+        example = [ "eth0" "wlan0" ];
+        type = types.listOf types.str;
+        description = ''
+          List of interfaces to monitor. Use "any" to monitor all interfaces.
+        '';
+      };
+
+      http-port = mkOption {
+        default = 3000;
+        type = types.uniq types.int;
+        description = ''
+          Sets the HTTP port of the embedded web server.
+        '';
+      };
+
+      configText = mkOption {
+        default = "";
+        example = ''
+          --interface=any
+          --http-port=3000
+          --disable-login
+        '';
+        type = types.lines;
+        description = ''
+          Overridable configuration file contents to use for ntopng. By
+          default, use the contents automatically generated by NixOS.
+        '';
+      };
+
+      extraConfig = mkOption {
+        default = "";
+        type = types.lines;
+        description = ''
+          Configuration lines that will be appended to the generated ntopng
+          configuration file. Note that this mechanism does not work when the
+          manual <option>configText</option> option is used.
+        '';
+      };
+
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+
+    # ntopng uses redis for data storage
+    services.redis.enable = true;
+
+    # nice to have manual page and ntopng command in PATH
+    environment.systemPackages = [ pkgs.ntopng ];
+
+    systemd.services.ntopng = {
+      description = "Ntopng Network Monitor";
+      requires = [ "redis.service" ];
+      after = [ "network.target" "redis.service" ];
+      wantedBy = [ "multi-user.target" ];
+      preStart = "mkdir -p /var/lib/ntopng/";
+      serviceConfig.ExecStart = "${pkgs.ntopng}/bin/ntopng ${configFile}";
+      unitConfig.Documentation = "man:ntopng(8)";
+    };
+
+    # ntopng drops priveleges to user "nobody" and that user is already defined
+    # in users-groups.nix.
+  };
+
+}

nixos/modules/services/security/fail2ban.nix

@@ -106,7 +106,7 @@ in
         serviceConfig =
           { ExecStart = "${pkgs.fail2ban}/bin/fail2ban-server -f";
             ReadOnlyDirectories = "/";
-            ReadWriteDirectories = "/run/fail2ban /var/tmp";
+            ReadWriteDirectories = "/run /var/tmp";
             CapabilityBoundingSet = "CAP_DAC_READ_SEARCH CAP_NET_ADMIN CAP_NET_RAW";
           };
 

nixos/modules/services/x11/window-managers/default.nix

@@ -17,6 +17,7 @@ in
       ./xmonad.nix
       ./i3.nix
       ./xbmc.nix
+      ./herbstluftwm.nix
     ];
 
   options = {

nixos/modules/services/x11/window-managers/herbstluftwm.nix

@@ -0,0 +1,28 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+  cfg = config.services.xserver.windowManager.herbstluftwm;
+in
+
+{
+  options = {
+    services.xserver.windowManager.herbstluftwm.enable = mkOption {
+      type = types.bool;
+      default = false;
+      example = true;
+      description = "Enable the herbstluftwm window manager.";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.xserver.windowManager.session = singleton {
+      name = "herbstluftwm";
+      start = "
+        ${pkgs.herbstluftwm}/bin/herbstluftwm
+      ";
+    };
+    environment.systemPackages = [ pkgs.herbstluftwm ];
+  };
+}

nixos/modules/virtualisation/google-compute-config.nix

@@ -0,0 +1,5 @@
+{ config, pkgs, modulesPath, ... }:
+
+{
+  imports = [ "${modulesPath}/virtualisation/google-compute-image.nix" ];
+}

nixos/modules/virtualisation/google-compute-image.nix

@@ -0,0 +1,155 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+  imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ];
+
+  system.build.googleComputeImage =
+    pkgs.vmTools.runInLinuxVM (
+      pkgs.runCommand "google-compute-image"
+        { preVM =
+            ''
+              mkdir $out
+              diskImage=$out/$diskImageBase
+              truncate $diskImage --size 10G
+              mv closure xchg/
+            '';
+
+          postVM =
+            ''
+              PATH=$PATH:${pkgs.gnutar}/bin:${pkgs.gzip}/bin
+              pushd $out
+              tar -Szcf $diskImageBase.tar.gz $diskImageBase
+              rm $out/$diskImageBase
+              popd
+            '';
+          diskImageBase = "nixos-${config.system.nixosVersion}-${pkgs.stdenv.system}.raw";
+          buildInputs = [ pkgs.utillinux pkgs.perl ];
+          exportReferencesGraph =
+            [ "closure" config.system.build.toplevel ];
+        }
+        ''
+          # Create partition table
+          ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos
+          ${pkgs.parted}/sbin/parted /dev/vda mkpart primary ext4 1 10G
+          ${pkgs.parted}/sbin/parted /dev/vda print
+          . /sys/class/block/vda1/uevent
+          mknod /dev/vda1 b $MAJOR $MINOR
+
+          # Create an empty filesystem and mount it.
+          ${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L nixos /dev/vda1
+          ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1
+
+          mkdir /mnt
+          mount /dev/vda1 /mnt
+
+          # The initrd expects these directories to exist.
+          mkdir /mnt/dev /mnt/proc /mnt/sys
+
+          mount --bind /proc /mnt/proc
+          mount --bind /dev /mnt/dev
+          mount --bind /sys /mnt/sys
+
+          # Copy all paths in the closure to the filesystem.
+          storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure)
+
+          mkdir -p /mnt/nix/store
+          echo "copying everything (will take a while)..."
+          cp -prd $storePaths /mnt/nix/store/
+
+          # Register the paths in the Nix database.
+          printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
+              chroot /mnt ${config.nix.package}/bin/nix-store --load-db
+
+          # Create the system profile to allow nixos-rebuild to work.
+          chroot /mnt ${config.nix.package}/bin/nix-env \
+              -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel}
+
+          # `nixos-rebuild' requires an /etc/NIXOS.
+          mkdir -p /mnt/etc
+          touch /mnt/etc/NIXOS
+
+          # `switch-to-configuration' requires a /bin/sh
+          mkdir -p /mnt/bin
+          ln -s ${config.system.build.binsh}/bin/sh /mnt/bin/sh
+
+          # Install a configuration.nix.
+          mkdir -p /mnt/etc/nixos /mnt/boot/grub
+          cp ${./google-compute-config.nix} /mnt/etc/nixos/configuration.nix
+
+          # Generate the GRUB menu.
+          ln -s vda /dev/sda
+          chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot
+
+          umount /mnt/proc /mnt/dev /mnt/sys
+          umount /mnt
+        ''
+    );
+
+  fileSystems."/".label = "nixos";
+
+  boot.kernelParams = [ "console=ttyS0" "panic=1" "boot.panic_on_fail" ];
+  boot.initrd.kernelModules = [ "virtio_scsi" ];
+
+  # Generate a GRUB menu.  Amazon's pv-grub uses this to boot our kernel/initrd.
+  boot.loader.grub.device = "/dev/sda";
+  boot.loader.grub.timeout = 0;
+
+  # Don't put old configurations in the GRUB menu.  The user has no
+  # way to select them anyway.
+  boot.loader.grub.configurationLimit = 0;
+
+  # Allow root logins only using the SSH key that the user specified
+  # at instance creation time.
+  services.openssh.enable = true;
+  services.openssh.permitRootLogin = "without-password";
+
+  # Force getting the hostname from Google Compute.
+  networking.hostName = mkDefault "";
+
+  # Always include cryptsetup so that NixOps can use it.
+  environment.systemPackages = [ pkgs.cryptsetup ];
+
+  # Prevent logging in as root without a password.  This doesn't really matter,
+  # since the only PAM services that allow logging in with a null
+  # password are local ones that are inaccessible on Google Compute machines.
+  security.initialRootPassword = "!";
+
+  # Configure default metadata hostnames
+  networking.extraHosts = ''
+    169.254.169.254 metadata.google.internal metadata
+  '';
+
+  systemd.services.fetch-root-authorized-keys =
+    { description = "Fetch authorized_keys for root user";
+
+      wantedBy = [ "multi-user.target" ];
+      before = [ "sshd.service" ];
+      after = [ "network.target" ];
+
+      path  = [ pkgs.curl ];
+      script =
+        ''
+          # Don't download the SSH key if it has already been downloaded
+          if ! [ -e /root/.ssh/authorized_keys ]; then
+                echo "obtaining SSH key..."
+                mkdir -p /root/.ssh
+                curl -o /root/authorized-keys-metadata http://metadata/0.1/meta-data/authorized-keys
+                if [ $? -eq 0 -a -e /root/authorized-keys-metadata ]; then
+                    cat /root/authorized-keys-metadata | cut -d: -f2- > /root/key.pub
+                    if ! grep -q -f /root/key.pub /root/.ssh/authorized_keys; then
+                        cat /root/key.pub >> /root/.ssh/authorized_keys
+                        echo "new key added to authorized_keys"
+                    fi
+                    chmod 600 /root/.ssh/authorized_keys
+                    rm -f /root/key.pub /root/authorized-keys-metadata
+                fi
+          fi
+        '';
+      serviceConfig.Type = "oneshot";
+      serviceConfig.RemainAfterExit = true;
+     };
+
+
+}

pkgs/applications/audio/a2jmidid/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "a2jmidid-${version}";
-  version = "7";
+  version = "8";
 
   src = fetchurl {
     url = "http://download.gna.org/a2jmidid/${name}.tar.bz2";
-    sha256 = "1pl91y7npirhmikzlizpbyx2vkfvdkvc6qvc2lv4capj3cp6ypx7";
+    sha256 = "0pzm0qk5ilqhwz74pydg1jwrds27vm47185dakdrxidb5bv3b5ia";
   };
 
   buildInputs = [ alsaLib dbus jackaudio pkgconfig python ];

pkgs/applications/audio/bristol/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation  rec {
   name = "bristol-${version}";
-  version = "0.60.10";
+  version = "0.60.11";
 
   src = fetchurl {
     url = "mirror://sourceforge/bristol/${name}.tar.gz";
-    sha256 = "070rn5zdx6vrqmq7w1rrpxig3bxlylbsw82nlmkjnhjrgm6yx753";
+    sha256 = "1fi2m4gmvxdi260821y09lxsimq82yv4k5bbgk3kyc3x1nyhn7vx";
   };
 
   buildInputs = [

pkgs/applications/audio/lingot/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk, alsaLib, libglade }:
 
 stdenv.mkDerivation {
-  name = "lingot-0.9.0";
+  name = "lingot-0.9.1";
 
   src = fetchurl {
-    url = mirror://savannah/lingot/lingot-0.9.0.tar.gz;
+    url = mirror://savannah/lingot/lingot-0.9.1.tar.gz;
-    sha256 = "07z129lp8m4sz608q409wb11c639w7cbn497r7bscgg08p6c07xb";
+    sha256 = "0ygras6ndw2fylwxx86ac11pcr2y2bcfvvgiwrh92z6zncx254gc";
   };
 
   buildInputs = [ pkgconfig intltool gtk alsaLib libglade ];

pkgs/applications/audio/moc/default.nix

@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg, libvorbis, mpc, libsndfile, jackaudio, db4, libav, libmodplug, timidity, libid3tag, libtool }:
+
+stdenv.mkDerivation rec {
+  name = "moc-${version}";
+  version = "2.5.0-beta1";
+
+  src = fetchurl {
+    url = "http://ftp.daper.net/pub/soft/moc/unstable/moc-${version}.tar.bz2";
+    sha256 = "076816da9c6d1e61a386a1dda5f63ee2fc84bc31e9011ef70acc1d391d4c46a6";
+  };
+
+  configurePhase = "./configure prefix=$out";
+
+  buildInputs = [ ncurses pkgconfig alsaLib flac libmad speex ffmpeg libvorbis mpc libsndfile jackaudio db4 libav libmodplug timidity libid3tag libtool ];
+
+  meta = {
+    description = "MOC (music on console) is a console audio player for LINUX/UNIX designed to be powerful and easy to use.";
+    homepage = http://moc.daper.net/;
+    license = stdenv.lib.licenses.gpl2;
+  };
+}

pkgs/applications/audio/mpg123/default.nix

@@ -1,11 +1,11 @@
 {stdenv, fetchurl, alsaLib }:
 
 stdenv.mkDerivation {
-  name = "mpg123-1.15.4";
+  name = "mpg123-1.16.0";
 
   src = fetchurl {
-    url = mirror://sourceforge/mpg123/mpg123-1.15.4.tar.bz2;
+    url = mirror://sourceforge/mpg123/mpg123-1.16.0.tar.bz2;
-    sha256 = "05aizspky9mp1bq2lfrkjzrsnjykl7gkbrhn93xcarj5b2izv1b8";
+    sha256 = "1lznnfdvg69a9qbbhvhfc9i86hxdmdqx67lvbkqbh8mmhpip43zh";
   };
 
   buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib;

pkgs/applications/editors/flpsed/default.nix

@@ -1,11 +1,11 @@
 {stdenv, fetchurl, fltk13, ghostscript}:
 
 stdenv.mkDerivation {
-  name = "flpsed-0.7.0";
+  name = "flpsed-0.7.1";
 
   src = fetchurl {
-    url = "http://www.ecademix.com/JohannesHofmann/flpsed-0.7.0.tar.gz";
+    url = "http://www.ecademix.com/JohannesHofmann/flpsed-0.7.1.tar.gz";
-    sha1 = "7966fd3b6fb3aa2a376386533ed4421ebb66ad62";
+    sha256 = "16i3mjc1cdx2wiwfhnv3z2ywmjma9785vwl3l31izx9l51w7ngj3";
   };
 
   buildInputs = [ fltk13 ghostscript ];

pkgs/applications/editors/geany/default.nix

@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gtk2, which, pkgconfig, intltool }:
 
 let
-  version = "1.23";
+  version = "1.23.1";
 in
 
 stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.geany.org/${name}.tar.bz2";
-    sha256 = "1c78rggjaz9fa8gj25wka1sa3argvixnzrarmqvwh0s8d5ragm6d";
+    sha256 = "1bcgjxywggsljs9kq22kr9xpzrq5xr7pb9d1b71rwryqb5pb25c8";
   };
 
   buildInputs = [ gtk2 which pkgconfig intltool ];

pkgs/applications/editors/hexedit/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "hexedit-${version}";
-  version = "1.2.12";
+  version = "1.2.13";
 
   src = fetchurl {
     url = "http://rigaux.org/${name}.src.tgz";
-    sha256 = "bcffbf3d128516cc4e1da64485866fbb5f62754f2af8327e7a527855186ba10f";
+    sha256 = "1mwdp1ikk64cqmagnrrps5jkn3li3n47maiqh2qc1xbp1ains4ka";
   };
 
   buildInputs = [ ncurses ];

pkgs/applications/editors/nano/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation (rec {
   pname = "nano";
-  version = "2.2.6";
+  version = "2.3.2";
 
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnu/nano/${name}.tar.gz";
-    sha256 = "0yp6pid67k8h7394spzw0067fl2r7rxm2b6kfccg87g8nlry2s5y";
+    sha256 = "1s3b21h5p7r8xafw0gahswj16ai6k2vnjhmd15b491hl0x494c7z";
   };
 
   buildInputs = [ ncurses gettext ];

pkgs/applications/graphics/autopanosiftc/default.nix

@@ -1,11 +1,11 @@
 {stdenv, fetchurl, cmake, libpng, libtiff, libjpeg, panotools, libxml2 }:
 
 stdenv.mkDerivation {
-  name = "autopano-sift-C-2.5.0";
+  name = "autopano-sift-C-2.5.1";
 
   src = fetchurl {
-    url = mirror://sourceforge/hugin/autopano-sift-C-2.5.0.tar.gz;
+    url = mirror://sourceforge/hugin/autopano-sift-C-2.5.1.tar.gz;
-    sha256 = "0pvkapjg7qdkjg151wjc7islly9ag8fg6bj0g5nbllv981ixjql3";
+    sha256 = "0dqk8ff82gmy4v5ns5nr9gpzkc1p7c2y8c8fkid102r47wsjk44s";
   };
 
   buildInputs = [ cmake libpng libtiff libjpeg panotools libxml2 ];

pkgs/applications/graphics/digikam/default.nix

@@ -4,11 +4,11 @@ liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost
 shared_desktop_ontologies, marble, mysql }:
 
 stdenv.mkDerivation rec {
-  name = "digikam-3.2.0";
+  name = "digikam-3.5.0";
 
   src = fetchurl {
     url = "http://download.kde.org/stable/digikam/${name}.tar.bz2";
-    sha256 = "06j858d2nvbqh0bw6m60rh1bsws06fm5vfjpwwi3zxsf5ka08wmx";
+    sha256 = "0an4awlg0b8pwl6v8p5zfl3aghgnxck2pc322cyk6i6yznj2mgap";
   };
 
   nativeBuildInputs = [ cmake automoc4 pkgconfig ];

pkgs/applications/graphics/freecad/default.nix

@@ -1,6 +1,6 @@
-{ fetchurl, stdenv, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts,
+{ stdenv, fetchurl, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts
-boost, zlib,
+, boost, zlib, python, swig, gfortran, soqt, libf2c , pyqt4, makeWrapper
-python, swig, gfortran, soqt, libf2c, pyqt4, makeWrapper }:
+, matplotlib, pycollada }:
 
 stdenv.mkDerivation rec {
   name = "freecad-${version}";
@@ -12,7 +12,9 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost
-    zlib python swig gfortran soqt libf2c pyqt4 makeWrapper ];
+    zlib python swig gfortran soqt libf2c pyqt4 makeWrapper matplotlib
+    pycollada
+  ];
 
   enableParallelBuilding = true;
 

pkgs/applications/graphics/graphicsmagick/default.nix

@@ -1,6 +1,6 @@
 {stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript
 , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz
-, libX11}:
+, libX11, quantumdepth ? 8}:
 
 let version = "1.3.18"; in
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
     sha256 = "1axh4j2jr3l92dan15b2nmx9da4l7i0rcz9b5bvfd4q742zfwj7x";
   };
 
-  configureFlags = "--enable-shared";
+  configureFlags = "--enable-shared --with-quantum-depth=" + toString quantumdepth;
 
   buildInputs =
     [ bzip2 freetype ghostscript graphviz libjpeg libpng libtiff libX11 libxml2

pkgs/applications/graphics/k3d/debian-patches.nix

@@ -1,6 +1,6 @@
 # Generated by debian-patches.sh from debian-patches.txt
 let
-  prefix = "http://patch-tracker.debian.org/patch/series/dl/k3d/0.8.0.2-15";
+  prefix = "http://patch-tracker.debian.org/patch/series/dl/k3d/0.8.0.2-18";
 in
 [
   {
@@ -9,6 +9,6 @@ in
   }
   {
     url = "${prefix}/k3d_gtkmm224.patch";
-    sha256 = "0a81fg96zby6kidqwj6n8mhbrh0j5fpnmfh7lr6havz5r2is9ks5";
+    sha256 = "1c7z2zkqs9qw185q7bhz6vvzl6vlf1zpg9vlhc1f0cz9rgak3gji";
   }
 ]

pkgs/applications/graphics/photivo/default.nix

@@ -0,0 +1,16 @@
+{ stdenv, fetchhg, cmake, qt4, fftw, graphicsmagick_q16,
+  lcms2, lensfun, pkgconfig, libjpeg, exiv2, liblqr1 }:
+
+stdenv.mkDerivation rec {
+  name = "photivo-2013-05-20";
+
+  src = fetchhg {
+    url = "http://code.google.com/p/photivo/";
+    tag = "6256ff175312";
+    sha256 = "0pyvkijr7wwik21hdp1zwbbyqnhc07kf0m48ih1rws78fq3h86cc";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [ qt4 fftw graphicsmagick_q16 lcms2 lensfun libjpeg exiv2 liblqr1 ];
+}

pkgs/applications/graphics/xaos/default.nix

@@ -2,7 +2,7 @@ a :
 let 
   fetchurl = a.fetchurl;
 
-  version = a.lib.attrByPath ["version"] "3.5" a; 
+  version = a.lib.attrByPath ["version"] "3.6" a; 
   buildInputs = with a; [
     aalib gsl libpng libX11 xproto libXext xextproto 
     libXt zlib gettext intltool perl
@@ -11,7 +11,7 @@ in
 rec {
   src = fetchurl {
     url = "mirror://sourceforge/xaos/xaos-${version}.tar.gz";
-    sha256 = "0hj8sxya4s9rc1m4xvxj00jgiczi3ljf2zvrhx34r3ja2m9af7s7";
+    sha256 = "15cd1cx1dyygw6g2nhjqq3bsfdj8sj8m4va9n75i0f3ryww3x7wq";
   };
 
   inherit buildInputs;

pkgs/applications/misc/cgminer/default.nix

@@ -1,19 +1,22 @@
 { fetchgit, stdenv, pkgconfig, libtool, autoconf, automake,
-  curl, ncurses, amdappsdk, amdadlsdk, xorg }:
+  curl, ncurses, amdappsdk, amdadlsdk, xorg, jansson }:
 
 stdenv.mkDerivation rec {
-  version = "2.11.4";
+  version = "3.7.2";
   name = "cgminer-${version}";
 
   src = fetchgit {
     url = "https://github.com/ckolivas/cgminer.git";
-    rev = "96c8ff5f10f2d8f0cf4d1bd889e8eeac2e4aa715";
+    rev = "refs/tags/v3.7.2";
-    sha256  = "1vf9agy4vw50cap03qig2y65hdrsdy7cknkzyagv89w5xb230r9a";
+    sha256  = "0hl71328l19rlclajb6k9xsqybm2ln8g44p788gijpw4laj9yli6";
   };
 
-  buildInputs = [ autoconf automake pkgconfig libtool curl ncurses amdappsdk amdadlsdk xorg.libX11 xorg.libXext xorg.libXinerama ];
+  buildInputs = [
+    autoconf automake pkgconfig libtool curl ncurses amdappsdk amdadlsdk
+    xorg.libX11 xorg.libXext xorg.libXinerama jansson
+  ];
   configureScript = "./autogen.sh";
-  configureFlags = "--enable-scrypt";
+  configureFlags = "--enable-scrypt --enable-opencl";
   NIX_LDFLAGS = "-lgcc_s -lX11 -lXext -lXinerama";
 
   preConfigure = ''
@@ -21,7 +24,7 @@ stdenv.mkDerivation rec {
   '';
 
   postBuild = ''
-    gcc api-example.c -I compat/jansson -o cgminer-api
+    gcc api-example.c -o cgminer-api
   '';
 
   postInstall = ''

pkgs/applications/misc/gkrellm/default.nix

@@ -1,10 +1,10 @@
 { fetchurl, stdenv, gettext, pkgconfig, glib, gtk, libX11, libSM, libICE }:
 
 stdenv.mkDerivation rec {
-  name = "gkrellm-2.3.4";
+  name = "gkrellm-2.3.5";
   src = fetchurl {
     url = "http://members.dslextreme.com/users/billw/gkrellm/${name}.tar.bz2";
-    sha256 = "0mjg2pxpiqms7d6dvxzxvpa420cakhpjxvrclhq0y8jd2dlv2irl";
+    sha256 = "12rc6zaa7kb60b9744lbrlfkxxfniprm6x0mispv63h4kh75navh";
   };
 
   buildInputs = [gettext pkgconfig glib gtk libX11 libSM libICE];

pkgs/applications/misc/hello/ex-2/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "hello-2.8";
+  name = "hello-2.9";
 
   src = fetchurl {
     url = "mirror://gnu/hello/${name}.tar.gz";
-    sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6";
+    sha256 = "19qy37gkasc4csb1d3bdiz9snn8mir2p3aj0jgzmfv0r2hi7mfzc";
   };
 
   doCheck = true;

pkgs/applications/misc/ranger/default.nix

@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, python, fetchurl }:
+
+buildPythonPackage {
+  name = "ranger-1.6.1";
+
+  meta = {
+    description = "File manager with minimalistic curses interface";
+    homepage = "http://ranger.nongnu.org/";
+    license = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ iyzsong ];
+  };
+
+  src = fetchurl {
+    url = "http://ranger.nongnu.org/ranger-1.6.1.tar.gz";
+    sha256 = "0pnvfwk2a1p35246fihm3fsr1m7r2njirbxm28ba276psajk1cnc";
+  };
+
+  doCheck = false;
+
+  propagatedBuildInputs = with python.modules; [ curses ];
+}

pkgs/applications/misc/xlsfonts/default.nix

@@ -4,11 +4,11 @@
 
 {stdenv, fetchurl, libX11, pkgconfig}:
 stdenv.mkDerivation rec {
-  name = "xlsfonts-1.0.2";
+  name = "xlsfonts-1.0.4";
 
   src = fetchurl {
     url = "mirror://xorg/individual/app/${name}.tar.bz2";
-    sha256 = "070iym754g3mf9x6xczl4gdnpvlk6rdyl1ndwhpjl21vg2dm2vnc";
+    sha256 = "1lhcx600z9v65nk93xaxfzi79bm4naynabb52gz1vy1bxj2r25r8";
   };
 
   buildInputs = [libX11 pkgconfig];

pkgs/applications/networking/browsers/firefox/default.nix

@@ -17,9 +17,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
 
 rec {
 
-  firefoxVersion = "25.0.1";
+  firefoxVersion = "26.0";
 
-  xulVersion = "25.0.1"; # this attribute is used by other packages
+  xulVersion = "26.0"; # this attribute is used by other packages
 
 
   src = fetchurl {
@@ -29,7 +29,7 @@ rec {
         # Fall back to this url for versions not available at releases.mozilla.org.
         "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
     ];
-    sha1 = "592ebd242c4839ef0e18707a7e959d8bed2a98f3";
+    sha1 = "f7c6642d6f62aea8d4eced48dd27aba0634edcd5";
   };
 
   commonConfigureFlags =
@@ -143,6 +143,7 @@ rec {
 
     patches = [
       ./disable-reporter.patch # fixes "search box not working when built on xulrunner"
+      ./xpidl.patch
     ];
 
     propagatedBuildInputs = [xulrunner];

pkgs/applications/networking/browsers/firefox/xpidl.patch

@@ -0,0 +1,11 @@
+--- mozilla-release/python/mozbuild/mozbuild/backend/recursivemake.py	2013-12-05 08:07:53.000000000 -0800
++++ mozilla-release_1/python/mozbuild/mozbuild/backend/recursivemake.py	2013-12-12 23:38:39.697318563 -0800
+@@ -421,7 +421,7 @@
+     def _handle_idl_manager(self, manager):
+         build_files = self._purge_manifests['xpidl']
+ 
+-        for p in ('Makefile', 'backend.mk', '.deps/.mkdir.done',
++        for p in ('Makefile.in', 'Makefile', 'backend.mk', '.deps/.mkdir.done',
+             'xpt/.mkdir.done'):
+             build_files.add(p)
+ 

pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, intltool, pkgconfig, gtk, GConf, alsaLib }:
 
 stdenv.mkDerivation rec {
-  name = "gmtk-1.0.5";
+  name = "gmtk-1.0.8";
 
   src = fetchurl {
     url = "http://gmtk.googlecode.com/files/${name}.tar.gz";
-    sha256 = "a07130d62719e8c1244f8405dd97445798df5204fc0f3f2f2b669b125114b468";
+    sha256 = "034b02nplb2bp01yn4p19345jh3yibhn4lcxznrzcsmsyj2vlzq0";
   };
 
   buildInputs = [ intltool pkgconfig gtk GConf alsaLib ];

pkgs/applications/networking/instant-messengers/amsn/default.nix

@@ -1,10 +1,10 @@
 {stdenv, fetchurl, which, tcl, tk, x11, libpng, libjpeg, makeWrapper}:
 
 stdenv.mkDerivation {
-  name = "amsn-0.98.4";
+  name = "amsn-0.98.9";
   src = fetchurl {
-    url = mirror://sourceforge/amsn/amsn-0.98.4-src.tar.gz;
+    url = mirror://sourceforge/amsn/amsn-0.98.9-src.tar.gz;
-    sha256 = "1kcn1hc6bvgy4svf5l3j5psdrvsmy0p3r33fn7gzcinqdf3xfgqx";
+    sha256 = "0b8ir7spxnsz8f7kvr9f1k91nsy8cb65q6jv2l55b04fl20x4z7r";
   };
 
   configureFlags = "--with-tcl=${tcl}/lib --with-tk=${tk}/lib --enable-static";

pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, telepathy_glib, libxslt }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-5.14.0";
+  name = "${pname}-5.14.1";
   pname = "telepathy-mission-control";
 
   src = fetchurl {
     url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
-    sha256 = "0c4asjgk7pk39i8njf0q1df0mhisif83lq716ln6r0wja9zh9q2q";
+    sha256 = "1jqzby5sr09bprp3fyr8w65rcv9ljc045rp7lm9ik89wkhcw05jb";
   };
 
   buildInputs = [ telepathy_glib ];

pkgs/applications/networking/irc/ii/default.nix

@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "ii-1.6";
+  name = "ii-1.7";
   
   src = fetchurl {
     url = "http://dl.suckless.org/tools/${name}.tar.gz";
-    sha256 = "0afccbcm7i9lfch5mwzs3l1ax79dg3g6rrw0z8rb7d2kn8wsckvr";
+    sha256 = "176cqwnn6h7w4kbfd66hzqa243l26pqp2b06bii0nmnm0rkaqwis";
   };
 
   installPhase = ''

pkgs/applications/networking/p2p/qbittorrent/default.nix

@@ -2,11 +2,11 @@
 , pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "qbittorrent-3.1.2";
+  name = "qbittorrent-3.1.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/qbittorrent/${name}.tar.xz";
-    sha256 = "1viia11qixp1qqxcyiw1x4if63cfyqk4rscpzp1vnhnzm06irv7y";
+    sha256 = "16m3l8qjcj63brzrdn82cbijvz8fcxfgpibi4g5g6sbissjkwsww";
   };
 
   buildInputs = [ qt4 which dbus_libs boost libtorrentRasterbar

pkgs/applications/networking/sniffers/etherape/default.nix

@@ -2,10 +2,10 @@
 , gnomedocutils, scrollkeeper, libxslt }:
 
 stdenv.mkDerivation rec {
-  name = "etherape-0.9.12";
+  name = "etherape-0.9.13";
   src = fetchurl {
     url = "mirror://sourceforge/etherape/${name}.tar.gz";
-    sha256 = "0ici0aqw2r221lc3rhrdcnvavbhcj0ybwawgrhh399i74w7wf14k";
+    sha256 = "1xq93k1slyak8mgwrw5kymq0xn0kl8chvfcvaablgki4p0l2lg9a";
   };
 
   configureFlags = [ "--disable-scrollkeeper" ];

pkgs/applications/office/hledger-irr/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hledger-irr";
-  version = "0.1.1.2";
+  version = "0.1.1.3";
-  sha256 = "1mh1lzhnxc8ps8n5j37wrmbqafwdyap60j8rqr6xdfa2syfyq8i2";
+  sha256 = "0vjf478b9msmgr1nxyy8pgc9mvn61i768ypcr5gbinsnsr9kxqsm";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ Cabal hledgerLib statistics time ];

pkgs/applications/science/electronics/archimedes/default.nix

@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "archimedes-2.0.0";
+  name = "archimedes-2.0.1";
 
   src = fetchurl {
     url = "mirror://gnu/archimedes/${name}.tar.gz";
-    sha256 = "1ajg4xvk5slv05fsbikrina9g4bmhx8gykk249yz21pir67sdk4x";
+    sha256 = "0jfpnd3pns5wxcxbiw49v5sgpmm5b4v8s4q1a5292hxxk2hzmb3z";
   };
 
   meta = {

pkgs/applications/version-management/git-and-tools/git-annex/default.nix

@@ -4,18 +4,18 @@
 , extensibleExceptions, feed, filepath, git, gnupg1, gnutls, hamlet
 , hinotify, hS3, hslogger, HTTP, httpConduit, httpTypes, IfElse
 , json, lsof, MissingH, MonadCatchIOTransformers, monadControl, mtl
-, network, networkInfo, networkMulticast, networkProtocolXmpp
+, network, networkConduit, networkInfo, networkMulticast
-, openssh, perl, QuickCheck, random, regexTdfa, rsync
+, networkProtocolXmpp, openssh, perl, QuickCheck, random, regexTdfa
-, SafeSemaphore, SHA, stm, tasty, tastyHunit, tastyQuickcheck, text
+, rsync, SafeSemaphore, SHA, stm, tasty, tastyHunit
-, time, transformers, unixCompat, utf8String, uuid, wai, waiLogger
+, tastyQuickcheck, text, time, transformers, unixCompat, utf8String
-, warp, which, xmlConduit, xmlTypes, yesod, yesodCore, yesodDefault
+, uuid, wai, waiLogger, warp, which, xmlConduit, xmlTypes, yesod
-, yesodForm, yesodStatic
+, yesodCore, yesodDefault, yesodForm, yesodStatic
 }:
 
 cabal.mkDerivation (self: {
   pname = "git-annex";
-  version = "5.20131130";
+  version = "5.20131213";
-  sha256 = "0px918wzv9zqxz7wc6rx2ay8rizbckw79yinhisjvp3y5lldyjj1";
+  sha256 = "0mwslkz0kklp4phlsf8hibh97sabdnigls7hr9725wb0ncfa85yn";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
@@ -24,11 +24,11 @@ cabal.mkDerivation (self: {
     editDistance extensibleExceptions feed filepath gnutls hamlet
     hinotify hS3 hslogger HTTP httpConduit httpTypes IfElse json
     MissingH MonadCatchIOTransformers monadControl mtl network
-    networkInfo networkMulticast networkProtocolXmpp QuickCheck random
+    networkConduit networkInfo networkMulticast networkProtocolXmpp
-    regexTdfa SafeSemaphore SHA stm tasty tastyHunit tastyQuickcheck
+    QuickCheck random regexTdfa SafeSemaphore SHA stm tasty tastyHunit
-    text time transformers unixCompat utf8String uuid wai waiLogger
+    tastyQuickcheck text time transformers unixCompat utf8String uuid
-    warp xmlConduit xmlTypes yesod yesodCore yesodDefault yesodForm
+    wai waiLogger warp xmlConduit xmlTypes yesod yesodCore yesodDefault
-    yesodStatic
+    yesodForm yesodStatic
   ];
   buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ];
   configureFlags = "-fS3
@@ -47,8 +47,6 @@ cabal.mkDerivation (self: {
   checkPhase = ''
     export HOME="$NIX_BUILD_TOP/tmp"
     mkdir "$HOME"
-    cp dist/build/git-annex/git-annex git-annex
-    ./git-annex test
   '';
   meta = {
     homepage = "http://git-annex.branchable.com/";

pkgs/applications/version-management/subversion/default.nix

@@ -21,13 +21,13 @@ assert compressionSupport -> neon.compressionSupport;
 
 stdenv.mkDerivation rec {
 
-  version = "1.7.13";
+  version = "1.7.14";
 
   name = "subversion-${version}";
 
   src = fetchurl {
     url = "mirror://apache/subversion//${name}.tar.bz2";
-    sha1 = "844bb756ec505edaa12b9610832bcd21567139f1";
+    sha256 = "038jbcpwm083abp0rvk0fhnx65kp9mz1qvzs3f83ig8fxcvqzb64";
   };
 
   buildInputs = [ zlib apr aprutil sqlite ]

pkgs/applications/video/mpv/default.nix

@@ -0,0 +1,129 @@
+{ stdenv, fetchurl, fetchgit, freetype, pkgconfig, freefont_ttf, ffmpeg, libass
+, lua5, perl, libpthreadstubs
+, python3, docutils, which
+, x11Support ? true, libX11 ? null, libXext ? null, mesa ? null, libXxf86vm ? null
+, xineramaSupport ? true, libXinerama ? null
+, xvSupport ? true, libXv ? null
+, sdl2Support? true, SDL2 ? null
+, alsaSupport ? true, alsaLib ? null
+, screenSaverSupport ? true, libXScrnSaver ? null
+, vdpauSupport ? true, libvdpau ? null
+, dvdreadSupport? true, libdvdread ? null
+, dvdnavSupport ? true, libdvdnav ? null
+, bluraySupport ? true, libbluray ? null
+, speexSupport ? true, speex ? null
+, theoraSupport ? true, libtheora ? null
+, jackaudioSupport ? true, jackaudio ? null
+, pulseSupport ? true, pulseaudio ? null
+, bs2bSupport ? false, libbs2b ? null
+# For screenshots
+, libpngSupport ? true, libpng ? null
+# for Youtube support
+, quviSupport? false, libquvi ? null
+, cacaSupport? false, libcaca ? null
+}:
+
+assert x11Support -> (libX11 != null && libXext != null && mesa != null && libXxf86vm != null);
+assert xineramaSupport -> (libXinerama != null && x11Support);
+assert xvSupport -> (libXv != null && x11Support);
+assert sdl2Support -> SDL2 != null;
+assert alsaSupport -> alsaLib != null;
+assert screenSaverSupport -> libXScrnSaver != null;
+assert vdpauSupport -> libvdpau != null;
+assert dvdreadSupport -> libdvdread != null;
+assert dvdnavSupport -> libdvdnav != null;
+assert bluraySupport -> libbluray != null;
+assert speexSupport -> speex != null;
+assert theoraSupport -> libtheora != null;
+assert jackaudioSupport -> jackaudio != null;
+assert pulseSupport -> pulseaudio != null;
+assert bs2bSupport -> libbs2b != null;
+assert libpngSupport -> libpng != null;
+assert quviSupport -> libquvi != null;
+assert cacaSupport -> libcaca != null;
+
+# Purity problem: Waf needed to be is downloaded by bootstrap.py
+# but by purity reasons it should be avoided; thanks the-kenny to point it out!
+# Now, it will just download and package Waf, mimetizing bootstrap.py behaviour
+
+let 
+  waf = fetchurl {
+    url = https://waf.googlecode.com/files/waf-1.7.13;
+    sha256 = "03cc750049350ee01cdbc584b70924e333fcc17ba4a2d04648dab1535538a873";
+};
+
+in
+
+stdenv.mkDerivation rec {
+  name = "mpv-20130812";
+
+  src = fetchgit {
+    url = "https://github.com/mpv-player/mpv.git";
+    rev = "62925a5c15a76568c155259bafa1361ec139c66b";
+  };
+
+  buildInputs = with stdenv.lib;
+    [ waf freetype pkgconfig ffmpeg libass docutils which libpthreadstubs ]
+    ++ optionals x11Support [ libX11 libXext mesa libXxf86vm ]
+    ++ optional alsaSupport alsaLib
+    ++ optional xvSupport libXv
+    ++ optional theoraSupport libtheora
+    ++ optional xineramaSupport libXinerama
+    ++ optional dvdreadSupport libdvdread
+    ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
+    ++ optional bluraySupport libbluray
+    ++ optional jackaudioSupport jackaudio
+    ++ optional pulseSupport pulseaudio
+    ++ optional screenSaverSupport libXScrnSaver
+    ++ optional vdpauSupport libvdpau
+    ++ optional speexSupport speex
+    ++ optional bs2bSupport libbs2b
+    ++ optional libpngSupport libpng
+    ++ optional quviSupport libquvi
+    ++ optional sdl2Support SDL2
+    ++ optional cacaSupport libcaca
+    ;
+
+  nativeBuildInputs = [ python3 lua5 perl ];
+
+
+# There are almost no need of "configure flags", but some libraries
+# weren't detected; see the TODO comments below
+
+  NIX_LDFLAGS = stdenv.lib.optionalString x11Support "-lX11 -lXext";
+
+  enableParallelBuilding = true;
+
+  configurePhase = ''
+    python3 ${waf} configure --prefix=$out
+    patchShebangs TOOLS
+  '';
+
+  buildPhase = ''
+    python3 ${waf} build
+  '';
+
+  installPhase = ''
+    python3 ${waf} install
+    # Maybe not needed, but it doesn't hurt anyway: a standard font
+    mkdir -p $out/share/mpv
+    ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf  $out/share/mpv/subfont.ttf 
+    '';
+
+  meta = {
+    description = "A movie player that supports many video formats (MPlayer and mplayer2 fork)";
+    longDescription = ''
+    mpv is a free and open-source general-purpose video player, based on the MPlayer and mplayer2 projects, with great improvements above both.
+    '';
+    homepage = "http://mpv.io";
+    license = "GPLv2+";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
+
+# Heavily based on mplayer2 expression
+
+# TODO: Wayland support
+# TODO: investigate libquvi support: it isn't detected by Waf script!
+# TODO: investigate caca support: it isn't detected by Waf script!
+# TODO: a more systematic way to test this package

pkgs/applications/video/xbmc/default.nix

@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, makeWrapper
-, pkgconfig, cmake, gnumake, yasm, python
+, pkgconfig, cmake, gnumake, yasm, pythonFull
 , boost, avahi, libdvdcss, lame
 , gettext, pcre, yajl, fribidi
 , openssl, gperf, tinyxml2, taglib, libssh, swig, jre
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
 
     buildInputs = [
       makeWrapper
-      pkgconfig cmake gnumake yasm python
+      pkgconfig cmake gnumake yasm pythonFull
       boost libmicrohttpd
       gettext pcre yajl fribidi
       openssl gperf tinyxml2 taglib libssh swig jre
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
     postInstall = ''
       for p in $(ls $out/bin/) ; do
         wrapProgram $out/bin/$p \
-          --prefix PATH ":" "${python}/bin" \
+          --prefix PATH ":" "${pythonFull}/bin" \
           --prefix PATH ":" "${glxinfo}/bin" \
           --prefix PATH ":" "${xdpyinfo}/bin" \
           --prefix LD_LIBRARY_PATH ":" "${curl}/lib" \

pkgs/applications/window-managers/stalonetray/default.nix

@@ -11,10 +11,10 @@ let
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="stalonetray";
-    version="0.8.0";
+    version="0.8.1";
     name="${baseName}-${version}";
     url="mirror://sourceforge/${baseName}/${name}.tar.bz2";
-    hash="0ccllmpsmilns6xxl174vgcjf8kfakcrhg3psc4cg0yynqbi2mka";
+    hash="1wp8pnlv34w7xizj1vivnc3fkwqq4qgb9dbrsg15598iw85gi8ll";
   };
 in
 rec {

pkgs/applications/window-managers/windowmaker/default.nix

@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "windowmaker-${version}";
-  version = "0.95.4";
+  version = "0.95.5";
 
   src = fetchurl {
     url = "http://windowmaker.org/pub/source/release/"
         + "WindowMaker-${version}.tar.gz";
-    sha256 = "0icffqnmkkjjf412m27wljbf9vxb2ry4aiyi2pqmzw3h0pq9gsib";
+    sha256 = "1l3hmx4jzf6vp0zclqx9gsqrlwh4rvqm1g1zr5ha0cp0zmsg89ab";
   };
 
   buildInputs = [ pkgconfig libX11 libXft libXmu ];

pkgs/build-support/cabal/default.nix

@@ -156,7 +156,7 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
               (optional (versionOlder "7" ghc.version) (enableFeature self.enableStaticLibraries "library-vanilla"))
               (optional (versionOlder "7.4" ghc.version) (enableFeature self.enableSharedExecutables "executable-dynamic"))
               (optional (versionOlder "7" ghc.version) (enableFeature self.doCheck "tests"))
-            ];
+            ] ++ optional self.enableSharedExecutables "--ghc-option=-optl=-Wl,-rpath=$ORIGIN/../lib/${ghc.ghc.name}/${self.pname}-${self.version}";
 
             # GHC needs the locale configured during the Haddock phase.
             LANG = "en_US.UTF-8";

pkgs/desktops/gnome-2/desktop/gvfs/default.nix

@@ -3,11 +3,11 @@
 , udev, avahi, libxslt, docbook_xsl }:
 
 stdenv.mkDerivation rec {
-  name = "gvfs-1.14.1";
+  name = "gvfs-1.14.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gvfs/1.14/${name}.tar.xz";
-    sha256 = "0af86cd7ee7b6daca144776bdf12f2f30d3e18fdd70b4da58e1a68cea4f6716a";
+    sha256 = "1g4ghyf45jg2ajdkv2d972hbckyjh3d9jdrppai85pl9pk2dmfy3";
   };
 
   buildInputs =

pkgs/development/compilers/llvm/dragonegg.nix

@@ -1,12 +1,12 @@
 {stdenv, fetchurl, llvm, gmp, mpfr, mpc}:
 
 stdenv.mkDerivation rec {
-  version = "3.2";
+  version = "3.3";
   name = "dragonegg-${version}";
 
   src = fetchurl {
     url = "http://llvm.org/releases/${version}/${name}.src.tar.gz";
-    sha256 = "0jfxhqy3177drlvzgp6m0kwnbfyzrd4vzidnxjhck8a7a69a26bg";
+    sha256 = "1kfryjaz5hxh3q6m50qjrwnyjb3smg2zyh025lhz9km3x4kshlri";
   };
 
   # The gcc the plugin will be built for (the same used building dragonegg)

pkgs/development/guile-modules/guile-lib/default.nix

@@ -3,11 +3,11 @@
 assert stdenv ? gcc && stdenv.gcc ? gcc && stdenv.gcc.gcc != null;
 
 stdenv.mkDerivation rec {
-  name = "guile-lib-0.2.1";
+  name = "guile-lib-0.2.2";
 
   src = fetchurl {
     url = "mirror://savannah/guile-lib/${name}.tar.gz";
-    sha256 = "0ag18l7f9cpv4l577ln3f106xiggl7ndxhrqqiz7cg0w38s3cjvl";
+    sha256 = "1f9n2b5b5r75lzjinyk6zp6g20g60msa0jpfrk5hhg4j8cy0ih4b";
   };
 
   buildInputs = [guile texinfo];

pkgs/development/guile-modules/guile-ncurses/default.nix

@@ -1,11 +1,11 @@
 { fetchurl, stdenv, guile, ncurses, libffi }:
 
 stdenv.mkDerivation rec {
-  name = "guile-ncurses-1.3";
+  name = "guile-ncurses-1.4";
 
   src = fetchurl {
     url = "mirror://gnu/guile-ncurses/${name}.tar.gz";
-    sha256 = "0chvfjrlmg99db98ra9vzwjmbypqx7d4ssm8q0kvzi0n0p9irszi";
+    sha256 = "070wl664lsm14hb6y9ch97x9q6cns4k6nxgdzbdzi5byixn74899";
   };
 
   buildInputs = [ guile ncurses libffi ];

pkgs/development/interpreters/love/0.9.nix

@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, pkgconfig
+, SDL2, mesa, openal, luajit
+, libdevil, freetype, physfs
+, libmodplug, mpg123, libvorbis, libogg
+}:
+
+stdenv.mkDerivation rec {
+  name = "love-0.9.0";
+  src = fetchurl {
+    url = "https://bitbucket.org/rude/love/downloads/${name}-linux-src.tar.gz";
+    sha256 = "048n94584cnmdaf2rshakdzbj1lz2yd7k08aiykkpz13aaa283ag";
+  };
+
+  buildInputs = [
+    pkgconfig SDL2 mesa openal luajit
+    libdevil freetype physfs libmodplug mpg123 libvorbis libogg
+  ];
+
+  configureFlags = [
+    "--with-lua=luajit"
+  ];
+
+  meta = {
+    homepage = "http://love2d.org";
+    description = "A Lua-based 2D game engine/scripting language";
+    license = "zlib";
+
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.raskin ];
+  };
+}

pkgs/development/interpreters/luajit/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl} :
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec{
     version = "2.0.2";
@@ -9,8 +9,13 @@ stdenv.mkDerivation rec{
         sha256="0f3cykihfdn3gi6na9p0xjd4jnv26z18m441n5vyg42q9abh4ln0";
     };
 
+    patchPhase = stdenv.lib.optionalString (stdenv.gcc.libc != null)
+    ''
+      substituteInPlace Makefile \
+        --replace ldconfig ${stdenv.gcc.libc}/sbin/ldconfig
+    '';
+
     installPhase = ''
-        mkdir -p $out
         make install PREFIX=$out
     '';
 
@@ -18,5 +23,6 @@ stdenv.mkDerivation rec{
         description= "Just-in-time compiler and interpreter for lua 5.1.";
         homepage = http://luajit.org;
         license = stdenv.lib.licenses.mit;
+	platorms = stdenv.lib.platforms.linux;
     };
 }

pkgs/development/interpreters/php/5.3.nix

@@ -10,7 +10,7 @@ in
 
 composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
 
-  version = "5.3.27";
+  version = "5.3.28";
 
   name = "php-${version}";
 
@@ -224,7 +224,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
 
   src = fetchurl {
     url = "http://nl1.php.net/get/php-${version}.tar.bz2/from/this/mirror";
-    sha256 = "11xj6v65m6l2lq2s2j5pq5l0iwjsnxmv1nad9hja50ivc8fb4bg1";
+    sha256 = "04w53nn6qacpkd1x381mzd41kqh6k8kjnbyg44yvnkqwcl69db0c";
     name = "php-${version}.tar.bz2";
   };
 

pkgs/development/interpreters/php/5.4.nix

@@ -9,7 +9,7 @@ in
 
 composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
 
-  version = "5.4.21";
+  version = "5.4.23";
 
   name = "php-${version}";
 
@@ -235,7 +235,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
       "http://nl1.php.net/get/php-${version}.tar.bz2/from/this/mirror"
       "http://se1.php.net/get/php-${version}.tar.bz2/from/this/mirror"
     ];
-    sha256 = "1v2nqvgb0lvja4as5361ja3ry8ja7ib38wzia34g7inw3bp7r3za";
+    sha256 = "1k4iplqqcaqkmyq10h6a5qcpkfpkd05r2kclxw9n9qdrm47hfz5f";
     name = "php-${version}.tar.bz2";
   };
 

pkgs/development/interpreters/renpy/default.nix

@@ -3,11 +3,19 @@
 }:
 
 stdenv.mkDerivation {
-  name = "renpy-6.15.5";
+  name = "renpy-6.16.3";
+
+  meta = {
+    description = "Ren'Py Visual Novel Engine";
+    homepage = "http://renpy.org/";
+    license = "MIT";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ iyzsong ];
+  };
 
   src = fetchurl {
-    url = "http://www.renpy.org/dl/6.15.5/renpy-6.15.5-source.tar.bz2";
+    url = "http://www.renpy.org/dl/6.16.3/renpy-6.16.3-source.tar.bz2";
-    sha256 = "1k57dak1yk5iyxripqn2syhwwkh70y00pnnb9i1qf19lmiirxa60";
+    sha256 = "0yd7wj85kp0hlaqlrhl40irhkmcng89vcxypyx40pqmk87gjagqn";
   };
 
   buildInputs = [
@@ -34,16 +42,8 @@ stdenv.mkDerivation {
     makeWrapper ${python}/bin/python $out/bin/renpy \
       --set PYTHONPATH $program_PYTHONPATH \
       --set RENPY_BASE $out/share/renpy \
-      --set RENPY_LESS_UPDATES 1 \
       --add-flags "-O $out/share/renpy/renpy.py"
   '';
 
   NIX_CFLAGS_COMPILE = "-I${pygame}/include/${python.libPrefix}";
-
-  meta = {
-    description = "Ren'Py Visual Novel Engine";
-    homepage = "http://renpy.org/";
-    license = "MIT";
-    platforms = stdenv.lib.platforms.linux;
-  };
 }

pkgs/development/libraries/apr/default.nix

@@ -1,26 +1,26 @@
 { stdenv, fetchurl }:
 
-let
-   inherit (stdenv.lib) optionals;
-in
-
 stdenv.mkDerivation rec {
-  name = "apr-1.4.8";
+  name = "apr-1.5.0";
 
   src = fetchurl {
     url = "mirror://apache/apr/${name}.tar.bz2";
-    md5 = "ce2ab01a0c3cdb71cf0a6326b8654f41";
+    md5 = "cc93bd2c12d0d037f68e21cc6385dc31";
   };
 
-  patches = optionals stdenv.isDarwin [ ./darwin_fix_configure.patch ];
+  patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin_fix_configure.patch ];
 
   configureFlags =
     # Including the Windows headers breaks unistd.h.
     # Based on ftp://sourceware.org/pub/cygwin/release/libapr1/libapr1-1.3.8-2-src.tar.bz2
     stdenv.lib.optional (stdenv.system == "i686-cygwin") "ac_cv_header_windows_h=no";
 
+  enableParallelBuilding = true;
+
   meta = {
     homepage = http://apr.apache.org/;
     description = "The Apache Portable Runtime library";
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
   };
 }

pkgs/development/libraries/beecrypt/default.nix

@@ -1,10 +1,10 @@
 {stdenv, fetchurl, m4}:
 
 stdenv.mkDerivation {
-  name = "beecrypt-4.1.2";
+  name = "beecrypt-4.2.1";
   src = fetchurl {
-    url = mirror://sourceforge/beecrypt/beecrypt-4.1.2.tar.gz;
+    url = mirror://sourceforge/beecrypt/beecrypt-4.2.1.tar.gz;
-    md5 = "820d26437843ab0a6a8a5151a73a657c";
+    sha256 = "0pf5k1c4nsj77jfq5ip0ra1gzx2q47xaa0s008fnn6hd11b1yvr8";
   };
   buildInputs = [m4];
   configureFlags = "--disable-optimized --enable-static";

pkgs/development/libraries/check/default.nix

@@ -1,12 +1,12 @@
 { fetchurl, stdenv }:
 
-let version = "0.9.8"; in
+let version = "0.9.11"; in
 stdenv.mkDerivation {
   name = "check-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/check/${version}/check-${version}.tar.gz";
-    sha256 = "0zvak7vx0zq344x174yg9vkw6fg9kycda15zlbz4yn07pdbgkb42";
+    sha256 = "0dk9jx9hjjwsgly0iwvr5hhw870zlx21gwar7zxlzfq0zdzqqkpa";
   };
 
   doCheck = true;

pkgs/development/libraries/chromaprint/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "chromaprint-${version}";
-  version = "0.7";
+  version = "1.1";
 
   src = fetchurl {
     url = "http://bitbucket.org/acoustid/chromaprint/downloads/${name}.tar.gz";
-    sha256 = "00amjzrr4230v3014141hg8k379zpba56xsm572ab49w8kyw6ljf";
+    sha256 = "04nd8xmy4kgnpfffj6hw893f80bwhp43i01zpmrinn3497mdf53b";
   };
 
   buildInputs = [ cmake fftw boost ];

pkgs/development/libraries/classads/default.nix

@@ -1,15 +1,17 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, pcre }:
 
-let version = "1.0.4"; in
+let version = "1.0.10"; in
 
 stdenv.mkDerivation {
   name = "classads-${version}";
 
   src = fetchurl {
     url = "ftp://ftp.cs.wisc.edu/condor/classad/c++/classads-${version}.tar.gz";
-    sha256 = "80b11c6d383891c90e04e403b2f282e91177940c3fe536082899fbfb9e854d24";
+    sha256 = "1czgj53gnfkq3ncwlsrwnr4y91wgz35sbicgkp4npfrajqizxqnd";
   };
 
+  buildInputs = [ pcre ];
+
   configureFlags = ''                                                  
     --enable-namespace --enable-flexible-member
   '';

pkgs/development/libraries/clutter/default.nix

@@ -1,5 +1,7 @@
 { stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes
-, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib }:
+, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib, 
+gobjectIntrospection 
+}:
 
 stdenv.mkDerivation {
   name = "clutter-1.8.2";
@@ -12,10 +14,10 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ pkgconfig ];
   propagatedBuildInputs =
     [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango
-      atk json_glib
+      atk json_glib gobjectIntrospection
     ];
 
-  configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK
+  configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK
 
   meta = {
     description = "Clutter, a library for creating fast, dynamic graphical user interfaces";

pkgs/development/libraries/cogl/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, mesa, glib, gdk_pixbuf, libXfixes, libXcomposite
 , libXdamage, libintlOrEmpty
-, pangoSupport ? true, pango, cairo }:
+, pangoSupport ? true, pango, cairo, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
   name = "cogl-1.8.2";
@@ -12,8 +12,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
+  configureFlags = " --enable-introspection " ; 
+
   propagatedBuildInputs =
-    [ mesa glib gdk_pixbuf libXfixes libXcomposite libXdamage ]
+    [ mesa glib gdk_pixbuf libXfixes libXcomposite libXdamage 
+gobjectIntrospection ]
     ++ libintlOrEmpty;
 
   buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ];

pkgs/development/libraries/cppunit/default.nix

@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "cppunit-1.12.0";
+  name = "cppunit-1.12.1";
 
   src = fetchurl {
-    url = mirror://sourceforge/cppunit/cppunit-1.12.0.tar.gz;
+    url = mirror://sourceforge/cppunit/cppunit-1.12.1.tar.gz;
-    sha256 = "07zyyx5dyai94y8r8va28971f5mw84mb93xx9pm6m4ddpj6c79cq";
+    sha256 = "0jm49v5rmc5qw34vqs56gy8xja1dhci73bmh23cig4kcir6a0a5c";
   };
 
   meta = {

pkgs/development/libraries/geos/default.nix

@@ -10,11 +10,11 @@ composableDerivation.composableDerivation {} rec {
     # (if args.use_svn then ["libtool" "autoconf" "automake" "swig"] else [])
     # // edf { name = "ruby"; enable = { buildInputs = [ ruby ]; };}
 
-  name = "geos-3.3.8";
+  name = "geos-3.4.2";
 
   src = fetchurl {
     url = "http://download.osgeo.org/geos/${name}.tar.bz2";
-    sha256 = "0fshz8s9g610ycl4grrmcdcxb01aqpc6qac3x3jjik0vlz8x9v7b";
+    sha256 = "0lvcs8x9as5jlxilykgg3i4220x8m4z59b2ngfapl219gvgvzs0m";
   };
 
   enableParallelBuilding = true;

pkgs/development/libraries/glpk/default.nix

@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "glpk-4.47";
+  name = "glpk-4.52.1";
 
   src = fetchurl {
     url = "mirror://gnu/glpk/${name}.tar.gz";
-    sha256 = "13gl75w9dqh1a83v8wvlz9ychwljhy26n3l16r9dia3lpbikhm63";
+    sha256 = "0nz9ngmx23c8gbjr8l8ygnfaanxj2mwbl8awpg630bgrkxdnhc9j";
   };
 
   doCheck = true;

pkgs/development/libraries/gsl/default.nix

@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "gsl-1.15";
+  name = "gsl-1.16";
 
   src = fetchurl {
     url = "mirror://gnu/gsl/${name}.tar.gz";
-    sha256 = "18qf6jzz1r3mzb5qynywv4xx3z9g61hgkbpkdrhbgqh2g7jhgfc5";
+    sha256 = "0lrgipi0z6559jqh82yx8n4xgnxkhzj46v96dl77hahdp58jzg3k";
   };
 
   # ToDo: there might be more impurities than FMA support check

pkgs/development/libraries/gstreamer/gnonlin/default.nix

@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, gst_plugins_base, gstreamer }:
 
 stdenv.mkDerivation rec {
-  name = "gnonlin-0.10.15";
+  name = "gnonlin-0.10.17";
 
   src = fetchurl {
     urls = [
       "http://gstreamer.freedesktop.org/src/gnonlin/${name}.tar.bz2"
       "mirror://gentoo/distfiles/${name}.tar.bz2"
       ];
-    sha256 = "1yz0i3vzpadz5axwdb310bypl4rm1xy2n6mgajja0w2z6afnrfv0";
+    sha256 = "0dc9kvr6i7sh91cyhzlbx2bchwg84rfa4679ccppzjf0y65dv8p4";
   };
 
   buildInputs = [ gst_plugins_base gstreamer pkgconfig ];

pkgs/development/libraries/haskell/DAV/default.nix

@@ -1,16 +1,16 @@
-{ cabal, caseInsensitive, httpClient, httpConduit, httpTypes, lens
+{ cabal, caseInsensitive, httpClient, httpClientTls, httpTypes
-, liftedBase, mtl, network, optparseApplicative, resourcet
+, lens, liftedBase, mtl, network, optparseApplicative, resourcet
 , transformers, xmlConduit, xmlHamlet
 }:
 
 cabal.mkDerivation (self: {
   pname = "DAV";
-  version = "0.5";
+  version = "0.5.1";
-  sha256 = "1yda3w8rr8p7jnpjpbjafis7xi01wmd1fwrq4fprzpfgghcjidhq";
+  sha256 = "12r5hy6g5k5bdf3n84hpq9b90nz6v2v3xwy7prxkvv99iaxf2lsj";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    caseInsensitive httpClient httpConduit httpTypes lens liftedBase
+    caseInsensitive httpClient httpClientTls httpTypes lens liftedBase
     mtl network optparseApplicative resourcet transformers xmlConduit
     xmlHamlet
   ];

pkgs/development/libraries/haskell/HFuse/default.nix

@@ -18,7 +18,7 @@ cabal.mkDerivation (self: {
     homepage = "https://github.com/toothbrush/hfuse";
     description = "HFuse is a binding for the Linux FUSE library";
     license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
+    platforms = self.stdenv.lib.platforms.linux;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })

pkgs/development/libraries/haskell/HTTP/4000.2.10.nix

@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HTTP";
-  version = "4000.2.9";
+  version = "4000.2.10";
-  sha256 = "0fnf4blh7gw0cbap16ss811wr0haa2gqd0gzdbz668jk58n1gmz7";
+  sha256 = "1l97l6am45xgyg0dyxpfgbxc00wp8ishm7spd0hbgmwc5sgnvppg";
   buildDepends = [ mtl network parsec ];
   testDepends = [
     caseInsensitive conduit deepseq httpdShed httpTypes HUnit mtl

pkgs/development/libraries/haskell/HsOpenSSL/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HsOpenSSL";
-  version = "0.10.3.5";
+  version = "0.10.3.6";
-  sha256 = "1yvpvc9ylfqskdv0dqg6cl43w3wg7rggz0lwlrv04a45mrxygh80";
+  sha256 = "0h2q9isbrfvsyr4yzcv7y0vd3gha8ym67l4sn7zlz39n376i2z10";
   buildDepends = [ network time ];
   extraLibraries = [ openssl ];
   meta = {

pkgs/development/libraries/haskell/ListLike/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ListLike";
-  version = "4.0.1";
+  version = "4.0.2";
-  sha256 = "1ny6h3f1l0gigyv2rs24s7w158vsflrdx4i9v1al4910cxh56awv";
+  sha256 = "1ggh8yndnsmccgsl11fia4v2cad0vq3clibgh0311r3c43mwvnah";
   buildDepends = [ text vector ];
   testDepends = [ HUnit QuickCheck random text vector ];
   jailbreak = true;

pkgs/development/libraries/haskell/alsa-core/default.nix

@@ -10,6 +10,6 @@ cabal.mkDerivation (self: {
     homepage = "http://www.haskell.org/haskellwiki/ALSA";
     description = "Binding to the ALSA Library API (Exceptions)";
     license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
+    platforms = self.stdenv.lib.platforms.linux;
   };
 })

pkgs/development/libraries/haskell/alsa-pcm/default.nix

@@ -16,6 +16,6 @@ cabal.mkDerivation (self: {
     homepage = "http://www.haskell.org/haskellwiki/ALSA";
     description = "Binding to the ALSA Library API (PCM audio)";
     license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
+    platforms = self.stdenv.lib.platforms.linux;
   };
 })

pkgs/development/libraries/haskell/ansi-terminal/default.nix

@@ -2,12 +2,12 @@
 
 cabal.mkDerivation (self: {
   pname = "ansi-terminal";
-  version = "0.6";
+  version = "0.6.1";
-  sha256 = "0a5zrq80yrj48s2cm8lns06p6wwnz72vs2wy0ryp0gw6rrg50fkg";
+  sha256 = "0ncghc0z2xkfn1hfvyl0haf4mia9lhjbiqda11nxkqqfxdyklb2j";
   isLibrary = true;
   isExecutable = true;
   meta = {
-    homepage = "http://batterseapower.github.com/ansi-terminal";
+    homepage = "https://github.com/feuerbach/ansi-terminal";
     description = "Simple ANSI terminal support, with Windows compatibility";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;

pkgs/development/libraries/haskell/assert-failure/default.nix

@@ -0,0 +1,14 @@
+{ cabal, prettyShow, text }:
+
+cabal.mkDerivation (self: {
+  pname = "assert-failure";
+  version = "0.1";
+  sha256 = "1xwd6rhka9gzmldkaw3d7262h51wxw9dwgip39q8pjkvvfs5kwkr";
+  buildDepends = [ prettyShow text ];
+  meta = {
+    homepage = "https://github.com/Mikolaj/assert-failure";
+    description = "Syntactic sugar improving 'assert' and 'error'";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/cufft/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cufft";
-  version = "0.1.0.1";
+  version = "0.1.0.3";
-  sha256 = "0j1rsixl48z8xszym9s3rw4pwq4s5bz6inqkfsq726gni0nlm8vx";
+  sha256 = "1jj1ixacmhwjcb2syv4fglawpya5vmdhdk2xqrw4wwfxw4wc9ypi";
   buildDepends = [ cuda ];
   buildTools = [ c2hs ];
   meta = {
@@ -11,6 +11,5 @@ cabal.mkDerivation (self: {
     description = "Haskell bindings for the CUFFT library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })

pkgs/development/libraries/haskell/data-memocombinators/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "data-memocombinators";
-  version = "0.5.0";
+  version = "0.5.1";
-  sha256 = "1kh2xj1z68gig8y5fqfwaha0mcd41laa2di9x2hryjwdgzswxy74";
+  sha256 = "1mvfc1xri3kgkx5q7za01bqg1x3bfvbgcffw5vwl6jmq4hh1sd5l";
   buildDepends = [ dataInttrie ];
   meta = {
     homepage = "http://github.com/luqui/data-memocombinators";

pkgs/development/libraries/haskell/digestive-functors/default.nix

@@ -1,15 +1,15 @@
 { cabal, HUnit, mtl, QuickCheck, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, text
+, testFrameworkQuickcheck2, text, time
 }:
 
 cabal.mkDerivation (self: {
   pname = "digestive-functors";
-  version = "0.6.1.1";
+  version = "0.6.2.0";
-  sha256 = "05px6xal6kzppph5nm9w60vsdz0d9gng8zp26ipwpxzk57jg4jjw";
+  sha256 = "1d07ws5s34x9sviq7mfkl6fh1rl28r5x1rmgbkcxil5h6gxn5mi7";
-  buildDepends = [ mtl text ];
+  buildDepends = [ mtl text time ];
   testDepends = [
     HUnit mtl QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 text
+    testFrameworkQuickcheck2 text time
   ];
   jailbreak = true;
   meta = {

pkgs/development/libraries/haskell/doctest/default.nix

@@ -14,6 +14,7 @@ cabal.mkDerivation (self: {
     stringbuilder syb transformers
   ];
   doCheck = false;
+  noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.4";
   meta = {
     homepage = "https://github.com/sol/doctest-haskell#readme";
     description = "Test interactive Haskell examples";

pkgs/development/libraries/haskell/enummapset-th/default.nix

@@ -0,0 +1,14 @@
+{ cabal, deepseq }:
+
+cabal.mkDerivation (self: {
+  pname = "enummapset-th";
+  version = "0.6.0.1";
+  sha256 = "1v12pfj6k8av58sh6siwzspf2dnbcapmrzfpg2p4yz3bdkc70hh8";
+  buildDepends = [ deepseq ];
+  meta = {
+    homepage = "https://github.com/liyang/enummapset-th";
+    description = "TH-generated EnumSet/EnumMap wrappers around IntSet/IntMap";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/ghc-mod/default.nix

@@ -17,7 +17,6 @@ cabal.mkDerivation (self: {
     ioChoice syb time transformers
   ];
   buildTools = [ emacs ];
-  doCheck = false;
   postInstall = ''
     cd $out/share/$pname-$version
     make
@@ -25,12 +24,12 @@ cabal.mkDerivation (self: {
     cd ..
     ensureDir "$out/share/emacs"
     mv $pname-$version emacs/site-lisp
-    mv $out/bin/ghc-mod $out/ghc-mod
+    mv $out/bin/ghc-mod $out/bin/.ghc-mod-wrapped
     cat - > $out/bin/ghc-mod <<EOF
-    #!/bin/sh
+    #! ${self.stdenv.shell}
     COMMAND=\$1
     shift
-    eval exec $out/ghc-mod \$COMMAND \$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@"
+    eval exec $out/bin/.ghc-mod-wrapped \$COMMAND \$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@"
     EOF
     chmod +x $out/bin/ghc-mod
   '';

pkgs/development/libraries/haskell/github/default.nix

@@ -12,6 +12,7 @@ cabal.mkDerivation (self: {
     hashable HTTP httpConduit httpTypes network text time
     unorderedContainers vector
   ];
+  patches = [ ./fix-build.patch ];
   jailbreak = true;
   meta = {
     homepage = "https://github.com/fpco/github";

pkgs/development/libraries/haskell/github/fix-build.patch

@@ -0,0 +1,13 @@
+diff -ubr github-0.7.2-orig/Github/Private.hs github-0.7.2/Github/Private.hs
+--- github-0.7.2-orig/Github/Private.hs	2013-12-15 19:45:00.611789227 +0100
++++ github-0.7.2/Github/Private.hs	2013-12-15 19:45:46.359954006 +0100
+@@ -104,9 +104,6 @@
+              in Just (Data.List.takeWhile (/= '>') s')
+         else Nothing
+ 
+-doHttps :: Method -> String -> Maybe GithubAuth
+-        -> Maybe (RequestBody (ResourceT IO))
+-        -> IO (Either E.SomeException (Response LBS.ByteString))
+ doHttps reqMethod url auth body = do
+   let reqBody = fromMaybe (RequestBodyBS $ BS.pack "") body
+       reqHeaders = maybe [] getOAuth auth

pkgs/development/libraries/haskell/gloss-accelerate/default.nix

@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Extras to interface Gloss and Accelerate";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })

pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix

@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Parallel rendering of raster images using Accelerate";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })

pkgs/development/libraries/haskell/hledger-lib/default.nix

@@ -1,20 +1,20 @@
-{ cabal, cmdargs, csv, filepath, HUnit, mtl, parsec, prettyShow
+{ cabal, cmdargs, csv, dataPprint, filepath, HUnit, mtl, parsec
-, regexCompat, regexpr, safe, split, testFramework
+, prettyShow, regexCompatTdfa, regexpr, safe, split, testFramework
 , testFrameworkHunit, time, transformers, utf8String
 }:
 
 cabal.mkDerivation (self: {
   pname = "hledger-lib";
-  version = "0.21.3";
+  version = "0.22";
-  sha256 = "1vvki1dg98f8r9w6gmblazkbin7g2hzifwqd1frb0a3kp869i870";
+  sha256 = "059dbwmafwy25pbr9311lknhyjlycdhhal4ng9i56bgd334l2wx3";
   buildDepends = [
-    cmdargs csv filepath HUnit mtl parsec prettyShow regexCompat
+    cmdargs csv dataPprint filepath HUnit mtl parsec prettyShow
-    regexpr safe split time transformers utf8String
+    regexCompatTdfa regexpr safe split time transformers utf8String
   ];
   testDepends = [
-    cmdargs csv filepath HUnit mtl parsec prettyShow regexCompat
+    cmdargs csv dataPprint filepath HUnit mtl parsec prettyShow
-    regexpr safe split testFramework testFrameworkHunit time
+    regexCompatTdfa regexpr safe split testFramework testFrameworkHunit
-    transformers
+    time transformers
   ];
   meta = {
     homepage = "http://hledger.org";

pkgs/development/libraries/haskell/hledger-web/default.nix

@@ -1,20 +1,20 @@
 { cabal, blazeHtml, blazeMarkup, clientsession, cmdargs
 , dataDefault, filepath, hamlet, hjsmin, hledger, hledgerLib, hspec
-, httpConduit, HUnit, json, networkConduit, parsec, regexpr, safe
+, httpClient, httpConduit, HUnit, json, networkConduit, parsec
-, shakespeareText, text, time, transformers, wai, waiExtra
+, regexpr, safe, shakespeareText, text, time, transformers, wai
-, waiHandlerLaunch, warp, yaml, yesod, yesodCore, yesodStatic
+, waiExtra, waiHandlerLaunch, warp, yaml, yesod, yesodCore
-, yesodTest
+, yesodStatic, yesodTest
 }:
 
 cabal.mkDerivation (self: {
   pname = "hledger-web";
-  version = "0.21.3";
+  version = "0.22";
-  sha256 = "18gil6qwlzfk0y0f9q1la5np5phi0h3nqlb8rwn9qjjgvs134jgy";
+  sha256 = "0bd1cb6988ainkzi034a4g4xnslqc6djv74gbq58aaxjqn4m7m80";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     blazeHtml blazeMarkup clientsession cmdargs dataDefault filepath
-    hamlet hjsmin hledger hledgerLib httpConduit HUnit json
+    hamlet hjsmin hledger hledgerLib httpClient httpConduit HUnit json
     networkConduit parsec regexpr safe shakespeareText text time
     transformers wai waiExtra waiHandlerLaunch warp yaml yesod
     yesodCore yesodStatic

pkgs/development/libraries/haskell/hledger/default.nix

@@ -1,23 +1,24 @@
-{ cabal, cmdargs, csv, filepath, haskeline, hledgerLib, HUnit, mtl
+{ cabal, cmdargs, csv, dataPprint, filepath, haskeline, hledgerLib
-, parsec, prettyShow, regexCompat, regexpr, safe, shakespeareText
+, HUnit, mtl, parsec, prettyShow, regexCompatTdfa, regexpr, safe
-, split, testFramework, testFrameworkHunit, text, time
+, shakespeareText, split, tabular, testFramework
-, transformers, utf8String
+, testFrameworkHunit, text, time, transformers, utf8String
 }:
 
 cabal.mkDerivation (self: {
   pname = "hledger";
-  version = "0.21.3";
+  version = "0.22";
-  sha256 = "14j0axlq6xfaih7m6lqpis26ya0yl4v6g6xrqbihmjddvx7j32f2";
+  sha256 = "1fwi1a2nvhfjinif7gy7rv00gn7kazwzmhsskpim2a7bg99sfxb9";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    cmdargs filepath haskeline hledgerLib HUnit mtl parsec regexpr safe
+    cmdargs dataPprint filepath haskeline hledgerLib HUnit mtl parsec
-    shakespeareText split text time utf8String
+    regexpr safe shakespeareText split tabular text time utf8String
   ];
   testDepends = [
-    cmdargs csv filepath haskeline hledgerLib HUnit mtl parsec
+    cmdargs csv dataPprint filepath haskeline hledgerLib HUnit mtl
-    prettyShow regexCompat regexpr safe shakespeareText split
+    parsec prettyShow regexCompatTdfa regexpr safe shakespeareText
-    testFramework testFrameworkHunit text time transformers
+    split tabular testFramework testFrameworkHunit text time
+    transformers
   ];
   meta = {
     homepage = "http://hledger.org";

pkgs/development/libraries/haskell/markdown-unlit/default.nix

@@ -7,6 +7,7 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   testDepends = [ hspec QuickCheck silently stringbuilder ];
+  noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.4";
   meta = {
     description = "Literate Haskell support for Markdown";
     license = self.stdenv.lib.licenses.mit;

pkgs/development/libraries/haskell/mime-mail/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "mime-mail";
-  version = "0.4.2.1";
+  version = "0.4.3";
-  sha256 = "1rpxx90k4dgz1b5ss6vqqgd9n1hjrv09q20myy16zzlj1gmn8k3g";
+  sha256 = "0xh6j4vdg2ispr9f41s8pvx5rb08zqapkqxyvykvjg2ibmczzg4f";
   buildDepends = [
     base64Bytestring blazeBuilder filepath random text
   ];

pkgs/development/libraries/haskell/monad-par/0.3.4.6.nix

@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monad-par";
-  version = "0.3.4.5";
+  version = "0.3.4.6";
-  sha256 = "0xwjx3l9ssyxaa49v8kz7ic54va1qy6dqa1z5gvww7a5gw1ll81p";
+  sha256 = "1k345fpq31jg0mvfk8ap03wscnx8dvlp65gr567vai9ym1ahk6zy";
   buildDepends = [
     abstractDeque abstractPar deepseq monadParExtras mtl mwcRandom
     parallel

pkgs/development/libraries/haskell/pandoc/default.nix

@@ -26,6 +26,7 @@ cabal.mkDerivation (self: {
     testFrameworkQuickcheck2 text
   ];
   buildTools = [ alex happy ];
+  jailbreak = true;
   doCheck = false;
   meta = {
     homepage = "http://johnmacfarlane.net/pandoc";

pkgs/development/libraries/haskell/scotty/default.nix

@@ -1,15 +1,15 @@
 { cabal, aeson, blazeBuilder, caseInsensitive, conduit, dataDefault
-, httpTypes, mtl, regexCompat, resourcet, text, transformers, wai
+, httpTypes, mtl, regexCompat, text, transformers, wai, waiExtra
-, waiExtra, warp
+, warp
 }:
 
 cabal.mkDerivation (self: {
   pname = "scotty";
-  version = "0.6.0";
+  version = "0.6.1";
-  sha256 = "0h5m84kp3p2bc5q9vi9b8ky7k14d7hhhqgbl1mxrqkpw3m5z95xy";
+  sha256 = "1fcrd1fxlmgkm9d6xfyb76pmn68pgk0a367lpmyh77kp0zr3f7ib";
   buildDepends = [
     aeson blazeBuilder caseInsensitive conduit dataDefault httpTypes
-    mtl regexCompat resourcet text transformers wai waiExtra warp
+    mtl regexCompat text transformers wai waiExtra warp
   ];
   meta = {
     homepage = "https://github.com/scotty-web/scotty";

pkgs/development/libraries/haskell/snaplet-acid-state/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "snaplet-acid-state";
-  version = "0.2.5";
+  version = "0.2.6";
-  sha256 = "0qx6as1m0fwb5fkhvl0k71kx65njwq0dk183xi4gmdzhf83hkjbs";
+  sha256 = "005c4x7sh820iar69rany3hv4rlbzpsd4yqd2x2v3jql9z55k4s9";
   buildDepends = [ acidState snap text ];
   meta = {
     homepage = "https://github.com/mightybyte/snaplet-acid-state";

pkgs/development/libraries/haskell/tasty/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tasty";
-  version = "0.5.1";
+  version = "0.5.2.1";
-  sha256 = "0a59cwy3ks9jz7v27n9ws85qga38ksv1mg68p62birm1rw9xc3xd";
+  sha256 = "0dph1c0j2vjvzf5csp6hwlcx2zqa12yqrafk6pxs8bnd3r9a11ym";
   buildDepends = [
     ansiTerminal deepseq mtl optparseApplicative regexPosix stm tagged
   ];