Merge master into x-updates

lib/licenses.nix

@@ -28,12 +28,6 @@
     url = "http://developer.amd.com/amd-license-agreement/";
   };
 
-  amdadl = {
-    shortName = "amd-adl";
-    fullName = "amd-adl license";
-    url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/licenses/AMD-ADL?revision=1.1";
-  };
-
   # Apple Public Source License 2.0;
   # http://opensource.org/licenses/APSL-2.0
   apsl20 = "APSL 2.0";

lib/maintainers.nix

@@ -18,6 +18,7 @@
   bjornfor = "Bjørn Forsman <bjorn.forsman@gmail.com>";
   bluescreen303 = "Mathijs Kwik <mathijs@bluescreen303.nl>";
   bodil = "Bodil Stokke <nix@bodil.org>";
+  calrama = "Moritz Maxeiner <moritz@ucworks.org>";
   chaoflow = "Florian Friesdorf <flo@chaoflow.net>";
   coconnor = "Corey O'Connor <coreyoconnor@gmail.com>";
   coroa = "Jonas Hörsch <jonas@chaoflow.net>";
@@ -33,6 +34,7 @@
   jcumming = "Jack Cummings <jack@mudshark.org>";
   kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
   ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>";
+  linquize = "Linquize <linquize@yahoo.com.hk>";
   lovek323 = "Jason O'Conal <jason@oconal.id.au>";
   ludo = "Ludovic Courtès <ludo@gnu.org>";
   madjar = "Georges Dubus <georges.dubus@compiletoi.net>";

nixos/modules/installer/tools/nixos-generate-config.pl

@@ -61,7 +61,7 @@ my @attrs = ();
 my @kernelModules = ();
 my @initrdKernelModules = ();
 my @modulePackages = ();
-my @imports = ("<nixos/modules/installer/scan/not-detected.nix>");
+my @imports = ("<nixpkgs/nixos/modules/installer/scan/not-detected.nix>");
 
 
 sub debug {

nixos/modules/services/networking/git-daemon.nix

@@ -101,7 +101,7 @@ in
       name = "git-daemon";
       startOn = "ip-up";
       exec = "${pkgs.git}/bin/git daemon --reuseaddr "
-        + (optionalString (cfg.basePath != "") "--basepath=${cfg.basePath} ")
+        + (optionalString (cfg.basePath != "") "--base-path=${cfg.basePath} ")
         + (optionalString (cfg.listenAddress != "") "--listen=${cfg.listenAddress} ")
         + "--port=${toString cfg.port} --user=${gitUser} --group=${gitUser} ${cfg.options} "
         + "--verbose " + (optionalString cfg.exportAll "--export-all")  + concatStringsSep " " cfg.repositories;

nixos/modules/services/web-servers/apache-httpd/default.nix

@@ -628,8 +628,8 @@ in
           ++ concatMap (svc: svc.extraServerPath) allSubservices;
 
         environment =
-          { PHPRC = if enablePHP then phpIni else "";
-          } // (listToAttrs (concatMap (svc: svc.globalEnvVars) allSubservices));
+          optionalAttrs enablePHP { PHPRC = phpIni; }
+          // (listToAttrs (concatMap (svc: svc.globalEnvVars) allSubservices));
 
         preStart =
           ''

nixos/modules/system/boot/luksroot.nix

@@ -5,7 +5,7 @@ with pkgs.lib;
 let
   luks = config.boot.initrd.luks;
 
-  openCommand = { name, device, keyFile, keyFileSize, allowDiscards, ... }: ''
+  openCommand = { name, device, keyFile, keyFileSize, allowDiscards, yubikey, ... }: ''
     # Wait for luksRoot to appear, e.g. if on a usb drive.
     # XXX: copied and adapted from stage-1-init.sh - should be
     # available as a function.
@@ -31,9 +31,191 @@ let
     fi
     ''}
 
-    # open luksRoot and scan for logical volumes
+    open_normally() {
         cryptsetup luksOpen ${device} ${name} ${optionalString allowDiscards "--allow-discards"} \
           ${optionalString (keyFile != null) "--key-file=${keyFile} ${optionalString (keyFileSize != null) "--keyfile-size=${toString keyFileSize}"}"}
+    }
+
+    ${optionalString (luks.yubikeySupport && (yubikey != null)) ''
+
+    rbtohex() {
+        od -An -vtx1 | tr -d ' \n'
+    }
+
+    hextorb() {
+        tr '[:lower:]' '[:upper:]' | sed -e 's|\([0-9A-F]\{2\}\)|\\\\\\x\1|gI' | xargs printf
+    }
+
+    take() {
+        local c="$1"
+        shift
+        head -c $c "$@"
+    }
+
+    drop() {
+        local c="$1"
+        shift
+        if [ -e "$1" ]; then
+            cat "$1" | ( dd of=/dev/null bs="$c" count=1 2>/dev/null ; dd 2>/dev/null )
+        else
+            ( dd of=/dev/null bs="$c" count=1 2>/dev/null ; dd 2>/dev/null )
+        fi
+    }
+
+    open_yubikey() {
+
+        mkdir -p ${yubikey.storage.mountPoint}
+        mount -t ${yubikey.storage.fsType} ${toString yubikey.storage.device} ${yubikey.storage.mountPoint}
+
+        local uuid_r
+        local k_user
+        local challenge
+        local k_blob
+        local aes_blob_decrypted
+        local checksum_correct
+        local checksum
+        local uuid_luks
+        local user_record
+
+        uuid_luks="$(cryptsetup luksUUID ${device} | take 36 | tr -d '-')"
+
+        ${optionalString (!yubikey.multiUser) ''
+        user_record="$(cat ${yubikey.storage.mountPoint}${yubikey.storage.path})"
+        uuid_r="$(echo -n $user_record | take 32)"
+        ''}
+
+        for try in $(seq 3); do
+
+            ${optionalString yubikey.multiUser ''
+            local user_id
+            echo -n "Enter user id: "
+            read -s user_id
+            echo
+            ''}
+
+            ${optionalString yubikey.twoFactor ''
+            echo -n "Enter two-factor passphrase: "
+            read -s k_user
+            echo
+            ''}
+
+            ${optionalString yubikey.multiUser ''
+            local user_id_hash
+            user_id_hash="$(echo -n $user_id | openssl-wrap dgst -binary -sha512 | rbtohex)"
+
+            user_record="$(sed -n -e /^$user_id_hash[^$]*$/p ${yubikey.storage.mountPoint}${yubikey.storage.path} | tr -d '\n')"
+
+            if [ ! -z "$user_record" ]; then
+                user_record="$(echo -n $user_record | drop 128)"
+                uuid_r="$(echo -n $user_record | take 32)"
+            ''}
+
+                challenge="$(echo -n $k_user$uuid_r$uuid_luks | openssl-wrap dgst -binary -sha1 | rbtohex)"
+
+                k_blob="$(ykchalresp -${toString yubikey.slot} -x $challenge 2>/dev/null)"
+
+                aes_blob_decrypted="$(echo -n $user_record | drop 32 | hextorb | openssl-wrap enc -d -aes-256-ctr -K $k_blob -iv $uuid_r | rbtohex)"
+
+                checksum="$(echo -n $aes_blob_decrypted | drop 168)"
+                if [ "$(echo -n $aes_blob_decrypted | hextorb | take 84 | openssl-wrap dgst -binary -sha512 | rbtohex)" == "$checksum" ]; then
+                    checksum_correct=1
+                    break
+                else
+                    checksum_correct=0
+                    echo "Authentication failed!"
+                fi
+
+            ${optionalString yubikey.multiUser ''
+            else
+                checksum_correct=0
+                echo "Authentication failed!"
+            fi
+            ''}
+        done
+
+        if [ "$checksum_correct" != "1" ]; then
+            umount ${yubikey.storage.mountPoint}
+            echo "Maximum authentication errors reached"
+            exit 1
+        fi
+
+        local k_yubi
+        k_yubi="$(echo -n $aes_blob_decrypted | take 40)"
+
+        local k_luks
+        k_luks="$(echo -n $aes_blob_decrypted | drop 40 | take 128)"
+
+        echo -n "$k_luks" | hextorb | cryptsetup luksOpen ${device} ${name} ${optionalString allowDiscards "--allow-discards"} --key-file=-
+
+        update_failed=false
+
+        local new_uuid_r
+        new_uuid_r="$(uuidgen)"
+        if [ $? != "0" ]; then
+            for try in $(seq 10); do
+                sleep 1
+                new_uuid_r="$(uuidgen)"
+                if [ $? == "0" ]; then break; fi
+                if [ $try -eq 10 ]; then update_failed=true; fi
+            done
+        fi
+
+        if [ "$update_failed" == false ]; then
+            new_uuid_r="$(echo -n $new_uuid_r | take 36 | tr -d '-')"
+
+            local new_challenge
+            new_challenge="$(echo -n $k_user$new_uuid_r$uuid_luks | openssl-wrap dgst -binary -sha1 | rbtohex)"
+
+            local new_k_blob
+            new_k_blob="$(echo -n $new_challenge | hextorb | openssl-wrap dgst -binary -sha1 -mac HMAC -macopt hexkey:$k_yubi | rbtohex)"
+
+            local new_aes_blob
+            new_aes_blob=$(echo -n "$k_yubi$k_luks$checksum" | hextorb | openssl-wrap enc -e -aes-256-ctr -K "$new_k_blob" -iv "$new_uuid_r" | rbtohex)
+
+            ${optionalString yubikey.multiUser ''
+            sed -i -e "s|^$user_id_hash$user_record|$user_id_hash$new_uuid_r$new_aes_blob|1"
+            ''}
+
+            ${optionalString (!yubikey.multiUser) ''
+            echo -n "$new_uuid_r$new_aes_blob" > ${yubikey.storage.mountPoint}${yubikey.storage.path}
+            ''}
+        else
+            echo "Warning: Could not obtain new UUID, current challenge persists!"
+        fi
+
+        umount ${yubikey.storage.mountPoint}
+    }
+
+    yubikey_missing=true
+    ykinfo -v 1>/dev/null 2>&1
+    if [ $? != "0" ]; then
+        echo -n "waiting 10 seconds for yubikey to appear..."
+        for try in $(seq 10); do
+            sleep 1
+            ykinfo -v 1>/dev/null 2>&1
+            if [ $? == "0" ]; then
+                yubikey_missing=false
+                break
+            fi
+            echo -n .
+        done
+        echo "ok"
+    else
+        yubikey_missing=false
+    fi
+
+    if [ "$yubikey_missing" == true ]; then
+        echo "no yubikey found, falling back to non-yubikey open procedure"
+        open_normally
+    else
+        open_yubikey
+    fi
+    ''}
+
+    # open luksRoot and scan for logical volumes
+    ${optionalString ((!luks.yubikeySupport) || (yubikey == null)) ''
+    open_normally
+    ''}
   '';
 
   isPreLVM = f: f.preLVM;
@@ -139,10 +321,84 @@ in
           '';
         };
 
+        yubikey = mkOption {
+          default = null;
+          type = types.nullOr types.optionSet;
+          description = ''
+            The options to use for this LUKS device in Yubikey-PBA.
+            If null (the default), Yubikey-PBA will be disabled for this device.
+          '';
+
+          options = {
+            twoFactor = mkOption {
+              default = true;
+              type = types.bool;
+              description = "Whether to use a passphrase and a Yubikey (true), or only a Yubikey (false)";
+            };
+
+            multiUser = mkOption {
+              default = false;
+              type = types.bool;
+              description = "Whether to allow multiple users to authenticate with a Yubikey";
+            };
+
+            slot = mkOption {
+              default = 2;
+              type = types.int;
+              description = "Which slot on the Yubikey to challenge";
+            };
+
+            storage = mkOption {
+              type = types.optionSet;
+              description = "Options related to the authentication record";
+
+              options = {
+                device = mkOption {
+                  default = /dev/sda1;
+                  type = types.path;
+                  description = ''
+                    An unencrypted device that will temporarily be mounted in stage-1.
+                    Must contain the authentication record for this LUKS device.
+                  '';
+                };
+
+                fsType = mkOption {
+                  default = "vfat";
+                  type = types.string;
+                  description = "The filesystem of the unencrypted device";
+                };
+
+                mountPoint = mkOption {
+                  default = "/crypt-storage";
+                  type = types.string;
+                  description = "Path where the unencrypted device will be mounted in stage-1";
+                };
+
+                path = mkOption {
+                  default = "/crypt-storage/default";
+                  type = types.string;
+                  description = ''
+                    Absolute path of the authentication record on the unencrypted device with
+                    that device's root directory as "/".
+                  '';
+                };
+              };
+            };
+          };
         };
 
       };
+    };
 
+    boot.initrd.luks.yubikeySupport = mkOption {
+      default = false;
+      type = types.bool;
+      description = ''
+            Enables support for authenticating with a Yubikey on LUKS devices.
+            See the NixOS wiki for information on how to properly setup a LUKS device
+            and a Yubikey to work with this feature.
+          '';
+    };
   };
 
   config = mkIf (luks.devices != []) {
@@ -157,15 +413,47 @@ in
     # copy the cryptsetup binary and it's dependencies
     boot.initrd.extraUtilsCommands = ''
       cp -pdv ${pkgs.cryptsetup}/sbin/cryptsetup $out/bin
-      # XXX: do we have a function that does this?
-      for lib in $(ldd $out/bin/cryptsetup |grep '=>' |grep /nix/store/ |cut -d' ' -f3); do
-        cp -pdvn $lib $out/lib
-        cp -pvn $(readlink -f $lib) $out/lib
-      done
+
+      cp -pdv ${pkgs.libgcrypt}/lib/libgcrypt*.so.* $out/lib
+      cp -pdv ${pkgs.libgpgerror}/lib/libgpg-error*.so.* $out/lib
+      cp -pdv ${pkgs.cryptsetup}/lib/libcryptsetup*.so.* $out/lib
+      cp -pdv ${pkgs.popt}/lib/libpopt*.so.* $out/lib
+
+      ${optionalString luks.yubikeySupport ''
+      cp -pdv ${pkgs.utillinux}/bin/uuidgen $out/bin
+      cp -pdv ${pkgs.ykpers}/bin/ykchalresp $out/bin
+      cp -pdv ${pkgs.ykpers}/bin/ykinfo $out/bin
+      cp -pdv ${pkgs.openssl}/bin/openssl $out/bin
+
+      cp -pdv ${pkgs.libusb1}/lib/libusb*.so.* $out/lib
+      cp -pdv ${pkgs.ykpers}/lib/libykpers*.so.* $out/lib
+      cp -pdv ${pkgs.libyubikey}/lib/libyubikey*.so.* $out/lib
+      cp -pdv ${pkgs.openssl}/lib/libssl*.so.* $out/lib
+      cp -pdv ${pkgs.openssl}/lib/libcrypto*.so.* $out/lib
+
+      mkdir -p $out/etc/ssl
+      cp -pdv ${pkgs.openssl}/etc/ssl/openssl.cnf $out/etc/ssl
+
+      cat > $out/bin/openssl-wrap <<EOF
+#!$out/bin/sh
+EOF
+      chmod +x $out/bin/openssl-wrap
+      ''}
     '';
 
     boot.initrd.extraUtilsCommandsTest = ''
       $out/bin/cryptsetup --version
+      ${optionalString luks.yubikeySupport ''
+        $out/bin/uuidgen --version
+        $out/bin/ykchalresp -V
+        $out/bin/ykinfo -V
+        cat > $out/bin/openssl-wrap <<EOF
+#!$out/bin/sh
+export OPENSSL_CONF=$out/etc/ssl/openssl.cnf
+$out/bin/openssl "\$@"
+EOF
+        $out/bin/openssl-wrap version
+      ''}
     '';
 
     boot.initrd.preLVMCommands = concatMapStrings openCommand preLVM;

pkgs/applications/audio/flac/default.nix

@@ -12,9 +12,10 @@ stdenv.mkDerivation rec {
 
   doCheck = true; # takes lots of time but will be run rarely (small build-time closure)
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://xiph.org/flac/;
     description = "Library and tools for encoding and decoding the FLAC lossless audio file format";
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
+    maintainers = maintainers.mornfall;
   };
 }

pkgs/applications/audio/monkeys-audio/default.nix

@@ -11,4 +11,9 @@ stdenv.mkDerivation rec {
     url = "http://deb-multimedia.org/pool/main/m/${pname}/${pname}_${version}.orig.tar.gz";
     sha256 = "0kjfwzfxfx7f958b2b1kf8yj655lp0ppmn0sh57gbkjvj8lml7nz";
   };
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = maintainers.mornfall;
+  };
 }

pkgs/applications/editors/idea/default.nix

@@ -61,43 +61,23 @@ let
 
 in {
 
-  idea_community_1301 = buildIdea {
-    name = "idea-IC-133.331";
+  idea_community_1302 = buildIdea {
+    name = "idea-IC-133.696";
     description = "IntelliJ IDEA 13 Community Edition";
     license = stdenv.lib.licenses.asl20.shortName;
     src = fetchurl {
-      url = http://download-ln.jetbrains.com/idea/ideaIC-13.0.1.tar.gz;
-      sha256 = "6f268bb1dbe61ed0274fd2ea9b4b7403f50da11bdde208bcfc8c391d235d7c02";
+      url = http://download-ln.jetbrains.com/idea/ideaIC-13.0.2.tar.gz;
+      sha256 = "a776878c2dba877761b74d2886d006f64eec3c9694dbd1578380287a9c8cbd53";
     };
   };
 
-  idea_ultimate_1301 = buildIdea {
-    name = "idea-IU-133.331";
+  idea_ultimate_1302 = buildIdea {
+    name = "idea-IU-133.696";
     description = "IntelliJ IDEA 13 Ultimate Edition";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
-      url = http://download-ln.jetbrains.com/idea/ideaIU-13.0.1.tar.gz;
-      sha256 = "d3638d97b719773459d5027ba096b52695325b241cbf5e31e535165a5f19849d";
-    };
-  };
-
-  idea_community_13 = buildIdea {
-    name = "idea-IC-133.193";
-    description = "IntelliJ IDEA 13 Community Edition";
-    license = stdenv.lib.licenses.asl20.shortName;
-    src = fetchurl {
-      url = http://download-ln.jetbrains.com/idea/ideaIC-13.tar.gz;
-      sha256 = "5cd88b8effc5e4e55d999df1cec6f54c53b5adf0b88e49400b3a185bef7db13a";
-    };
-  };
-
-  idea_ultimate_13 = buildIdea {
-    name = "idea-IU-133.193";
-    description = "IntelliJ IDEA 13 Ultimate Edition";
-    license = stdenv.lib.licenses.unfree;
-    src = fetchurl {
-      url = http://download-ln.jetbrains.com/idea/ideaIU-13.tar.gz;
-      sha256 = "211a782654d04f2fe5fce9084043edfb8355a7bc4dc41fee7dc79cfe604d4654";
+      url = http://download-ln.jetbrains.com/idea/ideaIU-13.0.2.tar.gz;
+      sha256 = "7ba9499ecc82029470712d6ead520db1e2cf520e4f86d382cbdea1d0052712d0";
     };
   };
 

pkgs/applications/graphics/gimp/2.8.nix

@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk, glib, gdk_pixbuf
 , pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff
 , webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper
-, python, pygtk, libart_lgpl, libexif, gettext, xlibs }:
+, python, pygtk, libart_lgpl, libexif, gettext, xlibs, wrapPython }:
 
 stdenv.mkDerivation rec {
   name = "gimp-2.8.10";
@@ -16,8 +16,13 @@ stdenv.mkDerivation rec {
       freetype fontconfig lcms libpng libjpeg poppler libtiff webkit
       libmng librsvg libwmf zlib libzip ghostscript aalib jasper
       python pygtk libart_lgpl libexif gettext xlibs.libXpm
+      wrapPython
     ];
 
+  pythonPath = [ pygtk ];
+
+  postInstall = ''wrapPythonPrograms'';
+
   passthru = { inherit gtk; }; # probably its a good idea to use the same gtk in plugins ?
 
   #configureFlags = [ "--disable-print" ];

pkgs/applications/graphics/sane/backends.nix

@@ -12,7 +12,10 @@ stdenv.mkDerivation rec {
   name = "sane-backends-${version}";
 
   src = fetchurl {
-    url = "https://alioth.debian.org/frs/download.php/file/3958/${name}.tar.gz";
+    urls = [
+      "http://pkgs.fedoraproject.org/repo/pkgs/sane-backends/sane-backends-1.0.24.tar.gz/1ca68e536cd7c1852322822f5f6ac3a4/${name}.tar.gz"
+      "https://alioth.debian.org/frs/download.php/file/3958/${name}.tar.gz"
+    ];
     curlOpts = "--insecure";
     sha256 = "0ba68m6bzni54axjk15i51rya7hfsdliwvqyan5msl7iaid0iir7";
   };

pkgs/applications/misc/calibre/default.nix

@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-1.20.0";
+  name = "calibre-1.21.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/calibre/${name}.tar.xz";
-    sha256 = "1i7sybl6in0js8an1zp3mzqv394xnwx79rmv1hj7g6abpsqhjpj7";
+    sha256 = "05hwny9zi32gkk3hadvigrqrnbgzw53vhjkjp60dq0lb545pscih";
   };
 
   inherit python;

pkgs/applications/misc/cgminer/default.nix

@@ -1,5 +1,5 @@
-{ fetchgit, stdenv, pkgconfig, libtool, autoconf, automake,
-  curl, ncurses, amdappsdk, amdadlsdk, xorg, jansson }:
+{ fetchgit, stdenv, pkgconfig, libtool, autoconf, automake
+, curl, ncurses, amdappsdk, amdadlsdk, xorg, jansson }:
 
 stdenv.mkDerivation rec {
   version = "3.7.2";
@@ -42,6 +42,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/ckolivas/cgminer";
     license = licenses.gpl3;
     maintainers = [ maintainers.offline ];
-    platforms = [ "i686-linux" "x86_64-linux" ];
+    platforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = [];
   };
 }

pkgs/applications/misc/merkaartor/default.nix

@@ -1,17 +1,17 @@
-{stdenv, fetchurl, qt4, boost}:
+{stdenv, fetchurl, qt4, boost, proj, gdal}:
 
 stdenv.mkDerivation rec {
-  name = "merkaartor-0.17.2";
+  name = "merkaartor-0.18.1";
   src = fetchurl {
-    url = "http://merkaartor.be/attachments/download/253/merkaartor-0.17.2.tar.bz2";
-    sha256 = "0akhp9czzn39132mgj9h38nlh4l9ibzn3vh93bfs685zxyn4yps2";
+    url = "http://merkaartor.be/attachments/download/301/merkaartor-0.18.1.tar.bz2";
+    sha256 = "17qk45pmlxqigla1915dvn9pp91y85d2bkcaap4g3m8mk1crcsix";
   };
 
   configurePhase = ''
     qmake -makefile PREFIX=$out
   '';
 
-  buildInputs = [ qt4 boost ];
+  buildInputs = [ qt4 boost proj gdal ];
 
   meta = {
     description = "An openstreetmap editor";

pkgs/applications/misc/pstree/default.nix

@@ -16,5 +16,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Show the set of running processes as a tree";
     license = "GPL";
+    maintainers = stdenv.lib.maintainers.mornfall;
   };
 }

pkgs/applications/misc/redshift/default.nix

@@ -40,5 +40,6 @@ stdenv.mkDerivation rec {
     license = "GPLv3+";
     homepage = "http://jonls.dk/redshift";
     platforms = platforms.linux;
+    maintainers = maintainers.mornfall;
   }; 
 }

pkgs/applications/misc/rxvt_unicode/default.nix

@@ -41,5 +41,6 @@ stdenv.mkDerivation (rec {
   meta = {
     description = "A clone of the well-known terminal emulator rxvt";
     homepage = "http://software.schmorp.de/pkg/rxvt-unicode.html";
+    maintainers = stdenv.lib.maintainers.mornfall;
   };
 })

pkgs/applications/misc/ykpers/default.nix

@@ -0,0 +1,23 @@
+{stdenv, fetchurl, pkgconfig, libusb1, libyubikey}:
+
+stdenv.mkDerivation rec
+{
+  version = "1.15.0";
+  name = "ykpers-${version}";
+
+  src = fetchurl
+  {
+    url = "http://opensource.yubico.com/yubikey-personalization/releases/${name}.tar.gz";
+    sha256 = "1n4s8kk31q5zh2rm7sj9qmv86yl8ibimdnpvk9ny391a88qlypyd";
+  };
+
+  buildInputs = [pkgconfig libusb1 libyubikey];
+
+  meta =
+  {
+    homepage = "http://opensource.yubico.com/yubikey-personalization/";
+    description = "YubiKey Personalization cross-platform library and tool";
+    license = "bsd";
+    maintainers = [ stdenv.lib.maintainers.calrama ];
+  };
+}

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

@@ -51,15 +51,18 @@ let
     patches = singleton ./sandbox_userns_31.patch;
 
     postPatch = ''
-      sed -i -r -e 's/-f(stack-protector)(-all)?/-fno-\1/' build/common.gypi
-    '' + (if versionOlder version "32.0.0.0" then ''
-      sed -i -e 's|/usr/bin/gcc|gcc|' third_party/WebKit/Source/core/core.gypi
-    '' else ''
+      sed -i -r \
+        -e 's/-f(stack-protector)(-all)?/-fno-\1/' \
+        -e 's|/bin/echo|echo|' \
+        build/common.gypi
+      sed -i '/not RunGN/,+1d' build/gyp_chromium
       sed -i -e 's|/usr/bin/gcc|gcc|' \
         third_party/WebKit/Source/build/scripts/scripts.gypi \
         third_party/WebKit/Source/build/scripts/preprocessor.pm
-    '') + optionalString useOpenSSL ''
+    '' + optionalString useOpenSSL ''
       cat $opensslPatches | patch -p1 -d third_party/openssl/openssl
+    '' + optionalString (!versionOlder version "34.0.0.0") ''
+      sed -i '/import.*depot/d' build/gyp_chromium
     '';
 
     outputs = [ "out" "sandbox" "bundled" "main" ];

pkgs/applications/networking/browsers/chromium/sources.nix

@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   dev = {
-    version = "33.0.1712.4";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1712.4.tar.xz";
-    sha256 = "1c1m0y3nnz2lclqi21j6hgqmb46p1hv7c22zz9fn7dax7jkimydk";
+    version = "34.0.1809.0";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-34.0.1809.0.tar.xz";
+    sha256 = "0hyqqqq2hzbzk325pk9bc70lsh0al2nqf1mlahybp5vigy5jzy88";
   };
   beta = {
-    version = "32.0.1700.19";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-32.0.1700.19.tar.xz";
-    sha256 = "0d0kgy160pyg472ka43gxk7n09pqhhs9nd93jyxrp9qsyllfc425";
+    version = "33.0.1750.46";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.46.tar.xz";
+    sha256 = "04n43c4vn8i7qhlybqb19c2c8kri8nc1wpa2l83vin4sqxkq519h";
   };
   stable = {
-    version = "32.0.1700.77";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-32.0.1700.77.tar.xz";
-    sha256 = "1mwqa5k32d168swpw0bdcnhglxwcqdsx766fq0iz22h3hd4ccdwa";
+    version = "32.0.1700.102";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-32.0.1700.102.tar.xz";
+    sha256 = "0jxwhd7cd60ivisrnzcglqqnmy99np1vvjqa27y42d852xjx84ys";
   };
 }

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

@@ -2,12 +2,12 @@
   m4, glib_networking, gsettings_desktop_schemas }:
 
 stdenv.mkDerivation {
-  name = "dwb-0.1";
+  name = "dwb-2014-01-29";
 
   src = fetchgit {
     url = "https://bitbucket.org/portix/dwb.git";
-    rev = "84a8621787baded72e84afdd5cdda278cb81e007";
-    sha256 = "5a32f3c21ad59b43935a16108244f84d260fafaea9b93d41e8de9ba9089ee7b0";
+    rev = "eaf090af9ad63341a846377cb9ce473feee8f032";
+    sha256 = "1wqa5dry9p3x3y07zpq3km8ycr8wvz8c11754vf99pv1kzk8gq0n";
   };
 
   buildInputs = [ pkgconfig makeWrapper libsoup webkit gtk3 gnutls json_c m4  ];

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

@@ -1,21 +1,12 @@
-{ stdenv
-, fetchurl
-, libtool
-, libXext
-, libSM
-, libICE
-, libX11
-, libXft
-, libXau
-, libXdmcp
-, libXrender
-, freetype
-, fontconfig
-, openssl
+{ stdenv, fetchurl, libtool, libXext, libSM, libICE, libX11, libXft, libXau, libXdmcp, libXrender
+, libxcb, libXfixes, libXcomposite, libXi, dbus, freetype, fontconfig, openssl, zlib, mesa
+, libxslt, libxml2
 }:
 
+assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; 
+
 let
-  version = "1.94.407";
+  version = "2.1.982";
 
   rpath = stdenv.lib.makeSearchPath "lib" [
     stdenv.glibc
@@ -29,15 +20,29 @@ let
     libXau
     libXdmcp
     libXrender
+    libxcb
+    libXfixes
+    libXcomposite
+    libXi
+    dbus
     freetype
     fontconfig
     openssl
+    zlib
+    mesa
+    libxslt
+    libxml2
   ];
 
-  src = fetchurl {
-    url = "http://downloads.hipchat.com/linux/arch/hipchat-${version}-i686.pkg.tar.xz";
-    sha256 = "0kyjpa2ir066zqkvs1zmnx6kvl8v4jfl8h7bw110cgigwmiplk7k";
+  src = 
+    if stdenv.system == "i686-linux" then fetchurl {
+      url = "http://downloads.hipchat.com/linux/arch/i686/hipchat-${version}-i686.pkg.tar.xz";
+      sha256 = "1i60fkl5hdx2p2yfsx9w8qkzn6hl8fajvfls0r0gc2bqc9whg6vn";
+    } else fetchurl {
+      url = "http://downloads.hipchat.com/linux/arch/x86_64/hipchat-${version}-x86_64.pkg.tar.xz";
+      sha256 = "12bn4la9z1grkbcnixjwhadgxa2g6qkd5x7r3l3vn1sdalgal4ks";
     };
+
 in stdenv.mkDerivation {
   name = "hipchat-${version}";
 
@@ -49,8 +54,8 @@ in stdenv.mkDerivation {
     mv usr/share $out
     patchShebangs $out/bin
     for file in $(find $out/lib -type f); do
-        patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $file || true
-        patchelf --set-rpath ${rpath}:$out/lib $file || true
+        patchelf --set-interpreter $(cat $NIX_GCC/nix-support/dynamic-linker) $file || true
+        patchelf --set-rpath ${rpath}:${stdenv.lib.optionalString stdenv.is64bit "${stdenv.gcc.gcc}/lib64:"}$out/lib $file || true
     done
     substituteInPlace $out/share/applications/hipchat.desktop \
       --replace /opt/HipChat/bin $out/bin

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

@@ -21,10 +21,10 @@
 } :
 
 stdenv.mkDerivation rec {
-  name = "pidgin-2.10.7";
+  name = "pidgin-2.10.8";
   src = fetchurl {
     url = "mirror://sourceforge/pidgin/${name}.tar.bz2";
-    sha256 = "14piyx4xpc3l8286x4nh5pna2wfyn9cv0qa29br1q3d2xja2k8zb";
+    sha256 = "09w2gbnplyw21lmf9jwk6vkk5gpx5lq15s38bmhkxzw86mz3ccxn";
   };
 
   inherit nss ncurses;
@@ -51,8 +51,10 @@ stdenv.mkDerivation rec {
   configureFlags="--with-nspr-includes=${nspr}/include/nspr --with-nspr-libs=${nspr}/lib --with-nss-includes=${nss}/include/nss --with-nss-libs=${nss}/lib --with-ncurses-headers=${ncurses}/include --disable-meanwhile --disable-nm --disable-tcl"
   + (lib.optionalString (gnutls != null) " --enable-gnutls=yes --enable-nss=no")
   ;
-  meta = {
+  meta = with stdenv.lib; {
     description = "Pidgin IM - XMPP(Jabber), AIM/ICQ, IRC, SIP etc client";
     homepage = http://pidgin.im;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
   };
 }

pkgs/applications/networking/instant-messengers/tkabber-plugins/default.nix

@@ -1,21 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  name = "tkabber-plugins-${version}";
-  version = "0.11.1";
-
-  src = fetchurl {
-    url = "http://files.jabber.ru/tkabber/tkabber-plugins-${version}.tar.gz";
-    sha256 = "0jxriqvsckbih5a4lpisxy6wjw022wsz5j5n171gz0q3xw19dbgz";
-  };
-
-  configurePhase = ''
-    sed -e "s@/usr/local@$out@" -i Makefile
-  '';
-
-  meta = {
-    homepage = "http://tkabber.jabber.ru/tkabber-plugins";
-    description = "Plugins for the Tkabber instant messenger";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}

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

@@ -1,7 +1,24 @@
 { stdenv, fetchurl, tcl, tk, tcllib, tcltls, tclgpg
-, bwidget, makeWrapper, x11 }:
+, bwidget, makeWrapper, x11
+, withSitePlugins ? true
+, theme ? null
+}:
+
+with stdenv.lib;
 
 let
+  version = "1.0";
+
+  main = {
+    name = "tkabber";
+    sha256 = "49ee6e897dfe52ebac256531b54955e6b39223f606a9b8ad63a52475389db206";
+  };
+
+  plugins = {
+    name = "tkabber-plugins";
+    sha256 = "d61251dc664f0bfa8534e578096dede9a7bb7d4f2620489f8d2c43d36cd61ba9";
+  };
+
   tclLibraries = [ bwidget tcllib tcltls tclgpg ];
 
   getTclLibPath = p: "${p}/lib/${p.libPrefix}";
@@ -9,43 +26,47 @@ let
   tclLibPaths = stdenv.lib.concatStringsSep " "
     (map getTclLibPath tclLibraries);
 
-in stdenv.mkDerivation rec {
-  name = "tkabber-0.11.1";
+  mkTkabber = attrs: stdenv.mkDerivation (rec {
+    name = "${attrs.name}-${version}";
 
     src = fetchurl {
-    url = "http://files.jabber.ru/tkabber/tkabber-0.11.1.tar.gz";
-    sha256 = "19xv555cm7a2gczdalf9srxm39hmsh0fbidhwxa74a89nqkbf4lv";
+      url = "http://files.jabber.ru/tkabber/${name}.tar.xz";
+      inherit (attrs) sha256;
     };
 
-  defaultTheme = "ocean-deep";
+    prePatch = ''
+      sed -e "s@/usr/local@$out@" -i Makefile
+    '';
+  } // removeAttrs attrs [ "name" "sha256" ]);
 
-  patchPhase = ''
+in mkTkabber (main // {
+  postPatch = ''
     substituteInPlace login.tcl --replace \
       "custom::defvar loginconf(sslcacertstore) \"\"" \
       "custom::defvar loginconf(sslcacertstore) \$env(OPENSSL_X509_CERT_FILE)"
-
+  '' + optionalString (theme != null) ''
+    themePath="$out/share/doc/tkabber/examples/xrdb/${theme}.xrdb"
     sed -i '/^if.*load_default_xrdb/,/^}$/ {
-        s@option readfile \(\[fullpath [^]]*\]\)@option readfile "'"$out/share/doc/tkabber/examples/xrdb/${defaultTheme}.xrdb"'"@
+      s@option readfile \(\[fullpath [^]]*\]\)@option readfile "'"$themePath"'"@
     }' tkabber.tcl
   '';
 
-  configurePhase = ''
-    mkdir -p $out/bin
-    sed -e "s@/usr/local@$out@" -i Makefile
-  '';
-
   postInstall = ''
-    wrapProgram $out/bin/tkabber \
+    for prog in $out/bin/*; do
+      wrapProgram "$prog" \
         --prefix PATH : "${tk}/bin" \
         --set TCLLIBPATH '"${tclLibPaths}"' \
-      --set TKABBER_SITE_PLUGINS '$HOME/.nix-profile/share/tkabber-plugins'
+        ${optionalString withSitePlugins ''
+        --set TKABBER_SITE_PLUGINS '${mkTkabber plugins}/share/tkabber-plugins'
+        ''}
+    done
   '';
 
   buildInputs = [ tcl tk x11 makeWrapper ] ++ tclLibraries;
 
   meta = {
     homepage = "http://tkabber.jabber.ru/";
-    description = "A GUI client for the XMPP (Jabber) instant messaging protocol";
+    description = "A GUI XMPP (Jabber) client written in Tcl/Tk";
     license = stdenv.lib.licenses.gpl2;
   };
-}
+})

pkgs/applications/networking/mailreaders/mailpile/default.nix

@@ -5,8 +5,8 @@ buildPythonPackage rec {
 
   src = fetchgit {
     url = "https://github.com/pagekite/Mailpile.git";
-    rev = "695a25061a5220d4f0fd6ec3de4ccd9ae4c05a92";
-    sha256 = "0il9idfpnzb1a5cg3p9zrd6fnw2dhrqr6c3gzq1m06snw8jx9fpc";
+    rev = "6e19c1942541dbdefb5155db5f2583bf3ed22aeb";
+    sha256 = "04idlbjkasigq3vslcv33kg21rjyklm2yl8pyrf5h94lzabbl1fs";
   };
 
   propagatedBuildInputs = with pythonPackages; [

pkgs/applications/networking/mumble/default.nix

@@ -1,9 +1,18 @@
-{ stdenv, fetchurl, qt4, boost, speechd, protobuf, libsndfile,
- speex, libopus, avahi, pkgconfig,
-jackSupport ? false, 
-jackaudio ? null }:
+{ stdenv, fetchurl, qt4, boost, protobuf, libsndfile
+, speex, libopus, avahi, pkgconfig
+, jackSupport ? false
+, jackaudio ? null
+, speechdSupport ? false
+, speechd ? null
+}:
 
+assert jackSupport -> jackaudio != null;
+assert speechdSupport -> speechd != null;
 
+let
+  optional = stdenv.lib.optional;
+  optionalString = stdenv.lib.optionalString;
+in
 stdenv.mkDerivation rec {
   name = "mumble-" + version;
   version = "1.2.4";
@@ -13,35 +22,33 @@ stdenv.mkDerivation rec {
     sha256 = "16wwj6gwcnyjlnzh7wk0l255ldxmbwx0wi652sdp20lsv61q7kx1";
   };
 
-  patchPhase = ''
-    patch -p1 < ${ ./mumble-jack-support.patch }
-  '';
+  patches = optional jackSupport ./mumble-jack-support.patch;
 
   configurePhase = ''
     qmake CONFIG+=no-g15 CONFIG+=no-update CONFIG+=no-server \
       CONFIG+=no-embed-qt-translations CONFIG+=packaged \
       CONFIG+=bundled-celt CONFIG+=no-bundled-opus \
+      ${optionalString (!speechdSupport) "CONFIG+=no-speechd"} \
+      ${optionalString jackSupport "CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio"} \
       CONFIG+=no-bundled-speex
-  '' 
-  + stdenv.lib.optionalString jackSupport ''
-    CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio
   '';
 
 
-  buildInputs = [ qt4 boost speechd protobuf libsndfile speex
+  buildInputs = [ qt4 boost protobuf libsndfile speex
     libopus avahi pkgconfig ]
-    ++ (stdenv.lib.optional jackSupport jackaudio);
+    ++ (optional jackSupport jackaudio)
+    ++ (optional speechdSupport speechd);
 
   installPhase = ''
     mkdir -p $out
     cp -r ./release $out/bin
   '';
 
-  meta = { 
-    homepage = http://mumble.sourceforge.net/;
+  meta = with stdenv.lib; { 
+    homepage = "http://mumble.sourceforge.net/";
     description = "Low-latency, high quality voice chat software";
-    license = "BSD";
-    platforms = with stdenv.lib.platforms; linux;
-    maintainers = with stdenv.lib.maintainers; [viric];
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ viric ];
   };
 }

pkgs/applications/networking/mumble/murmur.nix

@@ -1,5 +1,15 @@
-{ stdenv, fetchurl, qt4, boost, protobuf, avahi, libcap, pkgconfig }:
+{ stdenv, fetchurl, qt4, boost, protobuf
+, avahi, libcap, pkgconfig
+, iceSupport ? false
+, zeroc_ice ? null
+}:
 
+assert iceSupport -> zeroc_ice != null;
+
+let
+  optional = stdenv.lib.optional;
+  optionalString = stdenv.lib.optionalString;
+in
 stdenv.mkDerivation rec {
   name = "murmur-" + version;
   version = "1.2.4";
@@ -9,22 +19,28 @@ stdenv.mkDerivation rec {
     sha256 = "16wwj6gwcnyjlnzh7wk0l255ldxmbwx0wi652sdp20lsv61q7kx1";
   };
 
-  configurePhase = ''
-    qmake CONFIG+=no-client CONFIG+=no-ice CONFIG+=no-embed-qt
+  patchPhase = optional iceSupport ''
+    sed -i 's,/usr/share/Ice/,${zeroc_ice}/,g' src/murmur/murmur.pro
   '';
 
-  buildInputs = [ qt4 boost protobuf avahi libcap pkgconfig ];
+  configurePhase = ''
+    qmake CONFIG+=no-client CONFIG+=no-embed-qt \
+    ${optionalString (!iceSupport) "CONFIG+=no-ice"}
+  '';
+
+  buildInputs = [ qt4 boost protobuf avahi libcap pkgconfig ]
+    ++ optional iceSupport [ zeroc_ice ];
 
   installPhase = ''
     mkdir -p $out
     cp -r ./release $out/bin
   '';
 
-  meta = { 
-    homepage = http://mumble.sourceforge.net/;
+  meta = with stdenv.lib; {
+    homepage = "http://mumble.sourceforge.net/";
     description = "Low-latency, high quality voice chat software";
-    license = "BSD";
-    platforms = with stdenv.lib.platforms; linux;
-    maintainers = with stdenv.lib.maintainers; [viric];
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ viric ];
   };
 }

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

@@ -7,16 +7,16 @@
 , network, networkConduit, networkInfo, networkMulticast
 , networkProtocolXmpp, openssh, optparseApplicative, perl
 , QuickCheck, random, regexTdfa, rsync, SafeSemaphore, SHA, stm
-, tasty, tastyHunit, tastyQuickcheck, text, time, transformers
-, unixCompat, utf8String, uuid, wai, waiLogger, warp, which
-, xmlConduit, xmlTypes, yesod, yesodCore, yesodDefault, yesodForm
-, yesodStatic
+, tasty, tastyHunit, tastyQuickcheck, tastyRerun, text, time
+, transformers, unixCompat, utf8String, uuid, wai, waiLogger, warp
+, which, xmlConduit, xmlTypes, yesod, yesodCore, yesodDefault
+, yesodForm, yesodStatic
 }:
 
 cabal.mkDerivation (self: {
   pname = "git-annex";
-  version = "5.20140127";
-  sha256 = "0aqqnv0faiva9vf0nb0d8xsd659y8cyrnyy6mfjdqjqdw8wha3yr";
+  version = "5.20140129";
+  sha256 = "0m1n3m16gvd0693i5xq5adki0hd0wdn7p5vqjxkqnc3imx9f11ng";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
@@ -27,9 +27,10 @@ cabal.mkDerivation (self: {
     MissingH MonadCatchIOTransformers monadControl mtl network
     networkConduit networkInfo networkMulticast networkProtocolXmpp
     optparseApplicative QuickCheck random regexTdfa SafeSemaphore SHA
-    stm tasty tastyHunit tastyQuickcheck text time transformers
-    unixCompat utf8String uuid wai waiLogger warp xmlConduit xmlTypes
-    yesod yesodCore yesodDefault yesodForm yesodStatic
+    stm tasty tastyHunit tastyQuickcheck tastyRerun text time
+    transformers unixCompat utf8String uuid wai waiLogger warp
+    xmlConduit xmlTypes yesod yesodCore yesodDefault yesodForm
+    yesodStatic
   ];
   buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ];
   configureFlags = "-fS3

pkgs/applications/video/bangarang/default.nix

@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ kdelibs phonon soprano shared_desktop_ontologies kdemultimedia taglib gettext ];
   nativeBuildInputs = [ cmake ];
 
+  patches = [ ./gcc-4.7.patch ];
+
   meta = with stdenv.lib; {
     description = "A media player for KDE based on Nepomuk and Phonon";
     longDescription = ''

pkgs/applications/video/bangarang/gcc-4.7.patch

@@ -0,0 +1,45 @@
+commit b893fcdb7ddfc8c59fd29a29b7265a713c3dbab1
+Author: Alex Fiestas <afiestas@kde.org>
+Date:   Thu Mar 29 10:09:22 2012 +0200
+
+    Build fix: Add unistd.h include since sleep is defined there
+
+diff --git a/src/platform/infofetchers/lastfminfofetcher.cpp b/src/platform/infofetchers/lastfminfofetcher.cpp
+index 0c49d69..fcc4cd3 100644
+--- a/src/platform/infofetchers/lastfminfofetcher.cpp
++++ b/src/platform/infofetchers/lastfminfofetcher.cpp
+@@ -32,6 +32,8 @@
+ #include <QFile>
+ #include <QTextEdit>
+ 
++#include <unistd.h>
++
+ LastfmInfoFetcher::LastfmInfoFetcher(QObject *parent) :
+         InfoFetcher(parent)
+ {
+diff --git a/src/platform/infofetchers/tmdbinfofetcher.cpp b/src/platform/infofetchers/tmdbinfofetcher.cpp
+index 7801644..3c01960 100644
+--- a/src/platform/infofetchers/tmdbinfofetcher.cpp
++++ b/src/platform/infofetchers/tmdbinfofetcher.cpp
+@@ -30,6 +30,8 @@
+ #include <QDomDocument>
+ #include <QFile>
+ 
++#include <unistd.h>
++
+ TMDBInfoFetcher::TMDBInfoFetcher(QObject *parent) :
+         InfoFetcher(parent)
+ {
+diff --git a/src/platform/infofetchers/tvdbinfofetcher.cpp b/src/platform/infofetchers/tvdbinfofetcher.cpp
+index ff351b0..670ed18 100644
+--- a/src/platform/infofetchers/tvdbinfofetcher.cpp
++++ b/src/platform/infofetchers/tvdbinfofetcher.cpp
+@@ -30,6 +30,8 @@
+ #include <QDomDocument>
+ #include <QFile>
+ 
++#include <unistd.h>
++
+ TVDBInfoFetcher::TVDBInfoFetcher(QObject *parent) :
+         InfoFetcher(parent)
+ {

pkgs/applications/video/quvi/library.nix

@@ -1,15 +1,15 @@
-{stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts}:
+{stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libproxy, libgcrypt}:
 
 stdenv.mkDerivation rec {
   name = "libquvi-${version}";
-  version="0.4.0";
+  version="0.9.4";
 
   src = fetchurl {
-    url = "mirror://sourceforge/quvi/libquvi-${version}.tar.gz";
-    sha256 = "15cm9j8dssn2zhplqvlw49piwfw511lia6b635byiwfniqf6dnwp";
+    url = "mirror://sourceforge/quvi/libquvi-${version}.tar.xz";
+    sha256 = "1cl1kbgxl1jnx2nwx4z90l0lap09lnnj1fg7hxsxk3m6aj4y4grd";
   };
 
-  buildInputs = [ pkgconfig lua5 curl quvi_scripts ];
+  buildInputs = [ pkgconfig lua5 curl quvi_scripts libproxy libgcrypt ];
 
   meta = { 
     description = "Web video downloader";

pkgs/applications/video/quvi/scripts.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "quvi-scripts-${version}";
-  version="0.4.0";
+  version="0.9.20131130";
 
   src = fetchurl {
-    url = "mirror://sourceforge/quvi/libquvi-scripts-${version}.tar.gz";
-    sha256 = "14p1sn7id4n35isaw3i3h8vsgfqlym09fih9k5xfqwsg6n7xdvq5";
+    url = "mirror://sourceforge/quvi/libquvi-scripts-${version}.tar.xz";
+    sha256 = "1qvp6z5k1qgcys7vf7jd6fm0g07xixmciwj14ypn1kqhmjgizwhp";
   };
 
   buildInputs = [ pkgconfig ];

pkgs/applications/video/quvi/tool.nix

@@ -1,15 +1,18 @@
-{stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libquvi}:
+{stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libquvi, lua5_sockets, glib, makeWrapper}:
 
 stdenv.mkDerivation rec {
   name = "quvi-${version}";
-  version="0.4.0";
+  version="0.9.5";
 
   src = fetchurl {
-    url = "mirror://sourceforge/quvi/quvi-${version}.tar.gz";
-    sha256 = "0qzyj55py4z7pg97794jjycq8nvrlr02072rgjzg8jgknw49hgfv";
+    url = "mirror://sourceforge/quvi/quvi-${version}.tar.xz";
+    sha256 = "1h52s265rp3af16dvq1xlscp2926jqap2l4ah94vrfchv6m1hffb";
   };
 
-  buildInputs = [ pkgconfig lua5 curl quvi_scripts libquvi ];
+  buildInputs = [ pkgconfig lua5 curl quvi_scripts libquvi glib makeWrapper ];
+  postInstall = ''
+      wrapProgram $out/bin/quvi --set LUA_PATH "${lua5_sockets}/share/lua/${lua5.luaversion}/?.lua"
+  '';
 
   meta = {
     description = "Web video downloader";

pkgs/data/documentation/pthread-man-pages/default.nix

@@ -43,5 +43,6 @@ in
     meta = {
       description = "POSIX threads (pthreads) manual pages from LinuxThreads";
       homepage = http://www.gnu.org/software/libc/;
+      maintainers = stdenv.lib.maintainers.mornfall;
     };
   }

pkgs/desktops/gnome-3/default.nix

@@ -6,11 +6,7 @@ rec {
   libcanberra = pkgs.libcanberra_gtk3; # just to be sure
   inherit (pkgs.gnome2) gnome_common ORBit2;
   orbit = ORBit2;
-
-
-#### Overrides of libraries
-
-  libsoup = pkgs.libsoup_2_44;
+  inherit (pkgs) libsoup;
 
 #### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
 

pkgs/development/compilers/cudatoolkit/default.nix

@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
       }
     else throw "cudatoolkit does not support platform ${stdenv.system}";
 
+  outputs = [ "out" "sdk" ];
+
   buildInputs = [ perl ];
 
   runtimeDependencies = [
@@ -30,6 +32,7 @@ stdenv.mkDerivation rec {
     sh $src --keep --noexec
     cd pkg/run_files
     sh cuda-linux64-rel-5.5.22-16488124.run --keep --noexec
+    sh cuda-samples-linux-5.5.22-16488124.run --keep --noexec
     cd pkg
   '';
 
@@ -44,8 +47,9 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    mkdir $out
+    mkdir $out $sdk
     perl ./install-linux.pl --prefix="$out"
+    perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out"
   '';
 
   meta = {

pkgs/development/compilers/ghc/7.6.3.nix

@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     echo "${buildMK}" > mk/build.mk
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
+  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
     export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}"
   '';
 

pkgs/development/compilers/llvm/3.4/llvm.nix

@@ -52,6 +52,6 @@ in stdenv.mkDerivation rec {
     homepage    = http://llvm.org/;
     license     = stdenv.lib.licenses.bsd3;
     maintainers = with stdenv.lib.maintainers; [ shlevy lovek323 raskin viric ];
-    platforms   = stdenv.lib.platforms.all;
+    platforms   = stdenv.lib.platforms.linux;
   };
 }

pkgs/development/compilers/mcpp/default.nix

@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, mcpp }:
+
+stdenv.mkDerivation rec {
+  name = "mcpp-2.7.2";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/mcpp/${name}.tar.gz";
+    sha256 = "0r48rfghjm90pkdyr4khxg783g9v98rdx2n69xn8f6c5i0hl96rv";
+  };
+
+  configureFlags = [ "--enable-mcpplib" ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://mcpp.sourceforge.net/";
+    description = "A portable c preprocessor";
+    license = licenses.bsd2;
+    platforms = platforms.unix;
+  };
+}

pkgs/development/interpreters/cython/2/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python, pkgconfig }:
 
 stdenv.mkDerivation {
-  name = "cython-0.16";
+  name = "cython-0.20";
 
   src = fetchurl {
-    url = http://www.cython.org/release/Cython-0.16.tar.gz;
-    sha256 = "1yz6jwv25xx5mbr2nm4l7mi65gvpm63dzi3vrw73p51wbpy525lp";
+    url = http://www.cython.org/release/Cython-0.20.tar.gz;
+    sha256 = "1a3m7zhw8mdyr95fwx7n1scrz82drr433i99dzm1n9dxi0cx2qah";
   };
 
   buildPhase = "python setup.py build --build-base $out";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   buildInputs = [ python pkgconfig ];
 
   meta = {
-    description = "An interpreter to help writing C extensions for Python";
+    description = "An interpreter to help writing C extensions for Python 2";
     platforms = stdenv.lib.platforms.all;
   };
 }

pkgs/development/interpreters/cython/3/default.nix

@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, python3, pkgconfig }:
+
+stdenv.mkDerivation {
+  name = "cython3-0.20";
+
+  src = fetchurl {
+    url = http://www.cython.org/release/Cython-0.20.tar.gz;
+    sha256 = "1a3m7zhw8mdyr95fwx7n1scrz82drr433i99dzm1n9dxi0cx2qah";
+  };
+
+  buildPhase = "python3 setup.py build --build-base $out";
+
+  installPhase = "python3 setup.py install --prefix=$out";
+
+  buildInputs = [ python3 pkgconfig ];
+
+  meta = {
+    description = "An interpreter to help writing C extensions for Python3";
+    platforms = stdenv.lib.platforms.all;
+  };
+}

pkgs/development/interpreters/hiphopvm/default.nix

@@ -1,14 +1,14 @@
 { stdenv, fetchurl, fetchgit, cmake, boost, libunwind, mysql, libmemcached, pcre
 , libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php, re2c
-, expat, libcap, oniguruma, libdwarf, libmcrypt, inteltbb, gperftools
-, bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam
+, expat, libcap, oniguruma, libdwarf, libmcrypt, inteltbb, gperftools, glog
+, bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng
 }:
 assert stdenv.system == "x86_64-linux";
 let
   src = fetchgit {
     url = "git://github.com/facebook/hiphop-php.git";
-    rev = "73f1c0ebd9b313f6b3baecd8c8046e0b595b1157";
-    sha256 = "104133c6054bc9ab0288eaa0cea168b6699e537b3ea76ecdc38ee833d93dca09";
+    rev = "1e23dec9f0b1ce8aaa5833d0527a369c8e254ffd";
+    sha256 = "0fblwgq8c3hmamw0m5d1mn8qhyqf14v2zf62cgrkvmbiz6jlrbr6";
   };
 
   libxml2_280 = stdenv.lib.overrideDerivation libxml2 (args: rec { 
@@ -22,36 +22,34 @@ let
     patches = [];
   });
 
-  curlFB = stdenv.lib.overrideDerivation curl (args: { patches = [ "${src}/src/third_party/libcurl-7.22.1.fb-changes.diff" ]; });
+  fbPatch = "${src}/hphp/third_party/libevent-1.4.14.fb-changes.diff";
 
-  fbPatch = "${src}/src/third_party/libevent-1.4.14.fb-changes.diff";
   libeventFB = stdenv.lib.overrideDerivation libevent (args: { patches = [fbPatch]; });
 in
 stdenv.mkDerivation {
-  name = "hiphop-php-73f1c0ebd9";
+  name = "hiphop-php-1e23dec9f0";
   inherit src;
   dontUseCmakeBuildDir = true;
   dontUseCmakeConfigure = true;
   USE_HHVM=1;
   preConfigure = ''
-    export HPHP_HOME=$PWD
     export HPHP_LIB=$PWD/bin
     export TBB_INSTALL_DIR=${inteltbb}
     export TBB_ARCH_PLATFORM="intel64/cc4.1.0_libc2.4_kernel2.6.16.21"
-    sed -i 's| DEPRECATED | DEPRECATED_ |' src/runtime/base/runtime_error.h
+    sed 's=/bin/bash=/${stdenv.shell}=g' -i hphp/util/generate-buildinfo.sh
   '';
   NIX_LDFLAGS = "-lpam -L${pam}/lib";
+  MYSQL_INCLUDE_DIR="${mysql}/include/mysql";
   MYSQL_DIR=mysql;
   buildInputs = [ 
-    cmake boost libunwind mysql libmemcached pcre libeventFB gd curlFB
+    cmake boost libunwind mysql libmemcached pcre libeventFB gd curl
     libxml2_280 icu flex bison openssl zlib php expat libcap oniguruma
     libdwarf libmcrypt inteltbb gperftools bzip2 openldap readline
-    libelf uwimap binutils cyrus_sasl pam
+    libelf uwimap binutils cyrus_sasl pam glog libpng
   ];
   installPhase = ''
     mkdir -p $out/bin
-    cp src/hhvm/hhvm $out/bin
-    cp bin/systemlib.php $out/bin
+    cp hphp/hhvm/hhvm $out/bin
   '';
   patches = [./tbb.patch];
 

pkgs/development/interpreters/lua-5/5.1.nix

@@ -9,6 +9,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "lua-5.1.5";
+  luaversion = "5.1";
 
   src = fetchurl {
     url = "http://www.lua.org/ftp/${name}.tar.gz";

pkgs/development/interpreters/lua-5/sockets.nix

@@ -0,0 +1,25 @@
+{stdenv, fetchurl, lua5}:
+
+stdenv.mkDerivation rec {
+  name    = "lua-sockets-${version}";
+  version = "2.0.2";
+  src = fetchurl {
+      url = "http://files.luaforge.net/releases/luasocket/luasocket/luasocket-${version}/luasocket-${version}.tar.gz";
+      sha256 = "19ichkbc4rxv00ggz8gyf29jibvc2wq9pqjik0ll326rrxswgnag";
+  };
+
+  luaver = "5.1"; # TODO
+  patchPhase = ''
+      sed -e "s,^INSTALL_TOP_SHARE.*,INSTALL_TOP_SHARE=$out/share/lua/${lua5.luaversion}," \
+          -e "s,^INSTALL_TOP_LIB.*,INSTALL_TOP_LIB=$out/lib/lua/${lua5.luaversion}," \
+          -i config
+  '';
+
+  buildInputs = [ lua5 ];
+
+  meta = {
+    homepage = "http://w3.impa.br/~diego/software/luasocket/";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.mornfall ];
+  };
+}

pkgs/development/interpreters/python/3.3/default.nix

@@ -69,8 +69,8 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = "http://python.org";
-    description = "a high-level dynamically-typed programming language";
+    homepage = http://python.org;
+    description = "A high-level dynamically-typed programming language";
     longDescription = ''
       Python is a remarkably powerful dynamic programming language that
       is used in a wide variety of application domains. Some of its key
@@ -81,7 +81,7 @@ stdenv.mkDerivation {
       high level dynamic data types.
     '';
     license = stdenv.lib.licenses.psfl;
-    platforms = stdenv.lib.platforms.all;
+    platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ simons chaoflow ];
   };
 }

pkgs/development/interpreters/ruby/patches.nix

@@ -14,6 +14,25 @@ let
 in
 
 {
+  buildr = {
+    # Many Buildfiles rely on RUBYLIB containing the current directory
+    # (as was the default in Ruby < 1.9.2).
+    extraWrapperFlags = "--prefix RUBYLIB : .";
+  };
+
+  fakes3 = {
+    postInstall = ''
+      cd $out/${ruby.gemPath}/gems/*
+      patch -Np1 -i ${../../ruby-modules/fake-s3-list-bucket.patch}
+    '';
+  };
+
+  ffi = {
+    postUnpack = "onetuh";
+    buildFlags = ["--with-ffi-dir=${libffi}"];
+    NIX_POST_EXTRACT_FILES_HOOK = patchUsrBinEnv;
+  };
+
   iconv = { buildInputs = [ libiconvOrEmpty ]; };
 
   libv8 = {
@@ -49,12 +68,10 @@ in
     '';
   };
 
-  sqlite3 = { propagatedBuildInputs = [ sqlite ]; };
-  
-  rails = { gemFlags = "--no-ri --no-rdoc"; };
-  
   ncurses = { propagatedBuildInputs = [ ncurses ]; };
 
+  ncursesw = { propagatedBuildInputs = [ ncurses ]; };
+
   nix = {
     postInstall = ''
       cd $out/${ruby.gemPath}/gems/nix*
@@ -62,8 +79,6 @@ in
     '';
   };
 
-  ncursesw = { propagatedBuildInputs = [ ncurses ]; };
-  
   nokogiri = {
     buildFlags =
       [ "--with-xml2-dir=${libxml2} --with-xml2-include=${libxml2}/include/libxml2"
@@ -71,10 +86,13 @@ in
       ];
   };
 
-  ffi = {
-    postUnpack = "onetuh";
-    buildFlags = ["--with-ffi-dir=${libffi}"];
-    NIX_POST_EXTRACT_FILES_HOOK = patchUsrBinEnv;
+  pry = { gemFlags = "--no-ri --no-rdoc"; };
+
+  rails = { gemFlags = "--no-ri --no-rdoc"; };
+
+  rjb = {
+    buildInputs = [ jdk ];
+    JAVA_HOME = jdk;
   };
 
   rmagick = {
@@ -83,6 +101,21 @@ in
     NIX_CFLAGS_COMPILE = "-I${imagemagick}/include/ImageMagick-6";
   };
 
+  sqlite3 = { propagatedBuildInputs = [ sqlite ]; };
+
+  xapian_full = {
+    buildInputs = [ gems.rake zlib libuuid ];
+    gemFlags = "--no-rdoc --no-ri";
+  };
+
+  xapian_full_alaveteli = {
+    buildInputs = [ zlib libuuid ];
+  };
+
+  xapian_ruby = {
+    buildInputs = [ zlib libuuid ];
+  };
+
   xrefresh_server =
     let
       patch = fetchurl {
@@ -98,37 +131,4 @@ in
         zcat ${patch} | patch -p 1
       ''; # */
     };
-
-  xapian_full = {
-    buildInputs = [ gems.rake zlib libuuid ];
-    gemFlags = "--no-rdoc --no-ri";
-  };
-
-  xapian_full_alaveteli = {
-    buildInputs = [ zlib libuuid ];
-  };
-
-  xapian_ruby = {
-    buildInputs = [ zlib libuuid ];
-  };
-
-  rjb = {
-    buildInputs = [ jdk ];
-    JAVA_HOME = jdk;
-  };
-
-  buildr = {
-    # Many Buildfiles rely on RUBYLIB containing the current directory
-    # (as was the default in Ruby < 1.9.2).
-    extraWrapperFlags = "--prefix RUBYLIB : .";
-  };
-  
-  pry = { gemFlags = "--no-ri --no-rdoc"; };
-
-  fakes3 = {
-    postInstall = ''
-      cd $out/${ruby.gemPath}/gems/*
-      patch -Np1 -i ${../../ruby-modules/fake-s3-list-bucket.patch}
-    '';
-  };
 }

pkgs/development/libraries/db/db-5.3.nix

@@ -0,0 +1,32 @@
+{ stdenv, fetchurl
+, cxxSupport ? true
+}:
+
+stdenv.mkDerivation rec {
+  name = "db-5.3.28";
+
+  src = fetchurl {
+    url = "http://download.oracle.com/berkeley-db/${name}.tar.gz";
+    sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0";
+  };
+
+  configureFlags = [
+    (if cxxSupport then "--enable-cxx" else "--disable-cxx")
+  ];
+
+  preConfigure = ''
+    cd build_unix
+    configureScript=../dist/configure
+  '';
+
+  postInstall = ''
+    rm -rf $out/docs
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/index.html";
+    description = "Berkeley DB";
+    license = "Berkeley Database License";
+    platforms = platforms.unix;
+  };
+}

pkgs/development/libraries/directfb/default.nix

@@ -35,4 +35,22 @@ stdenv.mkDerivation {
     ] ++ stdenv.lib.optionals enableX11 [
       "--enable-x11"
     ];
+
+  meta = with stdenv.lib; {
+    description = "Graphics and input library designed with embedded systems in mind";
+    longDescription = ''
+      DirectFB is a thin library that provides hardware graphics acceleration,
+      input device handling and abstraction, integrated windowing system with
+      support for translucent windows and multiple display layers, not only on
+      top of the Linux Framebuffer Device. It is a complete hardware
+      abstraction layer with software fallbacks for every graphics operation
+      that is not supported by the underlying hardware. DirectFB adds graphical
+      power to embedded systems and sets a new standard for graphics under
+      Linux.
+    '';
+    homepage = http://directfb.org/;
+    license = licenses.lgpl21;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
 }

pkgs/development/libraries/directfb/src-for-default.nix

@@ -1,9 +1,9 @@
 rec {
-   version="1.6.2";
-   name="directfb-1.6.2";
-   hash="0k9x8lnjvlyalsd07a8z4iv2rfmpiz6j7aj0y4m4sybxhc8c86xr";
+   version="1.6.3";
+   name="directfb-1.6.3";
+   hash="0w2yyx6l2wn8jj9y14ymknqyc88wwrl314p9204frck91znsr5ks";
    url="http://directfb.org/downloads/Core/DirectFB-1.6/DirectFB-${version}.tar.gz";
-   advertisedUrl="http://directfb.org/downloads/Core/DirectFB-1.6/DirectFB-1.6.2.tar.gz";
+   advertisedUrl="http://directfb.org/downloads/Core/DirectFB-1.6/DirectFB-1.6.3.tar.gz";
   
   
 }

pkgs/development/libraries/glog/default.nix

@@ -0,0 +1,16 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "glog-0.3.3";
+  
+  src = fetchurl {
+    url = "http://google-glog.googlecode.com/files/${name}.tar.gz";
+    sha1 = "ed40c26ecffc5ad47c618684415799ebaaa30d65";
+  };
+
+  meta = {
+    homepage = http://code.google.com/p/google-glog/;
+    license = "BSD";
+    description = "The glog library implements application-level logging.";
+  };
+}

pkgs/development/libraries/gssdp/default.nix

@@ -4,8 +4,8 @@ stdenv.mkDerivation {
   name = "gssdp-0.12.2.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gssdp/0.12/gssdp-0.12.2.1.tar.xz;
-    sha256 = "0544f9nv6dpnfd0qbmxm8xwqjh8dafcmf3vlzkdly12xh5bs52lj";
+    url = mirror://gnome/sources/gssdp/0.14/gssdp-0.14.6.tar.xz;
+    sha256 = "1kgakr0rpdpm7nkp4ycka12nndga16wmzim79v1nbcc0j2wxxkws";
   };
 
   buildInputs = [pkgconfig libsoup glib libxml2];

pkgs/development/libraries/gupnp-av/default.nix

@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, gupnp, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "gupnp-av-${version}";
+  majorVersion = "0.12";
+  version = "${majorVersion}.4";
+  src = fetchurl {
+    url = "mirror://gnome/sources/gupnp-av/${majorVersion}/gupnp-av-${version}.tar.xz";
+    sha256 = "0nvsvpiyfslz54j4hjh2gsdjkbi2qj2f4k0aw8s7f05kibprr2jl";
+  };
+  
+  buildInputs = [ gupnp pkgconfig ];
+
+  meta = {
+    homepage = http://gupnp.org/;
+    description = "GUPnP-AV is a collection of helpers for building AV (audio/video) applications using GUPnP.";
+    longDescription = "GUPnP implements the UPnP specification: resource announcement and discovery, description, control, event notification, and presentation (GUPnP includes basic web server functionality through libsoup). GUPnP does not include helpers for construction or control of specific standardized resources (e.g. MediaServer); this is left for higher level libraries utilizing the GUPnP framework.";
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}

pkgs/development/libraries/gupnp/default.nix

@@ -1,11 +1,12 @@
 { stdenv, fetchurl, pkgconfig, glib, libxml2, gssdp, libsoup, libuuid }:
  
-stdenv.mkDerivation {
-  name = "gupnp-0.18.4";
-
+stdenv.mkDerivation rec {
+  name = "gupnp-${version}";
+  majorVersion = "0.20";
+  version = "${majorVersion}.9";
   src = fetchurl {
-    url = mirror://gnome/sources/gupnp/0.18/gupnp-0.18.4.tar.xz;
-    sha256 = "18bqmy8r44fnga9wz9inlq6k2s0292bnnql0c0n2j4mj25bpshvb";
+    url = "mirror://gnome/sources/gupnp/${majorVersion}/gupnp-${version}.tar.xz";
+    sha256 = "0vicydn3f72x1rqql7857ans85mg7dfap7n7h8xrfyb9whxhlrb1";
   };
 
   propagatedBuildInputs = [ libxml2 libsoup gssdp ];
@@ -13,7 +14,16 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkgconfig ];
 
+  postInstall = '' 
+    cp -r ${libsoup}/include/libsoup-2.4/libsoup $out/include
+    cp -r ${gssdp}/include/gssdp-1.0/libgssdp $out/include
+    cp -r ${libxml2}/include/libxml2/libxml $out/include
+    '';
+
   meta = {
     homepage = http://www.gupnp.org/;
+    description = "GUPnP is an implementation of the UPnP specification.";
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

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

@@ -6,6 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "0a9g0iblfyqppcy1ni3ac8f3yv5km95bfblhwqlsk6khydi5ka98";
   buildDepends = [ HTTP json mtl network utf8String ];
   testDepends = [ HTTP HUnit json mtl network utf8String ];
+  doCheck = false;
   meta = {
     homepage = "http://github.com/arjunguha/haskell-couchdb/";
     description = "CouchDB interface";

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

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HList";
-  version = "0.3.0.1";
-  sha256 = "03mp99pb8whh3whyffyj8wbld8lv8i930dyjdpyfwiaj13x05iy4";
+  version = "0.3.1.0";
+  sha256 = "1cq7l7cv62jf47s75ycsgxg75kkrgnnrpb6y22cskc97hkfsnjmk";
   buildDepends = [ mtl ];
   testDepends = [ cmdargs doctest filepath hspec lens mtl syb ];
   buildTools = [ diffutils ];

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

@@ -0,0 +1,19 @@
+{ cabal, comonad, contravariant, distributive, free, mtl
+, semigroupoids, semigroups, tagged, transformers, void
+}:
+
+cabal.mkDerivation (self: {
+  pname = "adjunctions";
+  version = "4.0.1";
+  sha256 = "0z13rmh9yp8jg2jzj3bmysqc4h2nblshx125h2sx51wllnvxzh5l";
+  buildDepends = [
+    comonad contravariant distributive free mtl semigroupoids
+    semigroups tagged transformers void
+  ];
+  meta = {
+    homepage = "http://github.com/ekmett/adjunctions/";
+    description = "Adjunctions and representable functors";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/annotated-wl-pprint/default.nix

@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "annotated-wl-pprint";
+  version = "0.5.3";
+  sha256 = "0g8b4hmgh7jhiknfrlaqr9sxr7a6sikkpaws15dy8mg4r792bbis";
+  meta = {
+    homepage = "https://github.com/david-christiansen/annotated-wl-pprint";
+    description = "The Wadler/Leijen Pretty Printer, with annotation support";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

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

@@ -1,13 +1,14 @@
-{ cabal, certificate, cprngAes, dataDefault, network, socks, tls
-, tlsExtra
+{ cabal, cprngAes, dataDefaultClass, network, socks, tls, x509
+, x509Store, x509System, x509Validation
 }:
 
 cabal.mkDerivation (self: {
   pname = "connection";
-  version = "0.1.3.1";
-  sha256 = "1z9vb20466lg7l8z4abfbsdzpix18hswpqcl7s2gv838s2wvd16w";
+  version = "0.2.0";
+  sha256 = "17fzkgrjavmcxhdjj7agkx16jwpf6ql31nw1ni8gczkbp7azd0kp";
   buildDepends = [
-    certificate cprngAes dataDefault network socks tls tlsExtra
+    cprngAes dataDefaultClass network socks tls x509 x509Store
+    x509System x509Validation
   ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-connection";

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

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ekg";
-  version = "0.3.1.3";
-  sha256 = "1d8ly1lc92gh26bdqg3ql6n2iai3nyvwic6sj8pani58iv0p4ppc";
+  version = "0.3.1.4";
+  sha256 = "0hr9962yx463rq53xfqfm7vlv9izn47v3css3m6n4v694qlyz95i";
   buildDepends = [
     aeson filepath network snapCore snapServer text time transformers
     unorderedContainers

pkgs/development/libraries/haskell/fay-base/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "fay-base";
-  version = "0.18.0.0";
-  sha256 = "010zjcs4y0zdb4gijrw10sjc56i271s35bkwg5c0lblyr62nml0s";
+  version = "0.19";
+  sha256 = "03jf1ig3s2dcdd26j3d3iwm9hbiq5f5q5hyg22jdvl7lmvigw36j";
   buildDepends = [ fay ];
   meta = {
     homepage = "https://github.com/faylang/fay-base";

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

@@ -1,22 +1,22 @@
 { cabal, aeson, attoparsec, Cabal, cpphs, dataDefault, filepath
 , ghcPaths, haskellNames, haskellPackages, haskellSrcExts, HUnit
 , languageEcmascript, mtl, optparseApplicative, prettyShow, safe
-, sourcemap, split, syb, testFramework, testFrameworkHunit
-, testFrameworkTh, text, time, uniplate, unorderedContainers
-, utf8String, vector
+, scientific, sourcemap, split, syb, testFramework
+, testFrameworkHunit, testFrameworkTh, text, time, uniplate
+, unorderedContainers, utf8String, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "fay";
-  version = "0.18.1.3";
-  sha256 = "1m747l2555w1jkdwh8b851mxvngiy7l7sbkwvm2il6k5ygcz5gbv";
+  version = "0.19.0.1";
+  sha256 = "036z4wz7vziaczhx1ysbm7d2302n2sb6l1z48py8spai5awkbvh0";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     aeson attoparsec Cabal cpphs dataDefault filepath ghcPaths
     haskellNames haskellPackages haskellSrcExts HUnit
     languageEcmascript mtl optparseApplicative prettyShow safe
-    sourcemap split syb testFramework testFrameworkHunit
+    scientific sourcemap split syb testFramework testFrameworkHunit
     testFrameworkTh text time uniplate unorderedContainers utf8String
     vector
   ];

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

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "free";
-  version = "4.2";
-  sha256 = "0g2k36xqma8r6shrih40w5xv0pgs5ldr9lhc5hjpwmh4n3hgdhfb";
+  version = "4.4";
+  sha256 = "19c6zy7gxsd121g1kny9y8rv33gsxv3kfsi37iyn6q0p8r38wbcy";
   buildDepends = [
     bifunctors comonad distributive mtl profunctors semigroupoids
     semigroups transformers

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

@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hit";
-  version = "0.5.3";
-  sha256 = "0s6nfjdasf62x28vzks809slnh0p6j3g101jzqlfh7nrnj5k6q1d";
+  version = "0.5.4";
+  sha256 = "1gr2f1bzncg8zlxk343p1ifnf2a2px000syzmr7hcf4yhhfavrhz";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

pkgs/development/libraries/haskell/http-client-tls/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-client-tls";
-  version = "0.2.0.2";
-  sha256 = "0v5730rssddc28f1q6ndkcjrfz8r5a1wmxk1azpmdxlq6nh4i9q9";
+  version = "0.2.0.3";
+  sha256 = "0v8zbwlvdmkap5qbw9aw75krvw8j4q90fn301al13azzgjp71gmb";
   buildDepends = [ connection dataDefault httpClient network tls ];
   testDepends = [ hspec httpClient httpTypes ];
   doCheck = false;

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

@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lens";
-  version = "3.10.1";
-  sha256 = "0xjjld1ra1a0a739ia8swgbpw7r72hv0bs9akbqr9wyw8qdzibnh";
+  version = "3.10.2";
+  sha256 = "0hdj75sg8r1m2jdpfh81zdcwbhp6mb7xipp6q57pv6n90xc6dnxw";
   buildDepends = [
     bifunctors comonad contravariant distributive filepath
     genericDeriving hashable MonadCatchIOTransformers mtl parallel
@@ -23,6 +23,9 @@ cabal.mkDerivation (self: {
     testFrameworkHunit testFrameworkQuickcheck2 testFrameworkTh text
     transformers unorderedContainers vector
   ];
+  patchPhase = ''
+    sed -i lens.cabal -e 's|MonadCatchIO-transformers >=.*,|MonadCatchIO-transformers,|'
+  '';
   doCheck = false;
   meta = {
     homepage = "http://github.com/ekmett/lens/";

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

@@ -1,16 +1,17 @@
-{ cabal, binary, distributive, doctest, filepath, hashable, HUnit
-, lens, reflection, semigroupoids, semigroups, simpleReflect
-, tagged, testFramework, testFrameworkHunit, transformers
-, unorderedContainers, vector
+{ cabal, adjunctions, binary, distributive, doctest, filepath
+, hashable, HUnit, lens, reflection, semigroupoids, semigroups
+, simpleReflect, tagged, testFramework, testFrameworkHunit
+, transformers, unorderedContainers, vector, void
 }:
 
 cabal.mkDerivation (self: {
   pname = "linear";
-  version = "1.4";
-  sha256 = "1a2l68q0l2vlp4wpf5wqvpnag326s38k2ifh8hcfczjhsg9cq45a";
+  version = "1.6";
+  sha256 = "1aka0da4mwv9cdj76armlava0d4c5f8s2pv10fk6b5glyb0c1a7x";
   buildDepends = [
-    binary distributive hashable reflection semigroupoids semigroups
-    tagged transformers unorderedContainers vector
+    adjunctions binary distributive hashable lens reflection
+    semigroupoids semigroups tagged transformers unorderedContainers
+    vector void
   ];
   testDepends = [
     binary doctest filepath HUnit lens simpleReflect testFramework

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monadcryptorandom";
-  version = "0.6";
-  sha256 = "0gms6xsnr6g5lk36z92yygwmyrl568y1h76ww676wb3qph42xx3x";
+  version = "0.6.1";
+  sha256 = "0j99j0f2qwhslimfgslsdlv0xihsddas3i69pfnjwnsd9zg5pgj2";
   buildDepends = [ cryptoApi mtl tagged transformers ];
   meta = {
     homepage = "https://github.com/TomMD/monadcryptorandom";

pkgs/development/libraries/haskell/network-conduit-tls/default.nix

@@ -1,17 +1,17 @@
 { cabal, aeson, certificate, conduit, connection, cprngAes
 , cryptoApi, cryptoRandomApi, dataDefault, HUnit, monadControl, mtl
 , network, networkConduit, pem, systemFileio, systemFilepath, tls
-, tlsExtra, transformers
+, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "network-conduit-tls";
-  version = "1.0.3";
-  sha256 = "0l8h9pfrrqzkf45cp5r8kxpzc2fi6m01s4zkrh0d226rbps3gmvc";
+  version = "1.0.4.1";
+  sha256 = "1l79v4ippyfw6pl4h3vqswh79vcif80phf6kq5fr4xmv3b6nbc06";
   buildDepends = [
     aeson certificate conduit connection cprngAes cryptoApi
     cryptoRandomApi dataDefault monadControl network networkConduit pem
-    systemFileio systemFilepath tls tlsExtra transformers
+    systemFileio systemFilepath tls transformers
   ];
   testDepends = [ conduit connection HUnit mtl networkConduit ];
   meta = {

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

@@ -0,0 +1,13 @@
+{ cabal, deepseq }:
+
+cabal.mkDerivation (self: {
+  pname = "pqueue";
+  version = "1.2.1";
+  sha256 = "1fily60f4njby7zknmik7a2wxsm3y77ckr69w9bb3fgq22gbzky6";
+  buildDepends = [ deepseq ];
+  meta = {
+    description = "Reliable, persistent, fast priority queues";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/reactive-banana-wx/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "reactive-banana-wx";
-  version = "0.7.1.0";
-  sha256 = "06hkb8v6rjpw95vf16xh547igxxzddr6wpjiwhqwpwhz2alavk2v";
+  version = "0.8.0.0";
+  sha256 = "0qfd839nm2ppjhhhnn6s1hbx1mnrzjqx450p4jadsrs1y2403c9n";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ cabalMacosx reactiveBanana wx wxcore ];

pkgs/development/libraries/haskell/reactive-banana/default.nix

@@ -1,19 +1,21 @@
-{ cabal, hashable, HUnit, testFramework, testFrameworkHunit
+{ cabal, hashable, HUnit, pqueue, testFramework, testFrameworkHunit
 , transformers, unorderedContainers, vault
 }:
 
 cabal.mkDerivation (self: {
   pname = "reactive-banana";
-  version = "0.7.1.3";
-  sha256 = "117y1sk97kpiq0cippq0ydl2zqb99q49y2m2m6pgg2nh6gz6a3zb";
-  buildDepends = [ hashable transformers unorderedContainers vault ];
+  version = "0.8.0.0";
+  sha256 = "15dzvn7cbs9kg410lyd1kj6kf2r7ap2n9bc59byzkb0r8wzn9ra1";
+  buildDepends = [
+    hashable pqueue transformers unorderedContainers vault
+  ];
   testDepends = [
-    hashable HUnit testFramework testFrameworkHunit transformers
+    hashable HUnit pqueue testFramework testFrameworkHunit transformers
     unorderedContainers vault
   ];
   meta = {
     homepage = "http://haskell.org/haskellwiki/Reactive-banana";
-    description = "Practical library for functional reactive programming (FRP)";
+    description = "Library for functional reactive programming (FRP)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "reflection";
-  version = "1.3.2";
-  sha256 = "0jmdygvmvhw20aqjk7k0jah93ggfgf2bgq5zpwnz9bwgi9gs17x6";
+  version = "1.4";
+  sha256 = "0i6yb3fa9wizyaz8x9b7yzkw9jf7zahdrkr2y0iw7igdxqn4n0k7";
   buildDepends = [ tagged ];
   meta = {
     homepage = "http://github.com/ekmett/reflection";

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

@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "sourcemap";
-  version = "0.1.2.0";
-  sha256 = "040j2k1cwzlq5pybs6cg7wmf0x5i22zdidv2xvzdvgi5v7gf6kp1";
+  version = "0.1.3.0";
+  sha256 = "1flfsjs2z2zjzqwvmc2vcibvxh19s89ah4s560xr2s5mhdqwbkk5";
   buildDepends = [
     aeson attoparsec text unorderedContainers utf8String
   ];

pkgs/development/libraries/haskell/tls-extra/default.nix

@@ -1,23 +0,0 @@
-{ cabal, certificate, cipherAes, cipherRc4, cryptohash
-, cryptoPubkey, cryptoRandom, mtl, network, pem, time, tls, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "tls-extra";
-  version = "0.6.6";
-  sha256 = "0k0sj3nq1lrvbmd582mjj8cxbxigivz1hm8hhij1ncl2pgnq5xyv";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    certificate cipherAes cipherRc4 cryptohash cryptoPubkey
-    cryptoRandom mtl network pem time tls vector
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-tls";
-    description = "TLS extra default values and helpers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})

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

@@ -1,18 +1,23 @@
-{ cabal, cereal, certificate, cprngAes, cryptohash, cryptoPubkey
-, cryptoRandom, mtl, network, QuickCheck, testFramework
-, testFrameworkQuickcheck2, time
+{ cabal, asn1Encoding, asn1Types, cereal, cipherAes, cipherRc4
+, cprngAes, cryptohash, cryptoNumbers, cryptoPubkey
+, cryptoPubkeyTypes, cryptoRandom, dataDefaultClass, mtl, network
+, QuickCheck, testFramework, testFrameworkQuickcheck2, time, x509
+, x509Store, x509Validation
 }:
 
 cabal.mkDerivation (self: {
   pname = "tls";
-  version = "1.1.5";
-  sha256 = "1ja03x3i7dgjpy22h4shnni1xslph8i8q4accqq8njpqpz54c84c";
+  version = "1.2.2";
+  sha256 = "156l859mfpdax5rg1frwa5ms5bzggaja0mi795hh8i5c3ah7hfcp";
   buildDepends = [
-    cereal certificate cryptohash cryptoPubkey cryptoRandom mtl network
+    asn1Encoding asn1Types cereal cipherAes cipherRc4 cryptohash
+    cryptoNumbers cryptoPubkey cryptoPubkeyTypes cryptoRandom
+    dataDefaultClass mtl network x509 x509Store x509Validation
   ];
   testDepends = [
-    cereal certificate cprngAes cryptoPubkey cryptoRandom mtl
-    QuickCheck testFramework testFrameworkQuickcheck2 time
+    cereal cprngAes cryptoPubkey cryptoRandom dataDefaultClass mtl
+    QuickCheck testFramework testFrameworkQuickcheck2 time x509
+    x509Validation
   ];
   doCheck = false;
   meta = {

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

@@ -1,10 +1,10 @@
-{ cabal, mtl, RepLib, transformers }:
+{ cabal, binary, mtl, RepLib, transformers }:
 
 cabal.mkDerivation (self: {
   pname = "unbound";
-  version = "0.4.2";
-  sha256 = "1bnnnv4rmzb0pw7i56nzr7k7pahr9rcmlfi4xkpsjhrxmizcfml9";
-  buildDepends = [ mtl RepLib transformers ];
+  version = "0.4.3";
+  sha256 = "1lv60zpsvjfp9qnckwbphkfv0x9pz2qvaab3p4kj38fnlq2y20i4";
+  buildDepends = [ binary mtl RepLib transformers ];
   meta = {
     homepage = "http://code.google.com/p/replib/";
     description = "Generic support for programming with names and binders";

pkgs/development/libraries/haskell/vector-th-unbox/default.nix

@@ -1,10 +1,11 @@
-{ cabal, vector }:
+{ cabal, dataDefault, vector }:
 
 cabal.mkDerivation (self: {
   pname = "vector-th-unbox";
-  version = "0.2.0.1";
-  sha256 = "1q01yk6cyjxbdnmq31d5mfac09hbql43d7xiw1snc96nmkklfpjv";
+  version = "0.2.0.2";
+  sha256 = "1c8xy0rcl8il9ssclqshwi8dd2xx6bl1rfhrfm9h7wklw64db9xp";
   buildDepends = [ vector ];
+  testDepends = [ dataDefault vector ];
   meta = {
     description = "Deriver for Data.Vector.Unboxed using Template Haskell";
     license = self.stdenv.lib.licenses.bsd3;

pkgs/development/libraries/haskell/wai-extra/default.nix

@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-extra";
-  version = "2.0.3.2";
-  sha256 = "0zhwk78ny7ak6sf974gqg3zjrrmivgb7dvxs5jbqghq0a6xs97zi";
+  version = "2.0.3.3";
+  sha256 = "11ma8pazvysvpiy8y7xfh7kpmsfiw94bd6vyyi3ji8q71rzjlf62";
   buildDepends = [
     ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit
     caseInsensitive conduit dataDefault fastLogger httpTypes liftedBase

pkgs/development/libraries/haskell/warp-tls/default.nix

@@ -1,15 +1,14 @@
-{ cabal, certificate, conduit, cprngAes, cryptocipher
-, cryptoRandomApi, network, networkConduit, pem, tls, tlsExtra
-, transformers, wai, warp
+{ cabal, conduit, cprngAes, dataDefaultClass, network
+, networkConduit, tls, transformers, wai, warp
 }:
 
 cabal.mkDerivation (self: {
   pname = "warp-tls";
-  version = "2.0.1";
-  sha256 = "0qz02awxrfqmmckias21dh0irmf44vamv24jjjrbb6bjxbr4ldd0";
+  version = "2.0.2";
+  sha256 = "02wj9hwxd0x49g7kl68h3r4b9hc29yqfjagyybnr42xzwl6bdpyg";
   buildDepends = [
-    certificate conduit cprngAes cryptocipher cryptoRandomApi network
-    networkConduit pem tls tlsExtra transformers wai warp
+    conduit cprngAes dataDefaultClass network networkConduit tls
+    transformers wai warp
   ];
   meta = {
     homepage = "http://github.com/yesodweb/wai";

pkgs/development/libraries/haskell/x509-store/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "x509-store";
-  version = "1.4.3";
-  sha256 = "1px5r5y4vaxx479d4av333g1sc03mz1aalpvwwkbi5bwnxydvf01";
+  version = "1.4.4";
+  sha256 = "0i3hfrddr0wpfl75a76a1j24az08z4x7ya8l5qcdk7c1lr2c2bw8";
   buildDepends = [
     asn1Encoding asn1Types cryptoPubkeyTypes filepath mtl pem time x509
   ];

pkgs/development/libraries/haskell/yesod-platform/default.nix

@@ -1,74 +0,0 @@
-{ cabal, aeson, ansiTerminal, asn1Data, asn1Types, attoparsec
-, attoparsecConduit, authenticate, base64Bytestring
-, baseUnicodeSymbols, blazeBuilder, blazeBuilderConduit, blazeHtml
-, blazeMarkup, byteable, byteorder, caseInsensitive, cereal
-, certificate, cipherAes, cipherBlowfish, cipherCamellia, cipherDes
-, cipherRc4, clientsession, conduit, connection, controlMonadLoop
-, cookie, cprngAes, cryptoApi, cryptocipher, cryptoCipherTypes
-, cryptoConduit, cryptohash, cryptohashCryptoapi, cryptoNumbers
-, cryptoPubkey, cryptoPubkeyTypes, cryptoRandom, cryptoRandomApi
-, cssText, dataDefault, dataDefaultClass, dataDefaultInstancesBase
-, dataDefaultInstancesContainers, dataDefaultInstancesDlist
-, dataDefaultInstancesOldLocale, dlist, emailValidate, entropy
-, esqueleto, failure, fastLogger, fileEmbed, filesystemConduit
-, hamlet, hjsmin, hspec, hspecExpectations, htmlConduit
-, httpAttoparsec, httpClient, httpClientConduit, httpClientTls
-, httpConduit, httpDate, httpTypes, languageJavascript, liftedBase
-, mimeMail, mimeTypes, mmorph, monadControl, monadLogger
-, monadLoops, networkConduit, pathPieces, pem, persistent
-, persistentTemplate, poolConduit, primitive, processConduit
-, publicsuffixlist, pureMD5, pwstoreFast, quickcheckIo
-, resourcePool, resourcet, safe, scientific, securemem, semigroups
-, setenv, SHA, shakespeare, shakespeareCss, shakespeareI18n
-, shakespeareJs, shakespeareText, silently, simpleSendfile, skein
-, socks, stmChans, stringsearch, systemFileio, systemFilepath
-, tagged, tagsoup, tagstreamConduit, tls, tlsExtra
-, transformersBase, unixCompat, unorderedContainers, utf8Light
-, utf8String, vector, void, wai, waiAppStatic, waiExtra, waiLogger
-, waiTest, warp, warpTls, word8, xmlConduit, xmlTypes, xssSanitize
-, yaml, yesod, yesodAuth, yesodCore, yesodForm, yesodPersistent
-, yesodRoutes, yesodStatic, yesodTest, zlibBindings, zlibConduit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "yesod-platform";
-  version = "1.2.6.1";
-  sha256 = "1hwvpyxwirv9maangw4q6nb2m2kqpqvvh1i095fr08f1a1qih77f";
-  buildDepends = [
-    aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit
-    authenticate base64Bytestring baseUnicodeSymbols blazeBuilder
-    blazeBuilderConduit blazeHtml blazeMarkup byteable byteorder
-    caseInsensitive cereal certificate cipherAes cipherBlowfish
-    cipherCamellia cipherDes cipherRc4 clientsession conduit connection
-    controlMonadLoop cookie cprngAes cryptoApi cryptocipher
-    cryptoCipherTypes cryptoConduit cryptohash cryptohashCryptoapi
-    cryptoNumbers cryptoPubkey cryptoPubkeyTypes cryptoRandom
-    cryptoRandomApi cssText dataDefault dataDefaultClass
-    dataDefaultInstancesBase dataDefaultInstancesContainers
-    dataDefaultInstancesDlist dataDefaultInstancesOldLocale dlist
-    emailValidate entropy esqueleto failure fastLogger fileEmbed
-    filesystemConduit hamlet hjsmin hspec hspecExpectations htmlConduit
-    httpAttoparsec httpClient httpClientConduit httpClientTls
-    httpConduit httpDate httpTypes languageJavascript liftedBase
-    mimeMail mimeTypes mmorph monadControl monadLogger monadLoops
-    networkConduit pathPieces pem persistent persistentTemplate
-    poolConduit primitive processConduit publicsuffixlist pureMD5
-    pwstoreFast quickcheckIo resourcePool resourcet safe scientific
-    securemem semigroups setenv SHA shakespeare shakespeareCss
-    shakespeareI18n shakespeareJs shakespeareText silently
-    simpleSendfile skein socks stmChans stringsearch systemFileio
-    systemFilepath tagged tagsoup tagstreamConduit tls tlsExtra
-    transformersBase unixCompat unorderedContainers utf8Light
-    utf8String vector void wai waiAppStatic waiExtra waiLogger waiTest
-    warp warpTls word8 xmlConduit xmlTypes xssSanitize yaml yesod
-    yesodAuth yesodCore yesodForm yesodPersistent yesodRoutes
-    yesodStatic yesodTest zlibBindings zlibConduit
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://www.yesodweb.com/";
-    description = "Meta package for Yesod";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})

pkgs/development/libraries/ilixi/default.nix

@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pkgconfig, directfb, libsigcxx, libxml2, fontconfig }:
+
+# TODO: optional deps: baresip, FusionDale, FusionSound, SaWMan, doxygen,
+# Reflex, Wnn, NLS
+
+stdenv.mkDerivation rec {
+  name = "ilixi-1.0.0";
+
+  src = fetchurl {
+    url = "http://www.directfb.org/downloads/Libs/${name}.tar.gz";
+    sha256 = "1kmdmqf68jiv7y6as41bhbgdy70yy2i811a3l6kccbazlzpif34v";
+  };
+
+  buildInputs = [ pkgconfig directfb libsigcxx libxml2 fontconfig ];
+
+  configureFlags = ''
+    --enable-log-debug --enable-debug --enable-trace --with-examples
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Lightweight C++ GUI toolkit for embedded Linux systems";
+    homepage = http://ilixi.org/;
+    license = licenses.lgpl3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}

pkgs/development/libraries/libarchive/default.nix

@@ -5,7 +5,10 @@ stdenv.mkDerivation rec {
   name = "libarchive-3.1.2";
 
   src = fetchurl {
-    url = "${meta.homepage}/downloads/${name}.tar.gz";
+    urls = [
+      "http://pkgs.fedoraproject.org/repo/pkgs/libarchive/libarchive-3.1.2.tar.gz/efad5a503f66329bb9d2f4308b5de98a/${name}.tar.gz"
+      "${meta.homepage}/downloads/${name}.tar.gz"
+    ];
     sha256 = "0pixqnrcf35dnqgv0lp7qlcw7k13620qkhgxr288v7p4iz6ym1zb";
   };
 

pkgs/development/libraries/libcangjie/default.nix

@@ -0,0 +1,32 @@
+{ stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkgconfig, sqlite }:
+
+stdenv.mkDerivation rec {
+  name = "libcangjie-1.0";
+
+  src = fetchurl {
+    url = "https://github.com/Cangjians/libcangjie/archive/v1.0.tar.gz";
+    sha256 = "15la1pxa2fvhznlbkl32qp2cgd602bvrx2zmahybypbfik0cgqk1";
+  };
+
+  buildInputs = [ automake autoconf libtool m4 pkgconfig sqlite ];
+
+  configureScript = "./autogen.sh";
+  
+  preConfigure = ''
+    find . -name '*.sh' -exec sed -e 's@#!/bin/bash@${bash}/bin/bash@' -i '{}' ';'
+  '';
+
+  doCheck = true;
+
+  meta = {
+    description = "A C library implementing the Cangjie input method";
+    longDescription = ''
+      libcangjie is a library implementing the Cangjie input method.
+    '';
+    homepage = http://cangjians.github.io/projects/libcangjie/;
+    license = "LGPLv3+";
+
+    maintainers = [ stdenv.lib.maintainers.linquize ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}

pkgs/development/libraries/libsoup/2.44.nix

@@ -1,35 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, python, gobjectIntrospection
-, glib, libxml2, sqlite, glib_networking
-, gnomeSupport ? true, libgnome_keyring
-}:
-
-stdenv.mkDerivation {
-  name = "libsoup-2.44.2";
-
-  meta = {
-    description = "HTTP client/server library";
-    license = stdenv.lib.licenses.lgpl2Plus;
-  };
-
-  src = fetchurl {
-    url = mirror://gnome/sources/libsoup/2.44/libsoup-2.44.2.tar.xz;
-    sha256 = "1wwqsmi1jvidiqwbdnjl66nmk1yja8w9dxf9cz10zh56fjmvbr77";
-  };
-
-  preConfigure = ''
-    substituteInPlace libsoup/tld-parser.py \
-      --replace "!/usr/bin/env python" "!${python}/bin/${python.executable}"
-  '';
-
-  nativeBuildInputs = [ pkgconfig intltool python gobjectIntrospection ];
-
-  propagatedBuildInputs = [ glib libxml2 sqlite ]
-    ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring ];
-
-  passthru.propagatedUserEnvPackages = [ glib_networking ];
-
-  # glib_networking is a runtime dependency, not a compile-time dependency
-  configureFlags = "--disable-tls-check";
-
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
-}

pkgs/development/libraries/libsoup/default.nix

@@ -1,19 +1,26 @@
 { stdenv, fetchurl, glib, libxml2, pkgconfig
-, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking
-, libintlOrEmpty }:
-
+, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking, gobjectIntrospection
+, libintlOrEmpty
+, intltool, python }:
+let
+  majorVersion = "2.45";
+  version = "${majorVersion}.3";
+in
 stdenv.mkDerivation {
-  name = "libsoup-2.38.1";
+  name = "libsoup-${version}";
 
   src = fetchurl {
-    url = mirror://gnome/sources/libsoup/2.38/libsoup-2.38.1.tar.xz;
-    sha256 = "16iza4y8pmc4sn90iid88fgminvgcqypy3s2qnmzkzm5qwzr5f3i";
+    url = "mirror://gnome/sources/libsoup/${majorVersion}/libsoup-${version}.tar.xz";
+    sha256 = "04ma47hcrrbjp90r8jjn686cngnbgac24wgarpwwzlpg66wighva";
   };
 
+  patchPhase = ''
+    patchShebangs libsoup/
+  '';
 
-  buildInputs = libintlOrEmpty;
+  buildInputs = libintlOrEmpty ++ [ intltool python ];
   nativeBuildInputs = [ pkgconfig ];
-  propagatedBuildInputs = [ glib libxml2 ]
+  propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ]
     ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring sqlite ];
   passthru.propagatedUserEnvPackages = [ glib_networking ];
 

pkgs/development/libraries/libusb1/default.nix

@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, udev }:
 
 let
-  version = "1.0.17";
+  version = "1.0.18";
 in
 stdenv.mkDerivation rec {
-  name = "libusbx-${version}"; # it's a fork of original libusb1; should be mostly compatible
+  name = "libusb-${version}"; # at 1.0.18 libusb joined with libusbx
 
   src = fetchurl {
-    url = "mirror://sourceforge/libusbx/libusbx-${version}.tar.bz2";
-    sha256 = "1f25a773x9x5n48a0mcigyk77ay0hkiz6y6bi4588wzf7wn8svw7";
+    url = "mirror://sourceforge/libusb/libusb-${version}.tar.bz2";
+    sha256 = "081px0j98az0pjwwyjlq4qcmfn194fvm3qd4im0r9pm58pn5qgy7";
   };
 
   buildInputs = [ pkgconfig ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
 
   meta = {
-    homepage = http://www.libusb.org;
+    homepage = http://www.libusb.info;
     description = "User-space USB library";
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.urkud ];

pkgs/development/libraries/libyaml/cve-2013-6393_a.patch

@@ -0,0 +1,11 @@
+--- a/src/scanner.c	
++++ a/src/scanner.c	
+@@ -2574,7 +2574,7 @@ 
+ 
+     /* Resize the string to include the head. */
+ 
+-    while (string.end - string.start <= (int)length) {
++    while ((size_t)(string.end - string.start) <= length) {
+         if (!yaml_string_extend(&string.start, &string.pointer, &string.end)) {
+             parser->error = YAML_MEMORY_ERROR;
+             goto error;

pkgs/development/libraries/libyaml/cve-2013-6393_b.patch

@@ -0,0 +1,16 @@
+--- a/src/api.c	
++++ a/src/api.c	
+@@ -117,7 +117,12 @@ 
+ YAML_DECLARE(int)
+ yaml_stack_extend(void **start, void **top, void **end)
+ {
+-    void *new_start = yaml_realloc(*start, ((char *)*end - (char *)*start)*2);
++    void *new_start;
++
++    if ((char *)*end - (char *)*start >= INT_MAX / 2)
++	return 0;
++
++    new_start = yaml_realloc(*start, ((char *)*end - (char *)*start)*2);
+ 
+     if (!new_start) return 0;
+ 

pkgs/development/libraries/libyaml/cve-2013-6393_c.patch

@@ -0,0 +1,131 @@
+--- a/src/scanner.c	Mon Dec 24 03:51:32 2012 +0000
++++ a/src/scanner.c	Mon Jan 27 19:48:28 2014 -0500
+@@ -615,11 +615,14 @@ 
+  */
+ 
+ static int
+-yaml_parser_roll_indent(yaml_parser_t *parser, int column,
++yaml_parser_roll_indent(yaml_parser_t *parser, size_t column,
+         int number, yaml_token_type_t type, yaml_mark_t mark);
+ 
+ static int
+-yaml_parser_unroll_indent(yaml_parser_t *parser, int column);
++yaml_parser_unroll_indent(yaml_parser_t *parser, size_t column);
++
++static int
++yaml_parser_reset_indent(yaml_parser_t *parser);
+ 
+ /*
+  * Token fetchers.
+@@ -1206,7 +1209,7 @@ 
+  */
+ 
+ static int
+-yaml_parser_roll_indent(yaml_parser_t *parser, int column,
++yaml_parser_roll_indent(yaml_parser_t *parser, size_t column,
+         int number, yaml_token_type_t type, yaml_mark_t mark)
+ {
+     yaml_token_t token;
+@@ -1216,7 +1219,7 @@ 
+     if (parser->flow_level)
+         return 1;
+ 
+-    if (parser->indent < column)
++    if (parser->indent == -1 || parser->indent < column)
+     {
+         /*
+          * Push the current indentation level to the stack and set the new
+@@ -1254,7 +1257,7 @@ 
+ 
+ 
+ static int
+-yaml_parser_unroll_indent(yaml_parser_t *parser, int column)
++yaml_parser_unroll_indent(yaml_parser_t *parser, size_t column)
+ {
+     yaml_token_t token;
+ 
+@@ -1263,6 +1266,15 @@ 
+     if (parser->flow_level)
+         return 1;
+ 
++    /*
++     * column is unsigned and parser->indent is signed, so if
++     * parser->indent is less than zero the conditional in the while
++     * loop below is incorrect.  Guard against that.
++     */
++    
++    if (parser->indent < 0)
++        return 1;
++
+     /* Loop through the intendation levels in the stack. */
+ 
+     while (parser->indent > column)
+@@ -1283,6 +1295,41 @@ 
+ }
+ 
+ /*
++ * Pop indentation levels from the indents stack until the current
++ * level resets to -1.  For each intendation level, append the
++ * BLOCK-END token.
++ */
++
++static int
++yaml_parser_reset_indent(yaml_parser_t *parser)
++{
++    yaml_token_t token;
++
++    /* In the flow context, do nothing. */
++
++    if (parser->flow_level)
++        return 1;
++
++    /* Loop through the intendation levels in the stack. */
++
++    while (parser->indent > -1)
++    {
++        /* Create a token and append it to the queue. */
++
++        TOKEN_INIT(token, YAML_BLOCK_END_TOKEN, parser->mark, parser->mark);
++
++        if (!ENQUEUE(parser, parser->tokens, token))
++            return 0;
++
++        /* Pop the indentation level. */
++
++        parser->indent = POP(parser, parser->indents);
++    }
++
++    return 1;
++}
++
++/*
+  * Initialize the scanner and produce the STREAM-START token.
+  */
+ 
+@@ -1338,7 +1385,7 @@ 
+ 
+     /* Reset the indentation level. */
+ 
+-    if (!yaml_parser_unroll_indent(parser, -1))
++    if (!yaml_parser_reset_indent(parser))
+         return 0;
+ 
+     /* Reset simple keys. */
+@@ -1369,7 +1416,7 @@ 
+ 
+     /* Reset the indentation level. */
+ 
+-    if (!yaml_parser_unroll_indent(parser, -1))
++    if (!yaml_parser_reset_indent(parser))
+         return 0;
+ 
+     /* Reset simple keys. */
+@@ -1407,7 +1454,7 @@ 
+ 
+     /* Reset the indentation level. */
+ 
+-    if (!yaml_parser_unroll_indent(parser, -1))
++    if (!yaml_parser_reset_indent(parser))
+         return 0;
+ 
+     /* Reset simple keys. */

pkgs/development/libraries/libyaml/default.nix

@@ -8,6 +8,9 @@ stdenv.mkDerivation {
     sha256 = "0dvavrhxjrjfxgdgysxqfpdy08lpg3m9i8vxjyvdkcjsmra1by3v";
   };
 
+  # Downloaded on 2014-02-01 from https://bugzilla.redhat.com/show_bug.cgi?id=1033990
+  patches = [ ./cve-2013-6393_a.patch ./cve-2013-6393_b.patch ./cve-2013-6393_c.patch ];
+
   meta = {
     homepage = http://pyyaml.org/;
     description = "A YAML 1.1 parser and emitter written in C";

pkgs/development/libraries/libyubikey/default.nix

@@ -0,0 +1,21 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec
+{
+  version = "1.11";
+  name = "libyubikey-${version}";
+
+  src = fetchurl
+  {
+    url = "http://opensource.yubico.com/yubico-c/releases/${name}.tar.gz";
+    sha256 = "19pm4rqsnm9r0n5j26bqkxa1jpimdavzcvg5g7p416vkjhxc6lw9";
+  };
+
+  meta =
+  {
+    homepage = "http://opensource.yubico.com/yubico-c/";
+    description = "C library for manipulating Yubico YubiKey One-Time Passwords (OTPs)";
+    license = "bsd";
+    maintainers = [ stdenv.lib.maintainers.calrama ];
+  };
+}

pkgs/development/libraries/openldap/default.nix

@@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://www.openldap.org/";
     description = "An open source implementation of the Lightweight Directory Access Protocol";
+    maintainers = stdenv.lib.maintainers.mornfall;
   };
 }

pkgs/development/libraries/openmpi/default.nix

@@ -11,6 +11,7 @@ stdenv.mkDerivation {
     homePage = http://www.open-mpi.org/;
     description = "Open source MPI-2 implementation";
     longDescription = "The Open MPI Project is an open source MPI-2 implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers.";
+    maintainers = stdenv.lib.maintainers.mornfall;
   };
 }
 

pkgs/development/libraries/science/math/arpack/default.nix

@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, gfortran, openblas }:
+
+let version = "3.1.4";
+in
+stdenv.mkDerivation {
+  name = "arpack-${version}";
+  src = fetchurl {
+    url = "http://forge.scilab.org/index.php/p/arpack-ng/downloads/get/arpack-ng_${version}.tar.gz";
+    sha256 = "0m4cqy3d7fpzx1nac3brhr298qj7vx3fchjdz5b7n0pp616cmcm1";
+  };
+
+  buildInputs = [ gfortran ];
+  propagatedBuildInputs = [ openblas ];
+
+  # Auto-detection fails because gfortran brings in BLAS by default
+  configureFlags="--with-blas=-lopenblas --with-lapack=-lopenblas";
+
+  meta = {
+    homepage = "http://forge.scilab.org/index.php/p/arpack-ng/";
+    description = "A collection of Fortran77 subroutines to solve large scale eigenvalue problems";
+    platforms = stdenv.lib.platforms.all;
+    license = stdenv.lib.licenses.bsd3;
+  };
+}

pkgs/development/libraries/zeroc-ice/default.nix

@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, mcpp, bzip2, expat, openssl, db5 }:
+
+stdenv.mkDerivation rec {
+  name = "zeroc-ice-3.5.1";
+
+  src = fetchurl {
+    url = "http://www.zeroc.com/download/Ice/3.5/Ice-3.5.1.tar.gz";
+    sha256 = "14pk794p0fq3hcp50xmqnf9pp15dggiqhcnsav8xpnka9hcm37lq";
+  };
+
+  buildInputs = [ mcpp bzip2 expat openssl db5 ];
+
+  buildPhase = ''
+    cd cpp
+    make OPTIMIZE=yes
+  '';
+
+  installPhase = ''
+    make prefix=$out install
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.zeroc.com/ice.html";
+    description = "The internet communications engine";
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+  };
+}

pkgs/development/misc/amdadl-sdk/default.nix

@@ -42,8 +42,9 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "API to access display driver functionality for ATI graphics cards";
     homepage = http://developer.amd.com/tools/graphics-development/display-library-adl-sdk/;
-    license = licenses.amdadl;
+    license = licenses.unfree;
     maintainers = [ maintainers.offline ];
-    platforms = [ "i686-linux" "x86_64-linux" ];
+    platforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = [];
   };
 }

pkgs/development/mobile/androidenv/emulate-app.nix

@@ -95,7 +95,15 @@ stdenv.mkDerivation {
     
     ${stdenv.lib.optionalString (app != null) ''
       # Install the App through the debugger
-      ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port install ${app}/*.apk
+      
+      if [ -d "${app}" ]
+      then
+          appPath="$(echo ${app}/*.apk)"
+      else
+          appPath="${app}"
+      fi
+      
+      ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port install "$appPath"
     
       # Start the application
       ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port shell am start -a android.intent.action.MAIN -n ${package}/.${activity}

pkgs/development/tools/analysis/lcov/default.nix

@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "LCOV, a code coverage tool that enhances GNU gcov";
 
     longDescription =
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     homepage = http://ltp.sourceforge.net/coverage/lcov.php;
     license = "GPLv2+";
 
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
+    maintainers = [ maintainers.mornfall ];
+    platforms = platforms.all;
   };
 }