Merge branch 'master.upstream' into staging.upstream

2024-11-27 01:13:05 +00:00 · 2015-08-18 11:36:32 -07:00 · 2015-08-18 11:36:32 -07:00 · 2ac70270e8
commit 2ac70270e8
parent 5ec252e7ca 31a27c44c8
104 changed files with 3024 additions and 1101 deletions
--- a/doc/haskell-users-guide.xml
+++ b/doc/haskell-users-guide.xml
@ -712,7 +712,7 @@ text-1.2.0.4-98506efb1b9ada233bb5c2b2db516d91
    </para>
    <programlisting>
 # nix-store -q --referrers /nix/store/*-haskell-text-1.2.0.4 \
-  | nix-store --repair-path --option binary-caches http://hydra.nixos.org
+  | xargs -L 1 nix-store --repair-path --option binary-caches http://hydra.nixos.org
 </programlisting>
    <para>
      If you're using additional Hydra servers other than
--- a/doc/language-support.xml
+++ b/doc/language-support.xml
@ -464,6 +464,27 @@ python.buildEnv.override {
    with wrapped binaries in <filename>bin/</filename>.
  </para>

+  <para>
+  You can also use <varname>env</varname> attribute to create local
+  environments with needed packages installed (somewhat comparable to
+  <literal>virtualenv</literal>). For example, with the following
+  <filename>shell.nix</filename>:
+
+<programlisting language="nix">
+<![CDATA[with import <nixpkgs> {};
+
+(python3.buildEnv.override {
+  extraLibs = with python3Packages;
+    [ numpy
+      requests
+    ];
+}).env]]>
+</programlisting>
+
+  Running <command>nix-shell</command> will drop you into a shell where
+  <command>python</command> will have specified packages in its path.
+  </para>
+
  <variablelist>
    <title>
      <function>python.buildEnv</function> arguments
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@ -346,4 +346,24 @@ packageOverrides = pkgs: {

 </section>

+<section xml:id="sec-elm">
+
+<title>Elm</title>
+
+<para>
+The Nix expressions for Elm reside in
+<filename>pkgs/development/compilers/elm</filename>. They are generated
+automatically by <command>update-elm.rb</command> script. One should
+specify versions of Elm packages inside the script, clear the
+<filename>packages</filename> directory and run the script from inside it.
+<literal>elm-reactor</literal> is special because it also has Elm package
+dependencies. The process is not automated very much for now -- you should
+get the <literal>elm-reactor</literal> source tree (e.g. with
+<command>nix-shell</command>) and run <command>elm2nix.rb</command> inside
+it. Place the resulting <filename>package.nix</filename> file into
+<filename>packages/elm-reactor-elm.nix</filename>.
+</para>
+
+</section>
+
 </chapter>
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@ -158,6 +158,7 @@
  marcweber = "Marc Weber <marco-oweber@gmx.de>";
  maurer = "Matthew Maurer <matthew.r.maurer+nix@gmail.com>";
  matejc = "Matej Cotman <cotman.matej@gmail.com>";
+  mathnerd314 = "Mathnerd314 <mathnerd314.gph+hs@gmail.com>";
  matthiasbeyer = "Matthias Beyer <mail@beyermatthias.de>";
  mbakke = "Marius Bakke <ymse@tuta.io>";
  meditans = "Carlo Nucera <meditans@gmail.com>";
--- a/lib/modules.nix
+++ b/lib/modules.nix
@ -55,7 +55,7 @@ rec {
        };
      };

-      closed = closeModules (modules ++ [ internalModule ]) (specialArgs // { inherit config options; lib = import ./.; });
+      closed = closeModules (modules ++ [ internalModule ]) ({ inherit config options; lib = import ./.; } // specialArgs);

      # Note: the list of modules is reversed to maintain backward
      # compatibility with the old module system.  Not sure if this is
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@ -80,6 +80,9 @@ was accordingly renamed to <literal>bomi</literal>
 was accordingly renamed to <literal>electron</literal>
 </para></listitem>

+<listitem><para>Elm is not released on Hackage anymore. You should now use <literal>elmPackages.elm</literal>
+which contains the latest Elm platform.</para></listitem>
+
 <listitem>
  <para>
 	The CUPS printing service has been updated to version <literal>2.0.2</literal>.
--- a/nixos/lib/eval-config.nix
+++ b/nixos/lib/eval-config.nix
@ -17,6 +17,8 @@
  baseModules ? import ../modules/module-list.nix
 , # !!! See comment about args in lib/modules.nix
  extraArgs ? {}
+, # !!! See comment about args in lib/modules.nix
+  specialArgs ? {}
 , modules
 , # !!! See comment about check in lib/modules.nix
  check ? true
@ -47,7 +49,7 @@ in rec {
    inherit prefix check;
    modules = modules ++ extraModules ++ baseModules ++ [ pkgsModule ];
    args = extraArgs;
-    specialArgs = { modulesPath = ../modules; };
+    specialArgs = { modulesPath = ../modules; } // specialArgs;
  }) config options;

  # These are the extra arguments passed to every module.  In
--- a/nixos/maintainers/option-usages.nix
+++ b/nixos/maintainers/option-usages.nix
@ -1,59 +1,125 @@
 { configuration ? import ../lib/from-env.nix "NIXOS_CONFIG" <nixos-config>

-# []: display all options
-# [<option names>]: display the selected options
-, displayOptions ? [
-    "hardware.pcmcia.enable"
-    "environment.systemPackages"
-    "boot.kernelModules"
-    "services.udev.packages"
-    "jobs"
-    "environment.etc"
-    "system.activationScripts"
-  ]
+# provide an option name, as a string literal.
+, testOption ? null
+
+# provide a list of option names, as string literals.
+, testOptions ? [ ]
 }:

-# This file is used to generate a dot graph which contains all options and
-# there dependencies to track problems and their sources.
+# This file is made to be used as follow:
+#
+#   $ nix-instantiate ./option-usage.nix --argstr testOption service.xserver.enable -A txtContent --eval
+#
+# or
+#
+#   $ nix-build ./option-usage.nix --argstr testOption service.xserver.enable -A txt -o service.xserver.enable._txt
+#
+# otther target exists such as, `dotContent`, `dot`, and `pdf`.  If you are
+# looking for the option usage of multiple options, you can provide a list
+# as argument.
+#
+#   $ nix-build ./option-usage.nix --arg testOptions \
+#      '["boot.loader.gummiboot.enable" "boot.loader.gummiboot.timeout"]' \
+#      -A txt -o gummiboot.list
+#
+# Note, this script is slow as it has to evaluate all options of the system
+# once per queried option.
+#
+# This nix expression works by doing a first evaluation, which evaluates the
+# result of every option.
+#
+# Then, for each queried option, we evaluate the NixOS modules a second
+# time, except that we replace the `config` argument of all the modules with
+# the result of the original evaluation, except for the tested option which
+# value is replaced by a `throw` statement which is caught by the `tryEval`
+# evaluation of each option value.
+#
+# We then compare the result of the evluation of the original module, with
+# the result of the second evaluation, and consider that the new failures are
+# caused by our mutation of the `config` argument.
+#
+# Doing so returns all option results which are directly using the
+# tested option result.
+
+with import ../../lib;

 let

  evalFun = {
-    extraArgs ? {}
+    specialArgs ? {}
  }: import ../lib/eval-config.nix {
       modules = [ configuration ];
-       inherit extraArgs;
+       inherit specialArgs;
     };

  eval = evalFun {};
  inherit (eval) pkgs;

-  reportNewFailures = old: new: with pkgs.lib;
+  excludedTestOptions = [
+    # We cannot evluate _module.args, as it is used during the computation
+    # of the modules list.
+    "_module.args"
+
+    # For some reasons which we yet have to investigate, some options cannot
+    # be replaced by a throw without cuasing a non-catchable failure.
+    "networking.bonds"
+    "networking.bridges"
+    "networking.interfaces"
+    "networking.macvlans"
+    "networking.sits"
+    "networking.vlans"
+    "services.openssh.startWhenNeeded"
+  ];
+
+  # for some reasons which we yet have to investigate, some options are
+  # time-consuming to compute, thus we filter them out at the moment.
+  excludedOptions = [
+    "boot.systemd.services"
+    "systemd.services"
+    "environment.gnome3.packageSet"
+    "kde.extraPackages"
+  ];
+  excludeOptions = list:
+    filter (opt: !(elem (showOption opt.loc) excludedOptions)) list;
+
+
+  reportNewFailures = old: new:
    let
      filterChanges =
        filter ({fst, snd}:
-          !(fst.config.success -> snd.config.success)
+          !(fst.success -> snd.success)
        );

      keepNames =
        map ({fst, snd}:
-          assert fst.name == snd.name; snd.name
+          /* assert fst.name == snd.name; */ snd.name
        );
+
+      # Use  tryEval (strict ...)  to know if there is any failure while
+      # evaluating the option value.
+      #
+      # Note, the `strict` function is not strict enough, but using toXML
+      # builtins multiply by 4 the memory usage and the time used to compute
+      # each options.
+      tryCollectOptions = moduleResult:
+        flip map (excludeOptions (collect isOption moduleResult)) (opt:
+          { name = showOption opt.loc; } // builtins.tryEval (strict opt.value));
     in
       keepNames (
         filterChanges (
-           zipLists (collect isOption old) (collect isOption new)
+           zipLists (tryCollectOptions old) (tryCollectOptions new)
         )
       );


  # Create a list of modules where each module contains only one failling
  # options.
-  introspectionModules = with pkgs.lib;
+  introspectionModules =
    let
      setIntrospection = opt: rec {
-        name = opt.name;
-        path = splitString "." opt.name;
+        name = showOption opt.loc;
+        path = opt.loc;
        config = setAttrByPath path
          (throw "Usage introspection of '${name}' by forced failure.");
      };
@ -61,39 +127,67 @@ let
      map setIntrospection (collect isOption eval.options);

  overrideConfig = thrower:
-    pkgs.lib.recursiveUpdateUntil (path: old: new:
+    recursiveUpdateUntil (path: old: new:
      path == thrower.path
    ) eval.config thrower.config;


-  graph = with pkgs.lib;
+  graph =
    map (thrower: {
      option = thrower.name;
-      usedBy = reportNewFailures eval.options (evalFun {
-        extraArgs = {
-          config = overrideConfig thrower;
-        };
-      }).options;
+      usedBy = assert __trace "Investigate ${thrower.name}" true;
+        reportNewFailures eval.options (evalFun {
+          specialArgs = {
+            config = overrideConfig thrower;
+          };
+        }).options;
    }) introspectionModules;

-  graphToDot = graph: with pkgs.lib; ''
+  displayOptionsGraph =
+     let
+       checkList =
+         if !(isNull testOption) then [ testOption ]
+         else testOptions;
+       checkAll = checkList == [];
+     in
+       flip filter graph ({option, usedBy}:
+         (checkAll || elem option checkList)
+         && !(elem option excludedTestOptions)
+       );
+
+  graphToDot = graph: ''
    digraph "Option Usages" {
      ${concatMapStrings ({option, usedBy}:
-          assert __trace option true;
-          if displayOptions == [] || elem option displayOptions then
-            concatMapStrings (user: ''
-              "${option}" -> "${user}"''
-            ) usedBy
-          else ""
-        ) graph}
+          concatMapStrings (user: ''
+            "${option}" -> "${user}"''
+          ) usedBy
+        ) displayOptionsGraph}
    }
  '';

+  graphToText = graph:
+    concatMapStrings ({option, usedBy}:
+        concatMapStrings (user: ''
+          ${user}
+        '') usedBy
+      ) displayOptionsGraph;
+
 in

-pkgs.texFunctions.dot2pdf {
-  dotGraph = pkgs.writeTextFile {
+rec {
+  dotContent = graphToDot graph;
+  dot = pkgs.writeTextFile {
    name = "option_usages.dot";
-    text = graphToDot graph;
+    text = dotContent;
+  };
+
+  pdf = pkgs.texFunctions.dot2pdf {
+    dotGraph = dot;
+  };
+
+  txtContent = graphToText graph;
+  txt = pkgs.writeTextFile {
+    name = "option_usages.txt";
+    text = txtContent;
  };
 }
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@ -57,7 +57,7 @@ in
    environment = {

      systemPackages = mkOption {
-        type = types.listOf types.path;
+        type = types.listOf types.package;
        default = [];
        example = literalExample "[ pkgs.firefox pkgs.thunderbird ]";
        description = ''
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@ -235,7 +235,7 @@ chomp $virt;
 # Check if we're a VirtualBox guest.  If so, enable the guest
 # additions.
 if ($virt eq "oracle") {
-    push @attrs, "services.virtualboxGuest.enable = true;"
+    push @attrs, "virtualisation.virtualbox.guest.enable = true;"
 }


--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@ -103,20 +103,23 @@ in
        message = "cannot enable X11 forwarding without setting XAuth location";
      };

-    environment.etc =
-      [ { # SSH configuration.  Slight duplication of the sshd_config
-          # generation in the sshd service.
-          source = pkgs.writeText "ssh_config" ''
-            AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"}
-            ${optionalString cfg.setXAuthLocation ''
-              XAuthLocation ${pkgs.xorg.xauth}/bin/xauth
-            ''}
-            ForwardX11 ${if cfg.forwardX11 then "yes" else "no"}
-            ${cfg.extraConfig}
-          '';
-          target = "ssh/ssh_config";
-        }
-      ];
+    # SSH configuration. Slight duplication of the sshd_config
+    # generation in the sshd service.
+    environment.etc."ssh/ssh_config".text =
+      ''
+        AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"}
+
+        ${optionalString cfg.setXAuthLocation ''
+          XAuthLocation ${pkgs.xorg.xauth}/bin/xauth
+        ''}
+
+        ForwardX11 ${if cfg.forwardX11 then "yes" else "no"}
+
+        # Allow DSA keys for now. (These were deprecated in OpenSSH 7.0.)
+        PubkeyAcceptedKeyTypes +ssh-dss
+
+        ${cfg.extraConfig}
+      '';

    # FIXME: this should really be socket-activated for über-awesomeness.
    systemd.user.services.ssh-agent =
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@ -98,6 +98,9 @@ in zipModules ([]
 ++ obsolete [ "boot" "initrd" "extraKernelModules" ] [ "boot" "initrd" "kernelModules" ]
 ++ obsolete [ "boot" "extraKernelParams" ] [ "boot" "kernelParams" ]

+# smartd
++ obsolete [ "services" "smartd" "deviceOpts" ] [ "services" "smartd" "defaults" "monitored" ]
+
 # OpenSSH
 ++ obsolete [ "services" "sshd" "ports" ] [ "services" "openssh" "ports" ]
 ++ alias [ "services" "sshd" "enable" ] [ "services" "openssh" "enable" ]
--- a/nixos/modules/services/monitoring/smartd.nix
+++ b/nixos/modules/services/monitoring/smartd.nix
@ -4,8 +4,66 @@ with lib;

 let

+  host = config.networking.hostName or "unknown"
+       + optionalString (config.networking.domain != null) ".${config.networking.domain}";
+
  cfg = config.services.smartd;

+  nm = cfg.notifications.mail;
+  nw = cfg.notifications.wall;
+  nx = cfg.notifications.x11;
+
+  smartdNotify = pkgs.writeScript "smartd-notify.sh" ''
+    #! ${pkgs.stdenv.shell}
+    ${optionalString nm.enable ''
+      {
+      cat << EOF
+      From: smartd on ${host} <root>
+      To: undisclosed-recipients:;
+      Subject: SMART error on $SMARTD_DEVICESTRING: $SMARTD_FAILTYPE
+
+      $SMARTD_FULLMESSAGE
+      EOF
+
+      ${pkgs.smartmontools}/sbin/smartctl -a -d "$SMARTD_DEVICETYPE" "$SMARTD_DEVICE"
+      } | ${nm.mailer} -i "${nm.recipient}"
+    ''}
+    ${optionalString nw.enable ''
+      {
+      cat << EOF
+      Problem detected with disk: $SMARTD_DEVICESTRING
+      Warning message from smartd is:
+
+      $SMARTD_MESSAGE
+      EOF
+      } | ${pkgs.utillinux}/bin/wall 2>/dev/null
+    ''}
+    ${optionalString nx.enable ''
+      export DISPLAY=${nx.display}
+      {
+      cat << EOF
+      Problem detected with disk: $SMARTD_DEVICESTRING
+      Warning message from smartd is:
+
+      $SMARTD_FULLMESSAGE
+      EOF
+      } | ${pkgs.xorg.xmessage}/bin/xmessage -file - 2>/dev/null &
+    ''}
+  '';
+
+  notifyOpts = optionalString (nm.enable || nw.enable || nx.enable)
+    ("-m <nomailer> -M exec ${smartdNotify} " + optionalString cfg.notifications.test "-M test ");
+
+  smartdConf = pkgs.writeText "smartd.conf" ''
+    # Autogenerated smartd startup config file
+    DEFAULT ${notifyOpts}${cfg.defaults.monitored}
+
+    ${concatMapStringsSep "\n" (d: "${d.device} ${d.options}") cfg.devices}
+
+    ${optionalString cfg.autodetect
+       "DEVICESCAN ${notifyOpts}${cfg.defaults.autodetected}"}
+  '';
+
  smartdOpts = { name, ... }: {

    options = {
@ -22,34 +80,11 @@ let
        type = types.separatedString " ";
        description = "Options that determine how smartd monitors the device.";
      };
+
    };

  };

-  smartdMail = pkgs.writeScript "smartdmail.sh" ''
-    #! ${pkgs.stdenv.shell}
-    TMPNAM=/tmp/smartd-message.$$.tmp
-    if test -n "$SMARTD_ADDRESS"; then
-      echo  >"$TMPNAM" "From: smartd <root>"
-      echo >>"$TMPNAM" 'To: undisclosed-recipients:;'
-      echo >>"$TMPNAM" "Subject: $SMARTD_SUBJECT"
-      echo >>"$TMPNAM"
-      echo >>"$TMPNAM" "Failure on $SMARTD_DEVICESTRING: $SMARTD_FAILTYPE"
-      echo >>"$TMPNAM"
-      cat  >>"$TMPNAM"
-      ${pkgs.smartmontools}/sbin/smartctl >>"$TMPNAM" -a -d "$SMARTD_DEVICETYPE" "$SMARTD_DEVICE"
-      /var/setuid-wrappers/sendmail  <"$TMPNAM" -f "$SENDER" -i "$SMARTD_ADDRESS"
-    fi
-  '';
-
-  smartdConf = pkgs.writeText "smartd.conf" (concatMapStrings (device:
-    ''
-      ${device.device} -a -m root -M exec ${smartdMail} ${device.options} ${cfg.deviceOpts}
-    ''
-    ) cfg.devices);
-
-  smartdFlags = if (cfg.devices == []) then "" else "--configfile=${smartdConf}";
-
 in

 {
@ -59,26 +94,104 @@ in

    services.smartd = {

-      enable = mkOption {
-        default = false;
+      enable = mkEnableOption "smartd daemon from <literal>smartmontools</literal> package";
+
+      autodetect = mkOption {
+        default = true;
        type = types.bool;
-        example = true;
        description = ''
-          Run smartd from the smartmontools package. Note that e-mail
-          notifications will not be enabled unless you configure the list of
-          devices with <varname>services.smartd.devices</varname> as well.
+          Whenever smartd should monitor all devices connected to the
+          machine at the time it's being started (the default).
+
+          Set to false to monitor the devices listed in
+          <option>services.smartd.devices</option> only.
        '';
      };

-      deviceOpts = mkOption {
-        default = "";
-        type = types.string;
-        example = "-o on -s (S/../.././02|L/../../7/04)";
-        description = ''
-          Additional options for each device that is monitored. The example
-          turns on SMART Automatic Offline Testing on startup, and schedules short
-          self-tests daily, and long self-tests weekly.
-        '';
+      notifications = {
+
+        mail = {
+          enable = mkOption {
+            default = config.services.mail.sendmailSetuidWrapper != null;
+            type = types.bool;
+            description = "Whenever to send e-mail notifications.";
+          };
+
+          recipient = mkOption {
+            default = "root";
+            type = types.string;
+            description = "Recipient of the notification messages.";
+          };
+
+          mailer = mkOption {
+            default = "/var/setuid-wrappers/sendmail";
+            type = types.path;
+            description = ''
+              Sendmail-compatible binary to be used to send the messages.
+
+              You should probably enable
+              <option>services.postfix</option> or some other MTA for
+              this to work.
+            '';
+          };
+        };
+
+        wall = {
+          enable = mkOption {
+            default = true;
+            type = types.bool;
+            description = "Whenever to send wall notifications to all users.";
+          };
+        };
+
+        x11 = {
+          enable = mkOption {
+            default = config.services.xserver.enable;
+            type = types.bool;
+            description = "Whenever to send X11 xmessage notifications.";
+          };
+
+          display = mkOption {
+            default = ":${toString config.services.xserver.display}";
+            type = types.string;
+            description = "DISPLAY to send X11 notifications to.";
+          };
+        };
+
+        test = mkOption {
+          default = false;
+          type = types.bool;
+          description = "Whenever to send a test notification on startup.";
+        };
+
+      };
+
+      defaults = {
+        monitored = mkOption {
+          default = "-a";
+          type = types.separatedString " ";
+          example = "-a -o on -s (S/../.././02|L/../../7/04)";
+          description = ''
+            Common default options for explicitly monitored (listed in
+            <option>services.smartd.devices</option>) devices.
+
+            The default value turns on monitoring of all the things (see
+            <literal>man 5 smartd.conf</literal>).
+
+            The example also turns on SMART Automatic Offline Testing on
+            startup, and schedules short self-tests daily, and long
+            self-tests weekly.
+          '';
+        };
+
+        autodetected = mkOption {
+          default = cfg.defaults.monitored;
+          type = types.separatedString " ";
+          description = ''
+            Like <option>services.smartd.defaults.monitored</option>, but for the
+            autodetected devices.
+          '';
+        };
      };

      devices = mkOption {
@ -86,14 +199,9 @@ in
        example = [ { device = "/dev/sda"; } { device = "/dev/sdb"; options = "-d sat"; } ];
        type = types.listOf types.optionSet;
        options = [ smartdOpts ];
-        description = ''
-          List of devices to monitor. By default -- if this list is empty --,
-          smartd will monitor all devices connected to the machine at the time
-          it's being run. Configuring this option has the added benefit of
-          enabling e-mail notifications to "root" every time smartd detects an
-          error.
-        '';
-       };
+        description = "List of devices to monitor.";
+      };
+
    };

  };
@ -103,12 +211,19 @@ in

  config = mkIf cfg.enable {

+    assertions = [ {
+      assertion = cfg.autodetect || cfg.devices != [];
+      message = "smartd can't run with both disabled autodetect and an empty list of devices to monitor.";
+    } ];
+
    systemd.services.smartd = {
      description = "S.M.A.R.T. Daemon";

      wantedBy = [ "multi-user.target" ];

-      serviceConfig.ExecStart = "${pkgs.smartmontools}/sbin/smartd --no-fork ${smartdFlags}";
+      path = [ pkgs.nettools ]; # for hostname and dnsdomanname calls in smartd
+
+      serviceConfig.ExecStart = "${pkgs.smartmontools}/sbin/smartd --no-fork --configfile=${smartdConf}";
    };

  };
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@ -413,6 +413,9 @@ in
        ${flip concatMapStrings cfg.hostKeys (k: ''
          HostKey ${k.path}
        '')}
+
+        # Allow DSA keys for now. (These were deprecated in OpenSSH 7.0.)
+        PubkeyAcceptedKeyTypes +ssh-dss
      '';

    assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true;
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@ -66,7 +66,7 @@ in rec {
        (all nixos.tests.bootBiosCdrom)
        (all nixos.tests.ipv6)
        (all nixos.tests.kde4)
-        (all nixos.tests.lightdm)
+        #(all nixos.tests.lightdm)
        (all nixos.tests.login)
        (all nixos.tests.misc)
        (all nixos.tests.nat.firewall)
--- a/nixos/release.nix
+++ b/nixos/release.nix
@ -245,7 +245,7 @@ in rec {
  tests.kde4 = callTest tests/kde4.nix {};
  tests.kubernetes = hydraJob (import tests/kubernetes.nix { system = "x86_64-linux"; });
  tests.latestKernel.login = callTest tests/login.nix { latestKernel = true; };
-  tests.lightdm = callTest tests/lightdm.nix {};
+  #tests.lightdm = callTest tests/lightdm.nix {};
  tests.login = callTest tests/login.nix {};
  #tests.logstash = callTest tests/logstash.nix {};
  tests.misc = callTest tests/misc.nix {};
--- a/pkgs/applications/audio/deadbeef/default.nix
+++ b/pkgs/applications/audio/deadbeef/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool, pkgconfig
+{ stdenv, fetchurl, intltool, pkgconfig, fetchpatch
 # deadbeef can use either gtk2 or gtk3
 , gtk2Support ? true, gtk2 ? null
 , gtk3Support ? false, gtk3 ? null, gsettings_desktop_schemas ? null, makeWrapper ? null
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
  name = "deadbeef-0.6.2";

  src = fetchurl {
-    url = "http://garr.dl.sourceforge.net/project/deadbeef/${name}.tar.bz2";
+    url = "mirror://sourceforge/project/deadbeef/${name}.tar.bz2";
    sha256 = "06jfsqyakpvq0xhah7dlyvdzh5ym3hhb4yfczczw11ijd1kbjcrl";
  };

@ -82,6 +82,12 @@ stdenv.mkDerivation rec {

  enableParallelBuilding = true;

+  patches = [ (fetchpatch {
+                url = "https://github.com/Alexey-Yakovenko/deadbeef/commit/e7725ea73fa1bd279a3651704870156bca8efea8.patch";
+                sha256 = "0a04l2607y3swcq9b1apffl1chdwj38jwfiizxcfmdbia4a0qlyg";
+              })
+            ];
+
  postInstall = if !gtk3Support then "" else ''
    wrapProgram "$out/bin/deadbeef" \
      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
--- a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
+++ b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, deadbeef, glib }:
+
+stdenv.mkDerivation rec {
+  version = "1.8";
+  name = "deadbeef-mpris2-plugin-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/Serranya/deadbeef-mpris2-plugin/releases/download/v${version}/${name}.tar.xz";
+    sha256 = "1xg880zlxbqz7hs5g7xwc128l08j8c3isn45rdi138hi4fqbyjfi";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ deadbeef glib ];
+
+  meta = with stdenv.lib; {
+    description = "MPRISv2 plugin for the DeaDBeeF music player";
+    homepage = https://github.com/Serranya/deadbeef-mpris2-plugin/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.abbradar ];
+  };
+}
--- a/pkgs/applications/audio/deadbeef/wrapper.nix
+++ b/pkgs/applications/audio/deadbeef/wrapper.nix
@ -0,0 +1,22 @@
+{ stdenv, buildEnv, deadbeef, makeWrapper, plugins }:
+
+let
+drv = buildEnv {
+  name = "deadbeef-with-plugins-" + (builtins.parseDrvName deadbeef.name).version;
+
+  paths = [ deadbeef ] ++ plugins;
+
+  postBuild = ''
+    # TODO: This could be avoided if buildEnv could be forced to create all directories
+    if [ -L $out/bin ]; then
+      rm $out/bin
+      mkdir $out/bin
+      for i in ${deadbeef}/bin/*; do
+        ln -s $i $out/bin
+      done
+    fi
+    wrapProgram $out/bin/deadbeef \
+      --set DEADBEEF_PLUGIN_DIR "$out/lib/deadbeef"
+  '';
+  };
+in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; })
--- a/pkgs/applications/audio/distrho/default.nix
+++ b/pkgs/applications/audio/distrho/default.nix
@ -1,13 +1,13 @@
 { stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, libjack2
-, libxslt, lv2, pkgconfig, premake3, xlibs }:
+, libxslt, lv2, pkgconfig, premake3, xlibs, ladspa-sdk }:

 stdenv.mkDerivation rec {
-  name = "distrho-ports-git-2015-05-04";
+  name = "distrho-ports-git-2015-07-18";

  src = fetchgit {
    url = "https://github.com/DISTRHO/DISTRHO-Ports.git";
-    rev = "3f13db5dc7722ed0dcbb5256d7fac1ac9165c2d8";
-    sha256 = "6f740f6a8af714436ef75b858944e8122490a2faa04591a201105e84bca42fa0";
+    rev = "53458838505efef91ed069d0a7d970b6b3588eba";
+    sha256 = "0fb4dxfvvqy8lnm9c91sxwn5wbcw8grfpm52zag25vrls251aih3";
  };

  patchPhase = ''
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
  buildInputs = [
    alsaLib fftwSinglePrec freetype libjack2 pkgconfig premake3
    xlibs.libX11 xlibs.libXcomposite xlibs.libXcursor xlibs.libXext
-    xlibs.libXinerama xlibs.libXrender
+    xlibs.libXinerama xlibs.libXrender ladspa-sdk
  ];

  buildPhase = ''
--- a/pkgs/applications/editors/supertux-editor/default.nix
+++ b/pkgs/applications/editors/supertux-editor/default.nix
@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, mono, gtk-sharp, pkgconfig, makeWrapper, gnome, gtk }:
+stdenv.mkDerivation rec {
+  version = "git-2014-08-20";
+  name = "supertux-editor-${version}";
+
+  src = fetchFromGitHub {
+    owner = "SuperTux";
+    repo = "supertux-editor";
+    rev = "0c666e8ccc7daf9e9720fe79abd63f8fa979c5e5";
+    sha256 = "08y5haclgxvcii3hpdvn1ah8qd0f3n8xgxxs8zryj02b8n7cz3vx";
+  };
+
+  buildInputs = [mono gtk-sharp pkgconfig makeWrapper gnome.libglade gtk ];
+
+  installPhase = ''
+    mkdir -p $out/bin $out/lib/supertux-editor
+    cp *.{dll,dll.config,exe} $out/lib/supertux-editor
+    makeWrapper "${mono}/bin/mono" $out/bin/supertux-editor \
+      --add-flags "$out/lib/supertux-editor/supertux-editor.exe" \
+      --prefix MONO_GAC_PREFIX : ${gtk-sharp} \
+      --suffix LD_LIBRARY_PATH : $(echo $NIX_LDFLAGS | sed 's/ -L/:/g;s/ -rpath /:/g;s/-rpath //')
+
+    makeWrapper "${mono}/bin/mono" $out/bin/supertux-editor-debug \
+      --add-flags "--debug $out/lib/supertux-editor/supertux-editor.exe" \
+      --prefix MONO_GAC_PREFIX : ${gtk-sharp} \
+      --suffix LD_LIBRARY_PATH : $(echo $NIX_LDFLAGS | sed 's/ -L/:/g;s/ -rpath /:/g;s/-rpath //')
+  '';
+
+  # Always needed on Mono, otherwise nothing runs
+  dontStrip = true;
+
+  meta = with stdenv.lib; {
+    description = "Level editor for SuperTux";
+    homepage = https://github.com/SuperTux/supertux-editor;
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ mathnerd314 ];
+    platforms = platforms.linux;
+  };
+}
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@ -1,17 +1,17 @@
-{ stdenv, fetchhg, ncurses, gettext, pkgconfig
+{ stdenv, fetchFromGitHub, ncurses, gettext, pkgconfig

 # apple frameworks
 , CoreServices, CoreData, Cocoa, Foundation, libobjc }:

 stdenv.mkDerivation rec {
  name = "vim-${version}";
+  version = "7.4.826";

-  version = "7.4.683";
-
-  src = fetchhg {
-    url = "https://code.google.com/p/vim/";
-    rev = "v7-4-663";
-    sha256 = "1z0qarf6a2smab28g9dnxklhfayn85wx48bnddmyhb9kqzjgqgjc";
+  src = fetchFromGitHub {
+    owner = "vim";
+    repo = "vim";
+    rev = "v${stdenv.lib.replaceChars ["."] ["-"] version}";
+    sha256 = "147lkcjdd0jbc7y2hflfzwnyjhdgi1971pmkizihybxmmj1a4g8y";
  };

  # this makes maintainers very sad
--- a/pkgs/applications/graphics/ipe/default.nix
+++ b/pkgs/applications/graphics/ipe/default.nix
@ -1,12 +1,13 @@
 { stdenv, fetchurl, pkgconfig, zlib, qt4, freetype, cairo, lua5, texLive, ghostscriptX
+, libjpeg
 , makeWrapper }:
 let ghostscript = ghostscriptX; in
 stdenv.mkDerivation rec {
-  name = "ipe-7.1.2";
+  name = "ipe-7.1.8";

  src = fetchurl {
-    url = "mirror://sourceforge/ipe7/ipe/7.1.0/${name}-src.tar.gz";
-    sha256 = "04fs5slci3bmpgz8d038h3hnzzdw57xykcpsmisdxci2xrkxx41k";
+    url = "http://github.com/otfried/ipe/raw/master/releases/7.1/${name}-src.tar.gz";
+    sha256 = "1zx6dyr1rb6m6rvawagg9f8bc2li9nbighv2dglzjbh11bxqsyva";
  };

  # changes taken from Gentoo portage
@ -21,9 +22,10 @@ stdenv.mkDerivation rec {

  IPEPREFIX="$$out";
  URWFONTDIR="${texLive}/texmf-dist/fonts/type1/urw/";
+  LUA_PACKAGE = "lua";

  buildInputs = [
-    pkgconfig zlib qt4 freetype cairo lua5 texLive ghostscript makeWrapper
+    libjpeg pkgconfig zlib qt4 freetype cairo lua5 texLive ghostscript makeWrapper
  ];

  postInstall = ''
@ -36,12 +38,14 @@ stdenv.mkDerivation rec {

  meta = {
    description = "An editor for drawing figures";
-    homepage = http://ipe7.sourceforge.net;
+    homepage = http://ipe.otfried.org;
    license = stdenv.lib.licenses.gpl3Plus;
    longDescription = ''
      Ipe is an extensible drawing editor for creating figures in PDF and Postscript format.
      It supports making small figures for inclusion into LaTeX-documents
      as well as presentations in PDF.
    '';
+    maintainers = [ stdenv.lib.maintainers.ttuegel ];
+    platforms = stdenv.lib.platforms.linux;
  };
 }
--- a/pkgs/applications/graphics/solvespace/default.nix
+++ b/pkgs/applications/graphics/solvespace/default.nix
@ -4,7 +4,7 @@
 stdenv.mkDerivation {
  name = "solvespace-2.0";
  src = fetchgit {
-    url = "https://gitorious.org/solvespace/solvespace.git";
+    url = "https://github.com/jwesthues/solvespace.git";
    sha256 = "0sakxkmj2f0k27f67wy1xz2skpnwzg15yqrf7av97pgc5s8xb3da";
    rev = "e587d0e";
  };
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@ -6,11 +6,11 @@

 stdenv.mkDerivation rec {
  name = "calibre-${version}";
-  version = "2.34.0";
+  version = "2.35.0";

  src = fetchurl {
    url = "https://github.com/kovidgoyal/calibre/releases/download/v${version}/${name}.tar.xz";
-    sha256 = "04khi2jz7jrp6ppax57648sjkczvcxfqyzlyvhw155ggmpg8fiki";
+    sha256 = "13sic0l16myvka8mgpr56h6qlpf1cwx8xlf4acp3qz6gsmz3r23x";
  };

  inherit python;
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@ -6,7 +6,7 @@ buildPythonPackage rec {

  src = fetchurl {
    url = "https://download.electrum.org/Electrum-${version}.tar.gz";
-    sha256 = "0z5ksr1wlywl4bpvxjmmqnsk7jh1jfjdz9lsjkhf2j391jx0wz9q";
+    sha256 = "0y04m5b410y3s9vqvkbvmlvvx1nr0cyvrnl41yapz8hydw9vdkjx";
  };

  propagatedBuildInputs = with pythonPackages; [
--- a/pkgs/applications/misc/pstree/default.nix
+++ b/pkgs/applications/misc/pstree/default.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl }:

 stdenv.mkDerivation rec {
-  name = "pstree-2.36";
+  name = "pstree-2.39";

  src = fetchurl {
    url = "http://www.sfr-fresh.com/unix/misc/${name}.tar.gz";
-    sha256 = "1vx4fndmkkx3bmcv71rpzjjbn24hlfs10pl99dsfhbx16a2d41cx";
+    sha256 = "17s7v15c4gryjpi11y1xq75022nkg4ggzvjlq2dkmyg67ssc76vw";
  };

  unpackPhase = "unpackFile \$src; sourceRoot=.";
--- a/pkgs/applications/misc/xiphos/default.nix
+++ b/pkgs/applications/misc/xiphos/default.nix
@ -2,7 +2,7 @@
 , python
 , intltool
 , docbook2x, docbook_xml_dtd_412, libxslt
-, sword, clucene_core
+, sword, clucene_core, biblesync
 , gnome_doc_utils
 , libgsf, gconf
 , gtkhtml, libgtkhtml, libglade, scrollkeeper
@ -12,15 +12,15 @@

 stdenv.mkDerivation rec {
  name = "xiphos-${version}";  
-  version = "4.0.0";
+  version = "4.0.3-20150806";

  src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/gnomesword/Xiphos/${version}/${name}.tar.gz";
-    sha256 = "0rk9xhnaqm17af9ppjf2yqpy9p8s0z7m5ax586b7p16lylcqjh68";
+    url = "http://downloads.sourceforge.net/project/gnomesword/Xiphos/4.0.3/${name}.tar.gz";
+    sha256 = "1xkvhpasdlda2rp0874znz158z4rjh1hpynwy13d96kjxq4npiqv";
  };

  buildInputs = [ pkgconfig python intltool docbook2x docbook_xml_dtd_412 libxslt
-                  sword clucene_core gnome_doc_utils libgsf gconf gtkhtml libgtkhtml
+                  sword clucene_core biblesync gnome_doc_utils libgsf gconf gtkhtml libgtkhtml
                  libglade scrollkeeper webkitgtk dbus_glib enchant isocodes libuuid ];

  prePatch = ''
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@ -7,10 +7,10 @@
    sha256bin64 = "1v57w8n7dxw1yb20710f0mzkvil7apyikvfp0174xb2rbr1ipwng";
  };
  beta = {
-    version = "45.0.2454.26";
-    sha256 = "0ghgvll1q6nw1ds139nmabbilagffyln7k313w1yvn707wp7yg33";
-    sha256bin32 = "0611ad202vck0zi0jcldcr4j81kd9cnabsc9kssc6m46fy5rhhbk";
-    sha256bin64 = "0bwmpl7rq2nj0jf1xqx7n1mvx9kigbvpz2f8v0azwv4nb56p9c2q";
+    version = "45.0.2454.37";
+    sha256 = "1vbkyxvr8k3hmdysh063rl5d2bmag7nq3wxysivsdmi23b1dz6l6";
+    sha256bin32 = "0b4nxijijwk0n1as9l4wf0gxmwz4qs6ag0gi11cag3yp5z5p9cgi";
+    sha256bin64 = "0l0hs2vh1bhh6bqq7453fc7hpi0lamdlzqpdhgcz64k94bi0d748";
  };
  stable = {
    version = "44.0.2403.155";
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@ -16,14 +16,14 @@

 assert stdenv.cc ? libc && stdenv.cc.libc != null;

-let version = "40.0"; in
+let version = "40.0.2"; 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 = "48483e5738182f8567e2b6d2e29bd6bc1812d3eb";
+    sha1 = "b5d79fa3684284bfeb7277e99c756b8688e8121d";
  };

  buildInputs =
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@ -41,7 +41,7 @@ stdenv.mkDerivation {
        --suffix-each LD_LIBRARY_PATH ':' "$libs" \
        --suffix-each GTK_PATH ':' "$gtk_modules" \
        --suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \
-        --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \
+        --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
        --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \
        --set MOZ_OBJDIR "$(ls -d "${browser}/lib/${browserName}"*)"

--- a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
@ -15,13 +15,13 @@ let
 in

 stdenv.mkDerivation rec {
-  name = "bluejeans-2.100.41.8";
+  name = "bluejeans-${version}";

-  version = "2.100.41.8";
+  version = "2.100.102.8";

  src = fetchurl {
-    url = "https://swdl.bluejeans.com/skinny/bjnplugin_2.100.41.8-1_amd64.deb";
-    sha256 = "013m17lpgi6nhw2df10wvrsnsjxy5n7z41ab69vj5m9h0prw9vd1";
+    url = "https://swdl.bluejeans.com/skinny/bjnplugin_${version}-1_amd64.deb";
+    sha256 = "18f8jmhxvqy1yiiwlsssj7rjlfcb41xn16hnl6wv8r8r2mmic4v8";
  };

  phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
@ -36,11 +36,11 @@ stdenv.mkDerivation rec {
      plugins=$out/lib/mozilla/plugins
      patchelf \
        --set-rpath "${rpathPlugin}" \
-        $plugins/npbjnplugin_2.100.41.8.so
+        $plugins/npbjnplugin_${version}.so

      patchelf \
        --set-rpath "${rpathInstaller}" \
-        $plugins/npbjninstallplugin_2.100.41.8.so
+        $plugins/npbjninstallplugin_${version}.so
    '';

  dontStrip = true;
@ -51,6 +51,6 @@ stdenv.mkDerivation rec {
  meta = {
    homepage = http://bluejeans.com;
    license = stdenv.lib.licenses.unfree;
-    maintainers = [ stdenv.lib.maintainers.ocharles ];
+    maintainers = with maintainers; [ ocharles kamilchm ];
  };
 }
--- a/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix
@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
    homepage = https://telegram.org/;
    license = stdenv.lib.licenses.gpl2;
    platforms = stdenv.lib.platforms.linux;
-    maintainers = stdenv.lib.maintainers.jagajaga;
+    maintainers = [ stdenv.lib.maintainers.jagajaga ];
  };
 }
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@ -4,12 +4,12 @@ with goPackages;

 buildGoPackage rec {
  name = "syncthing-${version}";
-  version = "0.11.16";
+  version = "0.11.20";
  goPackagePath = "github.com/syncthing/syncthing";
  src = fetchgit {
    url = "git://github.com/syncthing/syncthing.git";
    rev = "refs/tags/v${version}";
-    sha256 = "f9b5c2de7e2b6592cccb0222c48b9baa2497dce519824a75923d40cc722ab937";
+    sha256 = "72092f2bfaaeb8c7c9264200f7d08c5e78f670f80a018dd70477c23c0fd88619";
  };

  subPackages = [ "cmd/syncthing" ];
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
@ -333,6 +333,7 @@
  name = "libgltf-0.0.2.tar.bz2";
  md5 = "d63a9f47ab048f5009d90693d6aa6424";
  brief = true;
+  subDir = "libgltf/";
 }
 {
  name = "liblangtag-0.5.1.tar.bz2";
--- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
@ -36,4 +36,9 @@ stdenv.mkDerivation {
  enableParallelBuilding = true;

  installFlags = "prefix=$(out)";
+
+  postInstall = ''
+    # Remove inert ftdetect vim plugin and a README that's a man page subset:
+    rm -r $out/share/{doc,vim}
+  '';
 }
--- a/pkgs/applications/window-managers/spectrwm/default.nix
+++ b/pkgs/applications/window-managers/spectrwm/default.nix
@ -15,13 +15,14 @@

 stdenv.mkDerivation rec {
  name = "spectrwm-${version}";
-  version = "2.6.2";
+  version = "2.7.2";

  src = fetchurl {
-    url = "https://github.com/conformal/spectrwm/archive/SPECTRWM_2_6_2.tar.gz";
-    sha256 = "1pc9p3vwa4bsv76myqkqhp4cxspr72s5igi7cs9xrpd4xx6xc90s";
+    url = "https://github.com/conformal/spectrwm/archive/SPECTRWM_2_7_2.tar.gz";
+    sha256 = "1yssqnhxlfl1b60gziqp8c5pzs1lr8p6anrnp9ga1zfdql3b7993";
  };

+
  buildInputs = [
    libX11
    libxcb
@ -35,7 +36,7 @@ stdenv.mkDerivation rec {
    xcbutilwm
  ];

-  sourceRoot = "spectrwm-SPECTRWM_2_6_2/linux";
+  sourceRoot = "spectrwm-SPECTRWM_2_7_2/linux";
  makeFlags="PREFIX=$(out)";
  installPhase = "PREFIX=$out make install";

--- a/pkgs/data/fonts/fira-code/default.nix
+++ b/pkgs/data/fonts/fira-code/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  name = "fira-code-${version}";
-  version = "0.5";
+  version = "0.6";

  src = fetchurl {
    url = "https://github.com/tonsky/FiraCode/releases/download/${version}/FiraCode-Regular.otf";
-    sha256 = "1y2jz1v7m0q73rz9vblxgaqkgh9wpp4fp7dq21hdyfhxkk3ss6xk";
+    sha256 = "1blalxnmrxqlm5i74jhm8j29n0zsnmqi3gppxa9szjzv4x2k5s0a";
  };

  phases = [ "installPhase" ];
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@ -8,7 +8,7 @@ let

  # Annoyingly, these files are updated without a change in URL. This means that
  # builds will start failing every month or so, until the hashes are updated.
-  version = "2015-08-11";
+  version = "2015-08-17";
 in
 stdenv.mkDerivation {
  name = "geolite-legacy-${version}";
@ -27,10 +27,10 @@ stdenv.mkDerivation {
    "1fhi5vm4drfzyl29b491pr1xr2kbsr3izp9a7k5zm3zkqags2187";
  srcGeoIPASNum = fetchDB
    "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
-    "1h4wpqs16a1w16znbr2h15b16p5y43vp6qhj0bc7krq5qa484y2k";
+    "0g9i1dyvh2389q8mp6wg2xg3lm9wmh5md1cvy698pzi1y6j9wka3";
  srcGeoIPASNumv6 = fetchDB
    "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
-    "09qiy2grxnakapvz5xjw3ivbxc0id6srqyd46p68mcy7gwrggcv7";
+    "0hfiiqffw8z10lzk1l2iaqlbgi39xk3j3mrlrzxvrsj4s08zdrks";

  meta = with stdenv.lib; {
    inherit version;
--- a/pkgs/data/misc/sound-theme-freedesktop/default.nix
+++ b/pkgs/data/misc/sound-theme-freedesktop/default.nix
@ -0,0 +1,22 @@
+{ stdenv, fetchurl, intltool }:
+
+let version = "0.8"; in
+stdenv.mkDerivation rec {
+  name = "sound-theme-freedesktop-${version}";
+
+  src = fetchurl {
+    sha256 = "054abv4gmfk9maw93fis0bf605rc56dah7ys5plc4pphxqh8nlfb";
+    url = "https://people.freedesktop.org/~mccann/dist/${name}.tar.bz2";
+  };
+
+  nativeBuildInputs = [ intltool ];
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Freedesktop reference sound theme";
+    homepage = http://freedesktop.org/wiki/Specifications/sound-theme-spec;
+    # See http://cgit.freedesktop.org/sound-theme-freedesktop/tree/CREDITS:
+    license = with licenses; [ cc-by-30 cc-by-sa-25 gpl2 gpl2Plus ];
+    maintainers = with maintainers; [ nckx ];
+  };
+}
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
@ -1,10 +1,11 @@
 { fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper
-, libcanberra, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio, fontconfig
+, libcanberra, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio
 , gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify
 , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
 , cracklib, python, libkrb5, networkmanagerapplet, networkmanager
 , libwacom, samba, shared_mime_info, tzdata, icu, libtool, udev
-, docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk }:
+, docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk
+, fontconfig, sound-theme-freedesktop }:

 # http://ftp.gnome.org/pub/GNOME/teams/releng/3.10.2/gnome-suites-core-3.10.2.modules
 # TODO: bluetooth, wacom, printers
@ -17,7 +18,8 @@ stdenv.mkDerivation rec {
    sha256 = "07vvmnqjjcc0cblpr6cdmg3693hihpjrq3q30mm3q68pdyfzbjgf";
  };

-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard gnome3.libgnomekbd ];
+  propagatedUserEnvPkgs =
+    [ gnome3.gnome_themes_standard gnome3.libgnomekbd sound-theme-freedesktop ];

  # https://bugzilla.gnome.org/show_bug.cgi?id=752596
  enableParallelBuilding = false;
--- a/pkgs/development/compilers/cudatoolkit/generic.nix
+++ b/pkgs/development/compilers/cudatoolkit/generic.nix
@ -63,6 +63,11 @@ in stdenv.mkDerivation rec {

    # let's remove the 32-bit libraries, they confuse the lib64->lib mover
    rm -rf $out/lib
+
+    # Fixup path to samples (needed for cuda 6.5 or else nsight will not find them)
+    if [ -d "$out"/cuda-samples ]; then
+        mv "$out"/cuda-samples "$out"/samples
+    fi
  '';

  setupHook = ./setup-hook.sh;
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@ -0,0 +1,81 @@
+{ lib, stdenv, buildEnv, haskell, nodejs, fetchurl, fetchpatch, makeWrapper }:
+
+let
+  makeElmStuff = deps:
+    let json = builtins.toJSON (lib.mapAttrs (name: info: info.version) deps);
+        cmds = lib.mapAttrsToList (name: info: let
+                 pkg = stdenv.mkDerivation {
+
+                   name = lib.replaceChars ["/"] ["-"] name + "-${info.version}";
+
+                   src = fetchurl {
+                     url = "https://github.com/${name}/archive/${info.version}.tar.gz";
+                     meta.homepage = "https://github.com/${name}/";
+                     inherit (info) sha256;
+                   };
+
+                   phases = [ "unpackPhase" "installPhase" ];
+
+                   installPhase = ''
+                     mkdir -p $out
+                     cp -r * $out
+                   '';
+
+                 };
+               in ''
+                 mkdir -p elm-stuff/packages/${name}
+                 ln -s ${pkg} elm-stuff/packages/${name}/${info.version}
+               '') deps;
+    in ''
+      export HOME=/tmp
+      mkdir elm-stuff
+      cat > elm-stuff/exact-dependencies.json <<EOF
+      ${json}
+      EOF
+    '' + lib.concatStrings cmds;
+
+  hsPkgs = haskell.packages.ghc7102.override {
+    overrides = self: super:
+      let hlib = haskell.lib;
+          elmRelease = import ./packages/release.nix { inherit (self) callPackage; };
+          elmPkgs' = elmRelease.packages;
+          elmPkgs = elmPkgs' // {
+
+            elm-reactor = hlib.overrideCabal elmPkgs'.elm-reactor (drv: {
+              buildTools = drv.buildTools or [] ++ [ self.elm-make ];
+              patches = [ (fetchpatch {
+                url = "https://github.com/elm-lang/elm-reactor/commit/ca4d91d3fc7c6f72aa802d79fd1563ab5f3c4f2c.patch";
+                sha256 = "1msq7rvjid27m11lwcz9r1vyczlk7bfknyywqln300c8bgqyl45j";
+              }) ];
+              preConfigure = makeElmStuff (import ./packages/elm-reactor-elm.nix);
+            });
+
+            elm-package = hlib.appendPatch elmPkgs'.elm-package (fetchpatch {
+              url = "https://github.com/elm-lang/elm-package/commit/af517f2ffe15f8ec1d8c38f01ce188bbdefea47a.patch";
+              sha256 = "0yq5vawmp9qq5w6qfy12r32ahpvccra749pnhg0zdykrj369m8a8";
+            });
+
+            elm-repl = hlib.overrideCabal elmPkgs'.elm-repl (drv: {
+              doCheck = false;
+              buildTools = drv.buildTools or [] ++ [ makeWrapper ];
+              postInstall =
+                let bins = lib.makeSearchPath "bin" [ nodejs self.elm-make ];
+                in ''
+                  wrapProgram $out/bin/elm-repl \
+                    --prefix PATH ':' ${bins}
+                '';
+            });
+
+          };
+      in elmPkgs // {
+        inherit elmPkgs;
+        elmVersion = elmRelease.version;
+      };
+  };
+in hsPkgs.elmPkgs // {
+  elm = buildEnv {
+    name = "elm-${hsPkgs.elmVersion}";
+    paths = lib.mapAttrsToList (name: pkg: pkg) hsPkgs.elmPkgs;
+    pathsToLink = [ "/bin" ];
+  };
+}
--- a/pkgs/development/compilers/elm/elm2nix.rb
+++ b/pkgs/development/compilers/elm/elm2nix.rb
@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+
+require 'json'
+
+system("elm-package install -y")
+depsSrc = JSON.parse(File.read("elm-stuff/exact-dependencies.json"))
+deps = Hash[ depsSrc.map { |pkg, ver|
+  url = "https://github.com/#{pkg}/archive/#{ver}.tar.gz"
+  sha256 = `nix-prefetch-url #{url}`
+
+  [ pkg, { version: ver,
+           sha256: sha256.strip
+         }
+  ]
+} ]
+
+File.open("package.nix", 'w') do |file|
+  file.puts "{"
+    for pkg, info in deps
+      file.puts "  \"#{pkg}\" = {"
+      file.puts "    version = \"#{info[:version]}\";"
+      file.puts "    sha256 = \"#{info[:sha256]}\";"
+      file.puts "  };"
+    end
+  file.puts "}"
+end
--- a/pkgs/development/compilers/elm/packages/elm-compiler.nix
+++ b/pkgs/development/compilers/elm/packages/elm-compiler.nix
@ -0,0 +1,37 @@
+{ mkDerivation, aeson, aeson-pretty, ansi-terminal, base, binary
+, blaze-html, blaze-markup, bytestring, cmdargs, containers
+, directory, edit-distance, fetchgit, filemanip, filepath, HUnit
+, indents, language-ecmascript, language-glsl, mtl, parsec, pretty
+, process, QuickCheck, stdenv, test-framework, test-framework-hunit
+, test-framework-quickcheck2, text, transformers, union-find
+, unordered-containers
+}:
+mkDerivation {
+  pname = "elm-compiler";
+  version = "0.15.1";
+  src = fetchgit {
+    url = "https://github.com/elm-lang/elm-compiler";
+    sha256 = "379a38db4f240ab206a2bbedc49d4768d7cf6fdf497b2d25dea71fca1d58efaa";
+    rev = "7fbdee067b494c0298d07c944629aaa5d3fa82f5";
+  };
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    aeson aeson-pretty ansi-terminal base binary blaze-html
+    blaze-markup bytestring cmdargs containers directory edit-distance
+    filepath indents language-ecmascript language-glsl mtl parsec
+    pretty process text transformers union-find unordered-containers
+  ];
+  testDepends = [
+    aeson aeson-pretty ansi-terminal base binary blaze-html
+    blaze-markup bytestring cmdargs containers directory edit-distance
+    filemanip filepath HUnit indents language-ecmascript language-glsl
+    mtl parsec pretty process QuickCheck test-framework
+    test-framework-hunit test-framework-quickcheck2 text transformers
+    union-find
+  ];
+  jailbreak = true;
+  homepage = "http://elm-lang.org";
+  description = "Values to help with elm-package, elm-make, and elm-lang.org.";
+  license = stdenv.lib.licenses.bsd3;
+}
--- a/pkgs/development/compilers/elm/packages/elm-make.nix
+++ b/pkgs/development/compilers/elm/packages/elm-make.nix
@ -0,0 +1,25 @@
+{ mkDerivation, aeson, ansi-wl-pprint, base, binary, blaze-html
+, blaze-markup, bytestring, containers, directory, elm-compiler
+, elm-package, fetchgit, filepath, mtl, optparse-applicative
+, stdenv, text
+}:
+mkDerivation {
+  pname = "elm-make";
+  version = "0.2";
+  src = fetchgit {
+    url = "https://github.com/elm-lang/elm-make";
+    sha256 = "b618e827ca01ddeae38624f4bf5baa3dc4cb6e9e3c9bf15f2dda5a7c756bca33";
+    rev = "d9bedfdadc9cefce8e5249db6a316a5e712158d0";
+  };
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    aeson ansi-wl-pprint base binary blaze-html blaze-markup bytestring
+    containers directory elm-compiler elm-package filepath mtl
+    optparse-applicative text
+  ];
+  jailbreak = true;
+  homepage = "http://elm-lang.org";
+  description = "A build tool for Elm projects";
+  license = stdenv.lib.licenses.bsd3;
+}
--- a/pkgs/development/compilers/elm/packages/elm-package.nix
+++ b/pkgs/development/compilers/elm/packages/elm-package.nix
@ -0,0 +1,27 @@
+{ mkDerivation, aeson, aeson-pretty, ansi-wl-pprint, base, binary
+, bytestring, containers, directory, elm-compiler, fetchgit
+, filepath, HTTP, http-client, http-client-tls, http-types, mtl
+, network, optparse-applicative, pretty, process, stdenv, text
+, time, unordered-containers, vector, zip-archive
+}:
+mkDerivation {
+  pname = "elm-package";
+  version = "0.5.1";
+  src = fetchgit {
+    url = "https://github.com/elm-lang/elm-package";
+    sha256 = "0d69e68831f4a86c6c02aed33fc3a6aca87636a7fb0bb6e39ffc74ddd15b5435";
+    rev = "365e2d86a8222c92e50951c7d30b3c5db44c383d";
+  };
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    aeson aeson-pretty ansi-wl-pprint base binary bytestring containers
+    directory elm-compiler filepath HTTP http-client http-client-tls
+    http-types mtl network optparse-applicative pretty process text
+    time unordered-containers vector zip-archive
+  ];
+  jailbreak = true;
+  homepage = "http://github.com/elm-lang/elm-package";
+  description = "Package manager for Elm libraries";
+  license = stdenv.lib.licenses.bsd3;
+}
--- a/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix
+++ b/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix
@ -0,0 +1,18 @@
+{
+  "evancz/virtual-dom" = {
+    version = "1.2.3";
+    sha256 = "03iv9fpng3gvia00v3gl8rs83j5b112hx0vm36az13zjr378b1jr";
+  };
+  "evancz/elm-markdown" = {
+    version = "1.1.5";
+    sha256 = "01vdaz56i064lah7kd8485j0y33di8wa134sr4292wb3na990a8r";
+  };
+  "evancz/elm-html" = {
+    version = "3.0.0";
+    sha256 = "0a2iw45x3qwxkgibkc6qx1csfa06gpkfc9b04vkq1h7ynw2g5577";
+  };
+  "elm-lang/core" = {
+    version = "2.1.0";
+    sha256 = "10fg7bcc310b5bwv6sq7gjhy9r5xzc98nbk4zhs4jqykn36i6l43";
+  };
+}
--- a/pkgs/development/compilers/elm/packages/elm-reactor.nix
+++ b/pkgs/development/compilers/elm/packages/elm-reactor.nix
@ -0,0 +1,27 @@
+{ mkDerivation, base, blaze-html, blaze-markup, bytestring, cmdargs
+, containers, directory, elm-compiler, fetchgit, filepath, fsnotify
+, HTTP, mtl, process, snap-core, snap-server, stdenv
+, system-filepath, text, time, transformers, unordered-containers
+, websockets, websockets-snap
+}:
+mkDerivation {
+  pname = "elm-reactor";
+  version = "0.3.2";
+  src = fetchgit {
+    url = "https://github.com/elm-lang/elm-reactor";
+    sha256 = "a7775971ea6634f13436f10098c462d39c6e115dbda79e537831a71975451e9a";
+    rev = "b6c11be539734e72015ce151a9189d06dfc9db76";
+  };
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    base blaze-html blaze-markup bytestring cmdargs containers
+    directory elm-compiler filepath fsnotify HTTP mtl process snap-core
+    snap-server system-filepath text time transformers
+    unordered-containers websockets websockets-snap
+  ];
+  jailbreak = true;
+  homepage = "http://elm-lang.org";
+  description = "Interactive development tool for Elm programs";
+  license = stdenv.lib.licenses.bsd3;
+}
--- a/pkgs/development/compilers/elm/packages/elm-repl.nix
+++ b/pkgs/development/compilers/elm/packages/elm-repl.nix
@ -0,0 +1,30 @@
+{ mkDerivation, base, binary, bytestring, bytestring-trie, cmdargs
+, containers, directory, elm-compiler, elm-package, fetchgit
+, filepath, haskeline, HUnit, mtl, parsec, process, QuickCheck
+, stdenv, test-framework, test-framework-hunit
+, test-framework-quickcheck2
+}:
+mkDerivation {
+  pname = "elm-repl";
+  version = "0.4.2";
+  src = fetchgit {
+    url = "https://github.com/elm-lang/elm-repl";
+    sha256 = "a6eadbef7886c4c65243723f101910909bb0d53b2c48454ed7b39cf700f9649c";
+    rev = "0c434fdb24b86a93b06c33c8f26857ce47caf165";
+  };
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    base binary bytestring bytestring-trie cmdargs containers directory
+    elm-compiler elm-package filepath haskeline mtl parsec process
+  ];
+  testDepends = [
+    base bytestring bytestring-trie cmdargs directory elm-compiler
+    elm-package filepath haskeline HUnit mtl parsec process QuickCheck
+    test-framework test-framework-hunit test-framework-quickcheck2
+  ];
+  jailbreak = true;
+  homepage = "https://github.com/elm-lang/elm-repl";
+  description = "a REPL for Elm";
+  license = stdenv.lib.licenses.bsd3;
+}
--- a/pkgs/development/compilers/elm/packages/release.nix
+++ b/pkgs/development/compilers/elm/packages/release.nix
@ -0,0 +1,11 @@
+{ callPackage }:
+{
+  version = "0.15.1";
+  packages = {
+    elm-compiler = callPackage ./elm-compiler.nix { };
+    elm-package = callPackage ./elm-package.nix { };
+    elm-make = callPackage ./elm-make.nix { };
+    elm-reactor = callPackage ./elm-reactor.nix { };
+    elm-repl = callPackage ./elm-repl.nix { };
+  };
+}
--- a/pkgs/development/compilers/elm/update-elm.rb
+++ b/pkgs/development/compilers/elm/update-elm.rb
@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+
+# Take those from https://github.com/elm-lang/elm-platform/blob/master/installers/BuildFromSource.hs
+$elm_version = "0.15.1"
+$elm_packages = { "elm-compiler" => "0.15.1",
+                  "elm-package" => "0.5.1",
+                  "elm-make" => "0.2",
+                  "elm-reactor" => "0.3.2",
+                  "elm-repl" => "0.4.2"
+                }
+
+for pkg, ver in $elm_packages
+  system "cabal2nix https://github.com/elm-lang/#{pkg} --revision refs/tags/#{ver} --jailbreak > #{pkg}.nix"
+end
+
+File.open("release.nix", 'w') do |file|
+  file.puts "{"
+  file.puts "  version = \"#{$elm_version}\";"
+  file.puts "  packages = {"
+  for pkg, ver in $elm_packages
+    file.puts "    #{pkg} = callPackage ./#{pkg}.nix { };"
+  end
+  file.puts "  };"
+  file.puts "}"
+end
--- a/pkgs/development/compilers/llvm/3.5/clang.nix
+++ b/pkgs/development/compilers/llvm/3.5/clang.nix
@ -5,7 +5,7 @@ in stdenv.mkDerivation {
  name = "clang-${version}";

  unpackPhase = ''
-    unpackFile ${fetch "cfe" "12yv3jwdjcbkrx7zjm8wh4jrvb59v8fdw4mnmz3zc1jb00p9k07w"}
+    unpackFile ${fetch "cfe" "0846h8vn3zlc00jkmvrmy88gc6ql6014c02l4jv78fpvfigmgssg"}
    mv cfe-${version}.src clang
    sourceRoot=$PWD/clang
    unpackFile ${clang-tools-extra_src}
--- a/pkgs/development/compilers/llvm/3.5/default.nix
+++ b/pkgs/development/compilers/llvm/3.5/default.nix
@ -2,7 +2,7 @@
 let
  callPackage = newScope (self // { inherit stdenv isl version fetch; });

-  version = "3.5.0";
+  version = "3.5.2";

  fetch = fetch_v version;
  fetch_v = ver: name: sha256: fetchurl {
@ -10,18 +10,18 @@ let
    inherit sha256;
  };

-  compiler-rt_src = fetch "compiler-rt" "0dl1kbrhz96djsxqr61iw5h788s7ncfpfb7aayixky1bhdaydcx4";
-  clang-tools-extra_src = fetch "clang-tools-extra" "0s8zjgxg8bj15nnqcw1cj1zffcralhh7f0gda1famddgg2rvx099";
+  compiler-rt_src = fetch "compiler-rt" "1hsdnzzdr5kglz6fnv3lcsjs222zjsy14y8ax9dy6zqysanplbal";
+  clang-tools-extra_src = fetch "clang-tools-extra" "01607w6hdf1pjgaapn9fy6smk22i3d4ncqjlhk4xi55ifi6kf6pj";

  self = {
    llvm = callPackage ./llvm.nix rec {
-      version = "3.5.0";
+      version = "3.5.2";
      fetch = fetch_v version;
      inherit compiler-rt_src;
    };

    clang = callPackage ./clang.nix rec {
-      version = "3.5.0";
+      version = "3.5.2";
      fetch = fetch_v version;
      inherit clang-tools-extra_src;
    };
@ -37,5 +37,7 @@ let
    libcxx = callPackage ./libc++ { stdenv = pkgs.clangStdenv; };

    libcxxabi = callPackage ./libc++abi { stdenv = pkgs.clangStdenv; };
+
+    #openmp = callPackage ./openmp {};
  };
 in self
--- a/pkgs/development/compilers/llvm/3.5/dragonegg.nix
+++ b/pkgs/development/compilers/llvm/3.5/dragonegg.nix
@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
  name = "dragonegg-${version}";

-  src = fetch "dragonegg" "1v1lc9h2nfk3lsk9sx1k4ckwddz813hqjmlp2bx2kwxx9hw364ar";
+  src = fetch "dragonegg" "1va4wv2b1dj0dpzsksnpnd0jic52q7pqj79w3m9jwdb58h7104dw";

  # The gcc the plugin will be built for (the same used building dragonegg)
  GCC = "gcc";
--- a/pkgs/development/compilers/llvm/3.5/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/3.5/libc++/default.nix
@ -1,13 +1,13 @@
 { lib, stdenv, fetchurl, cmake, libcxxabi, fixDarwinDylibNames }:

-let version = "3.5.0"; in
+let version = "3.5.2"; in

 stdenv.mkDerivation rec {
  name = "libc++-${version}";

  src = fetchurl {
    url = "http://llvm.org/releases/${version}/libcxx-${version}.src.tar.xz";
-    sha256 = "1h5is2jd802344kddm45jcm7bra51llsiv9r34h0rrb3ba2dlic0";
+    sha256 = "0irnl54fwzh2hzn9x4jfvnfyq5kd0zn0iwbzdivgwhqzw6fjdwdv";
  };

  # instead of allowing libc++ to link with /usr/lib/libc++abi.dylib,
--- a/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix
+++ b/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix
@ -1,7 +1,7 @@
 { stdenv, cmake, fetchurl, libcxx, libunwind, llvm }:

 let
-  version = "3.5.0";
+  version = "3.5.2";
  cmakeLists = fetchurl {
    name   = "CMakeLists.txt";
    url    = "http://llvm.org/svn/llvm-project/libcxxabi/trunk/CMakeLists.txt?p=217324";
@ -12,7 +12,7 @@ in stdenv.mkDerivation {

  src = fetchurl {
    url    = "http://llvm.org/releases/${version}/libcxxabi-${version}.src.tar.xz";
-    sha256 = "1ndcpw3gfrzh7m1jac2qadhkrqgvb65cns69j9niydyj5mmbxijk";
+    sha256 = "1c6rv0zx0na1w4hdmdfq2f6nj7limb7d1krrknwajxxkcn4yws92";
  };

  buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin) libunwind;
--- a/pkgs/development/compilers/llvm/3.5/lld.nix
+++ b/pkgs/development/compilers/llvm/3.5/lld.nix
@ -3,7 +3,7 @@
 stdenv.mkDerivation {
  name = "lld-${version}";

-  src = fetch "lld" "1sd4scqynryfrmcc4h0ljgwn2dgjmbbmf38z50ya6l0janpd2nxx";
+  src = fetch "lld" "1hpqawg1sc8mdqxqaxqmlzbrn69w1pkj8rxhjgqgmwra6c0xky89";

  preUnpack = ''
    # !!! Hopefully won't be needed for 3.5
--- a/pkgs/development/compilers/llvm/3.5/lldb.nix
+++ b/pkgs/development/compilers/llvm/3.5/lldb.nix
@ -15,7 +15,7 @@
 stdenv.mkDerivation {
  name = "lldb-${version}";

-  src = fetch "lldb" "0h8cmjrhjhigk7k2qll1pcf6jfgmbdzkzfz2i048pkfg851s0x44";
+  src = fetch "lldb" "0ffi9jn4k3yd0hvxs1v4n710x8siq21lb49v3351d7j5qinrpgi7";

  patchPhase = ''
    sed -i 's|/usr/bin/env||' \
--- a/pkgs/development/compilers/llvm/3.5/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.5/llvm.nix
@ -15,7 +15,7 @@
 }:

 let
-  src = fetch "llvm" "00swb43mzlvda8306arlg2jw7g6k3acwfccgf1k4c2pgd3rrkq98";
+  src = fetch "llvm" "0xf5q17kkxsrm2gsi93h4pwlv663kji73r2g4asb97klsmb626a4";
 in stdenv.mkDerivation rec {
  name = "llvm-${version}";

--- a/pkgs/development/compilers/llvm/3.5/polly.nix
+++ b/pkgs/development/compilers/llvm/3.5/polly.nix
@ -3,7 +3,7 @@
 stdenv.mkDerivation {
  name = "polly-${version}";

-  src =  fetch "polly" "1rqflmgzg1vzjm0r32c5ck8x3q0qm3g0hh8ggbjazh6x7nvmy6ll";
+  src =  fetch "polly" "1s6v54czmgq626an4yk2k34lrzkwmz1bjrbiafh7j23yc2w4nalx";

  patches = [ ./polly-separate-build.patch ];

--- a/pkgs/development/compilers/uhc/default.nix
+++ b/pkgs/development/compilers/uhc/default.nix
@ -50,5 +50,6 @@ in stdenv.mkDerivation rec {
    # On Darwin, the GNU libtool is used, which does not
    # support the -static flag and thus breaks the build.
    platforms = ["x86_64-linux"];
+    broken = true; # https://github.com/UU-ComputerScience/uhc/issues/60
  };
 }
--- a/pkgs/development/compilers/urweb/default.nix
+++ b/pkgs/development/compilers/urweb/default.nix
@ -2,12 +2,12 @@

 stdenv.mkDerivation rec {
  pname = "urweb";
-  version = "20150214";
+  version = "20150520";
  name = "${pname}-${version}";

  src = fetchurl {
    url = "http://www.impredicative.com/ur/${name}.tgz";
-    sha256 = "f7b7587fe72c04f14581ded11588777f7bb61e392634966cc0354e13d69f236d";
+    sha256 = "06pl6z4sh5fvh72drz4bp70yynr4i1rawc97ww5wag8976dirwrm";
  };

  buildInputs = [ stdenv.cc file openssl mlton mysql postgresql sqlite ];
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -37,11 +37,6 @@ self: super: {
  # Use the default version of mysql to build this package (which is actually mariadb).
  mysql = super.mysql.override { mysql = pkgs.mysql.lib; };

-  # Please also remove optparse-applicative special case from
-  # cabal2nix/hackage2nix.hs when removing the following.
-  elm-make = super.elm-make.override { optparse-applicative = self.optparse-applicative_0_10_0; };
-  elm-package = super.elm-package.override { optparse-applicative = self.optparse-applicative_0_10_0; };
-
  # Link the proper version.
  zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; };

@ -171,7 +166,7 @@ self: super: {
  # Jailbreak doesn't get the job done because the Cabal file uses conditionals a lot.
  darcs = (overrideCabal super.darcs (drv: {
    doCheck = false;            # The test suite won't even start.
-    patchPhase = "sed -i -e 's|attoparsec .*,|attoparsec,|' darcs.cabal";
+    patchPhase = "sed -i -e 's|attoparsec .*,|attoparsec,|' -e 's|vector .*,|vector,|' darcs.cabal";
  })).overrideScope (self: super: { zlib = self.zlib_0_5_4_2; });

  # https://github.com/massysett/rainbox/issues/1
@ -319,6 +314,7 @@ self: super: {
  xkbcommon = dontCheck super.xkbcommon;
  xmlgen = dontCheck super.xmlgen;
  ide-backend = dontCheck super.ide-backend;
+  msgpack-rpc = dontCheck super.msgpack-rpc;

  # These packages try to access the network.
  amqp = dontCheck super.amqp;
@ -398,7 +394,6 @@ self: super: {
  dotfs = dontCheck super.dotfs;                        # http://hydra.cryp.to/build/498599/log/raw
  DRBG = dontCheck super.DRBG;                          # http://hydra.cryp.to/build/498245/nixlog/1/raw
  either-unwrap = dontCheck super.either-unwrap;        # http://hydra.cryp.to/build/498782/log/raw
-  elm-repl = dontCheck super.elm-repl;                  # http://hydra.cryp.to/build/501878/nixlog/1/raw
  etcd = dontCheck super.etcd;
  fb = dontCheck super.fb;                              # needs credentials for Facebook
  fptest = dontCheck super.fptest;                      # http://hydra.cryp.to/build/499124/log/raw
@ -406,7 +401,6 @@ self: super: {
  ghc-events-parallel = dontCheck super.ghc-events-parallel;    # http://hydra.cryp.to/build/496828/log/raw
  ghcid = dontCheck super.ghcid;
  ghc-imported-from = dontCheck super.ghc-imported-from;
-  ghc-mod = dontCheck super.ghc-mod;                    # http://hydra.cryp.to/build/499674/log/raw
  ghc-parmake = dontCheck super.ghc-parmake;
  gitlib-cmdline = dontCheck super.gitlib-cmdline;
  git-vogue = dontCheck super.git-vogue;
@ -788,6 +782,11 @@ self: super: {
  singletons = markBroken super.singletons;
  units-attoparsec = dontDistribute super.units-attoparsec;
  ihaskell-widgets = dontDistribute super.ihaskell-widgets;
+  exinst-bytes = dontDistribute super.exinst-bytes;
+  exinst-deepseq = dontDistribute super.exinst-deepseq;
+  exinst-aeson = dontDistribute super.exinst-aeson;
+  exinst = dontDistribute super.exinst;
+  exinst-hashable = dontDistribute super.exinst-hashable;

  # https://github.com/anton-k/temporal-music-notation/issues/1
  temporal-music-notation = markBroken super.temporal-music-notation;
@ -814,9 +813,6 @@ self: super: {
  # https://github.com/kkardzis/curlhs/issues/6
  curlhs = dontCheck super.curlhs;

-  # This needs the latest version of errors to compile.
-  pipes-errors = super.pipes-errors.override { errors = self.errors_2_0_0; };
-
  # https://github.com/hvr/token-bucket/issues/3
  token-bucket = dontCheck super.token-bucket;

@ -829,9 +825,6 @@ self: super: {
  # FPCO's fork of Cabal won't succeed its test suite.
  Cabal-ide-backend = dontCheck super.Cabal-ide-backend;

-  # https://github.com/DanielG/cabal-helper/issues/2
-  cabal-helper = overrideCabal super.cabal-helper (drv: { preCheck = "export HOME=$TMPDIR"; });
-
  # https://github.com/ekmett/comonad/issues/25
  comonad = dontCheck super.comonad;

@ -904,7 +897,93 @@ self: super: {
  # https://github.com/liyang/thyme/issues/36
  thyme = dontCheck super.thyme;

+  # https://github.com/k0ral/hbro/issues/15
+  hbro = markBroken super.hbro;
+  hbro-contrib = dontDistribute super.hbro-contrib;
+
  # https://github.com/aka-bash0r/multi-cabal/issues/4
  multi-cabal = markBroken super.multi-cabal;

+  # Elm is no longer actively maintained on Hackage: https://github.com/NixOS/nixpkgs/pull/9233.
+  Elm = markBroken super.Elm;
+  elm-build-lib = markBroken super.elm-build-lib;
+  elm-compiler = markBroken super.elm-compiler;
+  elm-get = markBroken super.elm-get;
+  elm-make = markBroken super.elm-make;
+  elm-package = markBroken super.elm-package;
+  elm-reactor = markBroken super.elm-reactor;
+  elm-repl = markBroken super.elm-repl;
+  elm-server = markBroken super.elm-server;
+  elm-yesod = markBroken super.elm-yesod;
+
+  # https://github.com/GaloisInc/HaNS/pull/8
+  hans = appendPatch super.hans ./patches/hans-disable-webserver.patch;
+
+  # https://github.com/yi-editor/yi/issues/776
+  yi = markBroken super.yi;
+  yi-monokai = dontDistribute super.yi-monokai;
+  yi-snippet = dontDistribute super.yi-snippet;
+  yi-solarized = dontDistribute super.yi-solarized;
+  yi-spolsky = dontDistribute super.yi-spolsky;
+
+  # https://github.com/athanclark/commutative/issues/1
+  commutative = dontCheck super.commutative;
+
+  # https://github.com/athanclark/set-with/issues/1
+  set-with = dontCheck super.set-with;
+
+  # https://github.com/athanclark/sets/issues/1
+  sets = dontCheck super.sets;
+
+  # https://github.com/lens/lens-aeson/issues/18
+  lens-aeson = dontCheck super.lens-aeson;
+
+  # Byte-compile elisp code for Emacs.
+  ghc-mod = overrideCabal super.ghc-mod (drv: {
+    preCheck = "export HOME=$TMPDIR";
+    testToolDepends = drv.testToolDepends or [] ++ [self.cabal-install];
+    doCheck = false;            # https://github.com/kazu-yamamoto/ghc-mod/issues/335
+    executableToolDepends = drv.executableToolDepends or [] ++ [pkgs.emacs];
+    postInstall = ''
+      local lispdir=( "$out/share/"*"-${self.ghc.name}/${drv.pname}-${drv.version}/elisp" )
+      make -C $lispdir
+      mkdir -p $out/share/emacs/site-lisp
+      ln -s "$lispdir/"*.el{,c} $out/share/emacs/site-lisp/
+    '';
+  });
+
+  # Byte-compile elisp code for Emacs.
+  structured-haskell-mode = overrideCabal super.structured-haskell-mode (drv: {
+    executableToolDepends = drv.executableToolDepends or [] ++ [pkgs.emacs];
+    postInstall = ''
+      local lispdir=( "$out/share/"*"-${self.ghc.name}/${drv.pname}-${drv.version}/elisp" )
+      pushd >/dev/null $lispdir
+      for i in *.el; do
+        emacs -Q -L . -L ${pkgs.emacs24Packages.haskellMode}/share/emacs/site-lisp \
+          --batch --eval "(byte-compile-disable-warning 'cl-functions)" \
+          -f batch-byte-compile $i
+      done
+      popd >/dev/null
+      mkdir -p $out/share/emacs
+      ln -s $lispdir $out/share/emacs/site-lisp
+    '';
+  });
+
+  # Byte-compile elisp code for Emacs.
+  hindent = overrideCabal super.hindent (drv: {
+    executableToolDepends = drv.executableToolDepends or [] ++ [pkgs.emacs];
+    postInstall = ''
+      local lispdir=( "$out/share/"*"-${self.ghc.name}/${drv.pname}-${drv.version}/elisp" )
+      pushd >/dev/null $lispdir
+      for i in *.el; do
+        emacs -Q -L . -L ${pkgs.emacs24Packages.haskellMode}/share/emacs/site-lisp \
+          --batch --eval "(byte-compile-disable-warning 'cl-functions)" \
+          -f batch-byte-compile $i
+      done
+      popd >/dev/null
+      mkdir -p $out/share/emacs
+      ln -s $lispdir $out/share/emacs/site-lisp
+    '';
+  });
+
 }
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@ -203,15 +203,6 @@ self: super: {
  pell = dontDistribute super.pell;
  quadratic-irrational = dontDistribute super.quadratic-irrational;

-  # https://github.com/kazu-yamamoto/ghc-mod/issues/437
-  ghc-mod = markBroken super.ghc-mod;
-  HaRe = dontDistribute super.HaRe;
-  ghc-imported-from = dontDistribute super.ghc-imported-from;
-  git-vogue = dontDistribute super.git-vogue;
-  haskell-token-utils = dontDistribute super.haskell-token-utils;
-  hbb = dontDistribute super.hbb;
-  hsdev = dontDistribute super.hsdev;
-
  # https://github.com/lymar/hastache/issues/47
  hastache = dontCheck super.hastache;

@ -234,10 +225,10 @@ self: super: {
  containers_0_4_2_1 = markBroken super.containers_0_4_2_1;
  control-monad-free_0_5_3 = markBroken super.control-monad-free_0_5_3;
  haddock-api_2_15_0_2 = markBroken super.haddock-api_2_15_0_2;
-  optparse-applicative_0_10_0 = markBroken super.optparse-applicative_0_10_0;
  QuickCheck_1_2_0_1 = markBroken super.QuickCheck_1_2_0_1;
  seqid-streams_0_1_0 = markBroken super.seqid-streams_0_1_0;
-  vector_0_10_9_3 = markBroken super.vector_0_10_9_3;
+  vector_0_10_9_2 = markBroken super.vector_0_10_9_2;
+  hoopl_3_10_2_0 = markBroken super.hoopl_3_10_2_0;

  # http://hub.darcs.net/shelarcy/regex-tdfa-text/issue/1 -- upstream seems to be asleep
  regex-tdfa-text = appendPatch super.regex-tdfa-text ./patches/regex-tdfa-text.patch;
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@ -91,4 +91,9 @@ self: super: {
  # blaze-builder requires an additional build input on older compilers.
  blaze-builder = addBuildDepend super.blaze-builder super.bytestring-builder;

+  # available convertible package won't build with the available
+  # bytestring and ghc-mod won't build without convertible
+  convertible = markBroken super.convertible;
+  ghc-mod = markBroken super.ghc-mod;
+
 }
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
--- a/pkgs/development/haskell-modules/patches/hans-disable-webserver.patch
+++ b/pkgs/development/haskell-modules/patches/hans-disable-webserver.patch
@ -0,0 +1,11 @@
+diff -Naur hans-2.5.0.0/hans.cabal hans-2.5.0.1/hans.cabal
+--- hans-2.5.0.0/hans.cabal     2015-08-06 14:48:45.453072822 +0300
+++ hans-2.5.0.1/hans.cabal     2015-08-06 14:49:13.044391528 +0300
+@@ -30,6 +30,7 @@
+         description:    Build the example program
+
+ flag web-server
+        default:        False
+         description:    Build a simple web-server example
+
+ flag word32-in-random
--- a/pkgs/development/interpreters/python/wrapper.nix
+++ b/pkgs/development/interpreters/python/wrapper.nix
@ -6,28 +6,40 @@
 # Create a python executable that knows about additional packages.
 let
  recursivePthLoader = import ../../python-modules/recursive-pth-loader/default.nix { stdenv = stdenv; python = python; };
-in
-(buildEnv {
-  name = "${python.name}-env";
-  paths = stdenv.lib.filter (x : x ? pythonPath) (stdenv.lib.closePropagation extraLibs) ++ [ python recursivePthLoader ];
+  env = (buildEnv {
+    name = "${python.name}-env";
+    paths = stdenv.lib.filter (x : x ? pythonPath) (stdenv.lib.closePropagation extraLibs) ++ [ python recursivePthLoader ];

-  inherit ignoreCollisions;
+    inherit ignoreCollisions;

-  postBuild = ''
-    . "${makeWrapper}/nix-support/setup-hook"
+    postBuild = ''
+      . "${makeWrapper}/nix-support/setup-hook"

-    if [ -L "$out/bin" ]; then
-        unlink "$out/bin"
-    fi
-    mkdir -p "$out/bin"
+      if [ -L "$out/bin" ]; then
+          unlink "$out/bin"
+      fi
+      mkdir -p "$out/bin"

-    cd "${python}/bin"
-    for prg in *; do
-      rm -f "$out/bin/$prg"
-      makeWrapper "${python}/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out"
-    done
-  '' + postBuild;
-}) // {
-  inherit python;
-  inherit (python) meta;
-}
+      cd "${python}/bin"
+      for prg in *; do
+        rm -f "$out/bin/$prg"
+        makeWrapper "${python}/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out"
+      done
+    '' + postBuild;
+
+    passthru.env = stdenv.mkDerivation {
+      name = "interactive-${python.name}-environment";
+      nativeBuildInputs = [ env ];
+
+      buildCommand = ''
+        echo >&2 ""
+        echo >&2 "*** Python 'env' attributes are intended for interactive nix-shell sessions, not for building! ***"
+        echo >&2 ""
+        exit 1
+      '';
+    };
+  }) // {
+    inherit python;
+    inherit (python) meta;
+  };
+in env
--- a/pkgs/development/libraries/biblesync/default.nix
+++ b/pkgs/development/libraries/biblesync/default.nix
@ -0,0 +1,32 @@
+{ stdenv, fetchurl, pkgconfig, cmake, libuuid }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec{
+
+  name = "biblesync-${version}";
+  version = "1.1.2";
+
+  src = fetchurl{
+    url = "http://downloads.sourceforge.net/project/gnomesword/BibleSync/1.1.2/${name}.tar.gz";
+    sha256 = "0190q2da0ppif2242lahl8xfz01n9sijy60aq1a0545qcp0ilvl8";
+  };
+
+  buildInputs = [ pkgconfig cmake libuuid ];
+
+  meta = {
+    homepage = http://www.crosswire.org/wiki/BibleSync;
+    description = "A multicast protocol to Bible software shared conavigation";
+    longDescription = ''
+      BibleSync is a multicast protocol to support Bible software
+      shared co-navigation. It uses LAN multicast in either a
+      personal/small team mutual navigation motif or in a classroom
+      environment where there are Speakers plus the Audience. The
+      library implementing the protocol is a single C++ class
+      providing a complete yet minimal public interface to support
+      mode setting, setup for packet reception, transmit on local
+      navigation, and handling of incoming packets.
+    '';
+    license = licenses.publicDomain;
+    maintainers = [ maintainers.AndersonTorres ]; 
+  };
+}
--- a/pkgs/development/libraries/libpipeline/default.nix
+++ b/pkgs/development/libraries/libpipeline/default.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libpipeline-1.4.0";
+  name = "libpipeline-1.4.1";
  
  src = fetchurl {
    url = "mirror://savannah/libpipeline/${name}.tar.gz";
-    sha256 = "1dlvp2mxlhg5zbj509kc60h7g39hpgwkzkpdf855cyzizgkmkivr";
+    sha256 = "1vmrs4nvdsmb550bk10cankrd42ffczlibpsnafxpak306rdfins";
  };

  meta = with stdenv.lib; {
--- a/pkgs/development/libraries/science/math/metis/default.nix
+++ b/pkgs/development/libraries/science/math/metis/default.nix
@ -0,0 +1,20 @@
+{ stdenv, fetchurl, unzip, cmake }:
+
+stdenv.mkDerivation {
+  name = "metis-5.1.0";
+
+  src = fetchurl {
+    url = "http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.1.0.tar.gz";
+    sha256 = "1cjxgh41r8k6j029yxs8msp3z6lcnpm16g5pvckk35kc7zhfpykn";
+  };
+
+  cmakeFlags = [ "-DGKLIB_PATH=../GKlib" ];
+  buildInputs = [ unzip cmake ];
+
+  meta = {
+    description = "Serial graph partitioning and fill-reducing matrix ordering";
+    homepage = http://glaros.dtc.umn.edu/gkhome/metis/metis/overview;
+    license = stdenv.lib.licenses.asl20;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
--- a/pkgs/development/libraries/sword/default.nix
+++ b/pkgs/development/libraries/sword/default.nix
@ -2,13 +2,12 @@

 stdenv.mkDerivation rec {

-  version = "1.7.3";
-
  name = "sword-${version}";
+  version = "1.7.4";

  src = fetchurl {
    url = "http://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/${name}.tar.gz";
-    sha256 = "1sm9ivypsx3mraqnziic7qkxjx1b7crvlln0zq6cnpjx2pzqfgas";
+    sha256 = "0g91kpfkwccvdikddffdbzd6glnp1gdvkx4vh04iyz10bb7shpcr";
  };

  buildInputs = [ pkgconfig icu clucene_core curl ];
--- a/pkgs/development/tools/misc/arcanist/default.nix
+++ b/pkgs/development/tools/misc/arcanist/default.nix
@ -3,18 +3,18 @@
 let
  libphutil = fetchgit {
    url    = "git://github.com/phacility/libphutil.git";
-    rev    = "3753a09dfc7e7ee2626946735e420e5b50480f89";
-    sha256 = "86c2613fed23edff58452ceb9fa98ceb559c7e41abdb6752f87ebcf0f50a1a66";
+    rev    = "e509fc30ae782af97f3535b1febbf50d0f919d5a";
+    sha256 = "087dc5aadf1f78ebc7cf2b9107422f211b98ac96493fab8cf6bd9924ba77d986";
  };
  arcanist = fetchgit {
    url    = "git://github.com/phacility/arcanist.git";
-    rev    = "4d6d3feb7fc1fb63789554dddee8e489999c1201";
-    sha256 = "e3a9314544c4430ac6e67ba2ae180a96b009b3ab848ba8712fc2b308cf880372";
+    rev    = "fe8ed2a6f8b09b8c56e476ed1f9624d35732b776";
+    sha256 = "602fe03671c424d55af63e6288e906b350183bb42d558498ded005ae7e83fc85";
  };
 in
 stdenv.mkDerivation rec {
  name    = "arcanist-${version}";
-  version = "20150707";
+  version = "20150817";

  src = [ arcanist libphutil ];
  buildInputs = [ php makeWrapper flex ];
--- a/pkgs/games/zandronum/bin.nix
+++ b/pkgs/games/zandronum/bin.nix
@ -21,10 +21,10 @@
 assert stdenv.system == "x86_64-linux";

 stdenv.mkDerivation rec {
-  name = "zandronum-2.1";
+  name = "zandronum-2.1.2";
  src = fetchurl {
-    url = "http://zandronum.com/downloads/zandronum2.1-linux-x86_64.tar.bz2";
-    sha256 = "0fhk2gd0lqmc6brbli17ks5ywnlzkjyas1kfdqsf3d96w0z5rz11";
+    url = "http://zandronum.com/downloads/zandronum2.1.2-linux-x86_64.tar.bz2";
+    sha256 = "1f5aw2m8c0bl3lrvi2k3rrzq3q9x1ikxnxxjgh3k9qvanfn7ykbk";
  };

  libPath = stdenv.lib.makeLibraryPath [
--- a/pkgs/games/zandronum/default.nix
+++ b/pkgs/games/zandronum/default.nix
@ -1,11 +1,11 @@
 { stdenv, fetchhg, cmake, SDL, mesa, fmod42416, openssl, sqlite, sqlite-amalgamation }:

 stdenv.mkDerivation {
-  name = "zandronum-2.1";
+  name = "zandronum-2.1.2";
  src = fetchhg {
    url = "https://bitbucket.org/Torr_Samaho/zandronum-stable";
-    rev = "27275a8";
-    sha256 = "00xyrk0d1jrvy6zk059yawgd9b33z0fx4hvzcjvvbn03rqci60yc";
+    rev = "a3663b0061d5";
+    sha256 = "0qwsnbwhcldwrirfk6hpiklmcj3a7dzh6pn36nizci6pcza07p56";
  };

  phases = [ "unpackPhase" "configurePhase" "buildPhase" "installPhase" ];
--- a/pkgs/games/zandronum/server.nix
+++ b/pkgs/games/zandronum/server.nix
@ -1,11 +1,11 @@
 { stdenv, fetchhg, cmake, openssl, sqlite, sqlite-amalgamation, SDL }:

 stdenv.mkDerivation {
-  name = "zandronum-server-2.1";
+  name = "zandronum-server-2.1.2";
  src = fetchhg {
    url = "https://bitbucket.org/Torr_Samaho/zandronum-stable";
-    rev = "27275a8";
-    sha256 = "00xyrk0d1jrvy6zk059yawgd9b33z0fx4hvzcjvvbn03rqci60yc";
+    rev = "a3663b0061d5";
+    sha256 = "0qwsnbwhcldwrirfk6hpiklmcj3a7dzh6pn36nizci6pcza07p56";
  };

  phases = [ "unpackPhase" "configurePhase" "buildPhase" "installPhase" ];
--- a/pkgs/misc/emulators/mgba/default.nix
+++ b/pkgs/misc/emulators/mgba/default.nix
@ -0,0 +1,21 @@
+{ stdenv, fetchurl, cmake, ffmpeg, imagemagick, libzip, pkgconfig, qt53, SDL2 }:
+
+stdenv.mkDerivation rec {
+  name = "mgba-0.3.0";
+  src = fetchurl {
+    url = https://github.com/mgba-emu/mgba/archive/0.3.0.tar.gz;
+    sha256 = "02zz6bdcwr1fx7i7dacff0s8mwp0pvabycp282qvhhx44x44q7fm";
+  };
+
+  buildInputs = [ cmake ffmpeg imagemagick libzip pkgconfig qt53 SDL2 ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = https://endrist.com/mgba/;
+    description = "A modern GBA emulator with a focus on accuracy";
+    license = stdenv.lib.licenses.mpl20;
+    maintainers = with stdenv.lib.maintainers; [ MP2E ];
+  };
+}
+
--- a/pkgs/os-specific/linux/acpid/default.nix
+++ b/pkgs/os-specific/linux/acpid/default.nix
@ -1,11 +1,11 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:

 stdenv.mkDerivation rec {
-  name = "acpid-2.0.23";
+  name = "acpid-2.0.25";

  src = fetchurl {
    url = "mirror://sourceforge/acpid2/${name}.tar.xz";
-    sha256 = "1vl7c6vc724v4jwki17czgj6lnrknnj1a6llm8gkl32i2gnam5j3";
+    sha256 = "0s2wg84x6pnrkf7i7lpzw2rilq4mj50vwb7p2b2n5hdyfa00lw0b";
  };

  preBuild = ''
--- a/pkgs/os-specific/linux/bluez/bluez5.nix
+++ b/pkgs/os-specific/linux/bluez/bluez5.nix
@ -5,11 +5,11 @@
 assert stdenv.isLinux;

 stdenv.mkDerivation rec {
-  name = "bluez-5.32";
+  name = "bluez-5.33";
   
  src = fetchurl {
    url = "mirror://kernel/linux/bluetooth/${name}.tar.xz";
-    sha256 = "1xspdw87h2mpy5q36q7225yizgcvxlag1b8qi13h9v6b07kkakzy";
+    sha256 = "1lrn2irisr569m3fnrqhzsg77dgci55nlp5izv5phrjh2dx8008q";
  };

  pythonPath = with pythonPackages;
--- a/pkgs/os-specific/linux/htop/default.nix
+++ b/pkgs/os-specific/linux/htop/default.nix
@ -1,14 +1,17 @@
-{ fetchurl, stdenv, ncurses }:
+{ fetchFromGitHub, stdenv, autoreconfHook, ncurses }:

 stdenv.mkDerivation rec {
-  name = "htop-1.0.3";
+  name = "htop-1.0.3-186-gf2c053a";

-  src = fetchurl {
-    url = "http://hisham.hm/htop/releases/1.0.3/htop-1.0.3.tar.gz";
-    sha256 = "0a8qbpsifzjwc4f45xfwm48jhm59g6q5hlib4bf7z13mgy95fp05";
+  src = fetchFromGitHub {
+    sha256 = "017aihyg0bjli1hlvcqgqxpwzy2ayvwv6byhqd97n9sqfkmi9i0p";
+    rev = "f2c053a88497f3ad5ae786c16ecf1275212c13be";
+    repo = "htop";
+    owner = "hishamhm";
  };

  buildInputs = [ ncurses ];
+  nativeBuildInputs = [ autoreconfHook ];

  meta = {
    description = "An interactive process viewer for Linux";
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:

 import ./generic.nix (args // rec {
-  version = "3.10.86";
+  version = "3.10.87";
  extraMeta.branch = "3.10";

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1kax24y6xa49n4wc74qg503pbg0rd2imx5npyfp1wcnc6p68w0mr";
+    sha256 = "01lax9c6j2gw33pr7dla1ly1d89970mkbwh2hnmysgzsyh136rvg";
  };

  features.iwlwifi = true;
--- a/pkgs/os-specific/linux/kernel/linux-3.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix
@ -1,13 +1,13 @@
 { stdenv, fetchurl, ... } @ args:

 import ./generic.nix (args // rec {
-  version = "3.14.50";
+  version = "3.14.51";
  # Remember to update grsecurity!
  extraMeta.branch = "3.14";

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1bc0g8a707sfqhi9yifaijxzmfrqgry7l1j9473376q0f8pkwjvy";
+    sha256 = "1gqsd69cqijff4c4br4ydmcjl226d0yy6vrmgfvy16xiraavq1mk";
  };

  features.iwlwifi = true;
--- a/pkgs/os-specific/linux/kernel/linux-4.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix
@ -1,13 +1,13 @@
 { stdenv, fetchurl, ... } @ args:

 import ./generic.nix (args // rec {
-  version = "4.1.5";
+  version = "4.1.6";
  # Remember to update grsecurity!
  extraMeta.branch = "4.1";

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0v40vhcs3hkjw7gl71jq03ziz93cfh3vlpn686kc9y1nnbcxks5j";
+    sha256 = "1zlr7d5d7rhcbpwsi0svmv0zwj50n6mj6xgfzwwi336f5p26wbci";
  };

  features.iwlwifi = true;
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@ -11,13 +11,13 @@ let
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "lxc-1.1.2";
+  name = "lxc-1.1.3";

  src = fetchFromGitHub {
    owner = "lxc";
    repo = "lxc";
    rev = name;
-    sha256 = "149nq630h9bg87hb3cn086ci0cz29l7fp3i6qf1mqxv7hnildm8p";
+    sha256 = "109vpkxzkhixfvwfs6qphfbxb7pbk2qx22qc4zbk52d6gl78ygsb";
  };

  nativeBuildInputs = [
--- a/pkgs/os-specific/linux/procps-ng/default.nix
+++ b/pkgs/os-specific/linux/procps-ng/default.nix
@ -1,11 +1,11 @@
 { lib, stdenv, fetchurl, ncurses }:

 stdenv.mkDerivation {
-  name = "procps-3.3.10";
+  name = "procps-3.3.11";

  src = fetchurl {
-    url = mirror://sourceforge/procps-ng/procps-ng-3.3.10.tar.xz;
-    sha256 = "013z4rzy3p5m1zp6mmynpblv0c6zlcn91pw4k2vymz2djyc6ybm0";
+    url = mirror://sourceforge/procps-ng/procps-ng-3.3.11.tar.xz;
+    sha256 = "1va4n0mpsq327ca9dqp4hnrpgs6821rp0f2m0jyc1bfjl9lk2jg9";
  };

  buildInputs = [ ncurses ];
--- a/pkgs/servers/nosql/cassandra/2.1.nix
+++ b/pkgs/servers/nosql/cassandra/2.1.nix
@ -11,8 +11,8 @@

 let

-  version = "2.1.7";
-  sha256 = "12chnxcl9zg20d0l4rlzp13cnxvdqr8bx3bbvwbcpnh7ir5s7ldd";
+  version = "2.1.8";
+  sha256 = "1x92nw81pa4s95lv9qj42p05ry3ajk8klsqgc30zv7sjzm7cc31s";

 in

--- a/pkgs/servers/u9fs/default.nix
+++ b/pkgs/servers/u9fs/default.nix
@ -3,7 +3,7 @@
 stdenv.mkDerivation {
  name = "u9fs-20110513";
  src = fetchhg {
-    url = https://code.google.com/p/u9fs;
+    url = http://bitbucket.org/plan9-from-bell-labs/u9fs;
    rev = "9474edb23b11";
    sha256 = "0irwyk8vnvx0fmz8lmbdb2jrlvas8imr61jr76a1pkwi9wpf2wv6";
  };
@ -16,7 +16,7 @@ stdenv.mkDerivation {

  meta = with stdenv.lib;
    { description = "Serve 9P from Unix";
-      homepage = https://code.google.com/p/u9fs;
+      homepage = http://plan9.bell-labs.com/magic/man2html/4/u9fs;
      license = licenses.free;
      maintainers = [ maintainers.emery ];
      platforms = platforms.unix;
--- a/pkgs/servers/x11/xorg/xorgserver-xkbcomp-path.patch
+++ b/pkgs/servers/x11/xorg/xorgserver-xkbcomp-path.patch
@ -1,15 +1,15 @@
-*** xorg-server-X11R7.2-1.2.0-orig/xkb/xkbInit.c	2015-02-11 00:32:06.000000000 +0100
--- xorg-server-X11R7.2-1.2.0/xkb/xkbInit.c	2015-04-11 10:10:41.948438435 +0200
-***************
-*** 733,738 ****
--- 733,742 ----
-  int
-  XkbProcessArguments(int argc, char *argv[], int i)
-  {
-+     char *xkbBinDir = getenv("XKB_BINDIR");
-+     if (xkbBinDir)
-+         XkbBinDirectory = Xstrdup(xkbBinDir);
-+ 
-      if (strncmp(argv[i], "-xkbdir", 7) == 0) {
-          if (++i < argc) {
-  #if !defined(WIN32) && !defined(__CYGWIN__)
+diff --git a/os/utils.c b/os/utils.c
+index ed7581e..6593455 100644
+--- a/os/utils.c
+++ b/os/utils.c
+@@ -658,6 +658,10 @@ ProcessCommandLine(int argc, char *argv[])
+ 
+     defaultKeyboardControl.autoRepeat = TRUE;
+ 
+    char *xkbBinDir = getenv("XKB_BINDIR");
+    if (xkbBinDir)
+        XkbBinDirectory = Xstrdup(xkbBinDir);
+
+ #ifdef NO_PART_NET
+     PartialNetwork = FALSE;
+ #else
--- a/pkgs/tools/backup/obnam/default.nix
+++ b/pkgs/tools/backup/obnam/default.nix
@ -2,13 +2,13 @@

 pythonPackages.buildPythonPackage rec {
  name = "obnam-${version}";
-  version = "1.13";
+  version = "1.14";

  namePrefix = "";

  src = fetchurl rec {
    url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.xz";
-    sha256 = "13a9icgp7kvxaw700sdhxll0in00ghk0aacg26s4kxmxc85w92i4";
+    sha256 = "16875g14b7mxfd46159b92qa3gxq59w5gzf8x2n7icqa05s3483q";
  };

  buildInputs = [ pythonPackages.sphinx attr ];
--- a/pkgs/tools/backup/tarsnap/default.nix
+++ b/pkgs/tools/backup/tarsnap/default.nix
@ -1,18 +1,39 @@
 { stdenv, fetchurl, openssl, zlib, e2fsprogs }:

-stdenv.mkDerivation {
-  name = "tarsnap-1.0.35";
+let
+  bashCompletion = fetchurl {
+    url = "https://gist.githubusercontent.com/thoughtpolice/daa9431044883d3896f6/raw/282360677007db9739e5bf229873d3b231eb303a/tarsnap.bash";
+    sha256 = "1cj7m0n3sw9vlaz2dfvf0bgaxkv1pcc0l31zb4h5rmm8z6d33405";
+  };
+
+  zshCompletion = fetchurl {
+    url = "https://gist.githubusercontent.com/thoughtpolice/daa9431044883d3896f6/raw/282360677007db9739e5bf229873d3b231eb303a/tarsnap.zsh";
+    sha256 = "0pawqwichzpz29rva7mh8lpx4zznnrh2rqyzzj6h7z98l0dxpair";
+  };
+in
+stdenv.mkDerivation rec {
+  name = "tarsnap-${version}";
+  version = "1.0.35";

  src = fetchurl {
    url = "https://www.tarsnap.com/download/tarsnap-autoconf-1.0.35.tgz";
    sha256 = "16lc14rwrq84fz95j1g10vv0qki0qw73lzighidj5g23pib6g7vc";
  };

+  postInstall = ''
+    # Install some handy-dandy shell completions
+    mkdir -p $out/etc/bash_completion.d $out/share/zsh/site-functions
+    cp ${bashCompletion} $out/etc/bash_completion.d/tarsnap.bash
+    cp ${zshCompletion}  $out/share/zsh/site-functions/_tarsnap
+  '';
+
  buildInputs = [ openssl zlib e2fsprogs ];

  meta = {
    description = "Online backups for the truly paranoid";
-    homepage = "http://www.tarsnap.com/";
-    maintainers = with stdenv.lib.maintainers; [roconnor];
+    homepage    = "http://www.tarsnap.com/";
+    license     = "tarsnap";
+    platforms   = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ thoughtpolice roconnor ];
  };
 }
--- a/pkgs/tools/misc/direnv/default.nix
+++ b/pkgs/tools/misc/direnv/default.nix
@ -1,14 +1,14 @@
 { fetchurl, stdenv, go }:

 let
-  version = "2.6.0";
+  version = "2.7.0";
 in
 stdenv.mkDerivation {
  name = "direnv-${version}";
  src = fetchurl {
    url = "http://github.com/zimbatm/direnv/archive/v${version}.tar.gz";
    name = "direnv-${version}.tar.gz";
-    sha256 = "b85aac4d6a4ddf2daf193aabb3b2faf89e56507d33d763ab74cc7eb0b524ac03";
+    sha256 = "3cfa8f41e740c0dc09d854f3833058caec0ea0d67d19e950f97eee61106b0daf";
  };

  buildInputs = [ go ];
--- a/pkgs/tools/misc/man-db/default.nix
+++ b/pkgs/tools/misc/man-db/default.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libpipeline, db, groff }:
 
 stdenv.mkDerivation rec {
-  name = "man-db-2.7.1";
+  name = "man-db-2.7.2";
  
  src = fetchurl {
    url = "mirror://savannah/man-db/${name}.tar.xz";
-    sha256 = "03ly0hbpgjnag576rgccanaisn7f6422q5qxrj64vyzslc2651y4";
+    sha256 = "14p4sr57qc02gfnpybcnv33fb7gr266iqsyq7z4brs6wa6plwrr2";
  };
  
  buildInputs = [ pkgconfig libpipeline db groff ];
--- a/pkgs/tools/misc/picocom/default.nix
+++ b/pkgs/tools/misc/picocom/default.nix
@ -1,11 +1,14 @@
-{ stdenv, fetchurl, makeWrapper, lrzsz }:
+{ stdenv, fetchFromGitHub, makeWrapper, lrzsz }:

 stdenv.mkDerivation rec {
-  name = "picocom-1.7";
+  name = "picocom-${version}";
+  version = "1.8";

-  src = fetchurl {
-    url = "http://picocom.googlecode.com/files/${name}.tar.gz";
-    sha256 = "17hjq713naq02xar711aw24qqd52p591mj1h5n97cni1ga7irwyh";
+  src = fetchFromGitHub {
+    owner = "npat-efault";
+    repo = "picocom";
+    rev = version;
+    sha256 = "1954hnmnnr9yj5skynj2x5wjap8vlr4ski2rhwr36p5pzwmr9gni";
  };

  buildInputs = [ makeWrapper ];
--- a/pkgs/tools/misc/plowshare/default.nix
+++ b/pkgs/tools/misc/plowshare/default.nix
@ -1,15 +1,15 @@
-{ stdenv, fetchgit, makeWrapper, curl, spidermonkey }:
+{ stdenv, fetchFromGitHub, makeWrapper, curl, spidermonkey }:

 stdenv.mkDerivation rec {

  name = "plowshare4-${version}";
-
  version = "1.1.0";

-  src = fetchgit {
-    url = "https://code.google.com/p/plowshare/";
-    rev = "87bd955e681ddda05009ca8594d727260989d5ed";
-    sha256 = "0cbsnalmr6fa1ijsn1j1p9fdqi3ii96bx3xabgvvbbqkl7q938f9";
+  src = fetchFromGitHub {
+    owner = "mcrapet";
+    repo = "plowshare";
+    rev = "v${version}";
+    sha256 = "1xxkdv4q97dfzbcdnmy5079a59fwh8myxlvdr2dlxdv70fb72sq9";
  };

  buildInputs = [ makeWrapper ];
--- a/pkgs/tools/networking/aria2/default.nix
+++ b/pkgs/tools/networking/aria2/default.nix
@ -1,22 +1,29 @@
-{ stdenv, fetchurl, pkgconfig, c-ares, openssl, libxml2, sqlite, zlib }:
+{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, cppunit, libgcrypt
+, c-ares, openssl, libxml2, sqlite, zlib }:

 stdenv.mkDerivation rec {
  name = "aria2-${version}";
  version = "1.19.0";

-  src = fetchurl {
-    url = "mirror://sourceforge/aria2/stable/${name}/${name}.tar.xz";
-    sha256 = "0xm4fmap9gp2pz6z01mnnpmazw6pnhzs8qc58181m5ai4gy5ksp2";
+  src = fetchFromGitHub {
+    owner = "tatsuhiro-t";
+    repo = "aria2";
+    rev = "release-${version}";
+    sha256 = "1k4b8jfg4wjsvybb7hysplp6h831allhiqdy9jwsyy0m0zmgk00a";
  };

-  buildInputs = [ pkgconfig c-ares openssl libxml2 sqlite zlib ];
+  buildInputs = [
+    pkgconfig autoreconfHook cppunit libgcrypt c-ares openssl libxml2
+    sqlite zlib
+  ];

  configureFlags = [ "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" ];

  meta = with stdenv.lib; {
-    homepage = http://aria2.sourceforge.net/;
+    homepage = https://github.com/tatsuhiro-t/aria2;
    description = "A lightweight, multi-protocol, multi-source, command-line download utility";
-    maintainers = [ maintainers.koral ];
+    maintainers = with maintainers; [ koral jgeerds ];
    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
  };
 }
--- a/pkgs/tools/networking/filegive/default.nix
+++ b/pkgs/tools/networking/filegive/default.nix
@ -6,7 +6,7 @@ let

  # Code with BSD license
  srcNatPMP = fetchgit {
-    url = "https://code.google.com/p/go-nat-pmp/";
+    url = https://github.com/jackpal/go-nat-pmp;
    rev = "e04deda90d56";
    sha256 = "1swwfyzaj3l40yh9np3x4fcracgs79nwryc85sxbdakx8wwxs2xb";
  };
--- a/pkgs/tools/networking/netsniff-ng/default.nix
+++ b/pkgs/tools/networking/netsniff-ng/default.nix
@ -2,7 +2,7 @@
 , libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl
 , pkgconfig, zlib }:

-let version = "0.5.9-71-g77445f8"; in
+let version = "0.5.9-80-g3384ee7"; in
 stdenv.mkDerivation {
  name = "netsniff-ng-${version}";

@ -10,8 +10,8 @@ stdenv.mkDerivation {
  src = fetchFromGitHub rec {
    repo = "netsniff-ng";
    owner = repo;
-    rev = "77445f81d451eef6b78b79a2bcc24d21d4be4178";
-    sha256 = "0ny9bph070mny6i9r0i3wsx2bsl53135n439ab6r9qk710xjz91j";
+    rev = "3384ee7119222a6230c983dbdcbaf2ac2d6f92fb";
+    sha256 = "1j0g7sdf5ikr2bwd2qdwd1dpmknwaz55x3cgc8yiw39xp69hm7na";
  };

  buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl
--- a/pkgs/tools/networking/stunnel/default.nix
+++ b/pkgs/tools/networking/stunnel/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  name    = "stunnel-${version}";
-  version = "5.20";
+  version = "5.22";

  src = fetchurl {
    url    = "http://www.stunnel.org/downloads/${name}.tar.gz";
-    sha256 = "0ar940mw5sjxkh98d6wnrd366jfkqirbyf2b5kcdk1vjk9ra6dja";
+    sha256 = "0gxqiiksc5p65s67f53yxa2hb8w4hfcgd0s20jrcslw1jjk2imla";
  };

  buildInputs = [ openssl ];
--- a/pkgs/tools/security/afl/default.nix
+++ b/pkgs/tools/security/afl/default.nix
@ -9,11 +9,11 @@ let
 in
 stdenv.mkDerivation rec {
  name    = "afl-${version}";
-  version = "1.83b";
+  version = "1.86b";

  src = fetchurl {
    url    = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz";
-    sha256 = "1zkf9vdhmm1h0flxl1ybmw41amgh9cyh4hyb18jp972lgd9q642v";
+    sha256 = "1by9ncf6lgcyibzqwyla34jv64sd66mn8zhgjz2pcgsds51qwn0r";
  };

  # Note: libcgroup isn't needed for building, just for the afl-cgroup
--- a/Show More
+++ b/Show More