Merge remote-tracking branch 'origin/master' into staging.

lib/maintainers.nix

@@ -163,6 +163,7 @@
   rushmorem = "Rushmore Mushambi <rushmore@webenchanter.com>";
   rycee = "Robert Helgesson <robert@rycee.net>";
   sander = "Sander van der Burg <s.vanderburg@tudelft.nl>";
+  schmitthenner = "Fabian Schmitthenner <development@schmitthenner.eu>";
   schristo = "Scott Christopher <schristopher@konputa.com>";
   sepi = "Raffael Mancini <raffael@mancini.lu>";
   shell = "Shell Turner <cam.turn@gmail.com>";

lib/tests/modules.sh

@@ -0,0 +1,94 @@
+#!/bin/sh
+#
+# This script is used to test that the module system is working as expected.
+# By default it test the version of nixpkgs which is defined in the NIX_PATH.
+
+cd ./modules
+
+pass=0
+fail=0
+
+evalConfig() {
+    local attr=$1
+    shift;
+    local script="import ./default.nix { modules = [ $@ ];}"
+    nix-instantiate --timeout 1 -E "$script" -A "$attr" --eval-only
+}
+
+reportFailure() {
+    local attr=$1
+    shift;
+    local script="import ./default.nix { modules = [ $@ ];}"
+    echo 2>&1 "$ nix-instantiate -E '$script' -A '$attr' --eval-only"
+    evalConfig "$attr" "$@"
+    fail=$((fail + 1))
+}
+
+checkConfigOutput() {
+    local outputContains=$1
+    shift;
+    if evalConfig "$@" 2>/dev/null | grep --silent "$outputContains" ; then
+        pass=$((pass + 1))
+        return 0;
+    else
+        echo 2>&1 "error: Expected result matching '$outputContains', while evaluating"
+        reportFailure "$@"
+        return 1
+    fi
+}
+
+checkConfigError() {
+    local errorContains=$1
+    local err=""
+    shift;
+    if err==$(evalConfig "$@" 2>&1 >/dev/null); then
+        echo 2>&1 "error: Expected error code, got exit code 0, while evaluating"
+        reportFailure "$@"
+        return 1
+    else
+        if echo "$err" | grep --silent "$errorContains" ; then
+            pass=$((pass + 1))
+            return 0;
+        else
+            echo 2>&1 "error: Expected error matching '$errorContains', while evaluating"
+            reportFailure "$@"
+            return 1
+        fi
+    fi
+}
+
+checkConfigOutput "false" config.enable ./declare-enable.nix
+checkConfigError 'The option .* defined in .* does not exist.' config.enable ./define-enable.nix
+set -- config.enable ./declare-enable.nix ./define-enable.nix
+checkConfigOutput "true" "$@"
+checkConfigOutput "false" "$@" ./define-force-enable.nix
+checkConfigOutput "false" "$@" ./define-enable-force.nix
+
+checkConfigError 'attribute .*foo.* .* not found' config.loaOfSub.foo.enable ./declare-loaOfSub-any-enable.nix
+checkConfigOutput 'false' config.loaOfSub.foo.enable ./declare-loaOfSub-any-enable.nix ./define-loaOfSub-foo.nix
+set -- config.loaOfSub.foo.enable ./declare-loaOfSub-any-enable.nix ./define-loaOfSub-foo-enable.nix
+checkConfigOutput 'true' "$@"
+checkConfigOutput 'false' "$@" ./define-force-loaOfSub-foo-enable.nix
+checkConfigOutput 'false' "$@" ./define-loaOfSub-force-foo-enable.nix
+checkConfigOutput 'false' "$@" ./define-loaOfSub-foo-force-enable.nix
+checkConfigOutput 'false' "$@" ./define-loaOfSub-foo-enable-force.nix
+
+checkConfigError 'attribute .*bar.* .* not found' config.loaOfSub.bar.enable ./declare-loaOfSub-any-enable.nix ./define-loaOfSub-foo.nix
+checkConfigOutput 'false' config.loaOfSub.bar.enable ./declare-loaOfSub-any-enable.nix ./define-loaOfSub-foo.nix ./define-loaOfSub-bar.nix
+set -- config.loaOfSub.bar.enable ./declare-loaOfSub-any-enable.nix ./define-loaOfSub-foo.nix ./define-loaOfSub-bar-enable.nix
+checkConfigOutput 'true' "$@"
+checkConfigError 'attribute .*bar.* .* not found' "$@" ./define-force-loaOfSub-foo-enable.nix
+checkConfigError 'attribute .*bar.* .* not found' "$@" ./define-loaOfSub-force-foo-enable.nix
+checkConfigOutput 'true' "$@" ./define-loaOfSub-foo-force-enable.nix
+checkConfigOutput 'true' "$@" ./define-loaOfSub-foo-enable-force.nix
+
+cat <<EOF
+====== module tests ======
+$pass Pass
+$fail Fail
+EOF
+
+if test $fail -ne 0; then
+    exit 1
+fi
+exit 0

lib/tests/modules/declare-enable.nix

@@ -0,0 +1,14 @@
+{ lib, ... }:
+
+{
+  options = {
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+      type = lib.types.bool;
+      description = ''
+        Some descriptive text
+      '';
+    };
+  };
+}

lib/tests/modules/declare-loaOfSub-any-enable.nix

@@ -0,0 +1,29 @@
+{ lib, ... }:
+
+let
+  submod = { ... }: {
+    options = {
+      enable = lib.mkOption {
+        default = false;
+        example = true;
+        type = lib.types.bool;
+        description = ''
+          Some descriptive text
+        '';
+      };
+    };
+  };
+in
+
+{
+  options = {
+    loaOfSub = lib.mkOption {
+      default = {};
+      example = {};
+      type = lib.types.loaOf (lib.types.submodule [ submod ]);
+      description = ''
+        Some descriptive text
+      '';
+    };
+  };
+}

lib/tests/modules/default.nix

@@ -0,0 +1,7 @@
+{ lib ? import <nixpkgs/lib>, modules ? [] }:
+
+{
+  inherit (lib.evalModules {
+    inherit modules;
+  }) config options;
+}

lib/tests/modules/define-enable-force.nix

@@ -0,0 +1,5 @@
+{ lib, ... }:
+
+{
+  enable = lib.mkForce false;
+}

lib/tests/modules/define-enable.nix

@@ -0,0 +1,3 @@
+{
+  enable = true;
+}

lib/tests/modules/define-force-enable.nix

@@ -0,0 +1,5 @@
+{ lib, ... }:
+
+lib.mkForce {
+  enable = false;
+}

lib/tests/modules/define-force-loaOfSub-foo-enable.nix

@@ -0,0 +1,5 @@
+{ lib, ... }:
+
+lib.mkForce {
+  loaOfSub.foo.enable = false;
+}

lib/tests/modules/define-loaOfSub-bar-enable.nix

@@ -0,0 +1,3 @@
+{
+  loaOfSub.bar.enable = true;
+}

lib/tests/modules/define-loaOfSub-bar.nix

@@ -0,0 +1,3 @@
+{
+  loaOfSub.bar = {};
+}

lib/tests/modules/define-loaOfSub-foo-enable-force.nix

@@ -0,0 +1,5 @@
+{ lib, ... }:
+
+{
+  loaOfSub.foo.enable = lib.mkForce false;
+}

lib/tests/modules/define-loaOfSub-foo-enable.nix

@@ -0,0 +1,3 @@
+{
+  loaOfSub.foo.enable = true;
+}

lib/tests/modules/define-loaOfSub-foo-force-enable.nix

@@ -0,0 +1,7 @@
+{ lib, ... }:
+
+{
+  loaOfSub.foo = lib.mkForce {
+    enable = false;
+  };
+}

lib/tests/modules/define-loaOfSub-foo.nix

@@ -0,0 +1,3 @@
+{
+  loaOfSub.foo = {};
+}

lib/tests/modules/define-loaOfSub-force-foo-enable.nix

@@ -0,0 +1,7 @@
+{ lib, ... }:
+
+{
+  loaOfSub = lib.mkForce {
+    foo.enable = false;
+  };
+}

lib/tests/release.nix

@@ -0,0 +1,31 @@
+{ nixpkgs }:
+
+with import ./../.. { };
+with lib;
+
+stdenv.mkDerivation {
+  name = "nixpkgs-lib-tests";
+  buildInputs = [ nix ];
+  NIX_PATH="nixpkgs=${nixpkgs}";
+
+  buildCommand = ''
+    datadir="${nix}/share"
+    export TEST_ROOT=$(pwd)/test-tmp
+    export NIX_STORE_DIR=$TEST_ROOT/store
+    export NIX_LOCALSTATE_DIR=$TEST_ROOT/var
+    export NIX_LOG_DIR=$TEST_ROOT/var/log/nix
+    export NIX_STATE_DIR=$TEST_ROOT/var/nix
+    export NIX_DB_DIR=$TEST_ROOT/db
+    export NIX_CONF_DIR=$TEST_ROOT/etc
+    export NIX_MANIFESTS_DIR=$TEST_ROOT/var/nix/manifests
+    export NIX_BUILD_HOOK=
+    export PAGER=cat
+    cacheDir=$TEST_ROOT/binary-cache
+    nix-store --init
+
+    cd ${nixpkgs}/lib/tests
+    ./modules.sh
+
+    touch $out
+  '';
+}

nixos/doc/manual/configuration/network-manager.xml

@@ -10,7 +10,7 @@
 use NetworkManager. You can enable NetworkManager by setting:
 
 <programlisting>
-services.networkmanager.enable = true;
+networking.networkmanager.enable = true;
 </programlisting>
 
 some desktop managers (e.g., GNOME) enable NetworkManager
@@ -19,8 +19,8 @@ automatically for you.</para>
 <para>All users that should have permission to change network settings
 must belong to the <code>networkmanager</code> group.</para>
 
-<note><para><code>services.networkmanager</code> and
+<note><para><code>networking.networkmanager</code> and
-<code>services.wireless</code> can not be enabled at the same time:
+<code>networking.wireless</code> can not be enabled at the same time:
 you can still connect to the wireless networks using
 NetworkManager.</para></note>
 

nixos/modules/config/nsswitch.nix

@@ -8,6 +8,7 @@ let
 
   inherit (config.services.avahi) nssmdns;
   inherit (config.services.samba) nsswins;
+  ldap = config.users.ldap.enable;
 
 in
 
@@ -40,9 +41,9 @@ in
     # should define an option used by this module.
     environment.etc."nsswitch.conf".text =
       ''
-        passwd:    files ldap
+        passwd:    files ${optionalString ldap "ldap"}
-        group:     files ldap
+        group:     files ${optionalString ldap "ldap"}
-        shadow:    files ldap
+        shadow:    files ${optionalString ldap "ldap"}
         hosts:     files ${optionalString nssmdns "mdns_minimal [NOTFOUND=return]"} dns ${optionalString nssmdns "mdns"} ${optionalString nsswins "wins"} myhostname mymachines
         networks:  files dns
         ethers:    files

nixos/modules/config/update-users-groups.pl

@@ -174,12 +174,12 @@ foreach my $u (@{$spec->{users}}) {
         } elsif (defined $u->{initialHashedPassword}) {
             $u->{hashedPassword} = $u->{initialHashedPassword};
         }
+    }
 
-        # Create a home directory.
+    # Create a home directory.
-        if ($u->{createHome}) {
+    if ($u->{createHome} && ! -e $u->{home}) {
-            make_path($u->{home}, { mode => 0700 }) if ! -e $u->{home};
+        make_path($u->{home}, { mode => 0700 }) if ! -e $u->{home};
-            chown $u->{uid}, $u->{gid}, $u->{home};
+        chown $u->{uid}, $u->{gid}, $u->{home};
-        }
     }
 
     if (defined $u->{passwordFile}) {

nixos/modules/programs/ssh.nix

@@ -4,8 +4,19 @@
 
 with lib;
 
-let cfg  = config.programs.ssh;
+let
-    cfgd = config.services.openssh;
+
+  cfg  = config.programs.ssh;
+  cfgd = config.services.openssh;
+
+  askPassword = "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass";
+
+  askPasswordWrapper = pkgs.writeScript "ssh-askpass-wrapper"
+    ''
+      #! ${pkgs.stdenv.shell} -e
+      export DISPLAY="$(systemctl --user show-environment | ${pkgs.gnused}/bin/sed 's/^DISPLAY=\(.*\)/\1/; t; d')"
+      exec ${askPassword}
+    '';
 
 in
 {
@@ -117,6 +128,11 @@ in
             Restart = "on-failure";
             SuccessExitStatus = "0 2";
           };
+        # Allow ssh-agent to ask for confirmation. This requires the
+        # unit to know about the user's $DISPLAY (via ‘systemctl
+        # import-environment’).
+        environment.SSH_ASKPASS = optionalString config.services.xserver.enable askPasswordWrapper;
+        environment.DISPLAY = "fake"; # required to make ssh-agent start $SSH_ASKPASS
       };
 
     environment.extraInit = optionalString cfg.startAgent
@@ -126,5 +142,10 @@ in
         fi
       '';
 
+    environment.interactiveShellInit = optionalString config.services.xserver.enable
+      ''
+        export SSH_ASKPASS=${askPassword}
+      '';
+
   };
 }

nixos/modules/security/pam.nix

@@ -215,7 +215,7 @@ let
           ${optionalString cfg.otpwAuth
               "auth sufficient ${pkgs.otpw}/lib/security/pam_otpw.so"}
           ${optionalString cfg.oathAuth
-              "auth sufficient ${pkgs.oathToolkit}/lib/security/pam_oath.so"} window=5 usersfile=/etc/users.oath
+              "auth sufficient ${pkgs.oathToolkit}/lib/security/pam_oath.so window=5 usersfile=/etc/users.oath"}
           ${optionalString config.users.ldap.enable
               "auth sufficient ${pam_ldap}/lib/security/pam_ldap.so use_first_pass"}
           ${optionalString config.krb5.enable ''
@@ -252,7 +252,7 @@ let
           ${optionalString cfg.otpwAuth
               "session optional ${pkgs.otpw}/lib/security/pam_otpw.so"}
           ${optionalString cfg.oathAuth
-              "session optional ${pkgs.oathToolkit}/lib/security/pam_oath.so"} window=5 usersfile=/etc/users.oath
+              "session optional ${pkgs.oathToolkit}/lib/security/pam_oath.so window=5 usersfile=/etc/users.oath"}
           ${optionalString cfg.startSession
               "session optional ${pkgs.systemd}/lib/security/pam_systemd.so"}
           ${optionalString cfg.forwardXAuth

nixos/modules/services/databases/mongodb.nix

@@ -120,6 +120,7 @@ in
         };
 
         preStart = ''
+          rm ${cfg.dbpath}/mongod.lock || true
           if ! test -e ${cfg.dbpath}; then
               install -d -m0700 -o ${cfg.user} ${cfg.dbpath}
           fi

nixos/modules/services/networking/dnsmasq.nix

@@ -82,7 +82,7 @@ in
 
     systemd.services.dnsmasq = {
         description = "dnsmasq daemon";
-        after = [ "network.target" "systemd-resolved.conf" ];
+        after = [ "network.target" "systemd-resolved.service" ];
         wantedBy = [ "multi-user.target" ];
         path = [ dnsmasq ];
         preStart = ''

nixos/modules/services/networking/ssh/sshd.nix

@@ -195,12 +195,14 @@ in
         default =
           [ { path = "/etc/ssh/ssh_host_dsa_key";
               type = "dsa";
-              bits = 1024;
             }
             { path = "/etc/ssh/ssh_host_ecdsa_key";
               type = "ecdsa";
               bits = 521;
             }
+            { path = "/etc/ssh/ssh_host_ed25519_key";
+              type = "ed25519";
+            }
           ];
         description = ''
           NixOS can automatically generate SSH host keys.  This option
@@ -323,7 +325,7 @@ in
 
                 ${flip concatMapStrings cfg.hostKeys (k: ''
                   if ! [ -f "${k.path}" ]; then
-                      ssh-keygen -t "${k.type}" -b "${toString k.bits}" -f "${k.path}" -N ""
+                      ssh-keygen -t "${k.type}" ${if k ? bits then "-b ${toString k.bits}" else ""} -f "${k.path}" -N ""
                   fi
                 '')}
               '';

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

@@ -89,6 +89,10 @@ let
         ${config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
       ''}
 
+      # Tell systemd about our $DISPLAY. This is needed by the
+      # ssh-agent unit.
+      ${config.systemd.package}/bin/systemctl --user import-environment DISPLAY
+
       # Load X defaults.
       ${xorg.xrdb}/bin/xrdb -merge ${xresourcesXft}
       if test -e ~/.Xresources; then

nixos/modules/tasks/network-interfaces-systemd.nix

@@ -35,7 +35,10 @@ in
     assertions = [ {
       assertion = cfg.defaultGatewayWindowSize == null;
       message = "networking.defaultGatewayWindowSize is not supported by networkd.";
-    } ];
+    } ] ++ flip mapAttrsToList cfg.bridges (n: { rstp, ... }: {
+      assertion = !rstp;
+      message = "networking.bridges.${n}.rstp is not supported by networkd.";
+    });
 
     systemd.services.dhcpcd.enable = mkDefault false;
 

pkgs/applications/editors/edbrowse/default.nix

@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, spidermonkey_24, unzip, curl, pcre, readline, openssl }:
+stdenv.mkDerivation rec {
+  name = "edbrowse-3.5.2";
+  buildInputs = [ unzip curl pcre readline openssl spidermonkey_24 ];
+  preConfigure = ''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${spidermonkey_24}/include/mozjs-24"
+    '';
+  installPhase = "installBin src/edbrowse";
+  src = fetchurl {
+    url = "http://the-brannons.com/edbrowse/${name}.zip";
+    sha256 = "5f1ac927d126b8c8fd411231cffa9eba5405013e64994e55e1864b2f85d52714";
+  };
+  meta = {
+    description = "Edbrowse, a Command Line Editor Browser";
+    longDescription = ''
+      Edbrowse is a combination editor, browser, and mail client that is 100% text based.
+      The interface is similar to /bin/ed, though there are many more features, such as editing multiple files simultaneously, and rendering html.
+      This program was originally written for blind users, but many sighted users have taken advantage of the unique scripting capabilities of this program, which can be found nowhere else.
+      A batch job, or cron job, can access web pages on the internet, submit forms, and send email, with no human intervention whatsoever.
+      edbrowse can also tap into databases through odbc. It was primarily written by Karl Dahlke.
+      '';
+    license = stdenv.lib.licenses.gpl1Plus;
+    homepage = http://the-brannons.com/edbrowse/;
+    maintainers = [ stdenv.lib.maintainers.schmitthenner ];
+  };
+}

pkgs/applications/editors/idea/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip, jdk
-, coreutils, gnugrep, which, git, python, unzip
+, coreutils, gnugrep, which, git, python, unzip, androidsdk
 }:
 
 assert stdenv.isLinux;
@@ -54,25 +54,26 @@ let
     '';
 
     installPhase = ''
-      mkdir -vp $out/{bin,$name,share/pixmaps,libexec/${name}}
+      mkdir -p $out/{bin,$name,share/pixmaps,libexec/${name}}
-      cp -va . $out/$name
+      cp -a . $out/$name
       ln -s $out/$name/bin/${loName}.png $out/share/pixmaps/${execName}.png
       mv bin/fsnotifier* $out/libexec/${name}/.
 
       jdk=${jdk.home}
+      item=${desktopItem}
 
       makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \
         --prefix PATH : "$out/libexec/${name},${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin" \
         --prefix JDK_HOME : "$jdk" \
         --prefix ${hiName}_JDK : "$jdk"
 
-      cp -a "${desktopItem}"/* "$out"
+      ln -s "$item/share/applications" $out/share
     '';
 
   };
 
   buildAndroidStudio = { name, version, build, src, license, description }:
-    (mkIdeaProduct rec {
+    let drv = (mkIdeaProduct rec {
       inherit name version build src;
       product = "Studio";
       meta = with stdenv.lib; {
@@ -88,6 +89,13 @@ let
         maintainers = with maintainers; [ edwtjo ];
       };
     });
+    in stdenv.lib.overrideDerivation drv (x : {
+      buildInputs = x.buildInputs ++ [ makeWrapper ];
+      installPhase = x.installPhase +  ''
+        wrapProgram "$out/bin/android-studio" \
+          --set ANDROID_HOME "${androidsdk}/libexec/android-sdk-linux/"
+      '';
+    });
 
   buildClion = { name, version, build, src, license, description }:
     (mkIdeaProduct rec {
@@ -185,14 +193,14 @@ in
 
   android-studio = buildAndroidStudio rec {
     name = "android-studio-${version}";
-    version = "1.1.0b2";
+    version = "1.1.0";
-    build = "135.1711524";
+    build = "135.1740770";
     description = "Android development environment based on IntelliJ IDEA";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://dl.google.com/dl/android/studio/ide-zips/${version}" +
             "/android-studio-ide-${build}-linux.zip";
-      sha256 = "0pkmyk7ipd4bfbryhanak5mq3x8ix1yv4czx8yi9vdpa34b6pnkw";
+      sha256 = "1r2hrld3yfaxq3mw2xmzhvrrhc7w5xlv3d18rv758hy9n40c2nr1";
     };
   };
 

pkgs/applications/misc/cherrytree/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python, pythonPackages, gettext, pygtksourceview, sqlite }:
 
 stdenv.mkDerivation rec {
-  name = "cherrytree-0.35.6";
+  name = "cherrytree-0.35.7";
 
   src = fetchurl {
     url = "http://www.giuspen.com/software/${name}.tar.xz";
-    sha256 = "1nfrnnwaxb07jf5c3id8zimr3q3rbhvzjlmpb99d41d7hqrd2bxj";
+    sha256 = "03p3bx7skc361rmh0axhm0fa0inmxv4bpa9l566wskb3zq4sy4g3";
   };
 
   propagatedBuildInputs = [ pythonPackages.sqlite3 ];

pkgs/applications/misc/finalterm/default.nix

@@ -1,19 +1,17 @@
-{ stdenv, lib, fetchFromGitHub, makeWrapper
+{ stdenv, lib, fetchgit, makeWrapper
 , pkgconfig, cmake, libxml2, vala, intltool, libmx, gnome3, gtk3, gtk_doc
 , keybinder3, clutter_gtk, libnotify
 , libxkbcommon, xlibs, udev
 , bashInteractive
 }:
 
-let rev = "5ccde4e8f2c02a398f9172e07c25262ecf954626";
+stdenv.mkDerivation {
-in stdenv.mkDerivation {
+  name = "finalterm-git-2014-11-15";
-  name = "finalterm-git-${builtins.substring 0 8 rev}";
 
-  src = fetchFromGitHub {
+  src = fetchgit {
-    owner = "p-e-w";
+    url = "https://github.com/p-e-w/finalterm.git";
-    repo = "finalterm";
+    rev = "39b078b2a96a5c3c9e74f92b1929f383d220ca8b";
-    inherit rev;
+    sha256 = "c3ec9b36692b66a3aaa3125b2947c83beda4705b6d6f4a10b9bde9d8db8367c5";
-    sha256 = "1gw6nc19whfjd4xj0lc0fmjypn8d7nasif79671859ymnfizyq4f";
   };
 
   buildInputs = [

pkgs/applications/misc/xkblayout-state/default.nix

@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, qt4 }:
+
+stdenv.mkDerivation rec {
+  name = "xkblayout-state";
+  version = "1b";
+
+  src = fetchurl {
+    url = "https://github.com/nonpop/${name}/archive/v${version}.tar.gz";
+    sha256 = "1m1nnplrdb2mclhj0881wf78ckvdnyk24g4k4p5s5gpd96cxxwnx";
+  };
+
+  buildInputs = [ qt4 ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp xkblayout-state $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A small command-line program to get/set the current XKB keyboard layout";
+    homepage = https://github.com/nonpop/xkblayout-state;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.jagajaga ];
+  };
+}

pkgs/applications/networking/bittorrentsync/default.nix

@@ -5,15 +5,15 @@ let
     else if stdenv.system == "i686-linux" then "i386"
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
-  sha256 = if stdenv.system == "x86_64-linux" then "1prs3r6xcxq31xfdp3w2wdi3d7r6lw5r4d4zay2cwphmp4kpg3qg"
+  sha256 = if stdenv.system == "x86_64-linux" then "1b9f6qxpvyrzf23l71hw42qyg4i27by3hs91sm34drm24z7m7fpd"
-    else if stdenv.system == "i686-linux" then "09rn95qvkdwlzqq11hqfq4i5cam6dip7ww1wd5dpyirzn8yw7cfh"
+    else if stdenv.system == "i686-linux" then "0caqwaxd6i8cap35kpzkwy5dknk7iaxf5fbfjy46cbwylgcpsc2x"
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
   libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ];
 in
 stdenv.mkDerivation rec {
   name = "btsync-${version}";
-  version = "1.4.106";
+  version = "1.4.110";
 
   src  = fetchurl {
     url  = "http://syncapp.bittorrent.com/${version}/btsync_${arch}-${version}.tar.gz";

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

@@ -122,7 +122,7 @@ stdenv.mkDerivation {
       ln -s "$prefix/usr/lib/firefox-bin-${version}/firefox" "$out/bin/"
 
       for executable in \
-        firefox mozilla-xremote-client firefox-bin plugin-container \
+        firefox firefox-bin plugin-container \
         updater crashreporter webapprt-stub
       do
         patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
@@ -130,7 +130,7 @@ stdenv.mkDerivation {
       done
 
       for executable in \
-        firefox mozilla-xremote-client firefox-bin plugin-container \
+        firefox firefox-bin plugin-container \
         updater crashreporter webapprt-stub libxul.so
       do
         patchelf --set-rpath "$libPath" \

pkgs/applications/networking/browsers/firefox-bin/sources.nix

@@ -4,183 +4,185 @@
 # ruby generate_source.rb > source.nix
 
 {
-  version = "35.0.1";
+  version = "36.0";
   sources = [
-    { locale = "ach"; arch = "linux-i686"; sha1 = "124492ee256fc578cff9e7774f679a0dc3f75a27"; }
+    { locale = "ach"; arch = "linux-i686"; sha1 = "089dff0a3623feee0379832ccde522f86fdc448c"; }
-    { locale = "ach"; arch = "linux-x86_64"; sha1 = "f3503b3d8889d8f097219cee2fb793f06bdff7ed"; }
+    { locale = "ach"; arch = "linux-x86_64"; sha1 = "ac2ed6ffa8d27ecd978950220288e14c500aefbe"; }
-    { locale = "af"; arch = "linux-i686"; sha1 = "52dd493830ec7d3d0c1dd9d5d91449944f3ed0cb"; }
+    { locale = "af"; arch = "linux-i686"; sha1 = "e8d44633f01dffe46e8b1278ddb274eefee556a4"; }
-    { locale = "af"; arch = "linux-x86_64"; sha1 = "bb88cfe49158d1b650bff932ccd65f750681df9f"; }
+    { locale = "af"; arch = "linux-x86_64"; sha1 = "f7d364cf00f0058e55e193cc907fd4996f96043b"; }
-    { locale = "an"; arch = "linux-i686"; sha1 = "883f34da9eaf2975d46f07bf4ffb7e991231f9a8"; }
+    { locale = "an"; arch = "linux-i686"; sha1 = "85c2b67d8d963d9421559807b8dfb36baa976029"; }
-    { locale = "an"; arch = "linux-x86_64"; sha1 = "1757dbb135225b5b1958084fb3e8b0050451ac1f"; }
+    { locale = "an"; arch = "linux-x86_64"; sha1 = "182b4feeb5c24921c4074ee560e1d2619bc28a25"; }
-    { locale = "ar"; arch = "linux-i686"; sha1 = "839887065496742f53c7868bed5f172e0727b236"; }
+    { locale = "ar"; arch = "linux-i686"; sha1 = "a18be34551fa3352a30cc927746806ea3d0401ed"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha1 = "a0f4a097083449e81278a9accb23cb6e76cf39e1"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha1 = "be45f1db3b2f6128a35313aac0738eb6f3ed53f2"; }
-    { locale = "as"; arch = "linux-i686"; sha1 = "7395f49cdb471d67eff6aad56fd896b2b60ca9ea"; }
+    { locale = "as"; arch = "linux-i686"; sha1 = "44e5cf86e6318d2c25fa4f9dd9c0bfaf273f6749"; }
-    { locale = "as"; arch = "linux-x86_64"; sha1 = "219ac273c48ec5018a1c62eb5c8ff1588bad466a"; }
+    { locale = "as"; arch = "linux-x86_64"; sha1 = "da9d1e7e3e8ed4dbc935ece517e55ae456930e52"; }
-    { locale = "ast"; arch = "linux-i686"; sha1 = "5228be973800169254e75016b5c1c11477b40fbf"; }
+    { locale = "ast"; arch = "linux-i686"; sha1 = "c23f59e3452f7393554491a930626495e9855855"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha1 = "7065cbb3fea059bf880217068704367168458c78"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha1 = "fd2f6ce7d12a7c53fe9d9c11336b88c405859206"; }
-    { locale = "az"; arch = "linux-i686"; sha1 = "0c8cc063cd4661660b352d370281a477eb444697"; }
+    { locale = "az"; arch = "linux-i686"; sha1 = "5b92332c155a95b8638506ac1c3dd78e19e277e4"; }
-    { locale = "az"; arch = "linux-x86_64"; sha1 = "1fdb7b783a9a90767c5c63a149f3ada590e3f81f"; }
+    { locale = "az"; arch = "linux-x86_64"; sha1 = "5d148d13421bacb3d430e317a41253a0999ed55f"; }
-    { locale = "be"; arch = "linux-i686"; sha1 = "29532d5c3f3a8c9db4cc83dffea8328609eef286"; }
+    { locale = "be"; arch = "linux-i686"; sha1 = "36cfbc4b84a374535cde94643bbdacea3e141c60"; }
-    { locale = "be"; arch = "linux-x86_64"; sha1 = "cde75662d5b868117c76b3b4418292e6d536038c"; }
+    { locale = "be"; arch = "linux-x86_64"; sha1 = "0c0ea9dec82efd7baf2c2b382c0ab67d22f7b252"; }
-    { locale = "bg"; arch = "linux-i686"; sha1 = "272bd811c7b921ab80231c8994e04cb79aa7c868"; }
+    { locale = "bg"; arch = "linux-i686"; sha1 = "80e0068890e6b422f392924f4e317c6d2058695e"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha1 = "01bfcb17b1524d3c5571283fa8abaa409250a640"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha1 = "b4f3fa93b7d793560627ec4d51c138d013dd6c00"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "40d2d3a9da8033e60e2bcd8faa0aa94a1f8acffb"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "14f5d14a135fc929ee670078e50567b5461ece8a"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "a96f420650deb7d65c449861a05ae35154247009"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "95f561f92166d9db64ba5e36edaa14d7b4f989a3"; }
-    { locale = "bn-IN"; arch = "linux-i686"; sha1 = "e2db4777b68113ec300e00e1235d7aa6eaebb9a2"; }
+    { locale = "bn-IN"; arch = "linux-i686"; sha1 = "07b00a5d4b83d8d0e451ba08325fb44c784453f6"; }
-    { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "bf886b2983bd3f0528bfdba036d978230fb0f9f6"; }
+    { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "a96e0bafbf811c5bd57fb3e8164e38365386e460"; }
-    { locale = "br"; arch = "linux-i686"; sha1 = "6b74d9b0a1b6114810a98d615b32115b39be0eed"; }
+    { locale = "br"; arch = "linux-i686"; sha1 = "ee51d5b01c4489e5802c130748ee16b0a803dcb9"; }
-    { locale = "br"; arch = "linux-x86_64"; sha1 = "9c5c21f0b7d5f6677065cc57faccc4d6fb280a39"; }
+    { locale = "br"; arch = "linux-x86_64"; sha1 = "0cff437fe8c29705ec9d800d95329309eed540f4"; }
-    { locale = "bs"; arch = "linux-i686"; sha1 = "72acb7bd98f689eb8cef254c72da4fd0bda3274c"; }
+    { locale = "bs"; arch = "linux-i686"; sha1 = "0d7aef80272ca1de27560b7fe4f8ec892d386b6d"; }
-    { locale = "bs"; arch = "linux-x86_64"; sha1 = "015adba9f964ad8cfbaf5081416a380d0abbd167"; }
+    { locale = "bs"; arch = "linux-x86_64"; sha1 = "b62a905e9e992e3765cf196a18d50f533e2dd69f"; }
-    { locale = "ca"; arch = "linux-i686"; sha1 = "3e1f61aaa19328f7cc729fc011dc216ef33054cf"; }
+    { locale = "ca"; arch = "linux-i686"; sha1 = "82316407a9745d4dc56d961f5f2282c702950fe2"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha1 = "bb489274879dcdfeb86c778a7aef5d971e8c1111"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha1 = "69ae06e06a90a28eb66db4d0df2fdbb5397abc24"; }
-    { locale = "cs"; arch = "linux-i686"; sha1 = "729901a823944d4f92571f3f8f07d936f6e0635c"; }
+    { locale = "cs"; arch = "linux-i686"; sha1 = "c55e80b3d74f6dd494fe1c327053f59bef1c626a"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha1 = "3066eec76de4c79699893afe497d12540ed49d80"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha1 = "932f6a15f1445d180df01195c19677cbe63fd18f"; }
-    { locale = "cy"; arch = "linux-i686"; sha1 = "0206ebc636ab4f3264281ddbef21f3d99c72c92f"; }
+    { locale = "cy"; arch = "linux-i686"; sha1 = "abe63dfde0487c77fa9b3b9c77fcffe0f977b25b"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha1 = "48d7577d158daf8d4edf988c3efbb40944f7d607"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha1 = "89eeb72232affbd54eff30f4c9844f802c0cf243"; }
-    { locale = "da"; arch = "linux-i686"; sha1 = "39e692a7227349a53cde95a18024fd8f9c47a49d"; }
+    { locale = "da"; arch = "linux-i686"; sha1 = "57232745fa920525721ec6e9b3c3177862b5e096"; }
-    { locale = "da"; arch = "linux-x86_64"; sha1 = "0f85723f4a602c5348e1f910384cb05d4b0d37b8"; }
+    { locale = "da"; arch = "linux-x86_64"; sha1 = "2ba7156b5728f17ab1e55b27ee771722a9171cf1"; }
-    { locale = "de"; arch = "linux-i686"; sha1 = "b5150224a5115403cc12bdc583d89151d29aab23"; }
+    { locale = "de"; arch = "linux-i686"; sha1 = "17fd4dd5e4b2ea39ed20a6d890ea5927532abd38"; }
-    { locale = "de"; arch = "linux-x86_64"; sha1 = "890bd378d14fcfcfee327405323fb18d688f9575"; }
+    { locale = "de"; arch = "linux-x86_64"; sha1 = "58c72ef01098523392f63209057373b9e793ebb8"; }
-    { locale = "dsb"; arch = "linux-i686"; sha1 = "6f6b9af4610b85c73e523e8149849a21e60a078c"; }
+    { locale = "dsb"; arch = "linux-i686"; sha1 = "a3296dd541362c4ca3ce8734faa33512a0fff4fc"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "3d45d05927b18e7a3d95edad282bdb4efb41509f"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "c5c7bf61d4923ec9937afa6d261c7f0af64e468f"; }
-    { locale = "el"; arch = "linux-i686"; sha1 = "c1cca4d312329eef5023b16d08e7bfc40c3c06c8"; }
+    { locale = "el"; arch = "linux-i686"; sha1 = "be04c1f884f3f0d68fa5c421eb2c8b850bef2a44"; }
-    { locale = "el"; arch = "linux-x86_64"; sha1 = "2ca19c2beb794108f7138f07d91edefa5911e6da"; }
+    { locale = "el"; arch = "linux-x86_64"; sha1 = "33ffdffb657a379f2bdb3b39bacc60d59ae9b945"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha1 = "034f5d2c82e519b53afa490850ab305134c58d7d"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha1 = "16e2c1cda685b132b0d9378fd5ac22b0e07da320"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "66d8a48abb3fdefa2498e8bf56b5b1fffe8f61ea"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "89e552187c98fccc6b2270080c530bf7edf3471f"; }
-    { locale = "en-US"; arch = "linux-i686"; sha1 = "175647bcb6c4a879887e7b5c1d1260f11980f25c"; }
+    { locale = "en-US"; arch = "linux-i686"; sha1 = "42be4a279ef164a43908a0896cacec6a96b2c23e"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "7bab378891240db491078084ee0904dcd8c405cf"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "2a9aab1149b2bf59c2b687cb80a6fa550aa263be"; }
-    { locale = "en-ZA"; arch = "linux-i686"; sha1 = "71dedd0008bc788631c83ec68a2975baf7dc4ecb"; }
+    { locale = "en-ZA"; arch = "linux-i686"; sha1 = "92f42855948bd262266f6239a7f989848703a85f"; }
-    { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "d0b620b139fa436816f2f48971bdc67a829effee"; }
+    { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "95250cced67fb3a8eab40bc8db6d70b4efa610c9"; }
-    { locale = "eo"; arch = "linux-i686"; sha1 = "61f93f3ed51175afec69ab1f1ced1ad89e488cec"; }
+    { locale = "eo"; arch = "linux-i686"; sha1 = "6564b701a3face85aa53ab80024145b58d653ec5"; }
-    { locale = "eo"; arch = "linux-x86_64"; sha1 = "ee894635e4d584635a585702cfc364f318a8b7bc"; }
+    { locale = "eo"; arch = "linux-x86_64"; sha1 = "eaa3337fbca2b182981cae1423357c537a5cc33f"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha1 = "ffe30c5da202fe9fa068423e8b2155d38902239c"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha1 = "05cebf2df8c58c03934340b9d56a1a09e0af9ffc"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "bc7e04f5264f5c6542705e29adcf0e873fe22396"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "d8660257e51bf94c864b27cbbfa2e3ef98ef66f8"; }
-    { locale = "es-CL"; arch = "linux-i686"; sha1 = "c3f4fe2dcd009ddad4ed4c4c25dd8fde364dbb6f"; }
+    { locale = "es-CL"; arch = "linux-i686"; sha1 = "827deacb3439086c263e8a3f168700e510e0158c"; }
-    { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "271e4f84495a75bdf539f5d3383a510832ead8b1"; }
+    { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "b905a1b57ccacb8aec34f47126c26ce435edd2d9"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha1 = "7d2c74454e59220f15158fb13cf896d667b70f43"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha1 = "189f5230874080d982a23725cafba889db016194"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "0e02895eeeb66cb8aaea96b566745dcb83517fde"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "66f416faac68c156d0c2773a47cc2014ab51b0d1"; }
-    { locale = "es-MX"; arch = "linux-i686"; sha1 = "753c0788ab58ab390546116dbd708cba0e5ef908"; }
+    { locale = "es-MX"; arch = "linux-i686"; sha1 = "1bd21f64057f4ad4e74a2f6ef7c054f0662f95bb"; }
-    { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "64be3770cf6ffa3df353cac4493b07e95dae5a1d"; }
+    { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "0bdedcd03eae8fbde6fec2f35a7c1c0d2140f0ff"; }
-    { locale = "et"; arch = "linux-i686"; sha1 = "66b7184dfb39182fc3533e0601aac3d54005e7fd"; }
+    { locale = "et"; arch = "linux-i686"; sha1 = "d4a96b30b8f084a6b2d8e58db8e7398db0738606"; }
-    { locale = "et"; arch = "linux-x86_64"; sha1 = "f5f9b0ae73a57d61d32ac143aac09286bf75c8a7"; }
+    { locale = "et"; arch = "linux-x86_64"; sha1 = "30de382a9941c4f8857938c37e491ec1a2ebfc27"; }
-    { locale = "eu"; arch = "linux-i686"; sha1 = "92a25a4fdee339eb327acd0713ecb3da0975ae6f"; }
+    { locale = "eu"; arch = "linux-i686"; sha1 = "f43ef29288e5129b8335601ea2f45ee9b94c1b82"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha1 = "b58bb2d5b2257c1f75009ee3c53289b55dbe1f64"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha1 = "cfd741f43b86a1f0a62df2c44898289cd86c2936"; }
-    { locale = "fa"; arch = "linux-i686"; sha1 = "a39e96d6c082035be2dd826dfb990ba76bb85c57"; }
+    { locale = "fa"; arch = "linux-i686"; sha1 = "02f264a1e2c6dff8d1c1dc70f9af305fa9156c01"; }
-    { locale = "fa"; arch = "linux-x86_64"; sha1 = "e73e5bb35aede5957437cc0f789d035cc4cba639"; }
+    { locale = "fa"; arch = "linux-x86_64"; sha1 = "290d8a53538fe75d1e1d36407c7efa5f56569787"; }
-    { locale = "ff"; arch = "linux-i686"; sha1 = "e0c69dcae50a31788695beb9562f77bb6a101a61"; }
+    { locale = "ff"; arch = "linux-i686"; sha1 = "bcfd312781f308de7550a8f12609230c48c353b2"; }
-    { locale = "ff"; arch = "linux-x86_64"; sha1 = "bdd0884b3c0feabf9041ce10c7c379204b64cdf4"; }
+    { locale = "ff"; arch = "linux-x86_64"; sha1 = "eddd9175de24bc429c04be01e4af6af6f7003065"; }
-    { locale = "fi"; arch = "linux-i686"; sha1 = "19bf8ea81a02d32253db23c4c2432b4fb5437234"; }
+    { locale = "fi"; arch = "linux-i686"; sha1 = "3cf088f03c3003f1888645b06311e7f46007df83"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha1 = "e3c86049567412e74634bda3fa419c013b9c1e1b"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha1 = "a01a6fd604471cbd69c5046ec5e13f01ca63457a"; }
-    { locale = "fr"; arch = "linux-i686"; sha1 = "83ed1c125a7747768980c739fe4b76b47274f47b"; }
+    { locale = "fr"; arch = "linux-i686"; sha1 = "e8e3caf2ceef2ae8a645806731bf99572244fb24"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha1 = "4666f31d0983b7bec54c98bcfa02e85e3097d024"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha1 = "753a4bab9ce3016e773d4afa7ad9d14f7746cf4e"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "7a6fe37320351b18d0ee9257522d34213c598aa3"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "d0b3719b07b2c3fbe9c05ba30012331641c09d2b"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "eb7418db94f041d209d89ae33f20b0fa482d5c84"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "9e8ccf90e0687aa112d48f0faeffdee58f41ea95"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "525665b9310b099c93323dccef4e434627eb517b"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "a3fbc0aaf36e444ea10c4b0593ad3ec07e100147"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "88aa7e3b35f80474f3235f6aa087b4348f372b9e"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "ed1e7b3c62dbb97bfef8b6512b8032b7bd8d2c9e"; }
-    { locale = "gd"; arch = "linux-i686"; sha1 = "78b59e7934f2014b8dc99fba210a691ba0ace966"; }
+    { locale = "gd"; arch = "linux-i686"; sha1 = "49fc536511bdaa096086408385ae70cace64fb0b"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha1 = "8b0c11b78b6cd6363a8fb0dc51f88e306b321a34"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha1 = "67de65f4ae8accda417cd8fc9082160a4a46cc06"; }
-    { locale = "gl"; arch = "linux-i686"; sha1 = "f1d0bc9ccfa9ade46b1caabd511f8a6359895482"; }
+    { locale = "gl"; arch = "linux-i686"; sha1 = "dd239f26f4d758294ce21dc1ffebe9e02584e05d"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha1 = "9b2bcf8aa3a4dabd29b69ad3a102aa6ee999bebc"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha1 = "1b9d06b047de0c66485f2c7b642b6edddd7dacc3"; }
-    { locale = "gu-IN"; arch = "linux-i686"; sha1 = "2d3fa5a189283b4f5ddc88c5526380d1bbc9ff73"; }
+    { locale = "gu-IN"; arch = "linux-i686"; sha1 = "a191408d96e73da4ecda1faa2510dec307a3442b"; }
-    { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "e8d8803075e2b3bcd44470f2563fdb7d2855021e"; }
+    { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "5bf621a4fe1a625b70df63b53930a3a5ee922405"; }
-    { locale = "he"; arch = "linux-i686"; sha1 = "1c7695c021832d7daab3838d333a02ad141aa22d"; }
+    { locale = "he"; arch = "linux-i686"; sha1 = "95b84a18316a74e8fcd7d16fd6e9c1fea6778510"; }
-    { locale = "he"; arch = "linux-x86_64"; sha1 = "1a7fec7fbbeebdf3368ad7474ea593ab6d0d0131"; }
+    { locale = "he"; arch = "linux-x86_64"; sha1 = "548545c4d46c296aa9d922ee5a14312a9677822c"; }
-    { locale = "hi-IN"; arch = "linux-i686"; sha1 = "14ffc0706fe6f00d2778a3567dc27bdbc96b4fbb"; }
+    { locale = "hi-IN"; arch = "linux-i686"; sha1 = "5a5e53167fe9050bc9482d61d17f6808cc655407"; }
-    { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "77431a1b81c86b8da78b6a5728cf1d054b9b9a28"; }
+    { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "36e3df183cf2b5b645cb2d89b90b640b7f3697f2"; }
-    { locale = "hr"; arch = "linux-i686"; sha1 = "a0796dfbb45b796a3391e697320009ac761c082a"; }
+    { locale = "hr"; arch = "linux-i686"; sha1 = "fa1a4482857b788c49d04f6a5c3eeada25c2ac52"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha1 = "98aa2c4455caf0f35946ca2c6de7ff4214e33221"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha1 = "e641cf2b562c6b391e24601d4f3ceefb7117d02a"; }
-    { locale = "hsb"; arch = "linux-i686"; sha1 = "26933524c477fcd522b98f75e9e9339d80bdddf5"; }
+    { locale = "hsb"; arch = "linux-i686"; sha1 = "b1fc4cad22c66824297aec7c82053d1f7611f108"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "f365032803a41c57c75d06945104add35564afcd"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "1c2db6cf0a14002ad4c473ab1ff1fcd7f4543ca4"; }
-    { locale = "hu"; arch = "linux-i686"; sha1 = "ab4cb56cb1679159d1a7cca55f26b99c5ff1a784"; }
+    { locale = "hu"; arch = "linux-i686"; sha1 = "4c5a90ed0cb4d6930a3eab0a2ec216805d680895"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha1 = "829fb1baaaba4e3e43ad72b3e0bff78f8fd828e4"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha1 = "c71c7e68c493bd9ecb407f32c8896b41ecfe95d5"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "b329665bc7643e7e49461112a96fa8ab23f7d15b"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "01536fa2739a9dd68e713f4e4e41dac5f2b58422"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "4fea5950fddc26e002f72e7a8b4763fb8620bff1"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "b19d7fab445ed314ca8076d0b837c0e15407649d"; }
-    { locale = "id"; arch = "linux-i686"; sha1 = "d678096e976ada75bff62309e09cc5c92f4eb885"; }
+    { locale = "id"; arch = "linux-i686"; sha1 = "163e7a14d274a10780a18201afa7dfae27bf5967"; }
-    { locale = "id"; arch = "linux-x86_64"; sha1 = "f80f225ce9acd6f1aa91e18d351431d6ea3ca05e"; }
+    { locale = "id"; arch = "linux-x86_64"; sha1 = "d1108b006c607f470543915d8956394a1b767c27"; }
-    { locale = "is"; arch = "linux-i686"; sha1 = "abc31651c3c8884be2166e5d85fd09f793a9bf15"; }
+    { locale = "is"; arch = "linux-i686"; sha1 = "5460b7445462f786f138a755615f3970fbdc7274"; }
-    { locale = "is"; arch = "linux-x86_64"; sha1 = "4e276bb56d9cf9be18788ba1a585a29c094eec0c"; }
+    { locale = "is"; arch = "linux-x86_64"; sha1 = "e5ec0cff0f1c88f0b2a4444ef9d71bbeb3541772"; }
-    { locale = "it"; arch = "linux-i686"; sha1 = "2a3816a56615b910915207c97b093d5c81f169d5"; }
+    { locale = "it"; arch = "linux-i686"; sha1 = "39cab2de100e4a1a2783659cab5c7247e230aa11"; }
-    { locale = "it"; arch = "linux-x86_64"; sha1 = "4d7cec0c6fb393a0bf208135efd0b13691d319a5"; }
+    { locale = "it"; arch = "linux-x86_64"; sha1 = "b21a1d214bddd8f074d0d0a06d64c4aa35580c68"; }
-    { locale = "ja"; arch = "linux-i686"; sha1 = "54d9e17ee54a969da8ec68881a1165cd1d49a351"; }
+    { locale = "ja"; arch = "linux-i686"; sha1 = "b78dd34339c68348de753c66d6e12a78748aa261"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha1 = "fbc9ded1ab4d0714094beb4215dd0c547d931983"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha1 = "e4a1720278debf305c3f353bbafe35384b72bd61"; }
-    { locale = "kk"; arch = "linux-i686"; sha1 = "1e7ac8d7b657fc76aba70c2a1fc76cad3935aa0d"; }
+    { locale = "kk"; arch = "linux-i686"; sha1 = "371dc2118f8917d2fb904d07e23214728db13118"; }
-    { locale = "kk"; arch = "linux-x86_64"; sha1 = "3d7fa92e91b29546aa4232f118984c0c7c8e7066"; }
+    { locale = "kk"; arch = "linux-x86_64"; sha1 = "e4a4742b0f2efbb2491b501147bb1115f64b081d"; }
-    { locale = "km"; arch = "linux-i686"; sha1 = "88e470efb8cec8a1439a7fa02684e02c801ce5ec"; }
+    { locale = "km"; arch = "linux-i686"; sha1 = "4ad8c7a8821043a635e78f41f6da4ab6ffb334c2"; }
-    { locale = "km"; arch = "linux-x86_64"; sha1 = "9575cc0fa4130ca5856f20a058df7850e901f531"; }
+    { locale = "km"; arch = "linux-x86_64"; sha1 = "0f4685c194054dccaac5aec9fd27f6c74ed82148"; }
-    { locale = "kn"; arch = "linux-i686"; sha1 = "ede8a5f91dd08eb8901c565462a23ec49b647b87"; }
+    { locale = "kn"; arch = "linux-i686"; sha1 = "427b395693c8ce5d1f970f2c3a47d097785dcdea"; }
-    { locale = "kn"; arch = "linux-x86_64"; sha1 = "9af854901746299ee8eb542f82d8d2b302312ba7"; }
+    { locale = "kn"; arch = "linux-x86_64"; sha1 = "15e28abebde39ebafe916523b658463087be73db"; }
-    { locale = "ko"; arch = "linux-i686"; sha1 = "55b7af838ff5c46f2c0b9593e6a621007f6207f1"; }
+    { locale = "ko"; arch = "linux-i686"; sha1 = "919862720789c005e1773b4da3427fa56c3d0528"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha1 = "b41e5e2ac9b2d20a2d55fcbcc34f03ac110880e3"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha1 = "aa38b625f9bab73669919c0ad36221f7c887186e"; }
-    { locale = "lij"; arch = "linux-i686"; sha1 = "fb64abf1c4b9e1cd26bafe5d0f8d8d88c59e7788"; }
+    { locale = "lij"; arch = "linux-i686"; sha1 = "abc21985aa1de2fa256283f03fd3b98e147ccd3a"; }
-    { locale = "lij"; arch = "linux-x86_64"; sha1 = "b2d211490dba526c2be6a71be1767ca273635229"; }
+    { locale = "lij"; arch = "linux-x86_64"; sha1 = "8b811ce3fe2528d33a0f00a7c3292b9cb37eb1b1"; }
-    { locale = "lt"; arch = "linux-i686"; sha1 = "e052e41cb5426e15fbb9a95ac957eb24cda7605c"; }
+    { locale = "lt"; arch = "linux-i686"; sha1 = "601dd265370ee7514a2cdf6739bfbd3d59d450d6"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha1 = "4e37df4924c10a07dc0dc4a87e44e155dbdfa095"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha1 = "c13736cb853a35f1b6583d89b9ded90302acb637"; }
-    { locale = "lv"; arch = "linux-i686"; sha1 = "694554dd94105ba299365adacd31ccc683f33814"; }
+    { locale = "lv"; arch = "linux-i686"; sha1 = "09910ed1364063efc07e24a78224d1fc93b2196b"; }
-    { locale = "lv"; arch = "linux-x86_64"; sha1 = "116e576e4a0dee81c98a83a15a3fbd8d2e26361c"; }
+    { locale = "lv"; arch = "linux-x86_64"; sha1 = "0a6132a1080e084c9e4a691bce7e12459cec817b"; }
-    { locale = "mai"; arch = "linux-i686"; sha1 = "1d4cdcc4809ab9dfd6368ba9fa932f658b6e05f5"; }
+    { locale = "mai"; arch = "linux-i686"; sha1 = "262c75582645c2ee1c92552263aab7fe35483bc3"; }
-    { locale = "mai"; arch = "linux-x86_64"; sha1 = "ef6e2e49df835f2f06de46cfbaac0aa7d3a0bab0"; }
+    { locale = "mai"; arch = "linux-x86_64"; sha1 = "d76755153a0656c2fd17db53c40f493a0f0dcab6"; }
-    { locale = "mk"; arch = "linux-i686"; sha1 = "f8dd4ab0936e7a1e9511290201ee7b547d3dfa96"; }
+    { locale = "mk"; arch = "linux-i686"; sha1 = "787ec5a7ccf9b9bd116917de752e9b411e37fe5f"; }
-    { locale = "mk"; arch = "linux-x86_64"; sha1 = "2dd8f9499e9c5dee258905466ec1c9784c93e392"; }
+    { locale = "mk"; arch = "linux-x86_64"; sha1 = "2de12f1514a47f8c0ee8a166c7c6d68d8c966824"; }
-    { locale = "ml"; arch = "linux-i686"; sha1 = "c7ac2d940151db540edf268d5649b7958157deb0"; }
+    { locale = "ml"; arch = "linux-i686"; sha1 = "807bea1339fa44c2f1d9af264539d1f550235e62"; }
-    { locale = "ml"; arch = "linux-x86_64"; sha1 = "6b624ded66ca9f7a4b81e52b3366006830616afd"; }
+    { locale = "ml"; arch = "linux-x86_64"; sha1 = "aeca07821afbfc0ec1763fd30da7098e27f11b19"; }
-    { locale = "mr"; arch = "linux-i686"; sha1 = "83a2eebb9ea12fc58fdce64d2e6cca6a642ed6c4"; }
+    { locale = "mr"; arch = "linux-i686"; sha1 = "d431e48ecec721b996ab6f63b99ada14ac8bbbe5"; }
-    { locale = "mr"; arch = "linux-x86_64"; sha1 = "f9aeb1b9bfe90cb875967a518cc430ed78c76d34"; }
+    { locale = "mr"; arch = "linux-x86_64"; sha1 = "fb60740faf4aa2d98821c77b28be29f456707d37"; }
-    { locale = "ms"; arch = "linux-i686"; sha1 = "31e58e62373f5482059cbdb56228e93287071c2a"; }
+    { locale = "ms"; arch = "linux-i686"; sha1 = "5ef013dd820a0c945cea2f131573ffbac5693391"; }
-    { locale = "ms"; arch = "linux-x86_64"; sha1 = "9caa154f5f357eeff788b6069a6417f2cc6fa30d"; }
+    { locale = "ms"; arch = "linux-x86_64"; sha1 = "c6d211c224711eb33b8ce55605e140cc09492bd1"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "96a02745a2eceb0481e72dc195754500cac1cae2"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "6678b16af728fe90c7b58d9e5e0a3aa01ca40ca1"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "b141df4d511d380e955a3f4c49ce6f87e687a17e"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "2c77fe81d3723a9be4926bbfcfb904edc928649a"; }
-    { locale = "nl"; arch = "linux-i686"; sha1 = "1cd11a61afbc4d60878d089545b74c5c7d4a24f1"; }
+    { locale = "nl"; arch = "linux-i686"; sha1 = "45ee40efa93fc973e8c8d5f70f5155132f5a073b"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha1 = "a365160b0a1490dbf3234a2d3e05d338627dd0f2"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha1 = "29f74d404f90711974187120f8589c18125dba1e"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "cf4f384f73215fc3337775ca8933d687f19c3e51"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "162d5e2270488d40a60cb3c1e07aded76a82ba1d"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "b6e20b7ca13b95a17bfcab4bafa672fe814853dd"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "40af304764aa36609e3969bde13ace2745bf43d8"; }
-    { locale = "or"; arch = "linux-i686"; sha1 = "f6b4d3bfb92aa480c6bcec1ecf1e68c90201015e"; }
+    { locale = "or"; arch = "linux-i686"; sha1 = "721e06a231398af851bbaef046b69349b9c42e9f"; }
-    { locale = "or"; arch = "linux-x86_64"; sha1 = "df4538d39cce9cd7817c9b59b6aec949484fc84a"; }
+    { locale = "or"; arch = "linux-x86_64"; sha1 = "925cb0a0bf1544b4a95abd3bf1e6bf14017b7c89"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "fdc2799e53e9290c1e68975ed1a906c4cf6e0252"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "37f8b5ac56fcbda135b2ec5fd9ca7bfdb70d496e"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "c69c7a16743aa76ccbe8a89f33c5390a127f92bd"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "fabd53bf219b5c4e8b7f70e7ce82ab85609fcc01"; }
-    { locale = "pl"; arch = "linux-i686"; sha1 = "a7f253212f9aed52c95f260da1cb4683617b839b"; }
+    { locale = "pl"; arch = "linux-i686"; sha1 = "773977cbd1146de1699b7c25b7a382bec8d0f55c"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha1 = "792d883f300d2a9ccddd64fe88c9837926431c14"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha1 = "b3e5db98279b7425e5a1027bdfbddf8b2ba316ae"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "1221b7d1b7e997964b6e6e3de1364204e81682c6"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "fea58817e88b9e1709f1661a6465ff60e4463793"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "c65f1d29b35abc7070de124422f67e2e5c48a582"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "4e05bcc1f9dc58b6fa02aaafbfab67d185d12521"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "8ea761c8459bfd664cea9afddb5a716d633dd407"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "1fd067546d5d203ef201691205244ce7bd0dd96c"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "77d799feca448cb187931d8fdf80859f4a1214ad"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "b53ae8e66d220c5a66cbd32c8762eb6a13634297"; }
-    { locale = "rm"; arch = "linux-i686"; sha1 = "ee1901e059abc81b82ccd018f3cf05b2471fd7da"; }
+    { locale = "rm"; arch = "linux-i686"; sha1 = "edc6d8dc42d7d7ee6ea6e781bcfb346ae8d7f006"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha1 = "2e0615de00051dec1cb2fb4c5cb866fbd2f349b7"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha1 = "12fd2cb3ac781490c433003b743055a67348ef04"; }
-    { locale = "ro"; arch = "linux-i686"; sha1 = "a75e667217ee3a5ed1897bc01e07e52efb96d281"; }
+    { locale = "ro"; arch = "linux-i686"; sha1 = "87b92ed3e53f7fbed86ff1e4c6143de3c52b2f87"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha1 = "a76447946a8273cd8ec70cbbef013563f137688f"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha1 = "be0daa8a275ca40a8be609d24290a35a74b3ee36"; }
-    { locale = "ru"; arch = "linux-i686"; sha1 = "93e9548ae9f3fcfea35ef08ede8da2af98d693d3"; }
+    { locale = "ru"; arch = "linux-i686"; sha1 = "827b057a99f1c56f4a66f1f9e8e5de2a45f68471"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha1 = "af0613ba8b3ce75001c2a91c977fab728a8ae36c"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha1 = "3f390efc29e49aae39d0030880a3b26cf8cd6318"; }
-    { locale = "si"; arch = "linux-i686"; sha1 = "aba611c1658d64151ad57ca321fc0050773db894"; }
+    { locale = "si"; arch = "linux-i686"; sha1 = "7094d0d07dceae2e5a164d585e04799fd9a86a8b"; }
-    { locale = "si"; arch = "linux-x86_64"; sha1 = "7a047794eec69dbf15f60dfbda1b8611435d2fc4"; }
+    { locale = "si"; arch = "linux-x86_64"; sha1 = "7a852dc124c1f207610aaf884119ae8804caaa41"; }
-    { locale = "sk"; arch = "linux-i686"; sha1 = "c6225541a63f18923a241488263987c662847548"; }
+    { locale = "sk"; arch = "linux-i686"; sha1 = "2439f765924307b9d2d00ce32c13384839e39d5c"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha1 = "0ca98adb699801f93fe7cd76b1c386b18c1f67a6"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha1 = "6017d51322d4d838449d6edf969803c1281e9229"; }
-    { locale = "sl"; arch = "linux-i686"; sha1 = "679f7d72f705dcffdfc36e5b89e3db3b56f76b74"; }
+    { locale = "sl"; arch = "linux-i686"; sha1 = "cfb6d7bdfd5abf6815381997d8f19710711017b9"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha1 = "36ee186bc3b7c0868f344c02fe44a98585188e9d"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha1 = "e7cf289bd59a6499f018d403a5ad661fd117073b"; }
-    { locale = "son"; arch = "linux-i686"; sha1 = "f96fe078e660c69b46ae8d3e0ce3189e4725a9fd"; }
+    { locale = "son"; arch = "linux-i686"; sha1 = "e49233842e845f67d090b84caa86d9209bc5e79e"; }
-    { locale = "son"; arch = "linux-x86_64"; sha1 = "700f875dbd7b16ffad92e6ce9e39de41554384e7"; }
+    { locale = "son"; arch = "linux-x86_64"; sha1 = "dfaaa438d97fa3e0839b75144ba921898114f593"; }
-    { locale = "sq"; arch = "linux-i686"; sha1 = "60af78da783fd8183371f7e62ea9e58b0306fa24"; }
+    { locale = "sq"; arch = "linux-i686"; sha1 = "d80a35017d041e2e4bd3a8f0925bb11d696b2ad7"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha1 = "55f2172292ae2ffec2244396a3f1d8399ce4233b"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha1 = "f1f940683602b808962317e0da9adc82d2e81c03"; }
-    { locale = "sr"; arch = "linux-i686"; sha1 = "becede293c5e225c8212e91bd97dda070ee8e677"; }
+    { locale = "sr"; arch = "linux-i686"; sha1 = "2a82cd867d939131b1985dcfeaf0d9d2a8682edf"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha1 = "0a122107f6161757744deb21bf7afd1284aa9bcb"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha1 = "ce4e49019bf1065610b862aaaec900d509561a5c"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "0f95be8a5510fe89475346c0b3ee91bee967b4e9"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "c3a9e5d86fe94ff9f22a3f891b604379ab1374ea"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "6185a8d66a73082146fc728e1ee9108a72eb29b6"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "cc397d3ce95ccb4c957f05f90ac6eec28cbc383e"; }
-    { locale = "ta"; arch = "linux-i686"; sha1 = "6a4bb348caafce8d406bb431b69161ea21290241"; }
+    { locale = "ta"; arch = "linux-i686"; sha1 = "9ed781079e459942141597671a7ba13eef65bdf1"; }
-    { locale = "ta"; arch = "linux-x86_64"; sha1 = "5f1c0f08d2ee49d6484f84bdd721f2e26cf09fb1"; }
+    { locale = "ta"; arch = "linux-x86_64"; sha1 = "fbd5dc0126e6df1ebebcc270f58d16344a46ee49"; }
-    { locale = "te"; arch = "linux-i686"; sha1 = "43b4166646f593e82bd5ffe3609960f3bdf8abd2"; }
+    { locale = "te"; arch = "linux-i686"; sha1 = "7c29cc8335b9d4d3d9210c77caac74d25d477cdc"; }
-    { locale = "te"; arch = "linux-x86_64"; sha1 = "8f567accf4db46a669ac0da25ff48a843fd8c940"; }
+    { locale = "te"; arch = "linux-x86_64"; sha1 = "be02910dd1abc92d3754332e56274cc977773f64"; }
-    { locale = "th"; arch = "linux-i686"; sha1 = "ec19b178cc82802edb2f2060c47663422d3cef2a"; }
+    { locale = "th"; arch = "linux-i686"; sha1 = "259edc8e888fdc32c714a45cf9599d15111f14e3"; }
-    { locale = "th"; arch = "linux-x86_64"; sha1 = "667db54905a5e539c11752f954e93ac991f958bd"; }
+    { locale = "th"; arch = "linux-x86_64"; sha1 = "934b28f0936b8ac9a395c906f9ca04150c9f79db"; }
-    { locale = "tr"; arch = "linux-i686"; sha1 = "bddfc685191b9cd686ba8911e790e4c103d2a652"; }
+    { locale = "tr"; arch = "linux-i686"; sha1 = "be173ce377a1a3ece05fb708316d79a880708137"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha1 = "ea92a05be86355c31fc3cbde7ce1ab3946d9239c"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha1 = "52a94b0a3fb58c256b66019d9b8c8f5ab420f3e6"; }
-    { locale = "uk"; arch = "linux-i686"; sha1 = "b0a25b1047e3d2a34f28750db03e9cf7247d46b3"; }
+    { locale = "uk"; arch = "linux-i686"; sha1 = "fc8e6574ef667c6a2de19cb82bec4bc47b85f907"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha1 = "2753baa3b5c486723c8ace486203ff6c7e9c1ac9"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha1 = "bace7c6ffd9f02b0d6e24046f42c64b96db1a84a"; }
-    { locale = "vi"; arch = "linux-i686"; sha1 = "0d0b7a57282560bbb5e26e23f65844f0c5eac888"; }
+    { locale = "uz"; arch = "linux-i686"; sha1 = "1df792bf6b364632a0882ac055d9fee3b537e5c2"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha1 = "f6a44d48325d3da23cd618c78d70fd8d9201a7a4"; }
+    { locale = "uz"; arch = "linux-x86_64"; sha1 = "f77c0bd068b1c44d20027793a826714262d38351"; }
-    { locale = "xh"; arch = "linux-i686"; sha1 = "44700f87ec176ffed749ae31f7dd04664a8a050b"; }
+    { locale = "vi"; arch = "linux-i686"; sha1 = "8b367c6fee817dbb12e4c54b35df8a6d09900f33"; }
-    { locale = "xh"; arch = "linux-x86_64"; sha1 = "24c4355e2b12886232cff0c5fe791824050d38a6"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha1 = "307dee3afe576025524dee35904e70351cf03432"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "24f06bbdcfd94f3d0168c93f83c13fd5bbb59c5b"; }
+    { locale = "xh"; arch = "linux-i686"; sha1 = "b04a6593e912a40d20be3c90cca3c7cdcd893e92"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "ea584b5aaa279694c4550b83ddd61de586f62517"; }
+    { locale = "xh"; arch = "linux-x86_64"; sha1 = "6abfc8532600cdd20ce53923913d50b7eeb52ac8"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "c257cbd9ed02f699384ffb8ece286c3b8e94ea8f"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "5d57176765f3be64230f36aa292992adf4a3c48c"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "87fff9bf03bd3208bd71d92527dbddfb0dd12a6f"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "df6d9a163dddacbd58591bd9572b16c7364eda2c"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "92fa3a666d858427f2a0102d85320b567c43ee40"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "b11d2d33c335bd471b6762e39c646303b3345ba4"; }
   ];
 }

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

@@ -15,14 +15,14 @@
 
 assert stdenv.cc ? libc && stdenv.cc.libc != null;
 
-let version = "35.0.1"; in
+let version = "36.0"; in
 
 stdenv.mkDerivation rec {
   name = "firefox-${version}";
 
   src = fetchurl {
     url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2";
-    sha1 = "cf256ee1491ee502eb4432ade5a879104ebceede";
+    sha1 = "0939dd0258b042c7b7d4d3a3bff8e476c380885b";
   };
 
   buildInputs =

pkgs/applications/networking/dropbox/default.nix

@@ -1,8 +1,6 @@
-{ stdenv, fetchurl, makeDesktopItem
+{ stdenv, fetchurl, makeDesktopItem, makeWrapper
-, libSM, libX11, libXext, libXcomposite, libXcursor, libXdamage
+, dbus_libs, gcc, glib, libdrm, libffi, libICE, libSM
-, libXfixes, libXi, libXinerama, libXrandr, libXrender
+, libX11, libXmu, ncurses, popt, qt5, zlib
-, dbus, dbus_glib, fontconfig, gcc, patchelf
-, atk, glib, gdk_pixbuf, gtk, pango, zlib
 }:
 
 # this package contains the daemon version of dropbox
@@ -11,10 +9,13 @@
 # note: the resulting program has to be invoced as
 # 'dropbox' because the internal python engine takes
 # uses the name of the program as starting point.
-#
+
-# todo: dropbox is shipped with some copies of libraries.
+# Dropbox ships with its own copies of some libraries.
-# replace these libraries with the appropriate ones in
+# Unfortunately, upstream makes changes to the source of
-# nixpkgs.
+# some libraries, rendering them incompatible with the
+# open-source versions. Wherever possible, we must try
+# to make the bundled libraries work, rather than replacing
+# them with our own.
 
 let
   arch = if stdenv.system == "x86_64-linux" then "x86_64"
@@ -33,14 +34,11 @@ let
   # relative location where the dropbox libraries are stored
   appdir = "opt/dropbox";
 
-  # Libraries referenced by dropbox binary.
+  ldpath = stdenv.lib.makeSearchPath "lib"
-  # Be aware that future versions of the dropbox binary may refer
+    [
-  # to different versions than are currently in these packages.
+      dbus_libs gcc glib libdrm libffi libICE libSM libX11
-  ldpath = stdenv.lib.makeSearchPath "lib" [
+      libXmu ncurses popt qt5.base qt5.declarative qt5.webkit
-      libSM libX11 libXext libXcomposite libXcursor libXdamage
+      zlib
-      libXfixes libXi libXinerama libXrandr libXrender
-      atk dbus dbus_glib glib fontconfig gcc gdk_pixbuf
-      gtk pango zlib
     ];
 
   desktopItem = makeDesktopItem {
@@ -56,7 +54,6 @@ in stdenv.mkDerivation {
   name = "dropbox-${version}-bin";
   src = fetchurl {
     name = "dropbox-${version}.tar.gz";
-    
     url = "https://dl-web.dropbox.com/u/17/dropbox-lnx.${arch}-${version}.tar.gz";
     inherit sha256;
   };
@@ -67,15 +64,39 @@ in stdenv.mkDerivation {
     rm -f .dropbox-dist/dropboxd
   '';
 
+  buildInputs = [ makeWrapper ];
+
   installPhase = ''
     mkdir -p "$out/${appdir}"
     cp -r ".dropbox-dist/dropbox-lnx.${arch}-${version}"/* "$out/${appdir}/"
-    mkdir -p "$out/bin"
-    ln -s "$out/${appdir}/dropbox" "$out/bin/dropbox"
 
-    patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} \
+    rm "$out/${appdir}/libdrm.so.2"
-      "$out/${appdir}/dropbox"
+    rm "$out/${appdir}/libffi.so.6"
-    
+    rm "$out/${appdir}/libicudata.so.42"
+    rm "$out/${appdir}/libicui18n.so.42"
+    rm "$out/${appdir}/libicuuc.so.42"
+    rm "$out/${appdir}/libGL.so.1"
+    rm "$out/${appdir}/libpopt.so.0"
+    rm "$out/${appdir}/libQt5Core.so.5"
+    rm "$out/${appdir}/libQt5DBus.so.5"
+    rm "$out/${appdir}/libQt5Gui.so.5"
+    rm "$out/${appdir}/libQt5Network.so.5"
+    rm "$out/${appdir}/libQt5OpenGL.so.5"
+    rm "$out/${appdir}/libQt5PrintSupport.so.5"
+    rm "$out/${appdir}/libQt5Qml.so.5"
+    rm "$out/${appdir}/libQt5Quick.so.5"
+    rm "$out/${appdir}/libQt5Sql.so.5"
+    rm "$out/${appdir}/libQt5WebKit.so.5"
+    rm "$out/${appdir}/libQt5WebKitWidgets.so.5"
+    rm "$out/${appdir}/libQt5Widgets.so.5"
+    rm "$out/${appdir}/libX11-xcb.so.1"
+
+    rm "$out/${appdir}/qt.conf"
+    rm -fr "$out/${appdir}/plugins"
+
+    find "$out/${appdir}" -type f -a -perm +0100 \
+      -print -exec patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} {} \;
+
     RPATH=${ldpath}:${gcc.cc}/lib:$out/${appdir}
     echo "updating rpaths to: $RPATH"
     find "$out/${appdir}" -type f -a -perm +0100 \
@@ -83,6 +104,10 @@ in stdenv.mkDerivation {
 
     mkdir -p "$out/share/applications"
     cp "${desktopItem}/share/applications/"* $out/share/applications
+
+    mkdir -p "$out/bin"
+    makeWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \
+      --prefix LD_LIBRARY_PATH : "${ldpath}"
   '';
 
   meta = {

pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix

@@ -4,117 +4,117 @@
 # ruby generate_source.rb > source.nix
 
 {
-  version = "31.4.0";
+  version = "31.5.0";
   sources = [
-    { locale = "ar"; arch = "linux-i686"; sha1 = "5e6592c5f0569fb56613ed34db895a2fa6c77f66"; }
+    { locale = "ar"; arch = "linux-i686"; sha1 = "d36881e451b6a2f37d915aad58d05a21bb87f7d7"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha1 = "7f270aebf5de8c2f4a988d87b37cbdf12542a86a"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha1 = "21274f27a373bfbef19be027e5d29072ca60c9a1"; }
-    { locale = "ast"; arch = "linux-i686"; sha1 = "611bbfb96b6f2b39c9a7b83311ba7f96e0294501"; }
+    { locale = "ast"; arch = "linux-i686"; sha1 = "b01f2b2b84fec43aa53b72eb1298b502f7fe710f"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha1 = "5b8dbb29e1dfce40d0414b75a2e889e40ba62b1b"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha1 = "9ca6a14bd622b10e4a44d3aec496f610752c1e87"; }
-    { locale = "be"; arch = "linux-i686"; sha1 = "8aef167276d82e3243912f1773ce42bc5831d6a8"; }
+    { locale = "be"; arch = "linux-i686"; sha1 = "194a8808c66a48bf7da08ff119a7000088fe6cc5"; }
-    { locale = "be"; arch = "linux-x86_64"; sha1 = "81448779fcdcace457e7b3e37262345df9b100ec"; }
+    { locale = "be"; arch = "linux-x86_64"; sha1 = "4c2b3ee21c098894aea655b428459ae06f9d62ea"; }
-    { locale = "bg"; arch = "linux-i686"; sha1 = "4f82e7bfd24086e98721c6283156781a0a65e23f"; }
+    { locale = "bg"; arch = "linux-i686"; sha1 = "bc218d49b4e43fd3f05b7c4c8906b3da88e828d9"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha1 = "c3ddd6613f7591ff7d4aad1e39358f7107e56b5d"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha1 = "8bb02681a93dd6f0607b6a0b9ed53051fc628fa1"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "68340eea06073ddf2c64f2808d5136295962ebb5"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "c5cfd8d422751908cab17b741f4ed964de65a4f4"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "c080fda6eb86414e3157a54befcd9bf7e5a87148"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "80a5486d4150cdc140fc7c215927b9a49de7753c"; }
-    { locale = "br"; arch = "linux-i686"; sha1 = "087a853427912f6aef3802851cf61d8c36aaad93"; }
+    { locale = "br"; arch = "linux-i686"; sha1 = "401a491875fc0bc8d80650d83f7c70e6650c99df"; }
-    { locale = "br"; arch = "linux-x86_64"; sha1 = "b574ee98d1771d4a4be77a5e1f7573d03329d497"; }
+    { locale = "br"; arch = "linux-x86_64"; sha1 = "0a76c907d2bcdf877a73fb098a7a0d269e40a624"; }
-    { locale = "ca"; arch = "linux-i686"; sha1 = "4e56ed5b93e8aede015b4ba3b86d0121f5225e21"; }
+    { locale = "ca"; arch = "linux-i686"; sha1 = "4da40bb96d58d1465fab3cb23825d298140c81a2"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha1 = "8ca5266e9ad8c1f24a9426cd41b4f9af764308b1"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha1 = "c9e792e8d871b942e67c7d8b7471a7c40dc1d1de"; }
-    { locale = "cs"; arch = "linux-i686"; sha1 = "3e612559375de82f227fbdfad847bef58392ed64"; }
+    { locale = "cs"; arch = "linux-i686"; sha1 = "a0da8667faf948049adee23a8c68320eb0af0d4c"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha1 = "3aeb7ca07b82258353b1085705e6f0f18c3a3813"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha1 = "de9c5cb34defca191cba287a3088179b52385e51"; }
-    { locale = "da"; arch = "linux-i686"; sha1 = "7d09b5f73738ea9ea16c515434299df8654bbc1e"; }
+    { locale = "da"; arch = "linux-i686"; sha1 = "2a4c69398a3aa4dfe2c3d79330021e243893a660"; }
-    { locale = "da"; arch = "linux-x86_64"; sha1 = "3c7b5dafca343afa0be3d107078c42d525149ab7"; }
+    { locale = "da"; arch = "linux-x86_64"; sha1 = "2a24cc02c39be286de1c0407b5187effb3f74cad"; }
-    { locale = "de"; arch = "linux-i686"; sha1 = "5273088e2ad5278fbec29a3d80ff81123807bdb1"; }
+    { locale = "de"; arch = "linux-i686"; sha1 = "292c4de929c96302d10b235788b985281ed1a36c"; }
-    { locale = "de"; arch = "linux-x86_64"; sha1 = "d18893827828640ff83df8b3d340ed96312d4bfb"; }
+    { locale = "de"; arch = "linux-x86_64"; sha1 = "30ff8eacbe14d0b7d0fe4c8854d0b20af1fdbddb"; }
-    { locale = "el"; arch = "linux-i686"; sha1 = "dc0f3ecb015568805634ee78f5ec314d2502ae63"; }
+    { locale = "el"; arch = "linux-i686"; sha1 = "1092950cb1e9297a976b1e81a53b20bfa908c27f"; }
-    { locale = "el"; arch = "linux-x86_64"; sha1 = "ca7c336b9902c7f109c58e20d944c019cc3003dd"; }
+    { locale = "el"; arch = "linux-x86_64"; sha1 = "8eb096336f0a585922c31905534e8314dbe69f05"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha1 = "a7164e94562e7c711e0a8ca98cb9994c75aa4538"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha1 = "3c18093229125d47078da68cfbf785c96d8bdcc1"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "f53acad0af7a080e310b7a875b6cb6776d691fcd"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "7c9546c119585111c20bf9f0a7da38c1359e8bae"; }
-    { locale = "en-US"; arch = "linux-i686"; sha1 = "7c31b23b0dfe89c17c0eef61cc605f2ea6a5fca3"; }
+    { locale = "en-US"; arch = "linux-i686"; sha1 = "9a8c3ddf64900335a0da340da67e291fd9135c78"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "f837d7d1916d687e4482abb87b74de90c4131b4d"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "e00004d79733ba311f7b3586228c4c481935f9e6"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha1 = "80d6ad181ba25b3b65eb9fd990f03a1aadd68a7b"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha1 = "c5a60aaf75baf0cfc56575cd40bb61594c66dad0"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "f40f6514a2357aecabdc34708bbc819fb6546a70"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "e95dad323e8e6c1eb401b9528f16825b6d4defef"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha1 = "7c0d9500321fe5c854ba7f1f11cd1cfcec895919"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha1 = "66adbf58ccd65b6b60ef4196e13cf1b246151c6e"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "afa2780e35a8fb95b26f43595c2e7729e7d37360"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "35ecf91137560f06445007bbee54cbf8c5b9c438"; }
-    { locale = "et"; arch = "linux-i686"; sha1 = "711bf1da10758f784e5c31b3673eb612604775b9"; }
+    { locale = "et"; arch = "linux-i686"; sha1 = "d7ab0d4874a95cb2234b076906eeba14d9a76507"; }
-    { locale = "et"; arch = "linux-x86_64"; sha1 = "02ee282d0b54ad6490e742f7a3b29763bf1d0545"; }
+    { locale = "et"; arch = "linux-x86_64"; sha1 = "82f944cbc95eeb10e6b46a20d8bd5b031800c87b"; }
-    { locale = "eu"; arch = "linux-i686"; sha1 = "940125468f0129138e20a048fe09d3d489bab478"; }
+    { locale = "eu"; arch = "linux-i686"; sha1 = "1494e4dfdb95d0e6d62265536016601501277b7a"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha1 = "357a64c3b49e3d058ed715de24296fa6533dbe59"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha1 = "ca36606b18739f155a18637f6ce392bf466ba666"; }
-    { locale = "fi"; arch = "linux-i686"; sha1 = "abe4633376f244efffbd3faa7be4381a5dce0dcc"; }
+    { locale = "fi"; arch = "linux-i686"; sha1 = "dce9299b7bc905377566caa7e0289620e2d7e84f"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha1 = "f401ae0b0e51603249f6a7b925166bf287023dc7"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha1 = "6477fab8e95032bc57faecbb2240844a8d0314d5"; }
-    { locale = "fr"; arch = "linux-i686"; sha1 = "f563e7f6638da931c3e8b3b8055d8ea1923af204"; }
+    { locale = "fr"; arch = "linux-i686"; sha1 = "e8fbd234f3e35d8dcb0acb2d3fbdd2b03d9c06e1"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha1 = "5ebfc7889ad5fa147c50e70a66b42238dc289ffd"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha1 = "e2fb441f96c407371ed02e86d42b63e7e38107fa"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "a7c6c74459ac9ecae0b325765ae9fb3e2adab1c5"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "2798b02de295269ee7a0792bc89c6c9f809bfab0"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "923de165c7eb693316d4a81ad13e32636c1de990"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "ee398047c681098af9c5ad17101d34fe1699d038"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "6685e21a2b20ebb35da479604dfbf719b0822c3e"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "739d34bf1b8ab785194b6c591e636bc4826b908a"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "35d4f00f26c3bc18c7a6ebcc6d6d2ccd0a4499d4"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "518bce26ebb68021c4dc6a8472e3f267648746c4"; }
-    { locale = "gd"; arch = "linux-i686"; sha1 = "7ad9d25363f3b98085758fb2815d4fbf0b898b28"; }
+    { locale = "gd"; arch = "linux-i686"; sha1 = "5791da2bc93aa945f8f21b2896b80ae3b88f1bf6"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha1 = "ddb0b68b311e51f602248924b4b49481a64ac175"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha1 = "f576688726132e0c0b8b07f37dda5dfdac0dddd7"; }
-    { locale = "gl"; arch = "linux-i686"; sha1 = "216df56d5dde4f27d0f14cfaafd7af08a2732bf2"; }
+    { locale = "gl"; arch = "linux-i686"; sha1 = "95bff6f384ae2821857b3ae71b76aa5440ddd3e2"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha1 = "4c30c0ba4bbe22522565679b49b06d62673fbd74"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha1 = "7237149162123580592769f66b48be83ad358df5"; }
-    { locale = "he"; arch = "linux-i686"; sha1 = "7f67f2fe2166d207f7fa39feb85faae4595cbdbc"; }
+    { locale = "he"; arch = "linux-i686"; sha1 = "8bf0ba0630601e8773eb4117ea800a2d32e5c920"; }
-    { locale = "he"; arch = "linux-x86_64"; sha1 = "f5949cb31f01b11cb6a43a045798da64abea52af"; }
+    { locale = "he"; arch = "linux-x86_64"; sha1 = "de5ab889e9ccc204f7abfb7e3e52e4ec6edbcc47"; }
-    { locale = "hr"; arch = "linux-i686"; sha1 = "c6d784d2cd3f3baf6737dfd2d28c03f9b1c37623"; }
+    { locale = "hr"; arch = "linux-i686"; sha1 = "3a6030ec8f310e5b1b154e0cfd9b75142df4c282"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha1 = "b5598bc5a19b45ee17cfd259f7da581735f90430"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha1 = "0af6b30a39141e887b5ad14fb16bb71047dbd28e"; }
-    { locale = "hu"; arch = "linux-i686"; sha1 = "21699446dbcc9e0fb53e06dafec8efdbf6ab484b"; }
+    { locale = "hu"; arch = "linux-i686"; sha1 = "bc84640dcf855612668a0c457a01ee0239440447"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha1 = "e64a219956f4aa017ee742cc1768567052593282"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha1 = "a96c48529e7f4a50840903d212d9cacacd5d5d94"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "a60b5d60e8436355ee24029a4398168108ce8aea"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "5ae8b3ad145fd1fe9d83b450b588ae85f3371489"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "583af341312ea29b50a7eaa86d2c9758ce2f5735"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "6c911464a02b65f84da08717cface89029e9a2cf"; }
-    { locale = "id"; arch = "linux-i686"; sha1 = "2471ebfc64a84e8711d7bc26783a16d6300ada07"; }
+    { locale = "id"; arch = "linux-i686"; sha1 = "19b98a36c5b64a1ac6db72b6d21e6b3c9919b3bb"; }
-    { locale = "id"; arch = "linux-x86_64"; sha1 = "d67b28477e36501a03ce8fd79a23090d068a696e"; }
+    { locale = "id"; arch = "linux-x86_64"; sha1 = "88bbe2609b8e84050dfab1c6ae313b4ac5c1f619"; }
-    { locale = "is"; arch = "linux-i686"; sha1 = "f53018a38f84c7e4fc8d5a3ee952478d4a1c9ebe"; }
+    { locale = "is"; arch = "linux-i686"; sha1 = "24cf25824357b570ddf99445ed6ce5e02f61ac2f"; }
-    { locale = "is"; arch = "linux-x86_64"; sha1 = "f886bcdb98af1c217a837c10a5e0737cbd357ef0"; }
+    { locale = "is"; arch = "linux-x86_64"; sha1 = "f6cd888e6ae5c67cf35a811f087ace294ca80883"; }
-    { locale = "it"; arch = "linux-i686"; sha1 = "000d8e56b62768aee6dba9cb14b733f78908e751"; }
+    { locale = "it"; arch = "linux-i686"; sha1 = "5fbeb845a3e9237b61a77e552927fd1cf41eb369"; }
-    { locale = "it"; arch = "linux-x86_64"; sha1 = "27ffbd773f977b67903a62b9131b1dcda27dd7f2"; }
+    { locale = "it"; arch = "linux-x86_64"; sha1 = "77015135696730a9412a2ef180564e53bfc41074"; }
-    { locale = "ja"; arch = "linux-i686"; sha1 = "cd743c00682001094d3a7decd8396b6ce9b1e67e"; }
+    { locale = "ja"; arch = "linux-i686"; sha1 = "df807e1255871ecaa6487853798fb86e4228745c"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha1 = "64b8ba26bb1f85788321bd2ba38b4813859ebede"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha1 = "cdfaf85e81edad783059b2a7b6a5af19ec48e8f3"; }
-    { locale = "ko"; arch = "linux-i686"; sha1 = "445731309b578c262547f22364dfe1fd0eaf68d5"; }
+    { locale = "ko"; arch = "linux-i686"; sha1 = "3cd01ce359c500db39edefa75275bbd42244f344"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha1 = "9bc2efd19b17c0e09b55e6ae310e59147212d726"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha1 = "52918cadfa61a4f3903f35e34583b9554446ad98"; }
-    { locale = "lt"; arch = "linux-i686"; sha1 = "35a275d39c2a780b86749891c14ee77ca36f03bf"; }
+    { locale = "lt"; arch = "linux-i686"; sha1 = "ade54d46de66db43de1490523e23434c9cb69103"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha1 = "c70f2f57e1fd8c40da949a18314c30380728f7bd"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha1 = "52cd293a4329b51b40ff8d992dd2f980f6e8a7cd"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "c94ace97f23a6fce1e736bb334ddf6af3d5a0ff4"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "693b2d513df0a0f6b31adf9349c6627816b5c14b"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "b00717ab99a47ef3477fecb79d55dc5817c60c1e"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "be7c2f7a4988998ad19d5a87c28dbe2b06dc7d75"; }
-    { locale = "nl"; arch = "linux-i686"; sha1 = "a5864e976675278cb9fb7e65c1edb88f704557f1"; }
+    { locale = "nl"; arch = "linux-i686"; sha1 = "3920a26c7ac2f66ab7d2ea5d37d58471d9cea804"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha1 = "dba80bc2bc1ec67ba932525d05253803292bc9d8"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha1 = "f034ad4e4c347d6e2d4893b932c969c581cd51ad"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "161e1361b1ecc5f1ee31227b7e65705ab5355432"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "23e21892a7b08fb320c2af2711bbb44347de07e8"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "8051e55e5f7fbc42c7d75b5ad28834d11b699833"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "6177e5dca5ee9b703e585489610b874ab16b67d3"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "91c8812e39baaa1974d4d1c316c7c08022f3408f"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "ab89eca3573f847ce9c4757910303ec3647d010e"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "948a679c843cee3f8da80f0a45b5416c7cc3b37c"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "4ccde5395018e719bd5f0d835ead47a272578685"; }
-    { locale = "pl"; arch = "linux-i686"; sha1 = "43005f6337f33171f745f2e493d8cf2a8371d143"; }
+    { locale = "pl"; arch = "linux-i686"; sha1 = "b1d15bc7c70deb8e00bf458082a8c2a4577ec6e2"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha1 = "78fea3bc7e24eb96aefb2e52b01657437fc9dfd6"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha1 = "fd146e4fb01ca78bcfe6ca2cd560a8252c37e561"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "0a5b4e14446c0f8f44004178f873bb289176e1b6"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "bb63c5a778ab9c819b742393bdd67e347b18943b"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "727d4a82754118749ea48e4b7ab6d182570957ad"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "c619bec7acc717dc3fe7718c5b9b27a0aab2bb86"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "8b4418f18b3569991ff2aca4528e70dd49247d81"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "42c13c4381d1046d8982f2891e45cc13becc5eab"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "0ffbee08f3e43fde37913679037d59b68a47d49b"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "610d59c9b8e8bbb61937a205db70605cf99b4684"; }
-    { locale = "rm"; arch = "linux-i686"; sha1 = "79606026969e837b4b9a1be73b71b0b183757504"; }
+    { locale = "rm"; arch = "linux-i686"; sha1 = "349481180512c188a1114e7c9c5aea6f39793137"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha1 = "0680dfa0417688e2ad6307b10f90c766db139789"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha1 = "b3bb61a6e2bc36af8521b1be44330f348e6019ab"; }
-    { locale = "ro"; arch = "linux-i686"; sha1 = "d06f4e7f748ffa8202bfc1dc0c4bc94894feb223"; }
+    { locale = "ro"; arch = "linux-i686"; sha1 = "211ef0e28c892f069c79be028cead4f484224977"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha1 = "a998af6413eec1123c9e4698ce217dc856c2bb4e"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha1 = "9868443f482a00cdd0d68106afcdd002f74d8232"; }
-    { locale = "ru"; arch = "linux-i686"; sha1 = "062a1ba9c8a5c06972895ebb11e12d90a50c450d"; }
+    { locale = "ru"; arch = "linux-i686"; sha1 = "1b722932dd8b3b517c61ec50588a917bc7a5d934"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha1 = "fd149bdbdc4a697cfab1d04b818b09718a3b945c"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha1 = "9465eded1480ddf1e807de2ee8b2d10e7bcf9f0f"; }
-    { locale = "si"; arch = "linux-i686"; sha1 = "50105a554db09e57ad99aee5c3b9c9f35eef3431"; }
+    { locale = "si"; arch = "linux-i686"; sha1 = "ddf30543b88f0dbab951ef76f93d4e9cef47bc00"; }
-    { locale = "si"; arch = "linux-x86_64"; sha1 = "ed360ef7cbf2ecc70b08922c27cdf3525c392137"; }
+    { locale = "si"; arch = "linux-x86_64"; sha1 = "5e0ecf9899cdbc63530e0b0bc72e585abb721863"; }
-    { locale = "sk"; arch = "linux-i686"; sha1 = "34dee72d71916209a3cad28e6adfa1b3270567c6"; }
+    { locale = "sk"; arch = "linux-i686"; sha1 = "38d6815aa5837005dfcb78cf25057a1f04b52da4"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha1 = "cfe76d345c17ab8711a723779d263c3baa0016ff"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha1 = "c5e2a1c6d67e41c318b13e81cdc7b6dc36d1798a"; }
-    { locale = "sl"; arch = "linux-i686"; sha1 = "391a923ff56ba6adf15817b12eec4555ede578fe"; }
+    { locale = "sl"; arch = "linux-i686"; sha1 = "6bc59e32db280aa2300b649b175330c7d503776d"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha1 = "b6c3ad0b50610fd2470a2366c58a2e4947a96698"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha1 = "39f5965ead13d55c0b84f633dff645e8bc2111c0"; }
-    { locale = "sq"; arch = "linux-i686"; sha1 = "f422d3adca0f15b70d53c9c9b9bae09d651ef535"; }
+    { locale = "sq"; arch = "linux-i686"; sha1 = "a06151bcacbc504da1351cda4f84539a2ce9afc8"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha1 = "d3c8c82a0531a20480ac93dc6e0c981068a327fc"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha1 = "e453d23bb265d4d5e729fb7f4f65553ec8d72250"; }
-    { locale = "sr"; arch = "linux-i686"; sha1 = "9d7ab49903107da8cd9859d09ae62dea661130a9"; }
+    { locale = "sr"; arch = "linux-i686"; sha1 = "6c6f0e1bc7e2327d05484628298a204897b379bd"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha1 = "24f770326910db0ebd3d521b7573f57c4db2afdd"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha1 = "2044a84b1fdcae2aa2ae5aec9132543ed10792ed"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "b93a538462e364202cf0a7ef9867f3bcaad5256d"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "ecd19886aed7b721172be2a030e3b9d1a752a648"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "b2c6c917b6575002f2f9f548ba1ae0aa3bd7a064"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "904ed03d02ceebed11505f95ccf158aa022d6aa5"; }
-    { locale = "ta-LK"; arch = "linux-i686"; sha1 = "e0d34774514f264bb02a2c5db76270bc228e80a8"; }
+    { locale = "ta-LK"; arch = "linux-i686"; sha1 = "4f9ec99fdb826957ef109a7665a97fe223a88d50"; }
-    { locale = "ta-LK"; arch = "linux-x86_64"; sha1 = "8119ba8f521da39af4d729fe52841c76e6a9c6f1"; }
+    { locale = "ta-LK"; arch = "linux-x86_64"; sha1 = "0bae36b2aac4e06bdf4b0b210f3179d15a074e8e"; }
-    { locale = "tr"; arch = "linux-i686"; sha1 = "76b9c748286ac40cb77b2dfe98e44b1ebadc6d9b"; }
+    { locale = "tr"; arch = "linux-i686"; sha1 = "e0ab549d8f4df80f8b7dc4fa978142935f103140"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha1 = "779ed971dac93d55e45a63e0ff4d3f6118317116"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha1 = "2c0b7ca57916bac4846ec1702094c02452a05a0d"; }
-    { locale = "uk"; arch = "linux-i686"; sha1 = "784a6432f04dc12f6abb405e4375540bb3c1bfac"; }
+    { locale = "uk"; arch = "linux-i686"; sha1 = "80af6c1ad5a226249f91b9ad40aa1fa2fae4e4c8"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha1 = "d6ec1ca2015c723d05e4f7a6e6006cb0f5f45667"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha1 = "6a2de95d4e501fa0eed932d36e7e667746e89af5"; }
-    { locale = "vi"; arch = "linux-i686"; sha1 = "e494cb50a3c99b4e96794544b1a7948663d0ae28"; }
+    { locale = "vi"; arch = "linux-i686"; sha1 = "7246575cd970737c8dd9ad84ad28316efcb37b7d"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha1 = "e9a8d6fb2b9328f7ea80c0d7be9943daaf37e71d"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha1 = "84f798a483558b24cfcbfe44af8c9d1c0acffc28"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "14624e631eb3bdfb9cde339dbf132e048f68f1c3"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "dda34b5b7026ffcd37b982968ac0815f02c082e2"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "1197fa99680d978b10c41ccac7183117c264f375"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "6a63ad1c758f639aaa8ee20b3153811514810425"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "78c73c73363b41b3ae36cea01cc64bc715602278"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "a3b378d077ef57ed52130df662c5b68208527cc1"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "76faeef7919eb2fb594773502ee5202ed11b67e4"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "857cb387742c175e8b31a0b2171de5ab27531141"; }
   ];
 }

pkgs/applications/networking/remote/freerdp/unstable.nix

@@ -2,6 +2,7 @@
 , libXdamage, libXext, glib, alsaLib, ffmpeg, libxkbfile, libXinerama, libXv
 , substituteAll
 , pulseaudio ? null, cups ? null, pcsclite ? null
+, buildServer ? true, optimize ? true
 }:
 
 stdenv.mkDerivation rec {
@@ -33,7 +34,10 @@ stdenv.mkDerivation rec {
     "-DWITH_CUNIT=OFF"
   ] ++ stdenv.lib.optional (pulseaudio != null) "-DWITH_PULSE=ON"
     ++ stdenv.lib.optional (cups != null) "-DWITH_CUPS=ON"
-    ++ stdenv.lib.optional (pcsclite != null) "-DWITH_PCSC=ON";
+    ++ stdenv.lib.optional (pcsclite != null) "-DWITH_PCSC=ON"
+    ++ stdenv.lib.optional buildServer "-DWITH_SERVER=ON"
+    ++ stdenv.lib.optional optimize "-DWITH_SSE2=ON";
+
 
   meta = with stdenv.lib; {
     description = "A Remote Desktop Protocol Client";

pkgs/applications/video/mpv/default.nix

@@ -56,16 +56,17 @@ let
 
 in
 
+with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "mpv-${version}";
-  version = "0.7.3";
+  version = "0.8.0";
 
   src = fetchurl {
     url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz";
-    sha256 = "1cg82zwzi6qh8s8w3716ikm1l1sigl9h6pd9ffdrp3ja4r2drp48";
+    sha256 = "110m4kdnggw0g1sl8jp3gjgjc3q7qb013dba0ggpvlqc8mwm4rg3";
   };
 
-  buildInputs = with stdenv.lib;
+  buildInputs = 
     [ python3 lua perl freetype pkgconfig ffmpeg libass docutils which libpthreadstubs lua5_sockets ]
     ++ optionals x11Support [ libX11 libXext mesa libXxf86vm ]
     ++ optional alsaSupport alsaLib

pkgs/build-support/build-fhs-chrootenv/env.nix

@@ -142,7 +142,7 @@ let
     cp -rsf ${staticUsrProfileTarget}/lib/32/* lib/
 
     # copy content of multiPaths (32bit libs)
-    cp -rsf ${staticUsrProfileMulti}/lib/* lib/
+    [ -d ${staticUsrProfileMulti}/lib ] && cp -rsf ${staticUsrProfileMulti}/lib/* lib/
 
     # copy content of targetPaths (64bit libs)
     cp -rsf ${staticUsrProfileTarget}/lib/* lib64/

pkgs/build-support/fetchgit/nix-prefetch-git

@@ -254,6 +254,7 @@ clone_user_rev() {
     local full_revision=$(cd $dir && (git rev-parse $rev 2> /dev/null || git rev-parse refs/heads/fetchgit) | tail -n1)
     echo "git revision is $full_revision"
     echo "git human-readable version is $(cd $dir && (git describe $full_revision 2> /dev/null || git describe --tags $full_revision 2> /dev/null || echo -- none --))" >&2
+    echo "Commit date is $(cd $dir && git show --no-patch --pretty=%ci $full_revision)"
 
     # Allow doing additional processing before .git removal
     eval "$NIX_PREFETCH_GIT_CHECKOUT_HOOK"

pkgs/build-support/fetchpatch/default.nix

@@ -19,4 +19,4 @@ fetchurl ({
         --clean "$out" > "$tmpfile"
     mv "$tmpfile" "$out"
   '';
-} // args)
+} // builtins.removeAttrs args ["stripLen"])

pkgs/build-support/fetchurl/default.nix

@@ -13,6 +13,7 @@ let
     stdenv.mkDerivation ({
       name = "mirrors-list";
       builder = ./write-mirror-list.sh;
+      preferLocalBuild = true;
     } // mirrors);
 
   # Names of the master sites that are mirrored (i.e., "sourceforge",

pkgs/data/misc/tzdata/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchurl }:
 
-let version = "2014j"; in
+let version = "2015a"; in
 
 stdenv.mkDerivation rec {
   name = "tzdata-${version}";
@@ -8,11 +8,11 @@ stdenv.mkDerivation rec {
   srcs =
     [ (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz";
-        sha256 = "038fvj6zf51k6z9sbbxbj87ajaf69l3whal2vwshbm4l0qr71n52";
+        sha256 = "0k4fy5x1813az0dwh82v5dhnvivfxxjin2szkgyfga00gn8r0965";
       })
       (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz";
-        sha256 = "1qpd12imy7q5hb5fhk48mfw65s0xlrkmms0zr2gk0mj88qjn3m3z";
+        sha256 = "06fxf9yw39wcpqifxf3lr8cn64nlwznqcyhd0cs2z1c6y88snnw8";
       })
     ];
 

pkgs/development/compilers/emscripten-fastcomp/default.nix

@@ -1,7 +1,7 @@
 { stdenv, fetchgit, python }:
 
 let
-  tag = "1.29.3";
+  tag = "1.29.10";
 in
 
 stdenv.mkDerivation rec {
@@ -10,13 +10,13 @@ stdenv.mkDerivation rec {
   srcFC = fetchgit {
     url = git://github.com/kripken/emscripten-fastcomp;
     rev = "refs/tags/${tag}";
-    sha256 = "ab44554dc43eee5552ea04c134a5aaff2cd32f6f6528f58a24025bcd8fd1d46e";
+    sha256 = "eee0f884c7e10e1b869b9d3afbb03bf69c63ec0560b136e3e8cd64ca00a41653";
   };
 
   srcFL = fetchgit {
     url = git://github.com/kripken/emscripten-fastcomp-clang;
     rev = "refs/tags/${tag}";
-    sha256 = "cc6dd704f5eba64fda931833479003bf3c8d9cf781bbaac3aa22a7b2644ccb26";
+    sha256 = "22c48e85dfacd9f2349d37fb421f0f848b65fc7b39e66984d04349ee3271667c";
   };
 
   buildInputs = [ python ];

pkgs/development/compilers/emscripten/default.nix

@@ -1,7 +1,7 @@
 { stdenv, fetchgit, emscriptenfastcomp, python, nodejs, closurecompiler, jre }:
 
 let
-  tag = "1.29.3";
+  tag = "1.29.10";
 in
 
 stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   src = fetchgit {
     url = git://github.com/kripken/emscripten;
     rev = "refs/tags/${tag}";
-    sha256 = "7f65d1d5cc1c1866554cd79ff83f87fc72a7df59cf1dfd6481e3f0aed5c7dc1f";
+    sha256 = "0d7ed2b801ac37acaf907bd03ba42cce3ac4a4c330bf1ef28de25bbb3f39ba87";
   };
 
   buildCommand = ''

pkgs/development/compilers/llvm/3.5/dragonegg.nix

@@ -5,14 +5,6 @@ stdenv.mkDerivation rec {
 
   src = fetch "dragonegg" "1v1lc9h2nfk3lsk9sx1k4ckwddz813hqjmlp2bx2kwxx9hw364ar";
 
-  patches = [(fetchpatch {
-    url = "https://llvm.org/viewvc/llvm-project/dragonegg/trunk/src/x86/ABIHack.inc"
-      + "?r1=208730&r2=208729&view=patch";
-    sha256 = "1al82gqz90hzjx24p0wls029lw2bgnlgd209kgvxsp82p4z1v1c1";
-    name = "bug-18548.patch";
-  })];
-  patchFlags = "-p2";
-
   # The gcc the plugin will be built for (the same used building dragonegg)
   GCC = "gcc";
 

pkgs/development/compilers/urweb/default.nix

@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "urweb";
-  version = "20141206";
+  version = "20150214";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://www.impredicative.com/ur/${name}.tgz";
-    sha256 = "077yakksxvdjlmwgc9wlz9jnkr345sikqjchvmxyv0axga5bw4rj";
+    sha256 = "f7b7587fe72c04f14581ded11588777f7bb61e392634966cc0354e13d69f236d";
   };
 
   buildInputs = [ stdenv.cc file openssl mlton mysql postgresql sqlite ];

pkgs/development/haskell-modules/configuration-common.nix

@@ -7,8 +7,8 @@ self: super: {
   # Some packages need a non-core version of Cabal.
   Cabal_1_18_1_6 = dontCheck super.Cabal_1_18_1_6;
   Cabal_1_20_0_3 = dontCheck super.Cabal_1_20_0_3;
-  Cabal_1_22_0_0 = dontCheck super.Cabal_1_22_0_0;
+  Cabal_1_22_1_1 = dontCheck super.Cabal_1_22_1_1;
-  cabal-install = dontCheck (super.cabal-install.override { Cabal = self.Cabal_1_22_0_0; });
+  cabal-install = dontCheck (super.cabal-install.override { Cabal = self.Cabal_1_22_1_1; });
 
   # Break infinite recursions.
   digest = super.digest.override { inherit (pkgs) zlib; };
@@ -43,6 +43,20 @@ self: super: {
     hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
   };
 
+  # CUDA needs help finding the SDK headers and libraries.
+  cuda = overrideCabal super.cuda (drv: {
+    extraLibraries = (drv.extraLibraries or []) ++ [pkgs.linuxPackages.nvidia_x11];
+    configureFlags = (drv.configureFlags or []) ++
+      pkgs.lib.optional pkgs.stdenv.is64bit "--extra-lib-dirs=${pkgs.cudatoolkit}/lib64" ++ [
+      "--extra-lib-dirs=${pkgs.cudatoolkit}/lib"
+      "--extra-include-dirs=${pkgs.cudatoolkit}/usr_include"
+    ];
+    preConfigure = ''
+      unset CC          # unconfuse the haskell-cuda configure script
+      sed -i -e 's|/usr/local/cuda|${pkgs.cudatoolkit}|g' configure
+    '';
+  });
+
   # Depends on code distributed under a non-free license.
   bindings-yices = dontDistribute super.bindings-yices;
   yices = dontDistribute super.yices;
@@ -206,6 +220,7 @@ self: super: {
 
   # These packages try to execute non-existent external programs.
   cmaes = dontCheck super.cmaes;                        # http://hydra.cryp.to/build/498725/log/raw
+  dbmigrations = dontCheck super.dbmigrations;
   filestore = dontCheck super.filestore;
   graceful = dontCheck super.graceful;
   hakyll = dontCheck super.hakyll;
@@ -216,6 +231,7 @@ self: super: {
   postgrest = dontCheck super.postgrest;
   snowball = dontCheck super.snowball;
   wai-middleware-hmac = dontCheck super.wai-middleware-hmac;
+  wai-middleware-throttle = dontCheck super.wai-middleware-throttle;
   xmlgen = dontCheck super.xmlgen;
 
   # These packages try to access the network.
@@ -378,6 +394,9 @@ self: super: {
   xcffib = dontCheck super.xcffib;
   xsd = dontCheck super.xsd;
 
+  # https://bitbucket.org/wuzzeb/webdriver-utils/issue/1/hspec-webdriver-101-cant-compile-its-test
+  hspec-webdriver = markBroken super.hspec-webdriver;
+
   # The build fails with the most recent version of c2hs.
   ncurses = super.ncurses.override { c2hs = self.c2hs_0_20_1; };
 
@@ -449,9 +468,6 @@ self: super: {
   # https://github.com/evanrinehart/mikmod/issues/1
   mikmod = addExtraLibrary super.mikmod pkgs.libmikmod;
 
-  # https://github.com/d12frosted/CanonicalPath/issues/3
-  system-canonicalpath = dontCheck super.system-canonicalpath;
-
   # https://github.com/basvandijk/threads/issues/10
   threads = dontCheck super.threads;
 
@@ -492,46 +508,27 @@ self: super: {
   # https://github.com/anton-k/temporal-csound/issues/2
   temporal-csound = markBrokenVersion "0.4.1" super.temporal-csound;
 
-  # https://github.com/gregwebs/haskell-heroku/issues/9
-  heroku = dontCheck super.heroku;
-
   # https://github.com/seanparsons/wiring/issues/1
   wiring = markBrokenVersion super.wiring;
 
-  # https://github.com/gibiansky/IHaskell/issues/355
-  ihaskell-parsec = markBroken super.ihaskell-parsec;
-
   # https://github.com/jwiegley/simple-conduit/issues/2
   simple-conduit = markBroken super.simple-conduit;
 
-  # https://github.com/evanrinehart/lowgl/issues/1
-  lowgl = markBroken super.lowgl;
-
   # https://github.com/srijs/hwsl2/issues/1
   hwsl2 = markBroken super.hwsl2;
 
   # https://code.google.com/p/linux-music-player/issues/detail?id=1
   mp = markBroken super.mp;
 
-  # https://github.com/athanclark/lucid-foundation/issues/1
-  lucid-foundation = markBroken super.lucid-foundation;
-  digestive-foundation-lucid = markBroken super.digestive-foundation-lucid;
-
   # Depends on broken lmdb package.
   vcache = markBroken super.vcache;
 
-  # https://github.com/osa1/language-lua/issues/14
-  language-lua = dontCheck super.language-lua;
-
   # https://github.com/afcowie/http-streams/issues/80
   http-streams = dontCheck super.http-streams;
 
   # https://github.com/vincenthz/hs-asn1/issues/12
   asn1-encoding = dontCheck super.asn1-encoding;
 
-  # https://github.com/NixOS/nixpkgs/issues/6343
-  c2hs = dontCheck super.c2hs;
-
   # wxc needs help deciding which version of GTK to use.
   wxc = overrideCabal (super.wxc.override { wxGTK = pkgs.wxGTK29; }) (drv: {
     patches = [ ./wxc-no-ldconfig.patch ];
@@ -540,8 +537,13 @@ self: super: {
   });
   wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK29; };
 
-  # Depends on obsolete QuickCheck 1.x.
+  # Depends on QuickCheck 1.x.
-  test-framework-quickcheck = markBroken super.test-framework-quickcheck;
+  ersatz = dontCheck (super.ersatz.override { QuickCheck = self.QuickCheck_1_2_0_1; }); # https://github.com/ekmett/ersatz/issues/8
+  HaVSA = super.HaVSA.override { QuickCheck = self.QuickCheck_1_2_0_1; };
+  test-framework-quickcheck = super.test-framework-quickcheck.override { QuickCheck = self.QuickCheck_1_2_0_1; };
+
+  # Doesn't support "this system". Linux? Needs investigation.
+  lhc = markBroken (super.lhc.override { QuickCheck = self.QuickCheck_1_2_0_1; });
 
   # Depends on broken test-framework-quickcheck.
   apiary = dontCheck super.apiary;
@@ -557,13 +559,35 @@ self: super: {
   apiary-session = dontCheck super.apiary-session;
   apiary-websockets = dontCheck super.apiary-websockets;
 
-  # https://github.com/fumieval/elevator/issues/2
-  elevator = markBroken super.elevator;
-  minioperational = markBroken super.minioperational;
-
   # https://github.com/mikeizbicki/hmm/issues/12
   hmm = markBroken super.hmm;
 
+  # https://github.com/alephcloud/hs-configuration-tools/issues/40
+  configuration-tools = dontCheck super.configuration-tools;
+
+  # https://github.com/fumieval/karakuri/issues/1
+  karakuri = markBroken super.karakuri;
+
+  # Upstream notified by e-mail.
+  snowglobe = markBroken super.snowglobe;
+  gearbox = markBroken super.gearbox;
+
+  # https://github.com/deech/fltkhs/issues/7
+  fltkhs = markBroken super.fltkhs;
+
+  # Build fails, but there seems to be no issue tracker available. :-(
+  hmidi = markBrokenVersion "0.2.1.0" super.hmidi;
+  padKONTROL = markBroken super.padKONTROL;
+
+  # https://github.com/lambdabot/lambdabot/issues/105
+  lambdabot-core = markBroken super.lambdabot-core;
+  lambdabot-haskell-plugins = markBroken super.lambdabot-haskell-plugins;
+  lambdabot-irc-plugins = markBroken super.lambdabot-irc-plugins;
+  lambdabot-misc-plugins = markBroken super.lambdabot-misc-plugins;
+  lambdabot-novelty-plugins = markBroken super.lambdabot-novelty-plugins;
+  lambdabot-reference-plugins = markBroken super.lambdabot-reference-plugins;
+  lambdabot-social-plugins = markBroken super.lambdabot-social-plugins;
+
 } // {
 
   # Not on Hackage.

pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix

@@ -38,7 +38,7 @@ self: super: {
   unix = null;
 
   # binary is not a core library for this compiler.
-  binary = self.binary_0_7_3_0;
+  binary = self.binary_0_7_4_0;
 
   # deepseq is not a core library for this compiler.
   deepseq_1_3_0_1 = dontJailbreak super.deepseq_1_3_0_1;

pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix

@@ -32,7 +32,7 @@ self: super: {
   unix = null;
 
   # binary is not a core library for this compiler.
-  binary = self.binary_0_7_3_0;
+  binary = self.binary_0_7_4_0;
 
   # deepseq is not a core library for this compiler.
   deepseq = self.deepseq_1_4_0_0;

pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix

@@ -39,6 +39,7 @@ self: super: {
 
   # haddock: No input file(s).
   nats = dontHaddock super.nats;
+  bytestring-builder = dontHaddock super.bytestring-builder;
 
   # These used to be core packages in GHC 7.8.x.
   old-locale = self.old-locale_1_0_0_7;
@@ -58,6 +59,7 @@ self: super: {
   utf8-string = overrideCabal super.utf8-string (drv: {
     patchPhase = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal";
   });
+  esqueleto = doJailbreak super.esqueleto;
 
   # bos/attoparsec#92
   attoparsec = dontCheck super.attoparsec;
@@ -84,4 +86,46 @@ self: super: {
   barecheck = doJailbreak super.barecheck;
   cartel = overrideCabal super.cartel (drv: { doCheck = false; patchPhase = "sed -i -e 's|base >= .*|base|' cartel.cabal"; });
 
+  # https://github.com/kazu-yamamoto/unix-time/issues/30
+  unix-time = dontCheck super.unix-time;
+
+  # https://github.com/peti/jailbreak-cabal/issues/5
+  ReadArgs = dontCheck super.ReadArgs;
+
+  # Until the changes have been pushed to Hackage
+  haskell-src-meta = appendPatch super.haskell-src-meta (pkgs.fetchpatch {
+    url = "https://github.com/bmillwood/haskell-src-meta/pull/31.patch";
+    sha256 = "0ij5zi2sszqns46mhfb87fzrgn5lkdv8yf9iax7cbrxb4a2j4y1w";
+  });
+  foldl = appendPatch super.foldl (pkgs.fetchpatch {
+    url = "https://github.com/Gabriel439/Haskell-Foldl-Library/pull/30.patch";
+    sha256 = "15lfh54vhdp36197dp4xpb2mr3g49gz2xzl31cjir1fmcvjsbgjl";
+  });
+  persistent-template = appendPatch super.persistent-template (pkgs.fetchpatch {
+    url = "https://github.com/yesodweb/persistent/commit/4d34960bc421ec0aa353d69fbb3eb0c73585db97.patch";
+    sha256 = "1gphl0v87y2fjwkwp6j0bnksd0d9dr4pis6aw97rij477bm5mrvw";
+    stripLen = 1;
+  });
+  stringsearch = appendPatch super.stringsearch (pkgs.fetchpatch {
+    url = "https://bitbucket.org/api/2.0/repositories/dafis/stringsearch/pullrequests/3/patch";
+    sha256 = "13n7wipaa1j2rghg2j68yjnda8a5galpv5sfz4j4d9509xakz25g";
+  });
+  mono-traversable = appendPatch super.mono-traversable (pkgs.fetchpatch {
+    url = "https://github.com/snoyberg/mono-traversable/pull/68.patch";
+    sha256 = "11hqf6hi3sc34wl0fn4rpigdf7wfklcjv6jwp8c3129yphg8687h";
+  });
+  conduit-combinators = appendPatch super.conduit-combinators (pkgs.fetchpatch {
+    url = "https://github.com/fpco/conduit-combinators/pull/16.patch";
+    sha256 = "0jpwpi3shdn5rms3lcr4srajbhhfp5dbwy7pl23c9kmlil3d9mk3";
+  });
+  wai-extra = appendPatch super.wai-extra (pkgs.fetchpatch {
+    url = "https://github.com/yesodweb/wai/pull/339.patch";
+    sha256 = "1rmz1ijfch143v7jg4d5r50lqq9r46zhcmdafq8p9g9pjxlyc590";
+    stripLen = 1;
+  });
+  yesod-auth = appendPatch super.yesod-auth (pkgs.fetchpatch {
+    url = "https://github.com/yesodweb/yesod/pull/941.patch";
+    sha256 = "1fycvjfr1l9wa03k30bnppl3ns99lffh9kmp9r7sr8b6yiydcajq";
+    stripLen = 1;
+  });
 }

pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix

@@ -40,7 +40,7 @@ self: super: {
   transformers-compat = disableCabalFlag super.transformers-compat "three";
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_0_0 = super.Cabal_1_22_0_0.override { binary = self.binary_0_7_3_0; process = self.process_1_2_2_0; };
+  Cabal_1_22_1_1 = super.Cabal_1_22_1_1.override { binary = self.binary_0_7_4_0; process = self.process_1_2_2_0; };
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;

pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix

@@ -37,7 +37,7 @@ self: super: {
   transformers-compat = disableCabalFlag super.transformers-compat "three";
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_0_0 = super.Cabal_1_22_0_0.override { binary = self.binary_0_7_3_0; };
+  Cabal_1_22_1_1 = super.Cabal_1_22_1_1.override { binary = self.binary_0_7_4_0; };
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;

pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix

@@ -40,7 +40,7 @@ self: super: {
   terminfo = self.terminfo_0_4_0_0;
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_0_0 = super.Cabal_1_22_0_0.override { binary = self.binary_0_7_3_0; };
+  Cabal_1_22_1_1 = super.Cabal_1_22_1_1.override { binary = self.binary_0_7_4_0; };
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;
@@ -87,7 +87,7 @@ self: super: {
       presburger pretty process QuickCheck random smtLib syb text
       tf-random transformers utf8-string
     ];
-    buildTools = with self; [ alex happy Cabal_1_22_0_0 ];
+    buildTools = with self; [ alex happy Cabal_1_22_1_1 ];
     patchPhase = "sed -i -e 's|process .*,|process,|' cryptol.cabal";
     description = "Cryptol: The Language of Cryptography";
     license = pkgs.stdenv.lib.licenses.bsd3;

pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix

@@ -82,15 +82,23 @@ self: super: {
   clac = dontDistribute super.clac;
 
   # https://github.com/junjihashimoto/test-sandbox-compose/issues/1
+  hspec-test-sandbox = markBroken super.hspec-test-sandbox;
+  test-framework-sandbox = markBroken super.test-sandbox-quickcheck;
   test-sandbox = markBroken super.test-sandbox;
   test-sandbox-compose = markBroken super.test-sandbox-compose;
+  test-sandbox-hunit = markBroken super.test-sandbox-hunit;
+  test-sandbox-quickcheck = markBroken super.test-sandbox-quickcheck;
 
-  # https://github.com/alephcloud/hs-configuration-tools/issues/38
+  # These packages need mtl 2.2.x directly or indirectly via dependencies.
-  configuration-tools = markBroken super.configuration-tools;
+  apiary-purescript = markBroken super.apiary-purescript;
+  highlighter2 = markBroken super.highlighter2;
+  hypher = markBroken super.hypher;
+  purescript = markBroken super.purescript;
+  yesod-purescript = markBroken super.yesod-purescript;
   yet-another-logger = markBroken super.yet-another-logger;
 
-  # Needs mtl 2.2.x.
+  # https://github.com/frosch03/arrowVHDL/issues/2
-  hypher = markBroken super.hypher;
+  ArrowVHDL = markBroken super.ArrowVHDL;
 
 }
 

pkgs/development/haskell-modules/generic-builder.nix

@@ -228,7 +228,7 @@ stdenv.mkDerivation ({
       mv $packageConfFile $packageConfDir/$pkgId.conf
     ''}
 
-    ${optionalString (enableSharedExecutables && isExecutable && stdenv.isDarwin) ''
+    ${optionalString (enableSharedExecutables && isExecutable && stdenv.isDarwin && stdenv.lib.versionOlder ghc.version "7.10") ''
       for exe in "$out/bin/"* ; do
         install_name_tool -add_rpath "$out/lib/ghc-${ghc.version}/${pname}-${version}" "$exe"
       done
@@ -241,6 +241,8 @@ stdenv.mkDerivation ({
 
     inherit pname version;
 
+    isHaskellLibrary = hasActiveLibrary;
+
     env = stdenv.mkDerivation {
       name = "interactive-${optionalString hasActiveLibrary "haskell-"}${pname}-${version}-environment";
       nativeBuildInputs = [ ghcEnv systemBuildInputs ];

pkgs/development/haskell-modules/with-packages-wrapper.nix

@@ -30,8 +30,8 @@ let
   libDir        = "$out/lib/ghc-${ghc.version}";
   docDir        = "$out/share/doc/ghc/html";
   packageCfgDir = "${libDir}/package.conf.d";
-  isHaskellPkg  = x: (x ? pname) && (x ? version) && (x ? env);
+  paths         = stdenv.lib.filter (x: x ? isHaskellLibrary) (stdenv.lib.closePropagation packages);
-  paths         = stdenv.lib.filter isHaskellPkg (stdenv.lib.closePropagation packages);
+  hasLibraries  = stdenv.lib.any (x: x.isHaskellLibrary) paths;
 in
 if paths == [] then ghc else
 buildEnv {
@@ -73,7 +73,7 @@ buildEnv {
       makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "${packageDBFlag}=${packageCfgDir}"
     done
 
-    $out/bin/ghc-pkg recache
+    ${stdenv.lib.optionalString hasLibraries "$out/bin/ghc-pkg recache"}
     $out/bin/ghc-pkg check
   '';
 } // {

pkgs/development/interpreters/groovy/default.nix

@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "groovy-${version}";
-  version = "2.4.0";
+  version = "2.4.1";
 
   src = fetchurl {
     url = "http://dl.bintray.com/groovy/maven/groovy-binary-${version}.zip";
-    sha256 = "1wb0rb89mvy1x64a8z9z3jmphw72vnkxaqbc0f2v35c2wv61p839";
+    sha256 = "1bhsv804iik497gflgp0wfhj6j4ylrladp1xndcszlfg576r1zch";
   };
 
   installPhase = ''
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An agile dynamic language for the Java Platform";
-    homepage = http://groovy.codehaus.org/;
+    homepage = http://groovy-lang.org/;
     license = licenses.asl20;
     maintainers = with maintainers; [ pSub ];
   };

pkgs/development/interpreters/octave/default.nix

@@ -31,9 +31,7 @@ stdenv.mkDerivation rec {
   # there is a mysterious sh: command not found
   doCheck = false;
 
-  /* The build failed with a missing libranlib.la in hydra,
+  enableParallelBuilding = true;
-     but worked on my computer. I think they have concurrency problems */
-  enableParallelBuilding = false;
 
   configureFlags = [ "--enable-readline" "--enable-dl" ];
 

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

@@ -21,7 +21,7 @@ with stdenv.lib;
 let
   majorVersion = "3.4";
   pythonVersion = majorVersion;
-  version = "${majorVersion}.2";
+  version = "${majorVersion}.3";
   fullVersion = "${version}";
 
   buildInputs = filter (p: p != null) [
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz";
-    sha256 = "1vrd9gqdqw7rw0kiiprqvng7ywnfc2hbyys7gr9mdh25s619cv8w";
+    sha256 = "1f4nm4z08sy0kqwisvv95l02crv6dyysdmx44p1mz3bn6csrdcxm";
   };
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";

pkgs/development/libraries/ffmpeg/2.x.nix

@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.5.3";
+  version = "2.5.4";
   name = "ffmpeg-${version}";
 
   src = fetchurl {
     url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
-    sha256 = "06j1cgw9h9ya5z8gpcf9v9zik3l4xz7sr4wshj06kznzz5z3sf4x";
+    sha256 = "11m2hbhdgphjxjp6hk438cxmipqjg5ixbr1kqnn9mbdhq9kc34fc";
   };
 
   subtitleSupport = config.ffmpeg.subtitle or true;

pkgs/development/libraries/gdal/default.nix

@@ -1,13 +1,13 @@
 { stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib
-, postgresql, mysql, libgeotiff, python, pythonPackages, proj}:
+, postgresql, mysql, libgeotiff, python, pythonPackages, proj, geos}:
 
 composableDerivation.composableDerivation {} (fixed: rec {
-  version = "1.11.1";
+  version = "1.11.2";
   name = "gdal-${version}";
 
   src = fetchurl {
     url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz";
-    sha256 = "0h1kib2pzv4nbppdnxv6vhngvk9ic531y8rzcwb8bg6am125jszl";
+    sha256 = "66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845";
   };
 
   buildInputs = [ unzip libjpeg libtiff python pythonPackages.numpy proj ];
@@ -26,6 +26,7 @@ composableDerivation.composableDerivation {} (fixed: rec {
     "--with-geotiff=${libgeotiff}"
     "--with-python"               # optional
     "--with-static-proj4=${proj}" # optional
+    "--with-geos=${geos}/bin/geos-config"# optional
   ];
 
   meta = {

pkgs/development/libraries/libav/default.nix

@@ -28,7 +28,7 @@ let
   result = {
     libav_0_8 = libavFun "0.8.16" "df88b8f7d04d47edea8b19d80814227f0c058e57";
     libav_9   = libavFun   "9.17" "5899d51947b62f6b0cf9795ec2330d5ed59a3273";
-    libav_11  = libavFun  "11"    "21f3c7c2154c0ad703872f2faa65ef20d6b7a14f";
+    libav_11  = libavFun  "11.2"  "52ba52cabe5d86b45ce62f56e11fa7912c6e5083";
   };
 
   libavFun = version : sha1 : stdenv.mkDerivation rec {

pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch

@@ -0,0 +1,25 @@
+diff --git a/configure.ac b/configure.ac
+index 3609d88..48c6bc6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -227,6 +227,7 @@ if [[ $use_bdjava = "yes" ]]; then
+   AC_DEFINE([USING_BDJAVA], [1], ["Define to 1 if using BD-Java"])
+   AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$java_arch"], ["Defines the architecture of the java vm."])
+   AC_DEFINE_UNQUOTED([JDK_HOME], ["$JDK_HOME"], [""])
++  CPPFLAGS="${CPPFLAGS} -DJARDIR='\"\$(datadir)/java\"'"
+ fi
+ AM_CONDITIONAL([USING_BDJAVA], [ test $use_bdjava = "yes" ])
+ 
+diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c
+index c622801..f4aab9b 100644
+--- a/src/libbluray/bdj/bdj.c
++++ b/src/libbluray/bdj/bdj.c
+@@ -210,7 +210,7 @@ static const char *_find_libbluray_jar(void)
+ #ifdef _WIN32
+         "" BDJ_JARFILE,
+ #else
+-        "/usr/share/java/" BDJ_JARFILE,
++        JARDIR "/" BDJ_JARFILE,
+ #endif
+     };
+ 

pkgs/development/libraries/libbluray/default.nix

@@ -2,9 +2,11 @@
 , withAACS ? false, libaacs ? null, jdk ? null, ant ? null
 , withMetadata ? true, libxml2 ? null
 , withFonts ? true, freetype ? null
+# Need to run autoreconf hook after BDJ jarfile patch
+, autoreconfHook ? null
 }:
 
-assert withAACS -> jdk != null && ant != null && libaacs != null;
+assert withAACS -> jdk != null && ant != null && libaacs != null && autoreconfHook != null;
 assert withMetadata -> libxml2 != null;
 assert withFonts -> freetype != null;
 
@@ -28,17 +30,27 @@ stdenv.mkDerivation rec {
 
   buildInputs =  with stdenv.lib;
                  [fontconfig]
-              ++ optionals withAACS [jdk libaacs]
+              ++ optionals withAACS [ jdk autoreconfHook ]
               ++ optional withMetadata libxml2
               ++ optional withFonts freetype
               ;
 
+  propagatedBuildInputs = stdenv.lib.optional withAACS libaacs;
+
+  preConfigure = stdenv.lib.optionalString withAACS ''
+    export JDK_HOME=${jdk.home}
+    export LIBS="$LIBS -L${libaacs} -laacs"
+  '';
+
   configureFlags =  with stdenv.lib;
-                    optionals withAACS ["--enable-bdjava" "--with-jdk=${jdk}"]
+                    optional withAACS "--enable-bdjava"
                  ++ optional (! withMetadata) "--without-libxml2"
                  ++ optional (! withFonts) "--without-freetype"
                  ;
 
+  # Fix search path for BDJ jarfile
+  patches = stdenv.lib.optional withAACS ./BDJ-JARFILE-path.patch;
+
   meta = with stdenv.lib; {
     homepage = http://www.videolan.org/developers/libbluray.html;
     description = "Library to access Blu-Ray disks for video playback";

pkgs/development/libraries/libharu/default.nix

@@ -1,40 +1,18 @@
-{ stdenv, fetchurl, zlib, libpng, patchutils }:
+{ stdenv, fetchzip, cmake, zlib, libpng }:
 
 stdenv.mkDerivation {
-  name = "libharu-2.2.1";
+  name = "libharu-2.3.0";
 
-  src = fetchurl {
+  src = fetchzip {
-    url = http://libharu.org/files/libharu-2.2.1.tar.bz2;
+    url = https://github.com/libharu/libharu/archive/RELEASE_2_3_0.tar.gz;
-    sha256 = "04493rjb4z8f04p3kjvnya8phg4b0vzy3mbdbp8jfy0dhvqg4h4j";
+    sha256 = "15s9hswnl3qqi7yh29jyrg0hma2n99haxznvcywmsp8kjqlyg75q";
   };
 
-  configureFlags = "--with-zlib=${zlib} --with-png=${libpng}";
+  buildInputs = [ zlib libpng cmake ];
-
-  buildInputs = [ zlib libpng ];
-
-  patches =
-    [ (stdenv.mkDerivation {
-        name = "linpng15.patch";
-
-        src = fetchurl {
-          url = https://github.com/libharu/libharu/commit/e5bf8b01f6c3d5e3fe0e26ac5345e0da10c03934.diff;
-          sha256 = "07k2x5d4pvpf8a5hvfb9pj0dpjgcvv8sdvxwx3wzbwqsf9swwrxb";
-        };
-
-        nativeBuildInputs = [ patchutils ];
-
-        buildCommand = "filterdiff -x '*/CHANGES' $src > $out";
-      })
-      (fetchurl {
-        url = https://github.com/libharu/libharu/commit/b472b64ab44d834eb29d237f31bf12396fee9aca.diff;
-        name = "endless-loop.patch";
-        sha256 = "1jrajz6zdch2pyzjkhmhm1b6ms8dk62snps7fwphnpvndrm4h4rr";
-      })
-    ];
 
   meta = {
     description = "Cross platform, open source library for generating PDF files";
-    homepage = http://libharu.org/wiki/Main_Page;
+    homepage = http://libharu.org/;
     license = stdenv.lib.licenses.zlib;
     maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = stdenv.lib.platforms.linux;

pkgs/development/libraries/libinput/default.nix

@@ -1,20 +1,45 @@
-{ stdenv, fetchurl, pkgconfig, mtdev, udev, libevdev }:
+{ stdenv, fetchurl, pkgconfig
+, libevdev, mtdev, udev
+, documentationSupport ? true, doxygen ? null, graphviz ? null # Documentation
+, eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support
+, testsSupport ? false, check ? null, valgrind ? null
+}:
 
+assert documentationSupport -> doxygen != null && graphviz != null;
+assert eventGUISupport -> cairo != null && glib != null && gtk3 != null;
+assert testsSupport -> check != null && valgrind != null;
+
+let
+  mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
+in
+
+with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "libinput-0.10.0";
+  name = "libinput-0.11.0";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz";
-    sha256 = "0h8lbhhxb5020bhdblxp1pkapy4bchjj3l44fxabz9pi1zw03q2c";
+    sha256 = "0hq7plvf9gpscy69pngffrfzqdrcwvpqr0a8fh45xslm5xwxcz4j";
   };
 
-  buildInputs = [ pkgconfig mtdev udev libevdev ];
+  configureFlags = [
+    (mkFlag documentationSupport "documentation")
+    (mkFlag eventGUISupport "event-gui")
+    (mkFlag testsSupport "tests")
+  ];
 
-  meta = with stdenv.lib; {
+  nativeBuildInputs = [ pkgconfig ];
-    homepage = http://www.freedesktop.org/wiki/Software/libinput;
+
-    description = "handles input devices in Wayland compositors and to provide a generic X.Org input driver";
+  buildInputs = [ libevdev mtdev udev ]
-    platforms = platforms.unix;
+    ++ optionals eventGUISupport [ cairo glib gtk3 ]
-    license = licenses.mit;
+    ++ optionals documentationSupport [ doxygen graphviz ]
-    maintainers = with maintainers; [ wkennington ];
+    ++ optionals testsSupport [ check valgrind ];
+
+  meta = {
+    description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver";
+    homepage    = http://www.freedesktop.org/wiki/Software/libinput;
+    license     = licenses.mit;
+    platforms   = platforms.unix;
+    maintainers = with maintainers; [ codyopel wkennington ];
   };
 }

pkgs/development/libraries/libsass/default.nix

@@ -0,0 +1,27 @@
+{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool }:
+
+stdenv.mkDerivation rec {
+  name = "libsass-${version}";
+  version = "3.1.0";
+
+  src = fetchFromGitHub {
+    owner = "sass";
+    repo = "libsass";
+    rev = version;
+    sha256 = "1k9a6hiybqk7xx4k2cb9vhdqskrrzhi60dvwp3gx39jhjqjfl96p";
+  };
+
+  preConfigure = ''
+    autoreconf --force --install
+  '';
+
+  buildInputs = [ autoconf automake libtool ];
+
+  meta = with lib; {
+    description = "A C/C++ implementation of a Sass compiler";
+    license = licenses.mit;
+    homepage = https://github.com/sass/libsass;
+    maintainers = with maintainers; [ offline ];
+    platforms = with platforms; unix;
+  };
+}

pkgs/development/libraries/libuv/default.nix

@@ -105,4 +105,5 @@ in
   //
   mapAttrs (v: h: mkWithAutotools stable (toVersion v) h) {
     v1_2_0 = "1nbp8qpgw64gl9nrjzxw0ndv1m64cfms0cy5a2883vw6877kizmx";
+    v1_4_0 = "17k028gn07vb9in440wbf0ar0rdl8bi5v4shm8nhj22vfb18dhl5";
   }

pkgs/development/libraries/libvirt-glib/default.nix

@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libvirt-glib-0.1.9";
+  name = "libvirt-glib-0.2.0";
 
   src = fetchurl {
     url = "http://libvirt.org/sources/glib/${name}.tar.gz";
-    sha256 = "0n59hp0kwn80z9136g2n7pwkrlhlsxksr6gy4w7783d71qk3cfq5";
+    sha256 = "02saqkk4wzsimsan7s9yc5bx05xn7j00hnxhq4sczkgr4krf1drh";
   };
 
   buildInputs = [

pkgs/development/libraries/libvirt/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libxml2, gnutls, devicemapper, perl, python
 , iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess, gettext
 , libtasn1, ebtables, libgcrypt, yajl, makeWrapper, pmutils, libcap_ng
-, dnsmasq, libnl, libpcap
+, dnsmasq, libnl, libpcap, libxslt, xhtml1
-, pythonPackages
+, pythonPackages, perlPackages
 }:
 
-let version = "1.2.9"; in
+let version = "1.2.12"; in
 
 assert version == pythonPackages.libvirt.version;
 
@@ -14,13 +14,13 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://libvirt.org/sources/${name}.tar.gz";
-    sha256 = "1i4ggs50dipz1hm0qlk6kak1n3klll8sx9fnffmvjlgla9d1m4wm";
+    sha256 = "0sp6xm6iyg5wfjgxiba4rpl527429r22lh241dzxjq25fxzj5xgg";
   };
 
   buildInputs = [
     pkgconfig libxml2 gnutls devicemapper perl python readline lvm2
     utillinux udev libpciaccess gettext libtasn1 libgcrypt yajl makeWrapper
-    libcap_ng libnl
+    libcap_ng libnl libxslt xhtml1 perlPackages.XMLXPath
   ];
 
   preConfigure = ''

pkgs/development/libraries/nss/default.nix

@@ -11,11 +11,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nss-${version}";
-  version = "3.17.3";
+  version = "3.17.4";
 
   src = fetchurl {
-    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_17_3_RTM/src/${name}.tar.gz";
+    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_17_4_RTM/src/${name}.tar.gz";
-    sha256 = "f4d5e9035a2f84f25f35c283de3b0ff60d72e918748de25eaf017ed201fa21d5";
+    sha256 = "1d98ad1881a4237ec98cbe472fc851480f0b0e954dfe224d047811fb96ff9d79";
   };
 
   buildInputs = [ nspr perl zlib sqlite ];

pkgs/development/libraries/openjpeg/1.x.nix

@@ -0,0 +1,10 @@
+{ callPackage, fetchurl, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "${branch}.2";
+  branch = "1.5";
+  src = fetchurl {
+    url = "mirror://gentoo/distfiles/openjpeg-${version}.tar.gz";
+    sha256 = "11waq9w215zvzxrpv40afyd18qf79mxc28fda80bm3ax98cpppqm";
+  };
+})

pkgs/development/libraries/openjpeg/2.0.1.nix

@@ -0,0 +1,10 @@
+{ callPackage, fetchurl, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "${branch}.0.1";
+  branch = "2";
+  src = fetchurl {
+    url = "mirror://sourceforge/openjpeg.mirror/openjpeg-${version}.tar.gz";
+    sha256 = "1c2xc3nl2mg511b63rk7hrckmy14681p1m44mzw3n1fyqnjm0b0z";
+  };
+})

pkgs/development/libraries/openjpeg/2.1.nix

@@ -0,0 +1,10 @@
+{ callPackage, fetchurl, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "${branch}.0";
+  branch = "2.1";
+  src = fetchurl {
+    url = "mirror://gentoo/distfiles/openjpeg-${version}.tar.gz";
+    sha256 = "00zzm303zvv4ijzancrsb1cqbph3pgz0nky92k9qx3fq9y0vnchj";
+  };
+})

pkgs/development/libraries/openjpeg/default.nix

@@ -1,40 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libpng, libtiff, lcms, cmake, glib/*passthru only*/ }:
-
-stdenv.mkDerivation rec {
-  name = "openjpeg-2.0.0";
-  passthru = {
-    incDir = "openjpeg-2.0";
-  };
-
-  src = fetchurl {
-    url = "http://openjpeg.googlecode.com/files/${name}.tar.gz";
-    sha1 = "0af78ab2283b43421458f80373422d8029a9f7a7";
-  };
-
-  buildInputs = [ cmake ];
-  nativebuildInputs = [ pkgconfig ];
-  propagatedBuildInputs = [ libpng libtiff lcms ]; # in closure anyway
-
-  postInstall = glib.flattenInclude + ''
-    mkdir -p "$out/lib/pkgconfig"
-    cat >"$out/lib/pkgconfig/libopenjp2.pc" <<EOF
-    prefix=$out
-    libdir=$out/lib
-    includedir=$out/include
-
-    Name: openjp2
-    Description: JPEG2000 library (Part 1 and 2)
-    URL: http://www.openjpeg.org/
-    Version: @OPENJPEG_VERSION@
-    Libs: -L$out/lib -lopenjp2
-    Cflags: -I$out/include
-    EOF
-  '';
-
-  meta = {
-    homepage = http://www.openjpeg.org/;
-    description = "Open-source JPEG 2000 codec written in C language";
-    license = stdenv.lib.licenses.bsd2;
-    platforms = stdenv.lib.platforms.all;
-  };
-}

pkgs/development/libraries/openjpeg/generic.nix

@@ -0,0 +1,83 @@
+{ stdenv, cmake, pkgconfig, libpng, libtiff, lcms2, glib/*passthru only*/
+, sharedLibsSupport ? true # Build shared libraries
+, codecSupport ? true # Codec executables
+, mj2Support ? true # MJ2 executables
+, jpwlLibSupport ? true # JPWL library & executables
+, jpipLibSupport ? true # JPIP library & executables
+, jpipServerSupport ? false, curl ? null, fcgi ? null # JPIP Server
+#, opjViewerSupport ? false, wxGTK ? null # OPJViewer executable
+, openjpegJarSupport ? false, jdk ? null # Openjpeg jar (Java)
+, jp3dSupport ? true # # JP3D comp
+, thirdPartySupport ? false # Third party libraries - OFF: only build when found, ON: always build
+, testsSupport ? false
+# Inherit generics
+, branch, src, version, ...
+}:
+
+assert jpipServerSupport -> (jpipLibSupport && (curl != null) && (fcgi != null));
+#assert opjViewerSupport -> (wxGTK != null);
+assert openjpegJarSupport -> (jdk != null);
+assert testsSupport -> codecSupport;
+
+let
+  mkFlag = optSet: flag: if optSet then "-D${flag}=ON" else "-D${flag}=OFF";
+in
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  name = "openjpeg-${version}";
+  inherit branch;
+  inherit version;
+  inherit src;
+
+  cmakeFlags = [
+    (mkFlag sharedLibsSupport "BUILD_SHARED_LIBS")
+    (mkFlag codecSupport "BUILD_CODEC")
+    (mkFlag mj2Support "BUILD_MJ2")
+    (mkFlag jpwlLibSupport "BUILD_JPWL")
+    (mkFlag jpipLibSupport "BUILD_JPIP")
+    (mkFlag jpipServerSupport "BUILD_JPIP_SERVER")
+    #(mkFlag opjViewerSupport "BUILD_VIEWER")
+    (mkFlag openjpegJarSupport "BUILD_JAVA")
+    (mkFlag jp3dSupport "BUILD_JP3D")
+    (mkFlag thirdPartySupport "BUILD_THIRDPARTY")
+    (mkFlag testsSupport "BUILD_TESTING")
+  ];
+
+  nativebuildInputs = [ pkgconfig ];
+
+  buildInputs = [ cmake ]
+    ++ optionals jpipServerSupport [ curl fcgi ]
+    #++ optional opjViewerSupport wxGTK
+    ++ optional openjpegJarSupport jdk;
+
+  propagatedBuildInputs = [ libpng libtiff lcms2 ];
+
+  postInstall = glib.flattenInclude + ''
+    mkdir -p "$out/lib/pkgconfig"
+    cat > "$out/lib/pkgconfig/libopenjp2.pc" <<EOF
+    prefix=$out
+    libdir=$out/lib
+    includedir=$out/include
+
+    Name: openjp2
+    Description: JPEG2000 library (Part 1 and 2)
+    URL: http://www.openjpeg.org/
+    Version: @OPENJPEG_VERSION@
+    Libs: -L$out/lib -lopenjp2
+    Cflags: -I$out/include
+    EOF
+  '';
+
+  passthru = {
+    incDir = "openjpeg-${branch}";
+  };
+
+  meta = {
+    description = "Open-source JPEG 2000 codec written in C language";
+    homepage    = http://www.openjpeg.org/;
+    license     = licenses.bsd2;
+    maintainer  = with maintainers; [ codyopel ];
+    platforms   = platforms.all;
+  };
+}

pkgs/development/libraries/sqlite/default.nix

@@ -3,11 +3,11 @@
 assert interactive -> readline != null && ncurses != null;
 
 stdenv.mkDerivation {
-  name = "sqlite-3.8.7.1";
+  name = "sqlite-3.8.7.4";
 
   src = fetchurl {
-    url = "http://www.sqlite.org/2014/sqlite-autoconf-3080701.tar.gz";
+    url = "http://www.sqlite.org/2014/sqlite-autoconf-3080704.tar.gz";
-    sha1 = "5601be1263842209d7c5dbf6128f1cc0b6bbe2e5";
+    sha1 = "70ca0b8884a6b145b7f777724670566e2b4f3cde";
   };
 
   buildInputs = lib.optionals interactive [ readline ncurses ];

pkgs/development/ocaml-modules/cstruct/default.nix

@@ -0,0 +1,27 @@
+{ stdenv, fetchzip, ocaml, findlib, sexplib, ocplib-endian, lwt, camlp4 }:
+
+let version = "1.6.0"; in
+
+stdenv.mkDerivation {
+  name = "ocaml-cstruct-${version}";
+
+  src = fetchzip {
+    url = "https://github.com/mirage/ocaml-cstruct/archive/v${version}.tar.gz";
+    sha256 = "09qw3rhfiq2kkns6660p9cwm5610k72md52a04cy91gr6gsig6ic";
+  };
+
+  buildInputs = [ ocaml findlib lwt camlp4 ];
+  propagatedBuildInputs = [ ocplib-endian sexplib ];
+
+  configureFlags = "--enable-lwt";
+
+  createFindlibDestdir = true;
+
+  meta = {
+    description = "Map OCaml arrays onto C-like structs";
+    homepage = https://github.com/mirage/ocaml-cstruct;
+    license = stdenv.lib.licenses.isc;
+    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+    platforms = ocaml.meta.platforms;
+  };
+}

pkgs/development/python-modules/generic/default.nix

@@ -51,7 +51,7 @@
 
 
 # Keep extra attributes from `attrs`, e.g., `patchPhase', etc.
-python.stdenv.mkDerivation (attrs // {
+if disabled then throw "${name} not supported for interpreter ${python.executable}" else python.stdenv.mkDerivation (attrs // {
   inherit doCheck;
 
   name = namePrefix + name;
@@ -167,7 +167,6 @@ python.stdenv.mkDerivation (attrs // {
   meta = with lib.maintainers; {
     # default to python's platforms
     platforms = python.meta.platforms;
-    broken = disabled;
   } // meta // {
     # add extra maintainer(s) to every package
     maintainers = (meta.maintainers or []) ++ [ chaoflow iElectric ];

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

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, python }:
+{ stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
   version = "6.0.1";
@@ -9,13 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "1d041j0nd1hc0562lbj269dydjm4rbzagdgzdnmwdxr98544yw44";
   };
 
-  # Python is required only by `make check`
+  buildInputs = [ perl ];
-  buildInputs = [ perl python ];
 
   enableParallelBuilding = true;
 
-  doCheck = true;
-
   postInstall = ''
     mv -v $out/share/man/man1/coan.1.{1,gz}
   '';

pkgs/development/web/iojs/default.nix

@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, python, utillinux, openssl, http-parser, zlib, nightly ? false }:
+{ stdenv, fetchurl, python, utillinux, openssl, http-parser, zlib, libuv, nightly ? false }:
 
 let
-  version = if nightly then "1.2.1-nightly20150213f0296933f8" else "1.2.0";
+  version = if nightly then "1.2.1-nightly201502201bf91878e7" else "1.3.0";
   inherit (stdenv.lib) optional maintainers licenses platforms;
 in stdenv.mkDerivation {
   name = "iojs-${version}";
@@ -11,19 +11,21 @@ in stdenv.mkDerivation {
           then "https://iojs.org/download/nightly/v${version}/iojs-v${version}.tar.gz"
           else "https://iojs.org/dist/v${version}/iojs-v${version}.tar.gz";
     sha256 = if nightly
-             then "0v9njaggddi128v58rd34qknph8pn9c653gqd4y29l1mwjvqg62s"
+             then "1bk0jiha7n3s9xawj77d4q1navq28pq061w2wa6cs70lik7n6ri4"
-             else "17axqswpl252gliak1wjc2l9jk6n5jqdfa9f1vv7x9acj776yrik";
+             else "08g0kmz2978jrfx4551fi12ypcsv9p6vic89lfs08ki7ajw2yrgb";
   };
 
   prePatch = ''
     sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i configure
   '';
 
-  configureFlags = [ "--shared-openssl" "--shared-http-parser" "--shared-zlib" ];
+  configureFlags = [ "--shared-openssl" "--shared-http-parser" "--shared-zlib" "--shared-libuv" ];
 
-  buildInputs = [ python openssl http-parser zlib ] ++ (optional stdenv.isLinux utillinux);
+  buildInputs = [ python openssl http-parser zlib libuv ] ++ (optional stdenv.isLinux utillinux);
   setupHook = ../nodejs/setup-hook.sh;
 
+  passthru.interpreterName = "iojs";
+
   meta = {
     description = "A friendly fork of Node.js with an open governance model";
     homepage = https://iojs.org/;

pkgs/development/web/iojs/update-iojs

@@ -0,0 +1,49 @@
+#!/bin/sh -e
+#
+# Fetch the latest io.js release (stable/nightly) and update
+# `default.nix` in this directory.
+#
+
+cd "$(dirname "$0")"
+
+latest() {
+    curl -s "$1" | grep 'href="v' \
+        | tail -1 | sed 's/.*href="v//;s/\/".*//'
+}
+
+latest_log() {
+    echo "Getting latest $1 version from $2" >&2
+    version=$(latest "$2")
+    echo " -> $version" >&2
+    echo "$version"
+}
+
+url() {
+    nix-instantiate -A "$1" 2> /dev/null | xargs cat \
+        | sed 's/.*"urls","//;s/".*//'
+}
+
+hash() {
+    nix-prefetch-url "$1" 2> /dev/null
+}
+
+hash_log() {
+    echo "Finding hash for $1" >&2
+    value=$(hash "$1")
+    echo " -> $value" >&2
+    echo "$value"
+}
+
+stable=$(latest_log stable 'https://iojs.org/dist/')
+nightly=$(latest_log nightly 'https://iojs.org/download/nightly/')
+
+sed -i \
+    "/version = if nightly/s/then.*/then \"$nightly\" else \"$stable\";/" \
+    default.nix
+
+stableHash=$(hash_log "$(url iojs.src)")
+nightlyHash=$(hash_log "$(url iojs-nightly.src)")
+
+sed -i \
+    "/sha256 = if nightly/{N;s/\"[^\"]*\"/\"$nightlyHash\"/;N;s/\"[^\"]*\";/\"$stableHash\";/}" \
+    default.nix

pkgs/development/web/nodejs/build-node-package.nix

@@ -1,22 +1,33 @@
 { stdenv, runCommand, nodejs, neededNatives}:
 
 {
-  name, src,
+  name, version ? "", src,
+
+  # by default name of nodejs interpreter e.g. "nodejs-${name}"
+  namePrefix ? nodejs.interpreterName + "-",
 
   # Node package name
-  pkgName ? (builtins.parseDrvName name).name,
+  pkgName ?
+    if version != "" then stdenv.lib.removeSuffix "-${version}" name else
+    (builtins.parseDrvName name).name,
 
   # List or attribute set of dependencies
   deps ? {},
 
   # List or attribute set of peer depencies
-  peerDependencies ? [],
+  peerDependencies ? {},
+
+  # List or attribute set of optional dependencies
+  optionalDependencies ? {},
+
+  # List of optional dependencies to skip
+  skipOptionalDependencies ? [],
 
   # Whether package is binary or library
-  bin ? null,
+  bin ? false,
 
-  # Flags passed to npm install
+  # Additional flags passed to npm install
-  flags ? [],
+  flags ? "",
 
   # Command to be run before shell hook
   preShellHook ? "",
@@ -24,6 +35,12 @@
   # Command to be run after shell hook
   postShellHook ? "",
 
+  # Same as https://docs.npmjs.com/files/package.json#os
+  os ? [],
+
+  # Same as https://docs.npmjs.com/files/package.json#cpu
+  cpu ? [],
+
   # Attribute set of already resolved deps (internal),
   # for avoiding infinite recursion
   resolvedDeps ? {},
@@ -34,42 +51,67 @@
 with stdenv.lib;
 
 let
-  npmFlags = concatStringsSep " " (map (v: "--${v}") flags);
-
-  sources = runCommand "node-sources" {} ''
-    tar --no-same-owner --no-same-permissions -xf ${nodejs.src}
-    mv $(find . -type d -mindepth 1 -maxdepth 1) $out
-  '';
-
-  # Convert deps to attribute set
-  attrDeps = if isAttrs deps then deps else
-    (listToAttrs (map (dep: nameValuePair dep.name dep) deps));
-
-  # All required node modules, without already resolved dependencies
-  requiredDeps = removeAttrs attrDeps (attrNames resolvedDeps);
-
-  # Recursive dependencies that we want to avoid with shim creation
-  recursiveDeps = removeAttrs attrDeps (attrNames requiredDeps);
-
-  peerDeps = filter (dep: dep.pkgName != pkgName) peerDependencies;
-
   self = let
-    # Pass resolved dependencies to dependencies of this package
+    sources = runCommand "node-sources" {} ''
-    deps = map (
+      tar --no-same-owner --no-same-permissions -xf ${nodejs.src}
-      dep: dep.override {
+      mv $(find . -type d -mindepth 1 -maxdepth 1) $out
-        resolvedDeps = resolvedDeps // { "${name}" = self; };
+    '';
-      }
+
-    ) (attrValues requiredDeps);
+    platforms = fold (entry: platforms:
+      let
+        filterPlatforms = attrByPath [(removePrefix "!" entry)] [] stdenv.lib.platforms;
+      in
+        if hasPrefix "!" entry then
+          filter (p: any (f: p != f) filterPlatforms) platforms
+        else
+          filter (p: any (f: p == f) filterPlatforms) platforms
+    ) nodejs.meta.platforms os;
+
+    mapDependencies = deps: f: rec {
+      # Convert deps to attribute set
+      attrDeps = if isAttrs deps then deps else
+        (listToAttrs (map (dep: nameValuePair dep.name dep) deps));
+
+      # All required node modules, without already resolved dependencies
+      # Also override with already resolved dependencies
+      requiredDeps = mapAttrs (name: dep:
+        dep.override {
+          resolvedDeps = resolvedDeps // { "${name}" = self; };
+        }
+      ) (filterAttrs f (removeAttrs attrDeps (attrNames resolvedDeps)));
+
+      # Recursive dependencies that we want to avoid with shim creation
+      recursiveDeps = filterAttrs f (removeAttrs attrDeps (attrNames requiredDeps));
+    };
+
+    _dependencies = mapDependencies deps (name: dep:
+      dep.pkgName != pkgName);
+    _optionalDependencies = mapDependencies optionalDependencies (name: dep:
+      any (platform: stdenv.system == platform) dep.meta.platforms &&
+      all (d: d != dep.pkgName) skipOptionalDependencies
+    );
+    _peerDependencies = mapDependencies peerDependencies (name: dep:
+      dep.pkgName != pkgName);
+
+    requiredDependencies =
+      _dependencies.requiredDeps //
+      _optionalDependencies.requiredDeps //
+      _peerDependencies.requiredDeps;
+
+    recursiveDependencies =
+      _dependencies.recursiveDeps //
+      _optionalDependencies.recursiveDeps //
+      _peerDependencies.recursiveDeps;
 
     patchShebangs = dir: ''
-        node=`type -p node`
+      node=`type -p node`
-        coffee=`type -p coffee || true`
+      coffee=`type -p coffee || true`
-        find -L ${dir} -type f -print0 | xargs -0 grep -Il . | \
+      find -L ${dir} -type f -print0 | xargs -0 grep -Il . | \
-        xargs sed --follow-symlinks -i \
+      xargs sed --follow-symlinks -i \
-            -e 's@#!/usr/bin/env node@#!'"$node"'@' \
+          -e 's@#!/usr/bin/env node@#!'"$node"'@' \
-            -e 's@#!/usr/bin/env coffee@#!'"$coffee"'@' \
+          -e 's@#!/usr/bin/env coffee@#!'"$coffee"'@' \
-            -e 's@#!/.*/node@#!'"$node"'@' \
+          -e 's@#!/.*/node@#!'"$node"'@' \
-            -e 's@#!/.*/coffee@#!'"$coffee"'@' || true
+          -e 's@#!/.*/coffee@#!'"$coffee"'@' || true
     '';
 
   in stdenv.mkDerivation ({
@@ -147,9 +189,9 @@ let
       # We do not handle shrinkwraps yet
       rm npm-shrinkwrap.json 2>/dev/null || true
 
-      mkdir build-dir
+      mkdir ../build-dir
       (
-        cd build-dir
+        cd ../build-dir
         mkdir node_modules
 
         # Symlink or copy dependencies for node modules
@@ -161,12 +203,7 @@ let
           '' else ''
             cp -R ${dep}/lib/node_modules/${dep.pkgName} node_modules/
           ''
-        ) deps}
+        ) (attrValues requiredDependencies)}
-
-        # Symlink peer dependencies
-        ${concatMapStrings (dep: ''
-          ln -sv ${dep}/lib/node_modules/${dep.pkgName} node_modules/
-        '') peerDeps}
 
         # Create shims for recursive dependenceies
         ${concatMapStrings (dep: ''
@@ -177,10 +214,10 @@ let
               "version": "${getVersion dep}"
           }
           EOF
-        '') (attrValues recursiveDeps)}
+        '') (attrValues recursiveDependencies)}
       )
 
-      export HOME=$PWD/build-dir
+      export HOME=$PWD/../build-dir
       runHook postConfigure
     '';
 
@@ -189,14 +226,14 @@ let
 
       # If source was a file, repackage it, so npm pre/post publish hooks are not triggered,
       if [[ -f $src ]]; then
-        tar --exclude='build-dir' -czf build-dir/package.tgz ./
+        GZIP=-1 tar -czf ../build-dir/package.tgz ./
         export src=$HOME/package.tgz
       else
         export src=$PWD
       fi
 
       # Install package
-      (cd $HOME && npm --registry http://www.example.com --nodedir=${sources} install $src ${npmFlags})
+      (cd $HOME && npm --registry http://www.example.com --nodedir=${sources} install $src --fetch-retries 0 ${flags})
 
       runHook postBuild
     '';
@@ -211,7 +248,7 @@ let
         ${concatMapStrings (dep: ''
           rm node_modules/${dep.pkgName}/package.json
           rmdir node_modules/${dep.pkgName}
-        '') (attrValues recursiveDeps)}
+        '') (attrValues recursiveDependencies)}
 
         mkdir -p $out/lib/node_modules
 
@@ -230,10 +267,10 @@ let
           done
         fi
 
-        # Symlink dependencies
+        # Move peer dependencies to node_modules
         ${concatMapStrings (dep: ''
           mv node_modules/${dep.pkgName} $out/lib/node_modules
-        '') peerDeps}
+        '') (attrValues _peerDependencies.requiredDeps)}
 
         # Install binaries and patch shebangs
         mv node_modules/.bin $out/lib/node_modules 2>/dev/null || true
@@ -256,25 +293,36 @@ let
       mkdir -p node_modules
       ${concatMapStrings (dep: ''
         ln -sfv ${dep}/lib/node_modules/${dep.pkgName} node_modules/
-      '') deps}
+      '') (attrValues requiredDependencies)}
       ${postShellHook}
     '';
 
+    # Stipping does not make a lot of sense in node packages
+    dontStrip = true;
+
+    meta = {
+      platforms = platforms;
+      maintainers = [ stdenv.lib.maintainers.offline ];
+    };
+
     passthru.pkgName = pkgName;
-  } // (filterAttrs (n: v: n != "deps" && n != "resolvedDeps") args) // {
+  } // (filterAttrs (n: v: all (k: n != k) ["deps" "resolvedDeps" "optionalDependencies"]) args) // {
-    name = "${
+    name = namePrefix + name;
-      if bin == true then "bin-" else if bin == false then "node-" else ""
-    }${name}";
 
     # Run the node setup hook when this package is a build input
     propagatedNativeBuildInputs = (args.propagatedNativeBuildInputs or []) ++ [ nodejs ];
 
-    # Make buildNodePackage useful with --run-env
+    nativeBuildInputs =
-    nativeBuildInputs = (args.nativeBuildInputs or []) ++ deps ++ peerDependencies ++ neededNatives;
+      (args.nativeBuildInputs or []) ++ neededNatives ++
+      (attrValues requiredDependencies);
 
     # Expose list of recursive dependencies upstream, up to the package that
     # caused recursive dependency
-    recursiveDeps = (flatten (map (d: remove name d.recursiveDeps) deps)) ++ (attrNames recursiveDeps);
+    recursiveDeps =
+      (flatten (
+        map (dep: remove name dep.recursiveDeps) (attrValues requiredDependencies)
+      )) ++
+      (attrNames recursiveDependencies);
   });
 
 in self

pkgs/development/web/nodejs/default.nix

@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, openssl, python, zlib, v8, utillinux, http-parser
+{ stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser
-, pkgconfig, runCommand, which, unstableVersion ? false 
+, pkgconfig, runCommand, which, unstableVersion ? false
 }:
 
 let
@@ -10,9 +10,8 @@ let
 
   version = if unstableVersion then "0.11.13" else "0.12.0";
 
-  # !!! Should we also do shared libuv?
   deps = {
-    inherit openssl zlib;
+    inherit openssl zlib libuv;
 
     # disabled system v8 because v8 3.14 no longer receives security fixes
     # we fall back to nodejs' internal v8 copy which receives backports for now
@@ -55,6 +54,8 @@ in stdenv.mkDerivation {
     ++ optionals stdenv.isDarwin [ pkgconfig openssl dtrace ];
   setupHook = ./setup-hook.sh;
 
+  passthru.interpreterName = "nodejs";
+
   meta = {
     description = "Event-driven I/O framework for the V8 JavaScript engine";
     homepage = http://nodejs.org;

pkgs/games/urbanterror/default.nix

@@ -1,19 +1,19 @@
-{ stdenv, fetchurl, unzip, SDL, mesa, openal, curl }:
+{ stdenv, fetchurl, unzip, SDL, mesa, openal, curl, libXxf86vm }:
 stdenv.mkDerivation rec {
   name = "urbanterror-${version}";
-  version = "4.2.018";
+  version = "4.2.023";
   srcs =
     [ (fetchurl {
-         url = "http://mirror.urtstats.net/urbanterror/UrbanTerror42_full018.zip";
+         url = "http://mirror.urtstats.net/urbanterror/UrbanTerror42_full023.zip";
-         sha256 = "10710c5b762687a75a7abd3cc56de005ce12dcb7ac14c08f40bcb4e9d96f4e83";
+         sha256 = "e287e2a17432b81551f5c16e431d752484ce9be10508e756542f653757a29090";
        })
       (fetchurl {
-         url = "https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-4.2.018.tar.gz";
+         url = "https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-4.2.023.tar.gz";
-         sha256 = "c1fb3eb3a1e526247352b1c6abb5432b8a9b8730731ef917e4e5d21a152fb494";
+         sha256 = "03zrrx5b96c1srf2p24ca7zygq84byvrmcgh42d8bh5ds579ziqp";
        })
     ];
-  buildInputs = [ unzip SDL mesa openal curl ];
+  buildInputs = [ unzip SDL mesa openal curl libXxf86vm];
-  sourceRoot = "ioq3-for-UrbanTerror-4-release-4.2.018";
+  sourceRoot = "ioq3-for-UrbanTerror-4-release-4.2.023";
   configurePhase = ''
     echo "USE_OPENAL = 1" > Makefile.local
     echo "USE_OPENAL_DLOPEN = 0" >> Makefile.local

pkgs/misc/vim-plugins/default.nix

@@ -655,11 +655,11 @@ rec {
 
   };
   "Gist" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Gist-2015-02-10";
+    name = "Gist";
     src = fetchgit {
       url = "git://github.com/mattn/gist-vim";
-      rev = "4d64b05bcbfdc8c22f37ff29776626be48251af7";
+      rev = "8a567b823163d349406dffaff4519e0bac10eade";
-      sha256 = "16101ab3802bbeba7e83706446474b61fbb6312270161cdb669780b54c3c04cf";
+      sha256 = "3f1b701529808bfbd000d377d49448d0ddd7e4e0cbf54fdc83fc5b676f567c88";
     };
     dependencies = [];
 
@@ -675,111 +675,111 @@ rec {
 
   };
   "Hoogle" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Hoogle-2013-11-26";
+    name = "Hoogle";
     src = fetchgit {
       url = "git://github.com/Twinside/vim-hoogle";
       rev = "81f28318b0d4174984c33df99db7752891c5c4e9";
-      sha256 = "e5a95db90efdb93cd06c0c6946c24ae3e401800dd0da344cc83171ff1bc696f2";
+      sha256 = "0f96f3badb6218cac87d0f7027ff032ecc74f08ad3ada542898278ce11cbd5a0";
     };
     dependencies = [];
 
   };
   "Solarized" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Solarized-2011-05-09";
+    name = "Solarized";
     src = fetchgit {
       url = "git://github.com/altercation/vim-colors-solarized";
       rev = "528a59f26d12278698bb946f8fb82a63711eec21";
-      sha256 = "1de517cfc66707e44c2d4d72080ee949cfb963a087e9e52c62cc4394f13ed597";
+      sha256 = "a1b2ef696eee94dafa76431c31ee260acdd13a7cf87939f27eca431d5aa5a315";
     };
     dependencies = [];
 
   };
   "Supertab" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Supertab-2015-02-15";
+    name = "Supertab";
     src = fetchgit {
       url = "git://github.com/ervandew/supertab";
-      rev = "c8bfeceb1fc92ad58f2ae6967cbfcd6fbcb0d6e7";
+      rev = "454c06e25680799b6f408622d6bfbaf920ace825";
-      sha256 = "9f610d2acd57537f6fa2bfafb9300fe7d42afedf30bc4bb3fb02974743f9ab27";
+      sha256 = "7ec13edc3338281ea1eb2fbae9a79b947fb3b490b684f8b4cc0ff9252845aa01";
     };
     dependencies = [];
 
   };
   "Syntastic" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Syntastic-2015-02-17";
+    name = "Syntastic";
     src = fetchgit {
       url = "git://github.com/scrooloose/syntastic";
-      rev = "47821840200cd8e14e99001caac602a37cdf8d5c";
+      rev = "7d9aec0bee91be677c38b94ff222d02aa732fe52";
-      sha256 = "becf0b07d25d9514ac7c5328d4e3deeab5731792887c8334571b72c3871a50ee";
+      sha256 = "9175783f6ea7ca148c156d9152ab59741da8e9ddede56c1ef9058a1856815723";
     };
     dependencies = [];
 
   };
   "Tabular" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Tabular-2013-05-16";
+    name = "Tabular";
     src = fetchgit {
       url = "git://github.com/godlygeek/tabular";
       rev = "60f25648814f0695eeb6c1040d97adca93c4e0bb";
-      sha256 = "dbfbeaf833ecc87c7f505fe25c79110f10535d81065fd4a30853565d288448d6";
+      sha256 = "28c860ad621587f2c3213fae47d1a3997746527c17d51e9ab94c209eb7bfeb0f";
     };
     dependencies = [];
 
   };
   "Tagbar" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Tagbar-2015-02-16";
+    name = "Tagbar";
     src = fetchgit {
       url = "git://github.com/majutsushi/tagbar";
-      rev = "a284cd009104b5c9b64a378cd98fdf4993c1689e";
+      rev = "00dfa82b00e734b453153564efeec933c48087f0";
-      sha256 = "c6458537ea211a77a8fb6f85b4d7eac1fec6714fd60398ebae00647599397922";
+      sha256 = "29305a2eb45ca104046b97557e9dbd599611564c533e5493de2fe467913af635";
     };
     dependencies = [];
 
   };
   "The_NERD_Commenter" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_Commenter-2014-07-08";
+    name = "The_NERD_Commenter";
     src = fetchgit {
       url = "git://github.com/scrooloose/nerdcommenter";
       rev = "6549cfde45339bd4f711504196ff3e8b766ef5e6";
-      sha256 = "7624da2591153946e0e9d0637c31b551bc1f87cea8441d725bdd01b0cd972588";
+      sha256 = "ef270ae5617237d68b3d618068e758af8ffd8d3ba27a3799149f7a106cfd178e";
     };
     dependencies = [];
 
   };
   "The_NERD_tree" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_tree-2014-11-20";
+    name = "The_NERD_tree";
     src = fetchgit {
       url = "git://github.com/scrooloose/nerdtree";
       rev = "3b98a7fcae8f9fff356907171f0406ff8cd28921";
-      sha256 = "75aa60c361c66c0bae986fc6a7111ccf529ab74409a9e11355e4c2fa065e1afc";
+      sha256 = "deec2ce33249829ae3925478d7d1925ea99e20c37dcc86db7c3bfac4fdc706e0";
     };
     dependencies = [];
 
   };
   "UltiSnips" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "UltiSnips-2015-02-14";
+    name = "UltiSnips";
     src = fetchgit {
       url = "git://github.com/sirver/ultisnips";
-      rev = "56ac14840f47521be9b61fb5ae72930f35d5d8a9";
+      rev = "d693259abb2e28f70abf760d395fcf526d5272ee";
-      sha256 = "a0766d809a0a858e3393429d67e68e7a85d67519e143a64e8ddd3f7fa2418ca6";
+      sha256 = "541e47c9ae5b1e18072f5abfc64eadca8ddfe0271b251f1ddadd15ab98d82600";
     };
     dependencies = [];
 
   };
   "VimOutliner" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "VimOutliner-2015-01-09";
+    name = "VimOutliner";
     src = fetchgit {
       url = "git://github.com/vimoutliner/vimoutliner";
       rev = "7c995f973c54b0d026137615af28059890edb197";
-      sha256 = "c48acd2d4939ece0de7a2bae42f04e2f247a087947b66da86b4fb96fb32330d9";
+      sha256 = "9d1526ec99904fd2ccfdb4dd6763b4cd04048cb74bb7a0a4c9b4a7b1f5d75cb5";
     };
     dependencies = [];
 
   };
   "WebAPI" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "WebAPI-2014-10-27";
+    name = "WebAPI";
     src = fetchgit {
       url = "git://github.com/mattn/webapi-vim";
       rev = "a7789abffe936db56e3152e23733847f94755753";
-      sha256 = "a5e9560b71b9e3c242c8623972f11a9298708e99f90b4f919610b0959417a767";
+      sha256 = "455b84d9fd13200ff5ced5d796075f434a7fb9c00f506769174579266ae2be80";
     };
     dependencies = [];
 
@@ -800,63 +800,63 @@ rec {
 
   };
   "commentary" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "commentary-2014-11-10";
+    name = "commentary";
     src = fetchgit {
       url = "git://github.com/tpope/vim-commentary";
       rev = "9c685131a5facfa0d643feca3a61b41c007d8170";
-      sha256 = "7f92a27f16f8a3a9285b14ca9dd9c7deb6cc7391075024446e5be395cca18c1e";
+      sha256 = "2a9f394d0669429469c2f1ddaf9a722c2773f35da08ea9496d3b4b4e85b6038d";
     };
     dependencies = [];
 
   };
   "ctrlp" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-2013-07-29";
+    name = "ctrlp";
     src = fetchgit {
       url = "git://github.com/kien/ctrlp.vim";
       rev = "b5d3fe66a58a13d2ff8b6391f4387608496a030f";
-      sha256 = "3736b2f152df20be0a0d5ed6a39929b2df1ed9bbe98f68d80db657c00f0dcb30";
+      sha256 = "41f7884973770552395b96f8693da70999dc815462d4018c560d3ff6be462e76";
     };
     dependencies = [];
 
   };
   "extradite" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "extradite-2015-01-26";
+    name = "extradite";
     src = fetchgit {
       url = "git://github.com/int3/vim-extradite";
       rev = "a1dc4b63befd5032e65a0c94e7257d4636aa6a3f";
-      sha256 = "0f03c331bfa61292087ec403e5a9083f3dc03988b6d5cb6704934d2e6c646fdb";
+      sha256 = "94e05bbe36c9d4cee9832530531eedff0da509d5a0a52beee4e524fd4ad96714";
     };
     dependencies = [];
 
   };
   "fugitive" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fugitive-2015-02-08";
+    name = "fugitive";
     src = fetchgit {
       url = "git://github.com/tpope/vim-fugitive";
-      rev = "eb8eb1850a47671a8a3639feab8b2a50577e4913";
+      rev = "933f6a1e1df549564062f936bd1c836d28cf1676";
-      sha256 = "d589245c1a9490a7c370ea80492a606fa207fac268a3c1bd5151fc3f326d3514";
+      sha256 = "f8b43c6f0513a814d6ddc735c2f668b0b1f187bbb0a312a82276c4501ef2a908";
     };
     dependencies = [];
 
   };
   "ghcmod" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ghcmod-2014-10-19";
+    name = "ghcmod";
     src = fetchgit {
       url = "git://github.com/eagletmt/ghcmod-vim";
       rev = "d5c6c7f3c85608b5b76dc3e7e001f60b86c32cb9";
-      sha256 = "b5a50bc1bcc0777def41cf7f18557f6674f709cbf22577ebe845ec1bb8e39e9d";
+      sha256 = "ab56d470ea18da3fae021e22bba14460505e61a94f8bf707778dff5eec51cd6d";
     };
     dependencies = [];
 
   };
   "github:MarcWeber/vim-addon-vim2nix" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "github-MarcWeber-vim-addon-vim2nix-2015-02-08";
+    name = "github-MarcWeber-vim-addon-vim2nix";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-vim2nix";
-      rev = "5507ee4db7599873d72fab035c752dea245e2cd4";
+       rev = "5507ee4db7599873d72fab035c752dea245e2cd4";
-      sha256 = "02094bd066f930469a2acebe93f960a4b57ee1e302fe2e80a87ef9e607791295";
+       sha256 = "1rqvgg3wq1grkh4nfj2wqmjg7a9r4hd82m89s9520kyzvldp8sgx";
-    };
+     };
-    dependencies = ["vim-addon-manager"];
+     dependencies = ["vim-addon-manager"];
 
   };
   "matchit.zip" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
@@ -881,401 +881,400 @@ rec {
   '';
   };
   "pathogen" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "pathogen-2014-11-06";
+    name = "pathogen";
     src = fetchgit {
       url = "git://github.com/tpope/vim-pathogen";
       rev = "b9fb0dfd811004010f5f6903edef42d6004ebea2";
-      sha256 = "9ccb1d234d9eb8bccc3a50ff6fadcc925644a0e17cd4444623d22843c5d82e80";
+      sha256 = "62ec7e9721651aa86aa716d47c2057771f7d093f414c3b98f50a759d210db4c7";
     };
     dependencies = [];
 
   };
   "quickfixstatus" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "quickfixstatus-2011-09-02";
+    name = "quickfixstatus";
     src = fetchgit {
       url = "git://github.com/dannyob/quickfixstatus";
       rev = "fd3875b914fc51bbefefa8c4995588c088163053";
-      sha256 = "a7f15f5404bf0719c5c1eab9c117c3ca4302b0232f959b509c364f3869a2c9fd";
+      sha256 = "7b6831d5da1c23d95f3158c67e4376d32c2f62ab2e30d02d3f3e14dcfd867d9b";
     };
     dependencies = [];
 
   };
   "rainbow_parentheses" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "rainbow_parentheses-2013-03-04";
+    name = "rainbow_parentheses";
     src = fetchgit {
       url = "git://github.com/kien/rainbow_parentheses.vim";
       rev = "eb8baa5428bde10ecc1cb14eed1d6e16f5f24695";
-      sha256 = "6f467a4de21e26e7d50a74d9fd1503ea67d94bdd93fde19ed5da42552487957b";
+      sha256 = "47975a426d06f41811882691d8a51f32bc72f590477ed52b298660486b2488e3";
     };
     dependencies = [];
 
   };
   "rust" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "rust-2015-01-29";
+    name = "rust";
     src = fetchgit {
       url = "git://github.com/wting/rust.vim";
       rev = "2450ecf3091cc7c2711ca9f00eae8e3bedd04376";
-      sha256 = "f7335d4265db4d0e030b6d1f23818710e8b80be4aeb42ebb60396d5327c6f669";
+      sha256 = "9d2e8b2c06d6100f9a1e76644313d457a2ff955241d8f712de6fddd0b7f5c4ee";
     };
     dependencies = [];
 
   };
   "sensible" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "sensible-2014-11-24";
+    name = "sensible";
     src = fetchgit {
       url = "git://github.com/tpope/vim-sensible";
       rev = "b30dcf387af977acfa21732592bfca05598b2188";
-      sha256 = "8b2b22cd0dc766d4ecc3fc9f9ad21412b033ff02b6a3047a768da82773bb6bfe";
+      sha256 = "6a9fc68c3eb0ee500ac59bdbc2c48d98e88a2936ee544f7203fa1a0296002b5f";
     };
     dependencies = [];
-
   };
   "snipmate" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "snipmate-2015-02-04";
+    name = "snipmate";
     src = fetchgit {
       url = "git://github.com/garbas/vim-snipmate";
       rev = "22e3bb0133ed6e2acbc630a49f0a780487f56fd5";
-      sha256 = "7b4a730b557d4f0d117e8ad7529ff38f81d29986db6d4418c0ea39ff3c827e65";
+      sha256 = "ec4a34d60a3930154342d37116baca5ca135881582261fa2a5136b298650ebe0";
     };
     dependencies = ["vim-addon-mw-utils" "tlib"];
 
   };
   "sourcemap" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "sourcemap-2012-09-19";
+    name = "sourcemap";
     src = fetchgit {
       url = "git://github.com/chikatoike/sourcemap.vim";
       rev = "0dd82d40faea2fdb0771067f46c01deb41610ba1";
-      sha256 = "95665edd31b4840728f6e1492ccf143d52079b2c1ce11407cf9936b03c9df23c";
+      sha256 = "a08c77aea39be4a0a980d62673d1d17fecc518a8aeb9101210e453aaacb78fbd";
     };
     dependencies = [];
 
   };
   "surround" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "surround-2015-02-08";
+    name = "surround";
     src = fetchgit {
       url = "git://github.com/tpope/vim-surround";
-      rev = "fd75eb2cb2ffe85a457445cb152d5a6c7acda140";
+      rev = "6afb2d90e3b3a637da093e1022ffaa232a2aeafd";
-      sha256 = "3322993b1c0aec299525d5d8120433b72a03e70cee573289639ed5675e33974e";
+      sha256 = "775e8d58469840f1cf5d69d3c92914fcca9ace6e351708e491fcc82fd2fa1269";
     };
     dependencies = [];
 
   };
   "table-mode" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "table-mode-2015-01-11";
+    name = "table-mode";
     src = fetchgit {
       url = "git://github.com/dhruvasagar/vim-table-mode";
       rev = "3096a26db437bfb6e66798bfbf45e7549ba767d9";
-      sha256 = "610bbcad80fc153e2d68745ad767205d906c08055e884b93b98a0e2aa947d4dd";
+      sha256 = "78e63f47cdae63507fc567e3c60c214a794be8d072a6b83a980c7bb58396829c";
     };
     dependencies = [];
 
   };
   "tlib" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tlib-2015-01-15";
+    name = "tlib";
     src = fetchgit {
       url = "git://github.com/tomtom/tlib_vim";
       rev = "9e629767e5a91ede057d07f8754326e68c92a692";
-      sha256 = "2c3c039175494fb3b2f5002194f3ee9f50dafc65c80bc5f3a07d9911aea52208";
+      sha256 = "8b435939fb1a439cc89734d3d7a38294217716c5b46b1402486e947e6ae97bb6";
     };
     dependencies = [];
 
   };
   "undotree" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "undotree-2015-01-29";
+    name = "undotree";
     src = fetchgit {
       url = "git://github.com/mbbill/undotree";
       rev = "42000e2a7140843030f517de9d4923dd5fa40458";
-      sha256 = "8a340bce79409b1f6c88c8c9310fd9d9eb97bba23c5208f66715e5a008cb0cba";
+      sha256 = "9a9a89ccfa69f41ba24ec8f2be366f469e0497cef735ad01ec0f22fef5fcc293";
     };
     dependencies = [];
 
   };
   "vim-addon-actions" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-actions-2014-09-22";
+    name = "vim-addon-actions";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-actions";
       rev = "a5d20500fb8812958540cf17862bd73e7af64936";
-      sha256 = "4a6d9e25b69cf458980e0b2acabc5b87e1e0d763f357fbeaee1e859b2f3d9069";
+      sha256 = "d2c3eb7a1f29e7233c6fcf3b02d07efebe8252d404ee593419ad399a5fdf6383";
     };
     dependencies = ["vim-addon-mw-utils" "tlib"];
 
   };
   "vim-addon-async" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-async-2013-10-18";
+    name = "vim-addon-async";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-async";
       rev = "dadc96e188f1cdacbac62129eb29a1eacfed792c";
-      sha256 = "ff9c7ce533dd2d0c2cabcd507f22c27b8507b03f58dfe30158304dca77133730";
+      sha256 = "27f941e21a8ca5940bd20914e2a9e3809e554f3ef2c27b3bafb9a153107a5d07";
     };
     dependencies = ["vim-addon-signs"];
 
   };
   "vim-addon-background-cmd" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-background-cmd-2015-01-05";
+    name = "vim-addon-background-cmd";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-background-cmd";
       rev = "e99076519139b959edce0581b0f31207a5ec7c64";
-      sha256 = "54872b6f636994a3057c0fcda3e6e540684205cf2d08a41778bcfbdd6d0a57a2";
+      sha256 = "524795221ae727635fe52ead47dff452d2dd48900917da609426ea399a2eceeb";
     };
     dependencies = ["vim-addon-mw-utils"];
 
   };
   "vim-addon-commenting" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-commenting-2013-06-10";
+    name = "vim-addon-commenting";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-commenting";
       rev = "b7cf748ac1c9bf555cbd347589e3b7196030d20b";
-      sha256 = "f0ce6072dd607c7fe3a337903d49d19bf90bc59d302977cc30dd26696cd723a9";
+      sha256 = "4ad7d5f6669f0a1b4a24c9ce3649c030d7d3fc8588de4d4d6c3269140fbe9b3e";
     };
     dependencies = [];
 
   };
   "vim-addon-completion" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-completion-2015-02-10";
+    name = "vim-addon-completion";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-completion";
-      rev = "021c449a5ce1ce4ac0af5955e05b0279c1cc0e75";
+      rev = "80f717d68df5b0d7b32228229ddfd29c3e86e435";
-      sha256 = "177738cbe3ab6083517e211c8aa8e6235beafb518a7e8b87922a675dbbed5b5b";
+      sha256 = "c8c0af8760f2622c4caef371482916861f68a850eb6a7cd746fe8c9ab405c859";
     };
     dependencies = ["tlib"];
 
   };
   "vim-addon-errorformats" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-errorformats-2014-11-05";
+    name = "vim-addon-errorformats";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-errorformats";
       rev = "dcbb203ad5f56e47e75fdee35bc92e2ba69e1d28";
-      sha256 = "59a7abe3d6be8e579737c7c614a5cb148df14cc1dcea3d711acb115190cb31b3";
+      sha256 = "a1260206545d5ae17f2e6b3319f5cf1808b74e792979b1c6667d75974cc53f95";
     };
     dependencies = [];
 
   };
   "vim-addon-goto-thing-at-cursor" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-goto-thing-at-cursor-2012-01-11";
+    name = "vim-addon-goto-thing-at-cursor";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-goto-thing-at-cursor";
       rev = "f052e094bdb351829bf72ae3435af9042e09a6e4";
-      sha256 = "a91752a43042086448246777cd9dc2fa7f5f8f54ef052148acfa51c05f58281e";
+      sha256 = "34658ac99d9a630db9c544b3dfcd2c3df69afa5209e27558cc022b7afc2078ea";
     };
     dependencies = ["tlib"];
 
   };
   "vim-addon-local-vimrc" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-local-vimrc-2014-02-14";
+    name = "vim-addon-local-vimrc";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-local-vimrc";
       rev = "7689b55ee86dd6046923fd28ceab49da3881abfe";
-      sha256 = "b496281c8b0dd4c7aada20789a6a3a6b6d1d2741d19b0a690d09bf121d0f40d8";
+      sha256 = "f11d13676e2fdfcc9cabc991577f0b2e85909665b6f245aa02f21ff78d6a8556";
     };
     dependencies = [];
 
   };
   "vim-addon-manager" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-manager-2014-12-03";
+    name = "vim-addon-manager";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-manager";
       rev = "fda9d2f4522024aa8bd8b8305e6a71c4a4a28c07";
-      sha256 = "6cff7636e5939931a1f152fe635319028fb92d88483789d737e89ef2d73ea16f";
+      sha256 = "1gp7w6wnp1cnvq7lhb6kkqrp315mxzwsc4sy1bxz1ih1rjdxmdd3";
     };
     dependencies = [];
 
   };
   "vim-addon-mru" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-mru-2013-08-08";
+    name = "vim-addon-mru";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-mru";
       rev = "e41e39bd9d1bf78ccfd8d5e1bc05ae5e1026c2bb";
-      sha256 = "b00f609e5e043171b2be729bbc7b5094678fdfe7de97a1b34bf9855bec7d75f8";
+      sha256 = "15b70f796f28cbd999060fea7f47408fa8a6cb176cd4915b9cc3dc6c53eed960";
     };
     dependencies = ["vim-addon-other" "vim-addon-mw-utils"];
 
   };
   "vim-addon-mw-utils" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-mw-utils-2012-11-05";
+    name = "vim-addon-mw-utils";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-mw-utils";
       rev = "0c5612fa31ee434ba055e21c76f456244b3b5109";
-      sha256 = "7ba038830b6f6c60a93d3dc8e60755a3728ddc8414e9d8c0089d5b530eb848e7";
+      sha256 = "4e1b6d1b59050f1063e58ef4bee9e9603616ad184cd9ef7466d0ec3d8e22b91c";
     };
     dependencies = [];
 
   };
   "vim-addon-nix" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-nix-2014-11-05";
+    name = "vim-addon-nix";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-nix";
       rev = "7b0a376bb1797fef8da2dc14e768f318bcb671e8";
-      sha256 = "db4c397ae56f81f600e67549c76a879901d6084246b34751526a9e39f3f720c1";
+      sha256 = "c2b0f6f50083063b5e801b872f38d4f00307fe5d7a4f3977a108e5cd10c1c410";
     };
     dependencies = ["vim-addon-completion" "vim-addon-goto-thing-at-cursor" "vim-addon-errorformats" "vim-addon-actions" "vim-addon-mw-utils" "tlib"];
 
   };
   "vim-addon-other" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-other-2014-07-15";
+    name = "vim-addon-other";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-other";
       rev = "f78720c9cb5bf871cabb13c7cbf94378dbf0163b";
-      sha256 = "ec0b80acd31bac66bb1fc72bfc960f2a89b156d6ecd0a620c143bde8fbfe1e21";
+      sha256 = "43f027e4b7576031072515c23c2b09f7f2c8bba7ee43a1e2041a4371bd954d1b";
     };
     dependencies = ["vim-addon-actions" "vim-addon-mw-utils"];
 
   };
   "vim-addon-php-manual" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-php-manual-2015-01-01";
+    name = "vim-addon-php-manual";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-php-manual";
       rev = "5f9810dd1f6e9f36a45f637ae6260ccff09256ff";
-      sha256 = "d127d274bd37c1ad4deae4e988403f987cb11c0a8d7f7d729bf1fcf282a33add";
+      sha256 = "3942eb6a7191c308beab240e91c99ee4e2c52e2d672503d46f98312e823b86cd";
     };
     dependencies = [];
 
   };
   "vim-addon-signs" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-signs-2013-04-19";
+    name = "vim-addon-signs";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-signs";
       rev = "17a49f293d18174ff09d1bfff5ba86e8eee8e8ae";
-      sha256 = "27035d6d8eace02be4a5585100372a709d7a582ea66b56a1c282ee5041e1fc70";
+      sha256 = "a9c03a32e758d51106741605188cb7f00db314c73a26cae75c0c9843509a8fb8";
     };
     dependencies = [];
 
   };
   "vim-addon-sql" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-sql-2014-01-18";
+    name = "vim-addon-sql";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-sql";
       rev = "05b8a0c211f1ae4c515c64e91dec555cdf20d90b";
-      sha256 = "0d5cb4e6fa829a39cf8ba537a463aece768619ce8bcbb8693a4c348fa64541ca";
+      sha256 = "a1334ae694e0a03229bacc8ba7e08e7223df240244c7378e3f1bd91d74e957c2";
     };
     dependencies = ["vim-addon-completion" "vim-addon-background-cmd" "tlib"];
 
   };
   "vim-addon-syntax-checker" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-syntax-checker-2013-07-12";
+    name = "vim-addon-syntax-checker";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-syntax-checker";
       rev = "8eb7217e636ca717d4de5cd03cc0180c5b66ae77";
-      sha256 = "530f1d69e8ebae201c07b38e50ebfadbae60649d4a73977c124cd3f1378d659f";
+      sha256 = "aef048e664653b5007df71ac24ed34ec55d8938c763d3f80885a122e445a9b3d";
     };
     dependencies = ["vim-addon-mw-utils" "tlib"];
 
   };
   "vim-addon-toggle-buffer" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-toggle-buffer-2012-01-13";
+    name = "vim-addon-toggle-buffer";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-toggle-buffer";
       rev = "a1b38b9c5709cba666ed2d84ef06548f675c6b0b";
-      sha256 = "c258c941e75f09474d27ebeb859438565e3e237873fa71d1abfc75f8dfaee963";
+      sha256 = "672166ecfe0599177afb56b444366f587f77e9659c256ac4e41ee45cb2df6055";
     };
     dependencies = ["vim-addon-mw-utils" "tlib"];
 
   };
   "vim-addon-xdebug" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-xdebug-2014-08-29";
+    name = "vim-addon-xdebug";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-xdebug";
       rev = "45f26407305b4ce6f8f5f37d2b5e6e4354104172";
-      sha256 = "ebf61896e9b32eeeb0553124cc0011aee7d779307a32771c3ecb7181951d479a";
+      sha256 = "0a7bf2caf36772c94bd25bfbf46bf628623809c9cfab447ff788eb74149464ef";
     };
     dependencies = ["WebAPI" "vim-addon-mw-utils" "vim-addon-signs" "vim-addon-async"];
 
   };
   "vim-airline" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-2015-02-13";
+    name = "vim-airline";
     src = fetchgit {
       url = "git://github.com/bling/vim-airline";
-      rev = "ca925efdbfe88b03597efc7caee4ee8762a2cfe0";
+      rev = "446397e006d8cba9e1ac38d8c656ba39218c139b";
-      sha256 = "47def66ab083fb847c8ee40e0a23bf6d69cdcc7919c869089542381c8319c972";
+      sha256 = "c1f3ae483616318574e892b1cbaac2e08b0b90fd7348d7de745984c764b21119";
     };
     dependencies = [];
 
   };
   "vim-coffee-script" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-coffee-script-2014-10-10";
+    name = "vim-coffee-script";
     src = fetchgit {
       url = "git://github.com/kchmck/vim-coffee-script";
       rev = "827e4a38b07479433b619091469a7495a392df8a";
-      sha256 = "ca93ff77aab2c5f0b855afa60b26fce355f74684e8de27e76d2d22eda3e75904";
+      sha256 = "89ee4c7cce9f3310be502df6b2dd2e70a715c0b06882afc9c8169fbf58b207d0";
     };
     dependencies = [];
 
   };
   "vim-easy-align" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-easy-align-2014-12-14";
+    name = "vim-easy-align";
     src = fetchgit {
       url = "git://github.com/junegunn/vim-easy-align";
       rev = "c62d124be614de65922b15d468c4049d1eee9353";
-      sha256 = "733dbf6c4d1a29957451d64c7cf431f877e5abefcee19017742b4d5e8d60165b";
+      sha256 = "868bd5a0405a7611e020fe7692a078ca72562674b6d9a404d2d83f665af96aee";
     };
     dependencies = [];
 
   };
   "vim-gitgutter" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-gitgutter-2015-02-11";
+    name = "vim-gitgutter";
     src = fetchgit {
       url = "git://github.com/airblade/vim-gitgutter";
-      rev = "061258e04476c0f9f653a969e640bf03b3659594";
+      rev = "e5efbaffc066ababc9ae0d689c7050fa5d6591bd";
-      sha256 = "535643c8e958d7c020ef0c39aadb5c6a7f3bad8895213bc0f6774c12e2627ac3";
+      sha256 = "78e7db87f4f677ede5aad758131d060f4fb6017cf716aa6adc0736e92934d42d";
     };
     dependencies = [];
 
   };
   "vim-iced-coffee-script" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-iced-coffee-script-2013-12-27";
+    name = "vim-iced-coffee-script";
     src = fetchgit {
       url = "git://github.com/noc7c9/vim-iced-coffee-script";
       rev = "e42e0775fa4b1f8840c55cd36ac3d1cedbc1dea2";
-      sha256 = "631786c89ebcd630788f2c7201b3f2503e0106eef4e3d9d808e91946f7778c08";
+      sha256 = "c7859591975a51a1736f99a433d7ca3e7638b417340a0472a63995e16d8ece93";
     };
     dependencies = [];
 
   };
   "vim-latex-live-preview" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-latex-live-preview-2013-11-25";
+    name = "vim-latex-live-preview";
     src = fetchgit {
       url = "git://github.com/xuhdev/vim-latex-live-preview";
       rev = "18625ceca4de5984f3df50cdd0202fc13eb9e37c";
-      sha256 = "c129e9360f0c3c616a26ea74cfde03c70cfae16f9e1eeb89cfbcfc16beb3b5b9";
+      sha256 = "261852d3830189a50176f997a4c6b4ec7e25893c5b7842a3eb57eb7771158722";
     };
     dependencies = [];
 
   };
   "vim-signature" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signature-2015-01-12";
+    name = "vim-signature";
     src = fetchgit {
       url = "git://github.com/kshenoy/vim-signature";
       rev = "b4ac4f38528313456f98b1a50722cfc9a06bfc45";
-      sha256 = "606e2b1dc19c0e9c7301e0c9a6ff07cd7cefe057f3a5ac17536735dcb1a03e06";
+      sha256 = "c065eb81669fd76a8bf6d19e220c85ad07ede73e6a9b3dd12634611146303675";
     };
     dependencies = [];
 
   };
   "vim-snippets" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-snippets-2015-02-17";
+    name = "vim-snippets";
     src = fetchgit {
       url = "git://github.com/honza/vim-snippets";
-      rev = "93b4de1299916de0d93d70629f86ff0fa9735061";
+      rev = "27906a3754f0ac292d0915a4075bff22db53fa3e";
-      sha256 = "82a909f180ea11959d20f838a2716ff188bdec9f5ea2406ccd4fa27388462cf6";
+      sha256 = "fce0a62e78f031a00da0c7863d51d9f19f826bdc01c56cf5fc959132db29b6a6";
     };
     dependencies = [];
 
   };
   "vim2hs" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim2hs-2014-04-16";
+    name = "vim2hs";
     src = fetchgit {
       url = "git://github.com/dag/vim2hs";
       rev = "f2afd55704bfe0a2d66e6b270d247e9b8a7b1664";
-      sha256 = "1c8120a530a29047a8034dc7b381a53f41b0d827d90ea496736b97b65a6b01f5";
+      sha256 = "485fc58595bb4e50f2239bec5a4cbb0d8f5662aa3f744e42c110cd1d66b7e5b0";
     };
     dependencies = [];
 
   };
   "vundle" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vundle-2014-07-18";
+    name = "vundle";
     src = fetchgit {
       url = "git://github.com/gmarik/vundle";
       rev = "0b28e334e65b6628b0a61c412fcb45204a2f2bab";
-      sha256 = "95b9b4b8bb76fa60f2a26ef48c3801385051bcb5b2f591d548dc45284b3ab79e";
+      sha256 = "9681d471d1391626cb9ad22b2b469003d9980cd23c5c3a8d34666376447e6204";
     };
     dependencies = [];
 

pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix

@@ -1,7 +1,7 @@
 { stdenv, fetchgit }:
 
 let
-  version = "17657c35869baa999b454e868cd3d5a7e1656425";
+  version = "4517261caab34742afdeaf0c36128b9579675717";
   shortVersion = stdenv.lib.substring 0 7 version;
 in
 stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   src = fetchgit {
     url = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
     rev = version;
-    sha256 = "15lv58wf3vjs4dpxvx3a7wn0pj83952wa2ab6ajfl3pbdhcvkzjb";
+    sha256 = "0w386nfwlqhk1wn7zzhfxkxx06nzqasc4dr0qq61wc29s9qlgi3c";
   };
 
   preInstall = ''

pkgs/os-specific/linux/gradm/default.nix

@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name    = "gradm-${version}";
-  version = "3.0-201408301734";
+  version = "3.1-201502222102";
 
   src  = fetchurl {
     url    = "http://grsecurity.net/stable/${name}.tar.gz";
-    sha256 = "171i1jyw82dnv2fi4dnh40dw1wa5hrllnpjf181cafnzxjpyb45i";
+    sha256 = "1dvzjjyq8phhjcm425j9hw0m0azg34lm02p0yn058jiipx731xrp";
   };
 
   buildInputs = [ gcc coreutils findutils binutils pam flex bison bash ];

pkgs/os-specific/linux/kernel/patches.nix

@@ -18,7 +18,7 @@ let
       };
     };
 
-  grsecPatch = { grversion ? "3.0", kversion, revision, branch, sha256 }:
+  grsecPatch = { grversion ? "3.1", kversion, revision, branch, sha256 }:
     { name = "grsecurity-${grversion}-${kversion}";
       inherit grversion kversion revision;
       patch = fetchurl {
@@ -66,16 +66,16 @@ rec {
 
   grsecurity_stable = grsecPatch
     { kversion  = "3.14.33";
-      revision  = "201502200812";
+      revision  = "201502222137";
       branch    = "stable";
-      sha256    = "1dydrphgz8sfjf7w8b0kqai9k1dld6jv6frhqs6gqjj06wbg1rwd";
+      sha256    = "1mzw5g4m5yxs0qzrx2am5s19zggn4n9pws8vsqq82dhawmwcbbq2";
     };
 
   grsecurity_unstable = grsecPatch
     { kversion  = "3.18.7";
-      revision  = "201502200813";
+      revision  = "201502222138";
       branch    = "test";
-      sha256    = "1svvy0sip6p3h8iqlw0rh3lnxqziwz9fw8znyq1rw5cia89dx4c8";
+      sha256    = "0dnnwky9s8qhfm2b5zhl41m8br4qdxwmwwv8rbp11srydcz1pzib";
     };
 
   grsec_fix_path =

pkgs/os-specific/linux/nvidia-x11/builder.sh

@@ -36,6 +36,22 @@ installPhase() {
     cp -prd *.so.* tls "$out/lib/"
     rm "$out"/lib/lib{glx,nvidia-wfb}.so.* # handled separately
 
+    if test -z "$libsOnly"; then
+        # Install the X drivers.
+        mkdir -p $out/lib/xorg/modules
+        cp -p libnvidia-wfb.* $out/lib/xorg/modules/
+        mkdir -p $out/lib/xorg/modules/drivers
+        cp -p nvidia_drv.so $out/lib/xorg/modules/drivers
+        mkdir -p $out/lib/xorg/modules/extensions
+        cp -p libglx.so.* $out/lib/xorg/modules/extensions
+
+        # Install the kernel module.
+        mkdir -p $out/lib/modules/$kernelVersion/misc
+        cp kernel/nvidia.ko $out/lib/modules/$kernelVersion/misc
+        cp kernel/uvm/nvidia-uvm.ko $out/lib/modules/$kernelVersion/misc
+    fi
+
+    # All libs except GUI-only are in $out now, so fixup them.
     for libname in `find "$out/lib/" -name '*.so.*'`
     do
       # I'm lazy to differentiate needed libs per-library, as the closure is the same.
@@ -54,33 +70,7 @@ installPhase() {
 
 
     if test -z "$libsOnly"; then
-        # Install the kernel module.
+        # Install headers and /share files etc.
-        mkdir -p $out/lib/modules/$kernelVersion/misc
-        cp kernel/nvidia.ko $out/lib/modules/$kernelVersion/misc
-        cp kernel/uvm/nvidia-uvm.ko $out/lib/modules/$kernelVersion/misc
-
-        # Install the X driver.
-        mkdir -p $out/lib/xorg/modules
-        cp -p libnvidia-wfb.* $out/lib/xorg/modules/
-        mkdir -p $out/lib/xorg/modules/drivers
-        cp -p nvidia_drv.so $out/lib/xorg/modules/drivers
-        mkdir -p $out/lib/xorg/modules/extensions
-        cp -p libglx.so.* $out/lib/xorg/modules/extensions
-
-        #patchelf --set-rpath $out/lib $out/lib/xorg/modules/extensions/libglx.so.*.*
-
-        # Install the programs.
-        mkdir -p $out/bin
-
-        for i in nvidia-settings nvidia-smi; do
-            cp $i $out/bin/$i
-            patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-                --set-rpath $out/lib:$programPath:$glPath $out/bin/$i
-        done
-
-        patchelf --set-rpath $glPath:$gtk3Path $out/lib/libnvidia-gtk3.so.*.*
-
-        # Header files etc.
         mkdir -p $out/include/nvidia
         cp -p *.h $out/include/nvidia
 
@@ -99,6 +89,18 @@ installPhase() {
             --replace '__UTILS_PATH__' $out/bin \
             --replace '__PIXMAP_PATH__' $out/share/pixmaps
 
+
+        # Install the programs.
+        mkdir -p $out/bin
+
+        for i in nvidia-settings nvidia-smi; do
+            cp $i $out/bin/$i
+            patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+                --set-rpath $out/lib:$programPath:$glPath $out/bin/$i
+        done
+
+        patchelf --set-rpath $glPath:$gtk3Path $out/lib/libnvidia-gtk3.so.*.*
+
         # Test a bit.
         $out/bin/nvidia-settings --version
     else

pkgs/os-specific/linux/zfs/git.nix

@@ -1,16 +1,12 @@
 { callPackage, stdenv, fetchgit, spl_git, ... } @ args:
 
-let
-  gitVersion = "7d2868d5fc88a4c30769b44f56a3a88a4277a9ab";
-in
-
 callPackage ./generic.nix (args // rec {
-  version = stdenv.lib.substring 0 7 gitVersion;
+  version = "2015-02-24";
 
   src = fetchgit {
     url = git://github.com/zfsonlinux/zfs.git;
-    rev = gitVersion;
+    rev = "8bdcfb53966313e9ff747e3028390c207cfdbe9a";
-    sha256 = "1gf0x8d0zs2h3w910agxm4nb9qr4chs54iiblnqz4k74yyhbmwgg";
+    sha256 = "0xcikjb57fz173sjh2wvv96ybvrsx9d24krq09wy9a4psxp7vr8f";
   };
 
   patches = [

pkgs/servers/consul/default.nix

@@ -2,7 +2,7 @@
 , bundlerEnv }:
 
 let
-  version = "0.4.1";
+  version = "0.5.0";
   # `sass` et al
   gems = bundlerEnv {
     name = "consul-deps";

pkgs/servers/consul/deps.nix

@@ -16,8 +16,8 @@ let
       src = fetchFromGitHub {
         owner = "armon";
         repo = "consul-api";
-        rev = "1b81c8e0c4cbf1d382310e4c0dc11221632e79d1";
+        rev = "dcfedd50ed5334f96adee43fc88518a4f095e15c";
-        sha256 = "0fgawc1si0hn41kfr9sq351jccy8y5ac83l437vnshj60i9q9s6w";
+        sha256 = "1k3yl34j4d8y6xxqdm70pjrbdcnp11dbf8i1mp60480xg0cwpb6d";
       };
     }
     {
@@ -25,8 +25,8 @@ let
       src = fetchFromGitHub {
         owner = "armon";
         repo = "go-metrics";
-        rev = "2b75159ce5d3641fb35b5a159cff309ac3cf4177";
+        rev = "88b7658f24511c4b885942b26e9ea7a61ee37ebc";
-        sha256 = "1fjsa7r97zlpdzi5l7qvgyabznn5pm6bpwi1rgrwaxh7gc3a28vi";
+        sha256 = "18f7nr6khirdmcsy5mic1yggwc189wfiqvms8i7yfcvfns5nq9cc";
       };
     }
     {
@@ -34,8 +34,8 @@ let
       src = fetchFromGitHub {
         owner = "armon";
         repo = "go-radix";
-        rev = "b045fc0ad3587e8620fb42a0dea882cf8c08aef9";
+        rev = "e39d623f12e8e41c7b5529e9a9dd67a1e2261f80";
-        sha256 = "1p09dwhngaszbr9si68xl1la74i359l0wibhhirpxrc8q4pgjplx";
+        sha256 = "10vhgr35dfbsm90q8aqp82vhdf4izqrx8bzzgn0h3vrx94c2pnq1";
       };
     }
     {
@@ -43,8 +43,17 @@ let
       src = fetchFromGitHub {
         owner = "armon";
         repo = "gomdb";
-        rev = "a8e036c4dabe7437014ecf9dbc03c6f6f0766ef8";
+        rev = "151f2e08ef45cb0e57d694b2562f351955dff572";
-        sha256 = "0hiw5qkkyfd22v291w7rbnlrb4kraqzbkjfx2dvl7rqchkb0hv68";
+        sha256 = "02wdhgfarmmwfbc75snd1dh6p9k9c1y2135apdm6mkr062qlxx61";
+      };
+    }
+    {
+      root = "github.com/golang/protobuf";
+      src = fetchFromGitHub {
+        owner = "golang";
+        repo = "protobuf";
+        rev = "c22ae3cf020a21ebb7ae566dccbe90fc8ea4f9ea";
+        sha256 = "1ab605jw0cprq0kbp0b5iyjw805wk08r3p9mvcyland7v4gfqys2";
       };
     }
     {
@@ -52,8 +61,8 @@ let
       src = fetchFromGitHub {
         owner = "hashicorp";
         repo = "consul";
-        rev = "v0.4.1";
+        rev = "a022dfcb32246274adc8fb383882353c056d1da3";
-        sha256 = "0fqrhmzi0jbbwylv7c1l0ywqr67aqlv6s891f4inp0y4abd7shc7";
+        sha256 = "1al6bc62c8qygq4yhr8rq9jkx51ijv11816kipphylw73kyyrzg5";
       };
     }
     {
@@ -70,8 +79,8 @@ let
       src = fetchFromGitHub {
         owner = "hashicorp";
         repo = "consul-template";
-        rev = "v0.5.1";
+        rev = "v0.7.0";
-        sha256 = "1h8sqmzf73bn12bj1yqldp9gl46gz766c3zrymwgl8p0mb74dllf";
+        sha256 = "0xaym2mi8j3hw1waplhqfypnxv32fi81xxx3clfzk0a6bjmaihfx";
       };
     }
     {
@@ -79,8 +88,8 @@ let
       src = fetchFromGitHub {
         owner = "hashicorp";
         repo = "go-checkpoint";
-        rev = "89ef2a697dd8cdb4623097d5bb9acdb19a470767";
+        rev = "88326f6851319068e7b34981032128c0b1a6524d";
-        sha256 = "0mfykh9jkh1m2zxlm2df4j5i6hd6iq1kc8afjladdhcqyrkwcch0";
+        sha256 = "1npasn9lmvx57nw3wkswwvl5k0wmn01jpalbwv832x5wq4r0nsz4";
       };
     }
     {
@@ -97,8 +106,8 @@ let
       src = fetchFromGitHub {
         owner = "hashicorp";
         repo = "go-syslog";
-        rev = "ac3963b72ac367e48b1e68a831e62b93fb69091c";
+        rev = "42a2b573b664dbf281bd48c3cc12c086b17a39ba";
-        sha256 = "1r9s1gsa4azcs05gx1179ixk7qvrkrik3v92wr4s8gwm00m0gf81";
+        sha256 = "1j53m2wjyczm9m55znfycdvm4c8vfniqgk93dvzwy8vpj5gm6sb3";
       };
     }
     {
@@ -106,8 +115,8 @@ let
       src = fetchFromGitHub {
         owner = "hashicorp";
         repo = "golang-lru";
-        rev = "253b2dc1ca8bae42c3b5b6e53dd2eab1a7551116";
+        rev = "f09f965649501e2ac1b0c310c632a7bebdbdc1d4";
-        sha256 = "01vdya86x4fylzwapnz6p3wkb8y17sfvbss656sixc37iirrhqr2";
+        sha256 = "0yjnmk2d2x0kqvkg1sdfkl3jr408yl76rpyqzkkbpkvdcjrz554c";
       };
     }
     {
@@ -115,8 +124,8 @@ let
       src = fetchFromGitHub {
         owner = "hashicorp";
         repo = "hcl";
-        rev = "e51eabcdf801f663738fa12f4340fbad13062738";
+        rev = "513e04c400ee2e81e97f5e011c08fb42c6f69b84";
-        sha256 = "09d047lg6py9waqd6zwb0c9id8hya4xv2cg7yi9jbx8kwq31s75l";
+        sha256 = "041js0k8bj7qsgr79p207m6r3nkpw7839gq31747618sap6w3g8c";
       };
     }
     {
@@ -133,8 +142,17 @@ let
       src = fetchFromGitHub {
         owner = "hashicorp";
         repo = "memberlist";
-        rev = "16d947e2d4b3f1fe508ee1d9b6ec34b8fd2e96d8";
+        rev = "3d05e25e06bbb9e2b0e0afbd0b1c7dcebdd29cab";
-        sha256 = "0xagvyyfl37r0n6s67m1dmrahaxf4gprnfkm12x9jcpp5rbq7jjq";
+        sha256 = "1pjknjfvbs692y6laizgd4fmd4pqn039vvnmnag7q362mrpf5aj4";
+      };
+    }
+    {
+      root = "github.com/hashicorp/net-rpc-msgpackrpc";
+      src = fetchFromGitHub {
+        owner = "hashicorp";
+        repo = "net-rpc-msgpackrpc";
+        rev = "d377902b7aba83dd3895837b902f6cf3f71edcb2";
+        sha256 = "05q8qlf42ygafcp8zdyx7y7kv9vpjrxnp8ak4qcszz9kgl2cg969";
       };
     }
     {
@@ -142,8 +160,8 @@ let
       src = fetchFromGitHub {
         owner = "hashicorp";
         repo = "raft";
-        rev = "cc9710ab540985954a67c108f414aa3152f5916f";
+        rev = "a88bfa8385bc52c1f25d0fc02d1b55a2708d04ab";
-        sha256 = "1v4hib68gaicaqcx3iyclxbp5p3g750rayh8f35sh5fwbklqw1qi";
+        sha256 = "02kr7919m6iv7l26wnihalfi4lydz886j6x75a53vgchdcsbv7ai";
       };
     }
     {
@@ -151,8 +169,17 @@ let
       src = fetchFromGitHub {
         owner = "hashicorp";
         repo = "raft-mdb";
-        rev = "6f52d0ce62a34e3f5bd29aa4d7068030d700d94a";
+        rev = "4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0";
-        sha256 = "0pchi88ib7nzz6rdc91dpxq1k3q2021m8245v0yqh0ilbvvvyj7i";
+        sha256 = "15l4n6zygwn3h118m2945h9jxkryaxxcgy8xij2rxjhzrzpfyj3i";
+      };
+    }
+    {
+      root = "github.com/hashicorp/scada-client";
+      src = fetchFromGitHub {
+        owner = "hashicorp";
+        repo = "scada-client";
+        rev = "c26580cfe35393f6f4bf1b9ba55e6afe33176bae";
+        sha256 = "0s8xg49fa7d2d0vv8pi37f43rjrgkb7w6x6ydkikz1v8ccg05p3b";
       };
     }
     {
@@ -160,8 +187,8 @@ let
       src = fetchFromGitHub {
         owner = "hashicorp";
         repo = "serf";
-        rev = "v0.6.3";
+        rev = "f1fd5030d6a55d3edc6916d2ba58e933c21314de";
-        sha256 = "0ck77ji28bvm4ahzxyyi4sm17c3fxc16k0k5mihl1nlkgdd73m8y";
+        sha256 = "0w84iw255aray7acasacwn8njm36aqbxiyalnjqwfsn0pwfjla0b";
       };
     }
     {
@@ -169,8 +196,8 @@ let
       src = fetchFromGitHub {
         owner = "hashicorp";
         repo = "terraform";
-        rev = "v0.3.1";
+        rev = "v0.3.7";
-        sha256 = "0z6r9dbqrzxaw4b1vbr14ci85jgz6qrq8p36ylcyabzfvwbxrl1m";
+        sha256 = "04cs6sjwysg95l5cfsmnpnx3d126bv86qbkg91gj8h98knk5bs6z";
       };
     }
     {
@@ -178,8 +205,8 @@ let
       src = fetchFromGitHub {
         owner = "hashicorp";
         repo = "yamux";
-        rev = "9feabe6854fadca1abec9cd3bd2a613fe9a34000";
+        rev = "b4f943b3f25da97dec8e26bee1c3269019de070d";
-        sha256 = "03lgbhwhiqk6rivc5cl6zxph5n2pdbdz95h0x7m0ngp3yk3aqgan";
+        sha256 = "18ivpiix006f0g085a11gra8z0n6bq344rrgc5rphn7nmnghqchz";
       };
     }
     {
@@ -191,13 +218,22 @@ let
         sha256 = "1vgiwwxhgx9c899f6ikvrs0w6vfsnypzalcqyr0mqm2w816r9hhs";
       };
     }
+    {
+      root = "github.com/matttproud/golang_protobuf_extensions";
+      src = fetchFromGitHub {
+        owner = "matttproud";
+        repo = "golang_protobuf_extensions";
+        rev = "ba7d65ac66e9da93a714ca18f6d1bc7a0c09100c";
+        sha256 = "1vz6zj94v90x8mv9h6qfp1211kmzn60ri5qh7p9fzpjkhga5k936";
+      };
+    }
     {
       root = "github.com/miekg/dns";
       src = fetchFromGitHub {
         owner = "miekg";
         repo = "dns";
-        rev = "dc30c7cd4ed2fc8af73d49da4ee285404958b8bd";
+        rev = "6427527bba3ea8fdf2b56fba43d20d1e3e76336d";
-        sha256 = "1pqdgjz0qwbbfgya2brsvhj88jp6rmprjwzgjsjnnv9nxwfsbb5s";
+        sha256 = "1zszpn44kak4cs5lmy9i7sslizqngldgb0ixn0la9x9gxf16h9zn";
       };
     }
     {
@@ -214,8 +250,35 @@ let
       src = fetchFromGitHub {
         owner = "mitchellh";
         repo = "mapstructure";
-        rev = "740c764bc6149d3f1806231418adb9f52c11bcbf";
+        rev = "442e588f213303bec7936deba67901f8fc8f18b1";
-        sha256 = "0rlz93rmz465nr0wmzvq1n58yc0qdw7v1chr6zmj9jj9pix0a7cb";
+        sha256 = "076svhy5jlnw4jykm3dsrx2dswifajrpr7d09mz9y6g3lg901rqd";
+      };
+    }
+    {
+      root = "github.com/prometheus/client_golang";
+      src = fetchFromGitHub {
+        owner = "prometheus";
+        repo = "client_golang";
+        rev = "0.2.0";
+        sha256 = "0iq2hlmdazwmpjq2k9gvpv2zprzxzmyzsc89c2kalrwl52ksg250";
+      };
+    }
+    {
+      root = "github.com/prometheus/client_model";
+      src = fetchFromGitHub {
+        owner = "prometheus";
+        repo = "client_model";
+        rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6";
+        sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9";
+      };
+    }
+    {
+      root = "github.com/prometheus/procfs";
+      src = fetchFromGitHub {
+        owner = "prometheus";
+        repo = "procfs";
+        rev = "6c34ef819e19b4e16f410100ace4aa006f0e3bf8";
+        sha256 = "1n48jhx50bhnjznxds4nmz04digbbbbjq3hkvvl29js1grylda0i";
       };
     }
     {
@@ -232,8 +295,8 @@ let
       src = fetchFromGitHub {
         owner = "ugorji";
         repo = "go";
-        rev = "a7f0616e8cd41d08149bec05c87524abe4e0520e";
+        rev = "c8676e5e9db1226325ca0ed7771633fb0109878b";
-        sha256 = "1sxbsvfb46gp6jpb8wy9z6329g2zzbm07xnzml627dsvwdcxvy4q";
+        sha256 = "18r1iajmc9a461kx0pz3lpv91lzlfg93cjw0k0j7ffk6901m0084";
       };
     }
   ];

pkgs/servers/consul/template.nix

@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "consul-template-${version}";
-  version = "0.5.1";
+  version = "0.7.0";
 
   src = import ./deps.nix {
     inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub;
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     description = "Generic template rendering and notifications with Consul";
     homepage = https://github.com/hashicorp/consul-template;
     license = licenses.mpl20;
-    maintainers = with maintainers; [ puffnfresh ];
+    maintainers = with maintainers; [ puffnfresh wkennington ];
     platforms = platforms.unix;
   };
 }

pkgs/servers/http/apache-httpd/2.4.nix

@@ -14,12 +14,12 @@ assert sslSupport -> aprutil.sslSupport && openssl != null;
 assert ldapSupport -> aprutil.ldapSupport && openldap != null;
 
 stdenv.mkDerivation rec {
-  version = "2.4.10";
+  version = "2.4.12";
   name = "apache-httpd-${version}";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    sha256 = "0slwcqw9f7fnb3kyz27hlsgh8j4wiza4yzqyp6vhfpvl3an4sv0p";
+    sha256 = "1r7a63ka41vlswrqbb21vall6sc7svwgd497kb6dh8a6zvnkjvdd";
   };
 
   buildInputs = [perl] ++

pkgs/servers/nosql/cassandra/default.nix

@@ -8,13 +8,13 @@
 , getopt
 }:
 
-let version = "2.1.2";
+let version = "2.1.3";
 in stdenv.mkDerivation rec {
   name = "cassandra-${version}";
 
   src = fetchurl {
     url = "http://apache.cs.utah.edu/cassandra/${version}/apache-${name}-bin.tar.gz";
-    sha256 = "1glpv3d1c63ccqnfjzz76cxb508qyvbgva26h5j7k8dd5av84lcr";
+    sha256 = "1hzb7h73vr28v9axw85c1987l2i5g4i9ivmgq5mqlv3cv1ng0knz";
   };
 
   buildInputs = [ makeWrapper ];