Merge branch 'master' into staging

2017-05-10 00:54:53 +02:00 · 2017-05-10 00:54:53 +02:00 · 8b01ec9a9e
commit 8b01ec9a9e
parent 7a61788bc1 9c90ff7e7d
86 changed files with 1227 additions and 966 deletions
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@ -446,6 +446,7 @@
  relrod = "Ricky Elrod <ricky@elrod.me>";
  renzo = "Renzo Carbonara <renzocarbonara@gmail.com>";
  retrry = "Tadas Barzdžius <retrry@gmail.com>";
+  rht = "rht <rhtbot@protonmail.com>";
  rick68 = "Wei-Ming Yang <rick68@gmail.com>";
  rickynils = "Rickard Nilsson <rickynils@gmail.com>";
  rlupton20 = "Richard Lupton <richard.lupton@gmail.com>";
@ -458,7 +459,6 @@
  roconnor = "Russell O'Connor <roconnor@theorem.ca>";
  romildo = "José Romildo Malaquias <malaquias@gmail.com>";
  rongcuid = "Rongcui Dong <rongcuid@outlook.com>";
-  ronny = "Ronny Pfannschmidt <nixos@ronnypfannschmidt.de>";
  rszibele = "Richard Szibele <richard@szibele.com>";
  rtreffer = "Rene Treffer <treffer+nixos@measite.de>";
  rushmorem = "Rushmore Mushambi <rushmore@webenchanter.com>";
--- a/nixos/modules/config/shells-environment.nix
+++ b/nixos/modules/config/shells-environment.nix
@ -55,7 +55,7 @@ in

    environment.profileRelativeEnvVars = mkOption {
      type = types.attrsOf (types.listOf types.str);
-      example = { PATH = [ "/bin" "/sbin" ]; MANPATH = [ "/man" "/share/man" ]; };
+      example = { PATH = [ "/bin" ]; MANPATH = [ "/man" "/share/man" ]; };
      description = ''
        Attribute set of environment variable.  Each attribute maps to a list
        of relative paths.  Each relative path is appended to the each profile
--- a/nixos/modules/hardware/all-firmware.nix
+++ b/nixos/modules/hardware/all-firmware.nix
@ -2,7 +2,9 @@

 with lib;

-{
+let
+  cfg = config.hardware;
+in {

  ###### interface

@ -12,7 +14,16 @@ with lib;
      default = false;
      type = types.bool;
      description = ''
-        Turn on this option if you want to enable all the firmware shipped in linux-firmware.
+        Turn on this option if you want to enable all the firmware.
+      '';
+    };
+
+    hardware.enableRedistributableFirmware = mkOption {
+      default = false;
+      type = types.bool;
+      description = ''
+        Turn on this option if you want to enable all the firmware with a license allowing redistribution.
+        (i.e. free firmware and <literal>firmware-linux-nonfree</literal>)
      '';
    };

@ -21,14 +32,27 @@ with lib;

  ###### implementation

-  config = mkIf config.hardware.enableAllFirmware {
-    hardware.firmware = with pkgs; [
-      broadcom-bt-firmware
-      firmwareLinuxNonfree
-      intel2200BGFirmware
-      rtl8723bs-firmware
-      rtl8192su-firmware
-    ];
-  };
-
+  config = mkMerge [
+    (mkIf (cfg.enableAllFirmware || cfg.enableRedistributableFirmware) {
+      hardware.firmware = with pkgs; [
+        firmwareLinuxNonfree
+        intel2200BGFirmware
+        rtl8723bs-firmware
+        rtl8192su-firmware
+      ];
+    })
+    (mkIf cfg.enableAllFirmware {
+      assertions = [{
+        assertion = !cfg.enableAllFirmware || (config.nixpkgs.config.allowUnfree or false);
+        message = ''
+          the list of hardware.enableAllFirmware contains non-redistributable licensed firmware files.
+            This requires nixpkgs.config.allowUnfree to be true.
+            An alternative is to use the hardware.enableRedistributableFirmware option.
+        '';
+      }];
+      hardware.firmware = with pkgs; [
+        broadcom-bt-firmware
+      ];
+    })
+  ];
 }
--- a/nixos/modules/hardware/network/broadcom-43xx.nix
+++ b/nixos/modules/hardware/network/broadcom-43xx.nix
@ -1,3 +1,3 @@
 {
-  hardware.enableAllFirmware = true;
+  hardware.enableRedistributableFirmware = true;
 }
--- a/nixos/modules/hardware/network/intel-2030.nix
+++ b/nixos/modules/hardware/network/intel-2030.nix
@ -1,3 +1,3 @@
 {
-  hardware.enableAllFirmware = true;
+  hardware.enableRedistributableFirmware = true;
 }
--- a/nixos/modules/hardware/network/intel-2100bg.nix
+++ b/nixos/modules/hardware/network/intel-2100bg.nix
@ -23,7 +23,7 @@

  config = lib.mkIf config.networking.enableIntel2100BGFirmware {

-    hardware.enableAllFirmware = true;
+    hardware.enableRedistributableFirmware = true;

  };

--- a/nixos/modules/hardware/network/intel-3945abg.nix
+++ b/nixos/modules/hardware/network/intel-3945abg.nix
@ -22,7 +22,7 @@

  config = lib.mkIf config.networking.enableIntel3945ABGFirmware {

-    hardware.enableAllFirmware = true;
+    hardware.enableRedistributableFirmware = true;

  };

--- a/nixos/modules/hardware/network/intel-4965agn.nix
+++ b/nixos/modules/hardware/network/intel-4965agn.nix
@ -1,3 +1,3 @@
 {
-  hardware.enableAllFirmware = true;
+  hardware.enableRedistributableFirmware = true;
 }
--- a/nixos/modules/hardware/network/intel-5000.nix
+++ b/nixos/modules/hardware/network/intel-5000.nix
@ -1,3 +1,3 @@
 {
-  hardware.enableAllFirmware = true;
+  hardware.enableRedistributableFirmware = true;
 }
--- a/nixos/modules/hardware/network/intel-5150.nix
+++ b/nixos/modules/hardware/network/intel-5150.nix
@ -1,3 +1,3 @@
 {
-  hardware.enableAllFirmware = true;
+  hardware.enableRedistributableFirmware = true;
 }
--- a/nixos/modules/hardware/network/intel-6000.nix
+++ b/nixos/modules/hardware/network/intel-6000.nix
@ -1,3 +1,3 @@
 {
-  hardware.enableAllFirmware = true;
+  hardware.enableRedistributableFirmware = true;
 }
--- a/nixos/modules/hardware/network/intel-6000g2a.nix
+++ b/nixos/modules/hardware/network/intel-6000g2a.nix
@ -1,3 +1,3 @@
 {
-  hardware.enableAllFirmware = true;
+  hardware.enableRedistributableFirmware = true;
 }
--- a/nixos/modules/hardware/network/intel-6000g2b.nix
+++ b/nixos/modules/hardware/network/intel-6000g2b.nix
@ -1,3 +1,3 @@
 {
-  hardware.enableAllFirmware = true;
+  hardware.enableRedistributableFirmware = true;
 }
--- a/nixos/modules/hardware/network/ralink.nix
+++ b/nixos/modules/hardware/network/ralink.nix
@ -20,7 +20,7 @@
  ###### implementation

  config = lib.mkIf config.networking.enableRalinkFirmware {
-    hardware.enableAllFirmware = true;
+    hardware.enableRedistributableFirmware = true;
  };

 }
--- a/nixos/modules/hardware/network/rtl8192c.nix
+++ b/nixos/modules/hardware/network/rtl8192c.nix
@ -20,7 +20,7 @@
  ###### implementation

  config = lib.mkIf config.networking.enableRTL8192cFirmware {
-    hardware.enableAllFirmware = true;
+    hardware.enableRedistributableFirmware = true;
  };

 }
--- a/nixos/modules/hardware/video/radeon.nix
+++ b/nixos/modules/hardware/video/radeon.nix
@ -1,3 +1,3 @@
 {
-  hardware.enableAllFirmware = true;
+  hardware.enableRedistributableFirmware = true;
 }
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@ -50,6 +50,13 @@ let
    LINUX /boot/bzImage
    APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} nomodeset
    INITRD /boot/initrd
+
+    # A variant to boot with 'copytoram'
+    LABEL boot-copytoram
+    MENU LABEL NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel} (with copytoram)
+    LINUX /boot/bzImage
+    APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} copytoram
+    INITRD /boot/initrd
  '';

  isolinuxMemtest86Entry = ''
@ -78,6 +85,12 @@ let
    echo "initrd /boot/initrd" >> $out/loader/entries/nixos-livecd-nomodeset.conf
    echo "options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} nomodeset" >> $out/loader/entries/nixos-livecd-nomodeset.conf

+    # A variant to boot with 'copytoram'
+    echo "title NixOS Live CD (with copytoram)" > $out/loader/entries/nixos-livecd-copytoram.conf
+    echo "linux /boot/bzImage" >> $out/loader/entries/nixos-livecd-copytoram.conf
+    echo "initrd /boot/initrd" >> $out/loader/entries/nixos-livecd-copytoram.conf
+    echo "options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} copytoram" >> $out/loader/entries/nixos-livecd-copytoram.conf
+
    echo "default nixos-livecd" > $out/loader/loader.conf
    echo "timeout ${builtins.toString config.boot.loader.timeout}" >> $out/loader/loader.conf
  '';
--- a/nixos/modules/installer/scan/not-detected.nix
+++ b/nixos/modules/installer/scan/not-detected.nix
@ -5,5 +5,5 @@
 with lib;

 {
-  hardware.enableAllFirmware = true;
+  hardware.enableRedistributableFirmware = true;
 }
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@ -129,6 +129,7 @@
  ./security/rtkit.nix
  ./security/wrappers/default.nix
  ./security/sudo.nix
+  ./services/admin/salt/master.nix
  ./services/amqp/activemq/default.nix
  ./services/amqp/rabbitmq.nix
  ./services/audio/alsa.nix
--- a/nixos/modules/profiles/all-hardware.nix
+++ b/nixos/modules/profiles/all-hardware.nix
@ -50,7 +50,7 @@
    ];

  # Include lots of firmware.
-  hardware.enableAllFirmware = true;
+  hardware.enableRedistributableFirmware = true;

  imports =
    [ ../hardware/network/zydas-zd1211.nix ];
--- a/nixos/modules/programs/environment.nix
+++ b/nixos/modules/programs/environment.nix
@ -31,7 +31,7 @@ in

    # TODO: move most of these elsewhere
    environment.profileRelativeEnvVars =
-      { PATH = [ "/bin" "/sbin" ];
+      { PATH = [ "/bin" ];
        INFOPATH = [ "/info" "/share/info" ];
        PKG_CONFIG_PATH = [ "/lib/pkgconfig" ];
        TERMINFO_DIRS = [ "/share/terminfo" ];
--- a/nixos/modules/services/admin/salt/master.nix
+++ b/nixos/modules/services/admin/salt/master.nix
@ -0,0 +1,60 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+
+  cfg  = config.services.salt.master;
+
+  fullConfig = lib.recursiveUpdate {
+    # Provide defaults for some directories to allow an immutable config dir
+
+    # Default is equivalent to /etc/salt/master.d/*.conf
+    default_include = "/var/lib/salt/master.d/*.conf";
+    # Default is in /etc/salt/pki/master
+    pki_dir = "/var/lib/salt/pki/master";
+  } cfg.configuration;
+
+in
+
+{
+  options = {
+    services.salt.master = {
+      enable = mkEnableOption "Salt master service";
+      configuration = mkOption {
+        type = types.attrs;
+        default = {};
+        description = "Salt master configuration as Nix attribute set.";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    environment = {
+      # Set this up in /etc/salt/master so `salt`, `salt-key`, etc. work.
+      # The alternatives are
+      # - passing --config-dir to all salt commands, not just the master unit,
+      # - setting a global environment variable,
+      etc."salt/master".source = pkgs.writeText "master" (
+        builtins.toJSON fullConfig
+      );
+      systemPackages = with pkgs; [ salt ];
+    };
+    systemd.services.salt-master = {
+      description = "Salt Master";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+      path = with pkgs; [
+        utillinux  # for dmesg
+      ];
+      serviceConfig = {
+        ExecStart = "${pkgs.salt}/bin/salt-master";
+        LimitNOFILE = 16384;
+        Type = "notify";
+        NotifyAccess = "all";
+      };
+    };
+  };
+
+  meta.maintainers = with lib.maintainers; [ aneeshusa ];
+}
--- a/nixos/modules/services/web-apps/mattermost.nix
+++ b/nixos/modules/services/web-apps/mattermost.nix
@ -201,7 +201,6 @@ in
          Group = cfg.group;
          ExecStart = "${pkgs.mattermost}/bin/mattermost-platform";
          WorkingDirectory = "${cfg.statePath}";
-          PrivateTmp = true;
          JoinsNamespaceOf = mkIf cfg.localDatabaseCreate "postgresql.service";
          Restart = "always";
          RestartSec = "10";
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@ -14,6 +14,9 @@ let
    ${cfg.extraConfig}
  '';
  qemuConfigFile = pkgs.writeText "qemu.conf" ''
+    ${optionalString cfg.qemuOvmf ''
+      nvram = ["${pkgs.OVMF}/FV/OVMF_CODE.fd:${pkgs.OVMF}/FV/OVMF_VARS.fd"]
+    ''}
    ${cfg.qemuVerbatimConfig}
  '';

@ -63,6 +66,15 @@ in {
      '';
    };

+    virtualisation.libvirtd.qemuOvmf = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Allows libvirtd to take advantage of OVMF when creating new
+        QEMU VMs with UEFI boot.
+      '';
+    };
+
    virtualisation.libvirtd.extraOptions = mkOption {
      type = types.listOf types.str;
      default = [ ];
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@ -54,10 +54,10 @@
      }) {};
    adaptive-wrap = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
        pname = "adaptive-wrap";
-        version = "0.5";
+        version = "0.5.1";
        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/adaptive-wrap-0.5.el";
-          sha256 = "0frgmp8vrrml4iykm60j4d6cl9rbcivy9yh24q6kd10bcyx59ypy";
+          url = "https://elpa.gnu.org/packages/adaptive-wrap-0.5.1.el";
+          sha256 = "0qi7gjprcpywk2daivnlavwsx53hl5wcqvpxbwinvigg42vxh3ll";
        };
        packageRequires = [];
        meta = {
@ -737,10 +737,10 @@
      }) {};
    exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild {
        pname = "exwm";
-        version = "0.13";
+        version = "0.14";
        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/exwm-0.13.tar";
-          sha256 = "0n1wzy6chh024r0yaywjbf7mdsrxs6hrfycv5v0ps0drf6q3zldc";
+          url = "https://elpa.gnu.org/packages/exwm-0.14.tar";
+          sha256 = "14hjjpbasm84p54fxy73fg7g1fdwqkvisdw8dwwgzkflmd647mkx";
        };
        packageRequires = [ xelb ];
        meta = {
@ -1663,10 +1663,10 @@
      }) {};
    seq = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
        pname = "seq";
-        version = "2.19";
+        version = "2.20";
        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/seq-2.19.tar";
-          sha256 = "11hb7is6a4h1lscjcfrzh576j0g3m5yjydn16s6x5bxp5gsr6zha";
+          url = "https://elpa.gnu.org/packages/seq-2.20.tar";
+          sha256 = "0vrpx6nnyjb0gsypknzagimlhvcvi5y1rcdkpxyqr42415zr8d0n";
        };
        packageRequires = [];
        meta = {
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@ -1645,6 +1645,27 @@
          license = lib.licenses.free;
        };
      }) {};
+    apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "apiwrap";
+        version = "0.1.2";
+        src = fetchFromGitHub {
+          owner = "vermiculus";
+          repo = "apiwrap.el";
+          rev = "2feb4a9c58a105867197f92c0b27f1de8d213f45";
+          sha256 = "0yyl2zn02mnhpg6xfcywypg3yprabgkzi9spr407nia86ljrqqss";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap";
+          sha256 = "0n50n1n5pvcgcp1gmna3ci36pnbanjdbjpgv7zyarlb80hywbiyw";
+          name = "apiwrap";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/apiwrap";
+          license = lib.licenses.free;
+        };
+      }) {};
    apples-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "apples-mode";
@ -4332,12 +4353,12 @@
    cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "cmake-mode";
-        version = "3.8.0";
+        version = "3.8.1";
        src = fetchFromGitHub {
          owner = "Kitware";
          repo = "CMake";
-          rev = "da7833c5bb1f331162d46a2c664a443c1c641089";
-          sha256 = "0ca99p3i0q0f313yzfzd62pc4gl385lr1rfsx4z5vlr24ap7ipzy";
+          rev = "8bd6af0d6386d1e0b26ff594b7d42621d67b5985";
+          sha256 = "10rij858aq3hdkdpackhmpmqj3zlfahc3jbfjffk2yicnwmnkb6s";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@ -8435,12 +8456,12 @@
    elpa-clone = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "elpa-clone";
-        version = "0.0.5";
+        version = "0.0.6";
        src = fetchFromGitHub {
          owner = "dochang";
          repo = "elpa-clone";
-          rev = "144bee09445b30cbf4f60b371a289f0d75a387aa";
-          sha256 = "1k80y3wcqvhdbc0w5ybicn2hqjldp7b4jwraca2b99676c0yiq25";
+          rev = "92f4c9d3570ad002575a90d0cc4a522c203a1110";
+          sha256 = "0m5w5wgyslvakcqpr3d198sy3561w2h002gflw0jp47v17hba1r7";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/11861edd9c7f9deebd44fd1f8ef648e7a04caf2b/recipes/elpa-clone";
@ -8840,11 +8861,11 @@
      }) {};
    emms = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
        pname = "emms";
-        version = "4.2";
+        version = "4.3";
        src = fetchgit {
          url = "https://git.savannah.gnu.org/git/emms.git";
-          rev = "6736d2e86d2909ef44759b1162e006bd5cc07547";
-          sha256 = "1qxdxy2grh0fdx50w1m9rmpvygxcywis4qjzi0mrpv2i7rwn8qal";
+          rev = "4cb3ae341847e8e8586373a95a458a453469812d";
+          sha256 = "0bmxlrk2p51bw5lgh2arkcz1v9bw6rpflwk778rdzn0rhzhvhp5b";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms";
@ -9420,22 +9441,22 @@
          license = lib.licenses.free;
        };
      }) {};
-    erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "erlang";
-        version = "19.3.2";
+        version = "20.0pre1";
        src = fetchFromGitHub {
          owner = "erlang";
          repo = "otp";
-          rev = "6acb7d6fb8d23c0b0b78d30a618d2636ad463e6e";
-          sha256 = "1a3yk18sr3y524jl8icp8qh5j143ykxs51xdwz2bzxac2y78k0xk";
+          rev = "4f03eba5294f1c1bc922b07f1267e6b0099fd4b5";
+          sha256 = "0ryi6r4ahh5dsl04nqgqhzymzm9krxr0kf4r3v3xg1yzw6d4g2a8";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
          sha256 = "1cs768xxbyrr78ln50k4yknmpbcc1iplws3k07r0gx5f3ca73iaq";
          name = "erlang";
        };
-        packageRequires = [];
+        packageRequires = [ emacs ];
        meta = {
          homepage = "https://melpa.org/#/erlang";
          license = lib.licenses.free;
@ -9863,12 +9884,12 @@
    ethan-wspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "ethan-wspace";
-        version = "0.7.0";
+        version = "0.7.1";
        src = fetchFromGitHub {
          owner = "glasserc";
          repo = "ethan-wspace";
-          rev = "b8eae49ed3e7f646c16234970af5663e3090e720";
-          sha256 = "1xqc4lqzirpmr21w766g8vmcvvsq8b3hv9i7r27i5x1g0j4jabja";
+          rev = "e055ee6730c0b03525d32e67511ef6c51e4c29e4";
+          sha256 = "0ik3y60xd3ap1pg5dr5ab6bq4qh8gblpgz1iiprmv7acr3ckzc41";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/9454f3a58e3416fa60d8411b0db19c408935408f/recipes/ethan-wspace";
@ -10828,12 +10849,12 @@
    eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "eziam-theme";
-        version = "0.4";
+        version = "0.4.1";
        src = fetchFromGitHub {
          owner = "thblt";
          repo = "eziam-theme-emacs";
-          rev = "3e888e489774e1f6e5ce15fda46296d2fee0de1f";
-          sha256 = "1rxyah6xcdjf3zx1b0gn56wi6gsk95ifsarca67ir3lc1797ldwk";
+          rev = "df2ae56e1ee5cc41c335ca6fd7ead3b99b3c5edd";
+          sha256 = "0nsch4zzqd64rq0y75knfp95nn5nq2hvvgcjhq0i075g2vwhf73w";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme";
@ -11122,12 +11143,12 @@
    find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
    melpaBuild {
        pname = "find-file-in-project";
-        version = "5.2.7";
+        version = "5.3.0";
        src = fetchFromGitHub {
          owner = "technomancy";
          repo = "find-file-in-project";
-          rev = "1ac2c0a717a1a0b70839625f2aaad2c18c21f729";
-          sha256 = "0vmigmbr4fc36sahpf0bj65isa4sf1xhn1v2qvnidbx8qg18hm2f";
+          rev = "9416c3db483dc86530a204f5ae1b587c5c3c8cec";
+          sha256 = "16mwa3si70z2q8g859vbc0al3h8mjig8z6m3l7a0lrx373mp205j";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@ -12848,6 +12869,27 @@
          license = lib.licenses.free;
        };
      }) {};
+    free-keys = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "free-keys";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "Fuco1";
+          repo = "free-keys";
+          rev = "edfd69dc369b2647447b7c28c7c1163b1ddf45b4";
+          sha256 = "0xgifa7s9n882f9ymyyz9gc11xfbj3vfpnxiq1fqfm5hmwx9pwbc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/55067e899ba618d4394ad9657322c92a667a0774/recipes/free-keys";
+          sha256 = "0j9cfgy2nkbska4lm5z32p804i9n8pdgn50bs5zzk1ilwd5vbalj";
+          name = "free-keys";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/free-keys";
+          license = lib.licenses.free;
+        };
+      }) {};
    fringe-helper = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "fringe-helper";
@ -13550,12 +13592,12 @@
    git-commit-insert-issue = callPackage ({ bitbucket, fetchFromGitLab, fetchurl, github-issues, gitlab, helm, lib, melpaBuild, projectile, s }:
    melpaBuild {
        pname = "git-commit-insert-issue";
-        version = "0.3";
+        version = "0.3.1";
        src = fetchFromGitLab {
          owner = "emacs-stuff";
          repo = "git-commit-insert-issue";
-          rev = "7ee9dc88acc1e766700a6170a2ba6b0b853220db";
-          sha256 = "1fi0gy0093dwdcsl7ikzdjxklqrf1p6f99bpxi4xzk2waca70klf";
+          rev = "5f08c17bf93b17915415d435ee41923d924fe20b";
+          sha256 = "11my5apnyhdqh0pmq9wdjd1iah415a5nw87sk586cb3vxnbn5qas";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/git-commit-insert-issue";
@ -14684,12 +14726,12 @@
    grails-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "grails-mode";
-        version = "1.0.1";
+        version = "1.0.2";
        src = fetchFromGitHub {
          owner = "Groovy-Emacs-Modes";
          repo = "groovy-emacs-modes";
-          rev = "50801257d376fd7383ddf9c19ff567183c24ad0b";
-          sha256 = "0wy8iw12b9bs7xza8jjnjvggr59rgbsgn1kk2g0pj0nppvfdrvjm";
+          rev = "f8e9628916d4d41e1816b53d02f0b5a00c499555";
+          sha256 = "1myb15n207yl2cgacmn105r1xbjq076paq6anvw53smy3fhw9sh9";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode";
@ -14846,8 +14888,8 @@
        version = "0.1";
        src = fetchhg {
          url = "https://bitbucket.com/tws/grass-mode.el";
-          rev = "5383fff2996b";
-          sha256 = "1igbdrs14dmaa5mbhq3jnrkq16nndingflpnwxi921dag613c3jz";
+          rev = "1ae8eae88117";
+          sha256 = "1sl3d5759fjm98pb50ykz2c05czb2298ipccwj2qz2hdzq63hfv8";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/grass-mode";
@ -14945,12 +14987,12 @@
    groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "groovy-mode";
-        version = "1.0.1";
+        version = "1.0.2";
        src = fetchFromGitHub {
          owner = "Groovy-Emacs-Modes";
          repo = "groovy-emacs-modes";
-          rev = "50801257d376fd7383ddf9c19ff567183c24ad0b";
-          sha256 = "0wy8iw12b9bs7xza8jjnjvggr59rgbsgn1kk2g0pj0nppvfdrvjm";
+          rev = "f8e9628916d4d41e1816b53d02f0b5a00c499555";
+          sha256 = "1myb15n207yl2cgacmn105r1xbjq076paq6anvw53smy3fhw9sh9";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
@ -15092,12 +15134,12 @@
    guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }:
    melpaBuild {
        pname = "guix";
-        version = "0.3";
+        version = "0.3.1";
        src = fetchFromGitHub {
          owner = "alezost";
          repo = "guix.el";
-          rev = "9cc6dba6ac9ede2855a1a95a22bc7353949f4362";
-          sha256 = "0yyq2z3vsgib9r8paaj7ls4f8rwxmnhi5jsydzdmwqw1hrpkclv9";
+          rev = "35c1506bec0cb43629d30cae8be6cd7f793fff8b";
+          sha256 = "1dlh4ppnbliv2ipfysdrnpix5kg6nwjc0468whi3w758nwpkamzc";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
@ -15511,12 +15553,12 @@
    helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
    melpaBuild {
        pname = "helm";
-        version = "2.6.1";
+        version = "2.7.0";
        src = fetchFromGitHub {
          owner = "emacs-helm";
          repo = "helm";
-          rev = "9db9ed21c8d6454c60eb50c7cc935540d31abc43";
-          sha256 = "1vanva75xv52yg68mqcbxvdbrkq66qb883sjvg3fsg4slwivbiz6";
+          rev = "bdc6711656954562ed721545ac22ee3a507110a3";
+          sha256 = "1zx41nwfpzc0zrzi3bm6pmja0rl1jl3brbybiww4f4kqh34d0ddj";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@ -15826,12 +15868,12 @@
    helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "helm-core";
-        version = "2.6.1";
+        version = "2.7.0";
        src = fetchFromGitHub {
          owner = "emacs-helm";
          repo = "helm";
-          rev = "9db9ed21c8d6454c60eb50c7cc935540d31abc43";
-          sha256 = "1vanva75xv52yg68mqcbxvdbrkq66qb883sjvg3fsg4slwivbiz6";
+          rev = "bdc6711656954562ed721545ac22ee3a507110a3";
+          sha256 = "1zx41nwfpzc0zrzi3bm6pmja0rl1jl3brbybiww4f4kqh34d0ddj";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@ -17254,12 +17296,12 @@
    hindent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "hindent";
-        version = "5.2.2";
+        version = "5.2.3";
        src = fetchFromGitHub {
          owner = "chrisdone";
          repo = "hindent";
-          rev = "d67cee32231aee30984b9c5d0250d21b5377b620";
-          sha256 = "126q56673w7yz1p58550k6aya47nhbzn29g4zvq6wjbnicn0vwd1";
+          rev = "abe2933e3d1f82e4eecfba11ffed27f7f52ca469";
+          sha256 = "12f1mmkapjf5l6ka3k09s4i3qg5pk1cr0mv182657n0rvdn041d4";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent";
@ -18430,12 +18472,12 @@
    inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "inf-clojure";
-        version = "1.4.0";
+        version = "2.0.0";
        src = fetchFromGitHub {
          owner = "clojure-emacs";
          repo = "inf-clojure";
-          rev = "a9eb2109fcd547b5c9f18f7bf9e617f32d47b5a0";
-          sha256 = "1dmr1arqy2vs9jdjha513mvw3yfwgkn4zs728q83asjy91sfcz7k";
+          rev = "c797a5aea3d2126b19c48ed99aefe3ebddd5f304";
+          sha256 = "1m8bkh8mwl1zbvpgllrghpqr5m86lkwxn3jl3i0qd60arwy51iiy";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure";
@ -18870,12 +18912,12 @@
    ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
    melpaBuild {
        pname = "ivy-erlang-complete";
-        version = "0.2.1";
+        version = "0.2.2";
        src = fetchFromGitHub {
          owner = "s-kostyaev";
          repo = "ivy-erlang-complete";
-          rev = "9ee63f0415e9774082993d672d8200bc7e62d715";
-          sha256 = "0wrkpl6v56k553zzksy4rh6wkwxdp027x8n0byic9phydrnsdn57";
+          rev = "906c31b679a4a676fe593a9620fbfc3707afb616";
+          sha256 = "1sxz8cyr9i4nk5vrvf6qag8i7yrgqnxyhkilrqrmdyf6vw1vxgag";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
@ -19981,12 +20023,12 @@
    kivy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "kivy-mode";
-        version = "1.9.1";
+        version = "1.10.0";
        src = fetchFromGitHub {
          owner = "kivy";
          repo = "kivy";
-          rev = "7e789b24cdb0ee044469d7bc42da9e4146674a18";
-          sha256 = "0rzzjzkzgpiadm9awkj7wrh2hg97lhgwxg74gvdis3fc1xg2hyri";
+          rev = "a4116a58d7c5448a4c6615021302375cbe3e129a";
+          sha256 = "070ybsn66spb82jp1fzrnkn6xlbn7jn8zprmxkz8jv0lf5lg6ggk";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@ -20065,12 +20107,12 @@
    kubernetes = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
    melpaBuild {
        pname = "kubernetes";
-        version = "0.9.0";
+        version = "0.11.0";
        src = fetchFromGitHub {
          owner = "chrisbarrett";
          repo = "kubernetes-el";
-          rev = "68dd3c2184e72b7a669e5706d1a3d95a220276d1";
-          sha256 = "163kx407jj08ifbpvvw1cp24qb4rm6l89ikgzqha01lc0bjglax5";
+          rev = "1b70b632f0e8aa851c2a54f8b19881b4657b541d";
+          sha256 = "044864d12h7ddv42b8kmnppm2ccmxl1nzarbvgkszxgmg7f6c14z";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes";
@ -20086,12 +20128,12 @@
    kubernetes-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, kubernetes, lib, melpaBuild }:
    melpaBuild {
        pname = "kubernetes-evil";
-        version = "0.9.0";
+        version = "0.11.0";
        src = fetchFromGitHub {
          owner = "chrisbarrett";
          repo = "kubernetes-el";
-          rev = "68dd3c2184e72b7a669e5706d1a3d95a220276d1";
-          sha256 = "163kx407jj08ifbpvvw1cp24qb4rm6l89ikgzqha01lc0bjglax5";
+          rev = "1b70b632f0e8aa851c2a54f8b19881b4657b541d";
+          sha256 = "044864d12h7ddv42b8kmnppm2ccmxl1nzarbvgkszxgmg7f6c14z";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes-evil";
@ -20125,6 +20167,27 @@
          license = lib.licenses.free;
        };
      }) {};
+    labburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "labburn-theme";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "ksjogo";
+          repo = "labburn-theme";
+          rev = "bfa1d9f1c7e107cb45754fe57e4e72a9be70e9d1";
+          sha256 = "1r221fwfigr6fk4p3xh00wgw9wxm2gpzvj17jf5pgd7cvyspchsy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b1bfc9870fbe61f58f107b72fd7f16efba22c902/recipes/labburn-theme";
+          sha256 = "09qqb62hfga88zka0pc27rc8i43cxi84cv1x8wj0vvzx6mvic1lm";
+          name = "labburn-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/labburn-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
    langtool = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "langtool";
@ -23148,22 +23211,22 @@
          license = lib.licenses.free;
        };
      }) {};
-    neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    neotree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "neotree";
-        version = "0.5.1";
+        version = "0.5.2";
        src = fetchFromGitHub {
          owner = "jaypei";
          repo = "emacs-neotree";
-          rev = "d2ae6ac8a919f164f34c589f2f46ddd140a79f81";
-          sha256 = "0xqcrxmpk2z4pd9scqn2nannqy0a76mkkqv9bz037a36w8v481nd";
+          rev = "5e1271655170f4cdc6849258e383c548a4e6e3d0";
+          sha256 = "0hx72fq10772bbyqrj7mhhp02k26cccjxdadiqm1ykainhfmn1x0";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree";
          sha256 = "05smm1xsn866lsrak0inn2qw6dvzy24lz6h7rvinlhk5w27xva06";
          name = "neotree";
        };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
        meta = {
          homepage = "https://melpa.org/#/neotree";
          license = lib.licenses.free;
@ -23361,12 +23424,12 @@
    nord-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "nord-theme";
-        version = "0.2.0";
+        version = "0.3.0";
        src = fetchFromGitHub {
          owner = "arcticicestudio";
          repo = "nord-emacs";
-          rev = "a49113a0808ef53d066068e227d3d5a4d7f0ad44";
-          sha256 = "04jj25h1infivqdvcgq0cbc96y2rj2c23y6vw6yh73x4kyynzvcc";
+          rev = "290aa9221a10e107acb0f06d0ec338fcb3e44785";
+          sha256 = "0az5l8y3jg6yk587wvgz1v5671d8p1vf9m0529x9axi1x7yzxry1";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/31cb60069825abe3998c8b43bc9177b39a7f3659/recipes/nord-theme";
@ -24563,12 +24626,12 @@
    org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "org-mime";
-        version = "0.0.6";
+        version = "0.0.7";
        src = fetchFromGitHub {
          owner = "org-mime";
          repo = "org-mime";
-          rev = "d540da37df26c673b83cc9aab36f2ca6cfed3481";
-          sha256 = "0fcq75cjvd0fh7ic0j28ly40i95clgn5i7j1sj5infycqkrj87xc";
+          rev = "dd1b9881af705b9e78f79791c9f933cabe59c125";
+          sha256 = "0ndyqz2hpvnx6kykjz4d8nmngdjfavlwchl2dasi6m98b585liqa";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime";
@ -26752,12 +26815,12 @@
    plain-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "plain-theme";
-        version = "2";
+        version = "5";
        src = fetchFromGitHub {
          owner = "yegortimoshenko";
          repo = "plain-theme";
-          rev = "43fc59d487d39e6110230a073f1376ab877aa739";
-          sha256 = "0g44qdpn3ni291awjklia4r26qyiavpjib04k761hfacrdkvsdys";
+          rev = "1e484668cf272ab1883cb3c1ad9e1e8639de395d";
+          sha256 = "0qhr8mch5fvy5gck5prradlrnx84h6n8nvrcqk6ynqd1nh0pnnzd";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/d7ad3737f081f101500317f7e183be6b1e7e8122/recipes/plain-theme";
@ -26936,6 +26999,27 @@
          license = lib.licenses.free;
        };
      }) {};
+    point-pos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "point-pos";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "alezost";
+          repo = "point-pos.el";
+          rev = "4cd0f8c8d1296c5c64f708b6a5835e8520c51b68";
+          sha256 = "1l3mlz51wp729rm6wf72x2fk1fla2n2s1qh8h8z58inipdi2qydp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/23a1e835155fba51f595c10c46487a4c269f43ff/recipes/point-pos";
+          sha256 = "1zv6hx8i8jwq52j4la1ff0ar0bpbs2pb4gcsh9hypghba11gnync";
+          name = "point-pos";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/point-pos";
+          license = lib.licenses.free;
+        };
+      }) {};
    pony-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
    melpaBuild {
        pname = "pony-snippets";
@ -28975,12 +29059,12 @@
    rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
    melpaBuild {
        pname = "rg";
-        version = "1.2.0";
+        version = "1.2.1";
        src = fetchFromGitHub {
          owner = "dajva";
          repo = "rg.el";
-          rev = "32fc22b192cbad03fca3835f29c36ab4a90e50a0";
-          sha256 = "168p4h7h9ik1f56cw0zr8brbn53d5jglv9r7i9zqh80zzhljw4xv";
+          rev = "44eca47f049b25bd45e8cbc7e6579911e552b88a";
+          sha256 = "0riv5cr5sy37pcwvg0yjwi3qkvqr081503j487mcc7dcyvwlcrzy";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
@ -29626,12 +29710,12 @@
    sayid = callPackage ({ cider, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "sayid";
-        version = "0.0.14";
+        version = "0.0.15";
        src = fetchFromGitHub {
          owner = "bpiel";
          repo = "sayid";
-          rev = "3e5456cade044f01eb0753aabc9e50868000bd14";
-          sha256 = "1asphbijh5y4ax03x1cn02l4ya8v44s23ani91a0d52msdaxbnyw";
+          rev = "b44b6d346604f8d1ef9b9180be359ce1e601a298";
+          sha256 = "0ggk60l132qgscgqbx4fdhzx6nlv2k7gbrjapkdl15slz2kyq03d";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd2e05f9c9328d8f9ae434c86697a4a04af8b0d/recipes/sayid";
@ -31220,12 +31304,12 @@
    spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spaceline }:
    melpaBuild {
        pname = "spaceline-all-the-icons";
-        version = "1.0.7";
+        version = "1.1.1";
        src = fetchFromGitHub {
          owner = "domtronn";
          repo = "spaceline-all-the-icons.el";
-          rev = "8915d284fc0b5fb83c9d6300750a40ef4ac05eae";
-          sha256 = "0fhni6lxs6pa8hgq16mapsxbyiqd74x9d0hhml77lanwgyy3fxnk";
+          rev = "481329d1d1c4c505a91b7f2ac231f77a19e2c74d";
+          sha256 = "15snhm5rq0n31g9hk5gzimhjclfll67vi7avhrhd9z9x6dvq0sp4";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons";
@ -32494,22 +32578,22 @@
          license = lib.licenses.free;
        };
      }) {};
-    telephone-line = callPackage ({ cl-lib ? null, eieio ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
+    telephone-line = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
    melpaBuild {
        pname = "telephone-line";
-        version = "0.3";
+        version = "0.4";
        src = fetchFromGitHub {
          owner = "dbordak";
          repo = "telephone-line";
-          rev = "70c113bea37719c83961023afd893044398e681d";
-          sha256 = "0smdlzrcbmip6c6c3rd0871wv5xyagavwsxhhgvki6ybyzdj9a19";
+          rev = "a83dcda21b0f6e10e51c3cded7da9a5d2ead5f34";
+          sha256 = "1cg34l6jq75mcqnb3p93z0kv1arvnswm8nkk39fmryand2yygnl9";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/9c998b70365fb0a210c3b9639db84034c7d45097/recipes/telephone-line";
          sha256 = "0dyh9h1yk9y0217b6rxsm7m372n910vpfgw5w23lkkrwa8x8qpx3";
          name = "telephone-line";
        };
-        packageRequires = [ cl-lib eieio emacs s seq ];
+        packageRequires = [ cl-generic cl-lib emacs seq ];
        meta = {
          homepage = "https://melpa.org/#/telephone-line";
          license = lib.licenses.free;
@ -33333,6 +33417,27 @@
          license = lib.licenses.free;
        };
      }) {};
+    turing-machine = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "turing-machine";
+        version = "0.1.2";
+        src = fetchFromGitHub {
+          owner = "therockmandolinist";
+          repo = "turing-machine";
+          rev = "41e367e54fbeff572f599f2f321ffc863601484e";
+          sha256 = "0qlm7y3pm8sfy36a8jc3cr955hqsmypzshbgxfnmcmz7wl96dplh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a003b40a52a92b3ab4d1ffc003f570d4fa6bfbde/recipes/turing-machine";
+          sha256 = "1ndy953q9hr1psqqkkqsffyvj800cnqdxcrixqiw0ls77f2kczcn";
+          name = "turing-machine";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/turing-machine";
+          license = lib.licenses.free;
+        };
+      }) {};
    twilight-anti-bright-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "twilight-anti-bright-theme";
@ -33504,12 +33609,12 @@
    undercover = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, shut-up }:
    melpaBuild {
        pname = "undercover";
-        version = "0.6.0";
+        version = "0.6.1";
        src = fetchFromGitHub {
          owner = "sviridov";
          repo = "undercover.el";
-          rev = "e72b8c924272f65d7cc6e884478e26d0b1e1e4e8";
-          sha256 = "06qcvbp5rd0kh3ibrxj5p6r578lwsrgd7yj5c6slwmkdmna2fj33";
+          rev = "86f856c799aacfd48d2eb42d1a6afda0e6e49845";
+          sha256 = "080bmfwyfi8663y8x594770hqz7mff7zvj2v03qdfwbhdr9w9y29";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/d58ad9eb863494f609114e3c6af8c14c891b83a5/recipes/undercover";
@ -34056,12 +34161,12 @@
    visual-fill-column = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "visual-fill-column";
-        version = "1.10";
+        version = "1.11";
        src = fetchFromGitHub {
          owner = "joostkremers";
          repo = "visual-fill-column";
-          rev = "159dcee48e7311ee816686d62e7ce36619127462";
-          sha256 = "0bij20a8f9pd4307m2qslcx8p3j59hkr14sm18aw0bric65him8b";
+          rev = "57c2a72d46900117ea92e0a01b97e19481800503";
+          sha256 = "086zfx4lh168rg50ndg8qzdh8vzc6sgfii7qzcn4mg4wa74hnp9y";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/c7628c805840c4687686d0b9dc5007342864721e/recipes/visual-fill-column";
@ -34413,12 +34518,12 @@
    webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, request }:
    melpaBuild {
        pname = "webpaste";
-        version = "1.2.2";
+        version = "1.3.0";
        src = fetchFromGitHub {
          owner = "etu";
          repo = "webpaste.el";
-          rev = "72ba31e5acb424cc3f87fb9c05233729722ef98e";
-          sha256 = "07bc62ymhx2kvnqi433w2nwnhqz18x6wdp1l1jqhljbr5xk39pn2";
+          rev = "70e8fd064184632b0363572b74647c7250d6eb1b";
+          sha256 = "1zlc65c0wnp8wgnpn9f60bxm4p2g46h1s2dpqm6rrvb7yp0diml3";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste";
@ -35527,8 +35632,8 @@
        version = "1.78";
        src = fetchhg {
          url = "https://www.yatex.org/hgrepos/yatex/";
-          rev = "7bf780961390";
-          sha256 = "19nxjabwr3c5sjii2pwlgak751wq9h12yp7xd6nz8i6f75md59xs";
+          rev = "428584533eab";
+          sha256 = "1nrvlziqfsyvsk09ynpww99z4vb8zv8h2jxsslvx1nm1shyn2ckh";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";
@ -35701,12 +35806,12 @@
    zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }:
    melpaBuild {
        pname = "zerodark-theme";
-        version = "4.2";
+        version = "4.4";
        src = fetchFromGitHub {
          owner = "NicolasPetton";
          repo = "zerodark-theme";
-          rev = "af231794425255d436690c9c31bceb2052251210";
-          sha256 = "1xnhcxf5d0gn8lhapjg7b289bqpf8w0d2mp76ksb8rsvx4r0bdbw";
+          rev = "60615d101769694038b17a2c75bb31c26f36a042";
+          sha256 = "09fpyhprmavv1fa97wa7lf182nhiw0797rh73xbhf7xhn1c22gbj";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme";
--- a/pkgs/applications/editors/emacs-modes/org-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/org-generated.nix
@ -1,10 +1,10 @@
 { callPackage }: {
    org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
        pname = "org";
-        version = "20170210";
+        version = "20170502";
        src = fetchurl {
-          url = "http://orgmode.org/elpa/org-20170210.tar";
-          sha256 = "1v8adjz3rv429is8m7xx2v8hvc20dxl4hcdhdf2vhcx44bgbvyjb";
+          url = "http://orgmode.org/elpa/org-20170502.tar";
+          sha256 = "1y5rdf6740z45v75y17yh3a1ivdk5fjrax3hyr11jydyicczk4h1";
        };
        packageRequires = [];
        meta = {
@ -14,10 +14,10 @@
      }) {};
    org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
        pname = "org-plus-contrib";
-        version = "20170210";
+        version = "20170502";
        src = fetchurl {
-          url = "http://orgmode.org/elpa/org-plus-contrib-20170210.tar";
-          sha256 = "1h0lwf1sw7n1df865ip5mp0pdmdi2md6hz6fq53r4zhali041ifx";
+          url = "http://orgmode.org/elpa/org-plus-contrib-20170502.tar";
+          sha256 = "06pr3w11zpns66km27ql3w8qlk6bxaxqx3bmaiwrxykhbf74dib0";
        };
        packageRequires = [];
        meta = {
--- a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
+++ b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
@ -1,7 +1,8 @@
 { stdenv, fetchgit, emacs, texinfo, texLive, perl, which, automake, enableDoc ? false }:

 stdenv.mkDerivation (rec {
-  name = "ProofGeneral-HEAD";
+  name = "ProofGeneral-unstable-${version}";
+  version = "2017-03-13";

  src = fetchgit {
    url = "https://github.com/ProofGeneral/PG.git";
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@ -269,12 +269,12 @@ in

  idea-ultimate = buildIdea rec {
    name = "idea-ultimate-${version}";
-    version = "2017.1.1";
+    version = "2017.1.2";
    description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
    license = stdenv.lib.licenses.unfree;
    src = fetchurl {
-      url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz";
-      sha256 = "18z9kv2nk8fgpns8r4ra39hs4d2v3knnwv9a996wrrbsfc9if8lp";
+      url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz";
+      sha256 = "03p5946j8m1v2ca21fz4cy4d90y6ksb8xcgd6ff7g15lg46hpjsm";
    };
    wmClass = "jetbrains-idea";
  };
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@ -8,12 +8,12 @@
 stdenv.mkDerivation rec {
  version = "${major}.${minor}";
  major = "0.26";
-  minor = "0";
+  minor = "1";
  name = "shotwell-${version}";

  src = fetchurl {
    url = "mirror://gnome/sources/shotwell/${major}/${name}.tar.xz";
-    sha256 = "090hvw9qcfs3irh05aji7pqh50j4v6xpwmsbl3r11svik7ag8p9h";
+    sha256 = "0xak1f69lp1yx3p8jgmr9c0z3jypi8zjpy3kiknn5n9g2f5cqq0a";
  };

  NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include";
--- a/pkgs/applications/misc/camlistore/default.nix
+++ b/pkgs/applications/misc/camlistore/default.nix
@ -1,26 +1,28 @@
-{ stdenv, lib, go, fetchgit, git }:
+{ stdenv, lib, go, fetchgit, git, buildGoPackage }:

-stdenv.mkDerivation rec {
-  version = "0.9";
+buildGoPackage rec {
  name = "camlistore-${version}";
+  version = "0.9";

  src = fetchgit {
    url = "https://github.com/camlistore/camlistore";
-    rev = "7b78c50007780643798adf3fee4c84f3a10154c9";
-    sha256 = "1vc4ca2rn8da0z0viv3vv2p8z211zdvq83jh2x2izdckdz204n17";
+    rev = "refs/tags/${version}";
+    sha256 = "1ypplr939ny9drsdngapa029fgak0wic8sbna588m79cbl17psya";
    leaveDotGit = true;
  };

-  buildInputs = [ go git ];
+  buildInputs = [ git ];

+  goPackagePath = "";
  buildPhase = ''
+    cd go/src/camlistore
    go run make.go
-    rm bin/README
  '';

  installPhase = ''
-    mkdir -p $out/bin
-    cp bin/* $out/bin
+    mkdir -p $bin/bin
+    rm bin/README
+    cp bin/* $bin/bin
  '';

  meta = with stdenv.lib; {
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@ -94,12 +94,12 @@ let

  flash = stdenv.mkDerivation rec {
    name = "flashplayer-ppapi-${version}";
-    version = "25.0.0.148";
+    version = "25.0.0.171";

    src = fetchzip {
      url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
          + "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
-      sha256 = "1888n0mbzhbvi95kq19fzw310p7nr9h3g5d3nyzq5fnvj0lcfxsf";
+      sha256 = "0g2955wybwqlcgslm0mfi0jdnpih1w10lkzm5g5am4smgpch8prs";
      stripRoot = false;
    };

--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@ -73,7 +73,7 @@ let
 in
 stdenv.mkDerivation rec {
  name = "flashplayer-${version}";
-  version = "25.0.0.148";
+  version = "25.0.0.171";

  src = fetchurl {
    url =
@ -84,14 +84,14 @@ stdenv.mkDerivation rec {
    sha256 =
      if debug then
        if arch == "x86_64" then
-          "1jxxnbd357ndw8b64lw4pwkg9j0shy0ns7xw0f36awimq7bclr8d"
+          "0rm7kdb8h1pf9z2sl3lv8siyizz3dw4fyfmizn48622nsfh13dzd"
        else
-          "1k0zyy4mz307r7ph4pnmyqaa0fdw2f52apala6dbrys0wdl05yfg"
+          "1akvvya0jn708ifmrf4pbpp3dpi10i3mgyld46275lcwpz8xhyw5"
      else
        if arch == "x86_64" then
-          "0n77a2z0928vd4bjgx69igzxvn8l9wrfh79j6knygdpnsbr3pybj"
+          "1r6cr00ax590jgjfp20wya67gkpw6cw0dgb9ixvlxnld4wi4mzk0"
        else
-          "1cb1h37av4icfhl4vjngsa3nfcrcdvzliwxdg22rshimlkfgr7vx";
+          "1x326qihprq59s70szf0yh96p78mbnkw41lhar71128nv91mnfc3";
  };

  nativeBuildInputs = [ unzip ];
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@ -55,7 +55,7 @@ let
 in
 stdenv.mkDerivation rec {
  name = "flashplayer-standalone-${version}";
-  version = "25.0.0.148";
+  version = "25.0.0.171";

  src = fetchurl {
    url =
@ -65,9 +65,9 @@ stdenv.mkDerivation rec {
        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/25/flash_player_sa_linux.x86_64.tar.gz";
    sha256 =
      if debug then
-        "1pkzpip8d3m92kyzap00xxq40yilgmaqnc47nak3i7gnbic8fa2r"
+        "1llvglydsqp5r9f903bzn8i09zg6rcka7lzxlhb8xi0gbw4imsv2"
      else
-        "0xxsbxnkf9xnljy6sn61jqx9xd1w0lm5mbw4ca7xk5rkc84ik91z";
+        "1sx20mgja17hi6zp5ygqg4sklp5h0h55j3jw5b759j9c2x1frq5g";
  };

  nativeBuildInputs = [ unzip ];
--- a/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/pkgs/applications/networking/ftp/filezilla/default.nix
@ -1,13 +1,13 @@
 { stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext
 , pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }:

-let version = "3.25.1"; in
+let version = "3.25.2"; in
 stdenv.mkDerivation {
  name = "filezilla-${version}";

  src = fetchurl {
    url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2";
-    sha256 = "1h9g26i16wvc3yjavd39lxifr8d21q9mvfidnwjp9ksrc1qvwww8";
+    sha256 = "1kdah69lbgpam7xrxrqxbcjplk459a5fv5ffvgfn5y5gq7dhm6sm";
  };

  configureFlags = [
--- a/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix
@ -6,13 +6,13 @@

 stdenv.mkDerivation rec {
  name = "qtox-${version}";
-  version = "1.9.0";
+  version = "1.10.0";

  src = fetchFromGitHub {
    owner  = "tux3";
    repo   = "qTox";
    rev    = "v${version}";
-    sha256 = "0l008mzrs1wsv5cbzxjkv3k48lghlcdsp8blqrkihjv5gcn3psml";
+    sha256 = "00pbb788147qxpzj3kfp6x6a9w2h8rmz0sdwfzzdjh1qyb43d4q0";
  };

  buildInputs = [
@ -34,8 +34,7 @@ stdenv.mkDerivation rec {
  installPhase = ''
    runHook preInstall

-    mkdir -p $out/bin
-    cp qtox $out/bin
+    install -Dm755 qtox $out/bin/qtox
    wrapQtProgram $out/bin/qtox

    runHook postInstall
@ -46,7 +45,7 @@ stdenv.mkDerivation rec {
  meta = with stdenv.lib; {
    description = "Qt Tox client";
    license = licenses.gpl3;
-    maintainers = with maintainers; [ viric jgeerds akaWolf ];
+    maintainers = with maintainers; [ viric jgeerds akaWolf peterhoeg ];
    platforms = platforms.all;
  };
 }
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@ -25,20 +25,20 @@ stdenv.mkDerivation rec {
  '';

  installPhase = ''
-    mkdir -p $out/bin $out/etc/systemd/{system,user}
+    mkdir -p $out/bin $out/lib/systemd/{system,user}

    cp bin/* $out/bin
  '' + lib.optionalString (stdenv.isLinux) ''
    substitute etc/linux-systemd/system/syncthing-resume.service \
-               $out/etc/systemd/system/syncthing-resume.service \
+               $out/lib/systemd/system/syncthing-resume.service \
               --replace /usr/bin/pkill ${pkgs.procps}/bin/pkill

    substitute etc/linux-systemd/system/syncthing@.service \
-               $out/etc/systemd/system/syncthing@.service \
+               $out/lib/systemd/system/syncthing@.service \
               --replace /usr/bin/syncthing $out/bin/syncthing

    substitute etc/linux-systemd/user/syncthing.service \
-               $out/etc/systemd/user/syncthing.service \
+               $out/lib/systemd/user/syncthing.service \
               --replace /usr/bin/syncthing $out/bin/syncthing
  '';

--- a/pkgs/applications/networking/syncthing/inotify.nix
+++ b/pkgs/applications/networking/syncthing/inotify.nix
@ -16,14 +16,14 @@ buildGoPackage rec {
  goDeps = ./inotify-deps.nix;

  postInstall = ''
-    mkdir -p $bin/etc/systemd/{system,user}
+    mkdir -p $bin/lib/systemd/{system,user}

    substitute $src/etc/linux-systemd/system/syncthing-inotify@.service \
-               $bin/etc/systemd/system/syncthing-inotify@.service \
+               $bin/lib/systemd/system/syncthing-inotify@.service \
               --replace /usr/bin/syncthing-inotify $bin/bin/syncthing-inotify

    substitute $src/etc/linux-systemd/user/syncthing-inotify.service \
-               $bin/etc/systemd/user/syncthing-inotify.service \
+               $bin/lib/systemd/user/syncthing-inotify.service \
               --replace /usr/bin/syncthing-inotify $bin/bin/syncthing-inotify
  '' + stdenv.lib.optionalString stdenv.isDarwin ''
    install_name_tool -delete_rpath $out/lib -add_rpath $bin $bin/bin/syncthing-inotify
--- a/pkgs/applications/science/math/weka/default.nix
+++ b/pkgs/applications/science/math/weka/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  name = "weka-${version}";
-  version = "3.8.0";
+  version = "3.8.1";

  src = fetchurl {
    url = "mirror://sourceforge/weka/${stdenv.lib.replaceChars ["."]["-"] name}.zip";
-    sha256 = "2586298688059a025e2810b1ffc73f4fb3cf81ebf2183d8d19b0763d33857f61";
+    sha256 = "16n1a74d1cispp0a22zyiivi78izi354y67gmbyvv2lv9sc45wmk";
  };

  buildInputs = [ unzip ];
--- a/pkgs/applications/science/misc/cytoscape/default.nix
+++ b/pkgs/applications/science/misc/cytoscape/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  name = "cytoscape-${version}";
-  version = "3.4.0";
+  version = "3.5.1";

  src = fetchurl {
    url = "http://chianti.ucsd.edu/${name}/${name}.tar.gz";
-    sha256 = "065fsqa01w7j85nljwwc0677lfw112xphnyn1c4hb04166q082p2";
+    sha256 = "1dvv0f7sc7q7lwmpd7xkcx86dd8lxh2il3wiwkij44gh7ni1qkfm";
  };

  buildInputs = [jre makeWrapper];
--- a/pkgs/applications/science/misc/openmvg/default.nix
+++ b/pkgs/applications/science/misc/openmvg/default.nix
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
    url = "https://www.github.com/openmvg/openmvg.git";

    # Tag v1.1
-    rev = "f5ecb48";
+    rev = "refs/tags/v${version}";
    sha256 = "1di9i7yxnkdvl8lhflynmqw62gaxwv00r1sd7nzzs9qn63g0af0f";
    fetchSubmodules = true;
  };
--- a/pkgs/applications/version-management/git-and-tools/tig/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix
@ -1,20 +1,20 @@
 { stdenv, fetchFromGitHub, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45
-, readline, makeWrapper, git, libiconv, autoreconfHook, findXMLCatalogs
+, readline, makeWrapper, git, libiconv, autoreconfHook, findXMLCatalogs, pkgconfig
 }:

 stdenv.mkDerivation rec {
  pname = "tig";
-  version = "2.2.1";
+  version = "2.2.2";
  name = "${pname}-${version}";

  src = fetchFromGitHub {
    owner = "jonas";
    repo = pname;
    rev = name;
-    sha256 = "09xiwm57df0vzk8r2hx5p1hwy5f9q8frmdf96aba2ia9837zn3av";
+    sha256 = "1zbj4pfcnj1d0zfhx5jw9x7f2hz99mry20bgyyvrij2vj8gf5vk4";
  };

-  nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs ];
+  nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkgconfig ];

  autoreconfFlags = "-I tools -v";

--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@ -18,11 +18,11 @@ let
    };
  };

-  version = "8.17.5";
+  version = "8.17.6";

  gitlabDeb = fetchurl {
    url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download";
-    sha256 = "1ga5ki1bh66sdk5yizjy0dqcg85hrzkdp0ag3si942yv28sjy1xk";
+    sha256 = "1pr8nfnkzmicn5nxjkq48l4nfjsp6v5j3v8p7cp8r86lgfdc6as3";
  };

 in
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
    owner = "gitlabhq";
    repo = "gitlabhq";
    rev = "v${version}";
-    sha256 = "0wvszxm28c80qwx6np5mi36saxzzg4n7jcp4ckvhhr3jvczn9m8g";
+    sha256 = "1yyyn2j0a457q2xbcxz6b33r23myr8kxbm9whj2dwrrbp4p273hr";
  };

  patches = [
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@ -1954,22 +1954,22 @@ rec {
    };

    debian8i386 = {
-      name = "debian-8.7-jessie-i386";
-      fullName = "Debian 8.7 Jessie (i386)";
+      name = "debian-8.8-jessie-i386";
+      fullName = "Debian 8.8 Jessie (i386)";
      packagesList = fetchurl {
        url = mirror://debian/dists/jessie/main/binary-i386/Packages.xz;
-        sha256 = "71cacb934dc4ab2e67a5ed215ccbc9836cf8d95687edec7e7fe8d3916e3b3fe8";
+        sha256 = "79dbf81e9698913c577333f47f5a56be78529fba265ec492880e8c369c478b58";
      };
      urlPrefix = mirror://debian;
      packages = commonDebianPackages;
    };

    debian8x86_64 = {
-      name = "debian-8.7-jessie-amd64";
-      fullName = "Debian 8.7 Jessie (amd64)";
+      name = "debian-8.8-jessie-amd64";
+      fullName = "Debian 8.8 Jessie (amd64)";
      packagesList = fetchurl {
        url = mirror://debian/dists/jessie/main/binary-amd64/Packages.xz;
-        sha256 = "b4cfbaaef31f05ce1726d00f0a173f5b6f33a9192513302319a49848884a17f3";
+        sha256 = "845fc80c9934d8c0f78ada6455c81c331a3359ef15c4c036b47e742fb1bb99c6";
      };
      urlPrefix = mirror://debian;
      packages = commonDebianPackages;
--- a/pkgs/data/fonts/inconsolata/lgc.nix
+++ b/pkgs/data/fonts/inconsolata/lgc.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  name = "inconsolata-lgc-${version}";
-  version = "git-2015-04-18";
+  version = "1.3";

  src = fetchFromGitHub {
    owner = "MihailJP";
    repo = "Inconsolata-LGC";
-    rev = "30bbc1bd82502bf76f1cc5553f17388da2ba20e7";
-    sha256 = "02af2gpksdxdp7zfh5qhgfqzc6gvah9v4ph818irwhs9gcq8833c";
+    rev = "8adfef7a7316fcd2e9a5857054c7cdb2babeb35d";
+    sha256 = "0dqjj3mlc28s8ljnph6l086b4j9r5dly4fldq59crycwys72zzai";
  };

  buildInputs = [ fontforge ];
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
    cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true
  '';

-  meta = {
+  meta = with stdenv.lib; {
    description = "Fork of Inconsolata font, with proper support of Cyrillic and Greek";
    longDescription = ''
      Inconsolata is one of the most suitable font for programmers created by Raph
@ -50,11 +50,9 @@ stdenv.mkDerivation rec {
    '';

    # See `License.txt' for details.
-    license = stdenv.lib.licenses.ofl;
+    license = licenses.ofl;
    homepage = https://github.com/MihailJP/Inconsolata-LGC;
-    maintainers = [
-      stdenv.lib.maintainers.avnik
-    ];
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = with maintainers; [ avnik rht ];
+    platforms = platforms.linux;
  };
 }
--- a/pkgs/development/compilers/ghcjs/base.nix
+++ b/pkgs/development/compilers/ghcjs/base.nix
@ -190,6 +190,6 @@ in mkDerivation (rec {
  description = "A Haskell to JavaScript compiler that uses the GHC API";
  license = stdenv.lib.licenses.bsd3;
  platforms = ghc.meta.platforms;
-  maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ];
+  maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan dmjio ];
  inherit broken;
 })
--- a/pkgs/development/compilers/ghcjs/default.nix
+++ b/pkgs/development/compilers/ghcjs/default.nix
@ -2,5 +2,5 @@

 bootPkgs.callPackage ./base.nix {
  inherit bootPkgs;
-  broken = true; # http://hydra.nixos.org/build/45110274
+  broken = false;
 }
--- a/pkgs/development/compilers/gnu-cobol/default.nix
+++ b/pkgs/development/compilers/gnu-cobol/default.nix
@ -0,0 +1,35 @@
+{ stdenv, fetchurl, gcc, makeWrapper
+, db, gmp, ncurses }:
+
+let version = {
+  maj = "2.0";
+  min = "rc-2";
+};
+in 
+stdenv.mkDerivation rec {
+  name = "gnu-cobol-${version.maj}${version.min}";
+
+  src = fetchurl {
+    url = "https://sourceforge.com/projects/open-cobol/files/gnu-cobol/${version.maj}/gnu-cobol-${version.maj}_${version.min}.tar.gz";
+    sha256 = "1pj7mjnp3l76zvzrh1xa6d4kw3jkvzqh39sbf02kiinq4y65s7zj";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildInputs = [ db gmp ncurses ];
+
+  postInstall = with stdenv.lib; ''
+    wrapProgram "$out/bin/cobc" \
+      --prefix PATH ':' "${gcc}/bin" \
+      --prefix NIX_LDFLAGS ' ' "'$NIX_LDFLAGS'" \
+      --prefix NIX_CFLAGS_COMPILE ' ' "'$NIX_CFLAGS_COMPILE'"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "An open-source COBOL compiler";
+    homepage = http://sourceforge.net/projects/open-cobol/;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ ericsagnes ];
+    platforms = platforms.linux;
+  };
+}
--- a/pkgs/development/compilers/go/1.7.nix
+++ b/pkgs/development/compilers/go/1.7.nix
@ -24,13 +24,13 @@ in

 stdenv.mkDerivation rec {
  name = "go-${version}";
-  version = "1.7.4";
+  version = "1.7.5";

  src = fetchFromGitHub {
    owner = "golang";
    repo = "go";
    rev = "go${version}";
-    sha256 = "1ks3xph20afrfp3vqs1sjnkpjb0lgxblv8706wa3iiyg7rka4axv";
+    sha256 = "00radlwbrssn0x3naamb33cfx7ap2jv7s51bqr705nmn2j5yyblk";
  };

  # perl is used for testing go vet
@ -105,7 +105,7 @@ stdenv.mkDerivation rec {

  patches =
    [ ./remove-tools-1.7.patch
-      ./ssl-cert-file-1.7.patch
+      ./ssl-cert-file.patch
      ./creds-test.patch

      # This test checks for the wrong thing with recent tzdata. It's been fixed in master but the patch
--- a/pkgs/development/compilers/go/1.8.nix
+++ b/pkgs/development/compilers/go/1.8.nix
@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
 , perl, which, pkgconfig, patch, fetchpatch
-, pcre, cacert
+, pcre, cacert, llvm
 , Security, Foundation, bash }:

 let
@ -24,13 +24,13 @@ in

 stdenv.mkDerivation rec {
  name = "go-${version}";
-  version = "1.8";
+  version = "1.8.1";

  src = fetchFromGitHub {
    owner = "golang";
    repo = "go";
    rev = "go${version}";
-    sha256 = "0plm11rqrqz7frwz0jjcm13x939yhny755ks1adxjzmsngln9prl";
+    sha256 = "1157mmzjpk887cpcpn2qy9c69anc22c4p3cjpl84zl7an41x660j";
  };

  # perl is used for testing go vet
@ -107,18 +107,16 @@ stdenv.mkDerivation rec {

  patches =
    [ ./remove-tools-1.8.patch
-      ./ssl-cert-file-1.8.patch
+      ./ssl-cert-file.patch
      ./creds-test.patch
      ./remove-test-pie-1.8.patch
-
-      # This test checks for the wrong thing with recent tzdata. It's been fixed in master but the patch
-      # works fine here for now.
-      (fetchpatch {
-        url    = "https://github.com/golang/go/commit/91563ced5897faf729a34be7081568efcfedda31.patch";
-        sha256 = "1ny5l3f8a9dpjjrnjnsplb66308a0x13sa0wwr4j6yrkc8j4qxqi";
-      })
    ];

+  postPatch = optionalString stdenv.isDarwin ''
+    echo "substitute hardcoded dsymutil with ${llvm}/bin/llvm-dsymutil"
+    substituteInPlace "src/cmd/link/internal/ld/lib.go" --replace dsymutil ${llvm}/bin/llvm-dsymutil
+  '';
+
  NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";

  GOOS = if stdenv.isDarwin then "darwin" else "linux";
--- a/pkgs/development/compilers/go/ssl-cert-file-1.7.patch
+++ b/pkgs/development/compilers/go/ssl-cert-file-1.7.patch
@ -1,78 +0,0 @@
-diff --git a/src/crypto/x509/root_cgo_darwin.go b/src/crypto/x509/root_cgo_darwin.go
-index a4b33c7..9700b75 100644
--- a/src/crypto/x509/root_cgo_darwin.go
-+++ b/src/crypto/x509/root_cgo_darwin.go
-@@ -151,11 +151,20 @@ int FetchPEMRoots(CFDataRef *pemRoots) {
- import "C"
- import (
- 	"errors"
-+	"io/ioutil"
-+	"os"
- 	"unsafe"
- )
- 
- func loadSystemRoots() (*CertPool, error) {
- 	roots := NewCertPool()
-+	if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
-+		data, err := ioutil.ReadFile(file)
-+		if err == nil {
-+			roots.AppendCertsFromPEM(data)
-+			return roots, nil
-+		}
-+	}
- 
- 	var data C.CFDataRef = nil
- 	err := C.FetchPEMRoots(&data)
-diff --git a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go
-index 59b303d..d4a34ac 100644
--- a/src/crypto/x509/root_darwin.go
-+++ b/src/crypto/x509/root_darwin.go
-@@ -28,16 +28,25 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate
- // The linker will not include these unused functions in binaries built with cgo enabled.
- 
- func execSecurityRoots() (*CertPool, error) {
-+	var (
-+		mu    sync.Mutex
-+		roots = NewCertPool()
-+	)
-+
-+	if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
-+		data, err := ioutil.ReadFile(file)
-+		if err == nil {
-+			roots.AppendCertsFromPEM(data)
-+			return roots, nil
-+		}
-+	}
-+
- 	cmd := exec.Command("/usr/bin/security", "find-certificate", "-a", "-p", "/System/Library/Keychains/SystemRootCertificates.keychain")
- 	data, err := cmd.Output()
- 	if err != nil {
- 		return nil, err
- 	}
- 
-	var (
-		mu    sync.Mutex
-		roots = NewCertPool()
-	)
- 	add := func(cert *Certificate) {
- 		mu.Lock()
- 		defer mu.Unlock()
-diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go
-index 7bcb3d6..3986e1a 100644
--- a/src/crypto/x509/root_unix.go
-+++ b/src/crypto/x509/root_unix.go
-@@ -24,6 +24,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate
- 
- func loadSystemRoots() (*CertPool, error) {
- 	roots := NewCertPool()
-+	if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
-+		data, err := ioutil.ReadFile(file)
-+		if err == nil {
-+			roots.AppendCertsFromPEM(data)
-+			return roots, nil
-+		}
-+	}
-+
- 	var firstErr error
- 	for _, file := range certFiles {
- 		data, err := ioutil.ReadFile(file)
--- a/pkgs/development/compilers/go/ssl-cert-file-1.8.patch
+++ b/pkgs/development/compilers/go/ssl-cert-file-1.8.patch
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@ -3,13 +3,13 @@

 stdenv.mkDerivation ( rec {
  name = "ponyc-${version}";
-  version = "0.13.1";
+  version = "0.14.0";

  src = fetchFromGitHub {
    owner = "ponylang";
    repo = "ponyc";
    rev = version;
-    sha256 = "1x3w7mxpwgf2bn2c1qqxbj4w5gp775l7r42lj9jvspayb6a6w28s";
+    sha256 = "0zzr3mmjp7010d3jfly6lbwaib546praml97kgj92yixahnwz533";
  };

  buildInputs = [ llvm makeWrapper which ];
--- a/pkgs/development/coq-modules/fiat/HEAD.nix
+++ b/pkgs/development/coq-modules/fiat/HEAD.nix
@ -2,8 +2,8 @@

 stdenv.mkDerivation rec {

-  name = "coq-fiat-${coq.coq-version}-${version}";
-  version = "20161024";
+  name = "coq-fiat-${coq.coq-version}-unstable-${version}";
+  version = "2016-10-24";

  src = fetchgit {
    url = "https://github.com/mit-plv/fiat.git";
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@ -236,7 +236,6 @@ stdenv.mkDerivation ({
    # libraries) from all the dependencies.
    local dynamicLinksDir="$out/lib/links"
    mkdir -p $dynamicLinksDir
-    local foundDylib=false
    for d in $(grep dynamic-library-dirs $packageConfDir/*|awk '{print $2}'); do
      ln -s $d/*.dylib $dynamicLinksDir
    done
--- a/pkgs/development/libraries/hpx/default.nix
+++ b/pkgs/development/libraries/hpx/default.nix
@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, boost, cmake, hwloc, gperftools, pkgconfig, python }:
+
+stdenv.mkDerivation rec {
+  name = "hpx-${version}";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "STEllAR-GROUP";
+    repo = "hpx";
+    rev = "${version}";
+    sha256 = "0k79gw4c0v4i7ps1hw6x4m7svxbfml5xm6ly7p00dvg7z9521zsk";
+  };
+
+  buildInputs = [ boost hwloc gperftools ];
+  nativeBuildInputs = [ cmake pkgconfig python ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "C++ standard library for concurrency and parallelism";
+    homepage = "https://github.com/STEllAR-GROUP/hpx";
+    license = stdenv.lib.licenses.boost;
+    platforms = [ "x86_64-linux" ]; # stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ bobakker ];
+  };
+}
--- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
+++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
@ -2,7 +2,8 @@
 , git, xorg, gnum4, libxcb, gperf }:

 stdenv.mkDerivation rec {
-  name = "xcb-util-cursor-0.1.1-3-gf03cc27";
+  name = "xcb-util-cursor-0.1.1-3-unstable-${version}";
+  version = "2017-04-05";

  src = fetchgit {
    url    = http://anongit.freedesktop.org/git/xcb/util-cursor.git;
--- a/pkgs/development/python-modules/Pygments/default.nix
+++ b/pkgs/development/python-modules/Pygments/default.nix
@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, docutils
+}:
+
+buildPythonPackage rec {
+  pname = "Pygments";
+  version = "2.2.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1k78qdvir1yb1c634nkv6rbga8wv4289xarghmsbbvzhvr311bnv";
+  };
+
+  propagatedBuildInputs = [ docutils ];
+
+  # Circular dependency with sphinx
+  doCheck = false;
+
+  meta = {
+    homepage = http://pygments.org/;
+    description = "A generic syntax highlighter";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ nckx garbas ];
+  };
+}
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@ -11,6 +11,7 @@
 , six
 , protobuf3_2
 , swig
+, werkzeug
 , mock
 , gcc
 , zlib
@ -31,7 +32,7 @@ assert ! (stdenv.isDarwin && cudaSupport);

 buildPythonPackage rec {
  pname = "tensorflow";
-  version = "1.0.0";
+  version = "1.1.0";
  name = "${pname}-${version}";
  format = "wheel";
  disabled = ! (isPy35 || isPy27);
@ -49,31 +50,31 @@ buildPythonPackage rec {
        darwin.cpu = {
          py2 = {
            url = tfurl "mac" "cpu" "py2-none-any" ;
-            sha256 = "15ayil28p20wkgpwkr4mz0imjxnf049xx4117jspg1qkjg2bn1b2";
+            sha256 = "1fgf26lw0liqxc9pywc8y2mj8l1mv48nhkav0pag9vavdacb9mqr";
          };
          py3 = {
            url = tfurl "mac" "cpu" "py3-none-any" ;
-            sha256 = "1ynyhbm7yrp421364s49a1r3p83zxy74iiy5c4hx2xm5c4gs29an";
+            sha256 = "0z5p1fra7bih0vqn618i2w3vyy8d1rkc72k7bmjq0rw8msl717ia";
          };
        };
        linux-x86_64.cpu = {
          py2 = {
            url = tfurl "linux" "cpu" "cp27-none-linux_x86_64";
-            sha256 = "1hwhq1qhjrfkqfkxpsrq6mdmdibnqr3n7xvzkxp6gaqj73vn5ch2";
+            sha256 = "0ld3hqx3idxk0zcrvn3p9yqnmx09zsj3mw66jlfw6fkv5hznx8j2";
          };
          py3 = {
            url = tfurl "linux" "cpu" "cp35-cp35m-linux_x86_64";
-            sha256 = "0jx2mmlw0nxah9l25r46i7diqiv31qcz7855n250lsxfwcppy7y3";
+            sha256 = "0ahz9222rzqrk43lb9w4m351klkm6mlnnvw8xfqip28vbmymw90b";
          };
        };
        linux-x86_64.cuda = {
          py2 = {
            url = tfurl "linux" "gpu" "cp27-none-linux_x86_64";
-            sha256 = "0l8f71x3ama5a6idj05jrswlmp4yg37fxhz8lx2xmgk14aszbcy5";
+            sha256 = "1baa9jwr6f8f62dyx6isbw8yyrd0pi1dz1srjblfqsyk1x3pnfvh";
          };
          py3 = {
            url = tfurl "linux" "gpu" "cp35-cp35m-linux_x86_64";
-            sha256 = "12q7s0yk0h3r4glh0fhl1fcdx7jl8xikwwp04a1lcagasr51s36m";
+            sha256 = "0606m2awy0ifhniy8lsyhd0xc388dgrwksn87989xlgy90wpxi92";
          };
        };
      };
@ -96,7 +97,7 @@ buildPythonPackage rec {
    );

  propagatedBuildInputs = with stdenv.lib;
-    [ numpy six protobuf3_2 swig mock ]
+    [ numpy six protobuf3_2 swig werkzeug mock ]
    ++ optionals cudaSupport [ cudatoolkit cudnn gcc49 ];

  # Note that we need to run *after* the fixup phase because the
@ -121,6 +122,7 @@ buildPythonPackage rec {
    description = "TensorFlow helps the tensors flow";
    homepage = http://tensorflow.org;
    license = licenses.asl20;
+    maintainers = with maintainers; [ jpbernardy ];
    platforms = with platforms; if cudaSupport then linux else linux ++ darwin;
  };
 }
--- a/pkgs/development/tools/misc/ycmd/default.nix
+++ b/pkgs/development/tools/misc/ycmd/default.nix
@ -2,7 +2,7 @@
 , gocode ? null
 , godef ? null
 , rustracerd ? null
-, Cocoa ? null
+, fixDarwinDylibNames, Cocoa ? null
 }:

 stdenv.mkDerivation rec {
@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
    sha256 = "0p5knlxgy66zi229ns1lfdhz5lram93vahmmk54w98fr3h8b1yfj";
  };

-  buildInputs = [ cmake boost ]  ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
+  buildInputs = [ cmake boost ]
+    ++ stdenv.lib.optional stdenv.isDarwin [ fixDarwinDylibNames Cocoa ];

  buildPhase = ''
    export EXTRA_CMAKE_ARGS=-DPATH_TO_LLVM_ROOT=${llvmPackages.clang-unwrapped}
@ -44,7 +45,7 @@ stdenv.mkDerivation rec {
    " ycmd/__main__.py

    mkdir -p $out/lib/ycmd
-    cp -r ycmd/ CORE_VERSION libclang.so.* ycm_core.so $out/lib/ycmd/
+    cp -r ycmd/ CORE_VERSION libclang.so.* libclang.dylib* ycm_core.so $out/lib/ycmd/

    mkdir -p $out/bin
    ln -s $out/lib/ycmd/ycmd/__main__.py $out/bin/ycmd
@ -78,7 +79,7 @@ stdenv.mkDerivation rec {
    description = "A code-completion and comprehension server";
    homepage = https://github.com/Valloric/ycmd;
    license = licenses.gpl3;
-    maintainers = with maintainers; [ rasendubi cstrahan ];
+    maintainers = with maintainers; [ rasendubi cstrahan lnl7 ];
    platforms = platforms.all;
  };
 }
--- a/pkgs/development/tools/yarn/default.nix
+++ b/pkgs/development/tools/yarn/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  name = "yarn-${version}";
-  version = "0.23.2";
+  version = "0.23.4";

  src = fetchzip {
    url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz";
-    sha256 = "06vqi78q1wsybr4nsh8xjnqmjynljmb36h21j2ffmni1adxf4syq";
+    sha256 = "1jv2fbi10rx6whqn1krn9lrgwpnmzlbfym23m0df4y6k9pfyc9pz";
  };

  buildInputs = [makeWrapper nodejs];
--- a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix
+++ b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
  meta = with stdenv.lib; {
    description = "Firmware for Broadcom WIDCOMM® Bluetooth devices";
    homepage = http://www.catalog.update.microsoft.com/Search.aspx?q=Broadcom+bluetooth;
-    license = licenses.unfreeRedistributableFirmware;
+    license = licenses.unfree;
    platforms = platforms.linux;
    maintainers = with maintainers; [ zraexy ];
  };
--- a/pkgs/os-specific/linux/kernel/hardened-config.nix
+++ b/pkgs/os-specific/linux/kernel/hardened-config.nix
@ -2,24 +2,29 @@
 # http://kernsec.org/wiki/index.php/Kernel_Self_Protection_Project#Recommended_settings
 # https://wiki.gentoo.org/wiki/Hardened/Hardened_Kernel_Project
 #
-# The base kernel is assumed to be at least 4.9 or whatever the toplevel
-# linux_hardened package expression uses.
-#
 # Dangerous features that can be permanently (for the boot session) disabled at
 # boot via sysctl or kernel cmdline are left enabled here, for improved
 # flexibility.

-{ stdenv }:
+{ stdenv, version }:

 with stdenv.lib;

+assert (versionAtLeast version "4.9");
+
 ''
 GCC_PLUGINS y # Enable gcc plugin options

-DEBUG_KERNEL y
-DEBUG_RODATA y # Make kernel text & rodata read-only
+${optionalString (versionAtLeast version "4.11") ''
+  GCC_PLUGIN_STRUCTLEAK y # A port of the PaX structleak plugin
+''}
+
 DEBUG_WX y # A one-time check for W+X mappings at boot; doesn't do anything beyond printing a warning

+${optionalString (versionAtLeast version "4.10") ''
+  BUG_ON_DATA_CORRUPTION y # BUG if kernel struct validation detects corruption
+''}
+
 # Additional validation of commonly targetted structures
 DEBUG_CREDENTIALS y
 DEBUG_NOTIFIERS y
@ -32,6 +37,9 @@ PAGE_POISONING y
 PAGE_POISONING_NO_SANITY y
 PAGE_POISONING_ZERO y

+CC_STACKPROTECTOR_REGULAR n
+CC_STACKPROTECTOR_STRONG y
+
 # Stricter /dev/mem
 STRICT_DEVMEM y
 IO_STRICT_DEVMEM y
--- a/pkgs/os-specific/linux/kernel/linux-4.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.10.nix
@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:

 import ./generic.nix (args // rec {
-  version = "4.10.14";
+  version = "4.10.15";
  extraMeta.branch = "4.10";

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

  kernelPatches = args.kernelPatches;
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:

 import ./generic.nix (args // rec {
-  version = "4.4.66";
+  version = "4.4.67";
  extraMeta.branch = "4.4";

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "10yl43sdzdy3c4vyqdzrw5vb59bbfb7z6k171a2sid9qr63hfi4s";
+    sha256 = "063vjskz6grjp3bmgcp056r8xzy578fwc2kmzdhb6lw5mih9r85f";
  };

  kernelPatches = args.kernelPatches;
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:

 import ./generic.nix (args // rec {
-  version = "4.9.26";
+  version = "4.9.27";
  extraMeta.branch = "4.9";

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

  kernelPatches = args.kernelPatches;
--- a/pkgs/os-specific/linux/shadow/default.nix
+++ b/pkgs/os-specific/linux/shadow/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, libxslt, libxml2
+{ stdenv, fetchpatch, fetchFromGitHub, autoreconfHook, libxslt, libxml2
 , docbook_xml_dtd_412, docbook_xsl, gnome_doc_utils, flex, bison
 , pam ? null, glibcCross ? null }:

@ -9,7 +9,7 @@ let
    then glibcCross
    else assert stdenv ? glibc; stdenv.glibc;

-  dots_in_usernames = fetchurl {
+  dots_in_usernames = fetchpatch {
    url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/shadow/files/shadow-4.1.3-dots-in-usernames.patch;
    sha256 = "1fj3rg6x3jppm5jvi9y7fhd2djbi4nc5pgwisw00xlh4qapgz692";
  };
@ -28,21 +28,30 @@ stdenv.mkDerivation rec {
  };

  buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam;
-  nativeBuildInputs = [autoreconfHook libxslt libxml2 
+  nativeBuildInputs = [autoreconfHook libxslt libxml2
    docbook_xml_dtd_412 docbook_xsl gnome_doc_utils flex bison
    ];

-  patches = [ ./keep-path.patch dots_in_usernames ];
+  patches =
+    [ ./keep-path.patch
+      dots_in_usernames
+      (fetchpatch {
+        url = https://github.com/shadow-maint/shadow/commit/507f96cdeb54079fb636c7ce21e371f7a16a520e.patch;
+        sha256 = "10k70fx3z051f83p1k7ljjaawbykhn7cy6fg1zy04jp3xkvdwxc7";
+      })
+    ];

  outputs = [ "out" "su" "man" ];

+  enableParallelBuilding = true;
+
  # Assume System V `setpgrp (void)', which is the default on GNU variants
  # (`AC_FUNC_SETPGRP' is not cross-compilation capable.)
  preConfigure = ''
    export ac_cv_func_setpgrp_void=yes
    export shadow_cv_logdir=/var/log
    (
-    head -n -1 "${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml" 
+    head -n -1 "${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml"
    tail -n +3 "${docbook_xsl}/share/xml/docbook-xsl/catalog.xml"
    ) > xmlcatalog
    configureFlags="$configureFlags --with-xml-catalog=$PWD/xmlcatalog ";
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@ -1,17 +1,15 @@
 {stdenv, fetchurl, fetchFromGitHub, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, fetchpatch}:

-let
-  inherit (stdenv.lib) optional optionalString;
-  baseName = "sysdig";
-  version = "0.15.0";
-in
+with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "${baseName}-${version}";
+  name = "sysdig-${version}";
+  version = "0.16.0";

-  src = fetchurl {
-    name = "${name}.tar.gz";
-    url = "https://github.com/draios/sysdig/archive/${version}.tar.gz";
-    sha256 = "08spprzgx6ksd7sjp5nk7z5szdlixh2sb0bsb9mfaq4xr12gsjw2";
+  src = fetchFromGitHub {
+    owner = "draios";
+    repo = "sysdig";
+    rev = version;
+    sha256 = "1h3f9nkc5fkvks6va0maq377m9qxnsf4q3f2dc14rdzfvnzidy06";
  };

  buildInputs = [
@ -37,7 +35,7 @@ stdenv.mkDerivation rec {
    export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
  '';

-  libPath = stdenv.lib.makeLibraryPath [
+  libPath = makeLibraryPath [
    zlib
    luajit
    ncurses
@ -67,7 +65,7 @@ stdenv.mkDerivation rec {
    fi
  '';

-  meta = with stdenv.lib; {
+  meta = {
    description = "A tracepoint-based system tracing tool for Linux (with clients for other OSes)";
    license = licenses.gpl2;
    maintainers = [maintainers.raskin];
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@ -1,5 +1,7 @@
 { stdenv, lib, fetchurl, openssl, libtool, perl, libxml2
-, libseccomp ? null }:
+, enableSeccomp ? false, libseccomp ? null }:
+
+assert enableSeccomp -> libseccomp != null;

 let version = "9.10.4-P6"; in

@ -17,7 +19,7 @@ stdenv.mkDerivation rec {
    stdenv.lib.optional stdenv.isDarwin ./darwin-openssl-linking-fix.patch;

  buildInputs = [ openssl libtool perl libxml2 ] ++
-    stdenv.lib.optional stdenv.isLinux libseccomp;
+    stdenv.lib.optional enableSeccomp libseccomp;

  STD_CDEFINES = [ "-DDIG_SIGCHASE=1" ]; # support +sigchase

@ -35,7 +37,7 @@ stdenv.mkDerivation rec {
    "--without-pkcs11"
    "--without-purify"
    "--without-python"
-  ] ++ lib.optional (stdenv.isi686 || stdenv.isx86_64) "--enable-seccomp";
+  ] ++ lib.optional enableSeccomp "--enable-seccomp";

  postInstall = ''
    moveToOutput bin/bind9-config $dev
--- a/pkgs/servers/mattermost/default.nix
+++ b/pkgs/servers/mattermost/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  name = "mattermost-${version}";
-  version = "3.6.2";
+  version = "3.8.2";

  src = fetchurl {
    url = "https://releases.mattermost.com/${version}/mattermost-team-${version}-linux-amd64.tar.gz";
-    sha256 = "1wf8xvy8njmhym45dwag6mdwhfgzg5xccvhyv7c68rz5h57vfgsb";
+    sha256 = "1rrcasx8yzr48lwznqhkqk4qjfhxq5lnfcl9xiqkh6y2gmaqbk42";
  };

  installPhase = ''
--- a/pkgs/servers/mattermost/matterircd.nix
+++ b/pkgs/servers/mattermost/matterircd.nix
@ -2,13 +2,13 @@

 buildGoPackage rec {
  name = "matterircd-${version}";
-  version = "0.11.2";
+  version = "0.11.3";

  src = fetchFromGitHub {
    owner = "42wim";
    repo = "matterircd";
    rev = "v${version}";
-    sha256 = "0yxqlckir50kdlbi36kak5ncfzl6sh811hzicdar5yzanzcip8ja";
+    sha256 = "10fmn6midfzmn6ylhrk00bvykn0zijypiqp5hjqn642kcdkrjc6i";
  };

  goPackagePath = "github.com/42vim/matterircd";
--- a/pkgs/servers/monitoring/cadvisor/default.nix
+++ b/pkgs/servers/monitoring/cadvisor/default.nix
@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
    homepage = https://github.com/google/cadvisor;
    license = licenses.asl20;
    maintainers = with maintainers; [ offline ];
-    platforms = platforms.unix;
+    platforms = platforms.linux;
  };
 }
--- a/pkgs/servers/search/elasticsearch/plugins.nix
+++ b/pkgs/servers/search/elasticsearch/plugins.nix
@ -94,10 +94,10 @@ in {
  elasticsearch_kopf = esPlugin rec {
    name = "elasticsearch-kopf-${version}";
    pluginName = "elasticsearch-kopf";
-    version = "1.5.7";
+    version = "2.1.1";
    src = fetchurl {
      url = "https://github.com/lmenezes/elasticsearch-kopf/archive/v${version}.zip";
-      sha256 = "0mq6jmjb4ldi03m431kzr7ly0bf7mdim7s5dx4wplb85gyhscns1";
+      sha256 = "1nwwd92g0jxhfpkxb1a9z5a62naa1y7hvlx400dm6mwwav3mrf4v";
    };
    meta = {
      homepage = https://github.com/lmenezes/elasticsearch-kopf;
--- a/pkgs/shells/zsh-git-prompt/default.nix
+++ b/pkgs/shells/zsh-git-prompt/default.nix
@ -0,0 +1,70 @@
+# zsh-git-prompt -- Informative git prompt for zsh
+#
+# Usage: to enable this plugin for all users, you could
+# add it to configuration.nix like this:
+#
+#   programs.zsh.interactiveShellInit = ''
+#     source ${pkgs.zsh-git-prompt}/share/zsh-git-prompt/zshrc.sh
+#   '';
+#
+# Or you can install it globally but only enable it in individual
+# users' ~/.zshrc files:
+#
+#   source /run/current-system/sw/share/zsh-git-prompt/zshrc.sh
+#
+# Or if installed locally:
+#
+#   source ~/.nix-profile/share/zsh-git-prompt/zshrc.sh
+#
+# Either way, you then have to set a prompt that incorporates
+# git_super_status, for example:
+#
+#   PROMPT='%B%m%~%b$(git_super_status) %# '
+#
+# More details are in share/doc/zsh-git-prompt/README.md, once
+# installed.
+#
+{ fetchgit
+, haskell
+, python
+, git
+, lib
+, ghcVersion ? "ghc802"
+}:
+
+haskell.packages.${ghcVersion}.callPackage
+  ({ mkDerivation, base, HUnit, parsec, process, QuickCheck, stdenv }:
+   mkDerivation rec {
+     pname = "zsh-git-prompt";
+     version = "0.5";
+     src = fetchgit {
+       url = "https://github.com/olivierverdier/zsh-git-prompt.git";
+       rev = "0a6c8b610e799040b612db8888945f502a2ddd9d";
+       sha256 = "19x1gf1r6l7r6i7vhhsgzcbdlnr648jx8j84nk2zv1b8igh205hw";
+     };
+     prePatch = ''
+        substituteInPlace zshrc.sh                       \
+          --replace ':-"python"' ':-"haskell"'           \
+          --replace 'python '    '${python.interpreter} ' \
+          --replace 'git '       '${git}/bin/git '
+     '';
+     preCompileBuildDriver = "cd src";
+     postInstall = ''
+        cd ..
+        gpshare=$out/share/${pname}
+        gpdoc=$out/share/doc/${pname}
+        mkdir -p $gpshare/src $gpdoc
+        cp README.md $gpdoc
+        cp zshrc.sh gitstatus.py $gpshare
+        mv $out/bin $gpshare/src/.bin
+     '';
+     isLibrary = false;
+     isExecutable = true;
+     libraryHaskellDepends = [ base parsec process QuickCheck ];
+     executableHaskellDepends = libraryHaskellDepends;
+     testHaskellDepends = [HUnit] ++ libraryHaskellDepends;
+     homepage = "http://github.com/olivierverdier/zsh-git-prompt#readme";
+     description = "Informative git prompt for zsh";
+     license = stdenv.lib.licenses.mit;
+     maintainers = [lib.maintainers.league];
+   }) {}
--- a/pkgs/tools/admin/salt/default.nix
+++ b/pkgs/tools/admin/salt/default.nix
@ -8,11 +8,11 @@

 python2Packages.buildPythonApplication rec {
  name = "salt-${version}";
-  version = "2016.11.2";
+  version = "2016.11.4";

  src = fetchurl {
    url = "mirror://pypi/s/salt/${name}.tar.gz";
-    sha256 = "0hrss5x47cr7ffyjl8jlkhf9j88lqvg7c33rjc5bimck8b7x7hzm";
+    sha256 = "0pvn0pkndwx81xkpah14awz4rg9zhkpl4bhn3hlrin1zinr0jhgv";
  };

  propagatedBuildInputs = with python2Packages; [
--- a/pkgs/tools/graphics/pngquant/default.nix
+++ b/pkgs/tools/graphics/pngquant/default.nix
@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
    fetchSubmodules = true;
  };

+  preConfigure = "patchShebangs .";
+
  buildInputs = [ pkgconfig libpng zlib lcms2 ];

  meta = with stdenv.lib; {
--- a/pkgs/tools/misc/graylog/plugins.nix
+++ b/pkgs/tools/misc/graylog/plugins.nix
@ -35,6 +35,19 @@ in {
      description = "SSO support for Graylog through trusted HTTP headers set by load balancers or authentication proxies";
    };
  };
+  internal-logs = glPlugin rec {
+    name = "graylog-internal-logs-${version}";
+    pluginName = "graylog-plugin-internal-logs";
+    version = "1.0.0";
+    src = fetchurl {
+      url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar";
+      sha256 = "1abl7wwr59k9vvr2fmrlrx4ipsjjl8xryqy19fy5irxhpwp93ixl";
+    };
+    meta = {
+      homepage = "https://github.com/graylog-labs/graylog-plugin-internal-logs";
+      description = "Graylog plugin to record internal logs of Graylog efficiently instead of sending them over the network";
+    };
+  };
  ipanonymizer = glPlugin rec {
    name = "graylog-ipanonymizer-${version}";
    pluginName = "graylog-plugin-ipanonymizer";
@ -61,6 +74,19 @@ in {
      description = "Jabber Alarmcallback Plugin for Graylog";
    };
  };
+  mongodb-profiler = glPlugin rec {
+    name = "graylog-mongodb-profiler-${version}";
+    pluginName = "graylog-plugin-mongodb-profiler";
+    version = "2.0.1";
+    src = fetchurl {
+      url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar";
+      sha256 = "1hadxyawdz234lal3dq5cy3zppl7ixxviw96iallyav83xyi23i8";
+    };
+    meta = {
+      homepage = "https://github.com/graylog-labs/graylog-plugin-mongodb-profiler";
+      description = "Graylog input plugin that reads MongoDB profiler data";
+    };
+  };
  netflow = glPlugin rec {
    name = "graylog-netflow-${version}";
    pluginName = "graylog-plugin-netflow";
@ -103,10 +129,10 @@ in {
  threatintel = glPlugin rec {
    name = "graylog-threatintel-${version}";
    pluginName = "graylog-plugin-threatintel";
-    version = "0.9.2";
+    version = "0.10.0";
    src = fetchurl {
      url = "https://github.com/Graylog2/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar";
-      sha256 = "0d2cjcgjwfqp6b756n68zbslm1pq1z9dhn6iiskmv6jdpkffjw3l";
+      sha256 = "0clg0vy8aipw122rfqww1lnjriazlnnh77pqiy5vnmv6ycjw0y4i";
    };
    meta = {
      homepage = "https://github.com/Graylog2/graylog-plugin-threatintel";
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl, makeWrapper, procps }:

 stdenv.mkDerivation rec {
-  name = "parallel-20170122";
+  name = "parallel-20170422";

  src = fetchurl {
    url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "19maf889vj1c4zakqwap58f44hgypyb5mzzwfsliir9gvvcq6zj1";
+    sha256 = "0afk1q8mqzz02h6imyykgi9gwk5gj08hzs6lwgd65ilj4slkh93s";
  };

  nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/tools/networking/whois/default.nix
+++ b/pkgs/tools/networking/whois/default.nix
@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, perl, gettext }:

 stdenv.mkDerivation rec {
-  version = "5.2.14";
+  version = "5.2.15";
  name = "whois-${version}";

  src = fetchFromGitHub {
    owner = "rfc1036";
    repo = "whois";
    rev = "v${version}";
-    sha256 = "06nx295g03z7vzrrc3mhxikpw870zvkilrlxghd2rpcbm939iin5";
+    sha256 = "0via0ls9lqmzvbbfq4zyla7si45nvkhdx0f516739f9b1jmffj04";
  };

  buildInputs = [ perl gettext ];
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@ -147,12 +147,12 @@ in rec {

  nixUnstable = (lib.lowPrio (common rec {
    name = "nix-1.12${suffix}";
-    suffix = "pre5344_eba840c8";
+    suffix = "pre5350_7689181e";
    src = fetchFromGitHub {
      owner = "NixOS";
      repo = "nix";
-      rev = "eba840c8a13b465ace90172ff76a0db2899ab11b";
-      sha256 = "08yrzlmshg854w5pwq8af634wic91h7k55fs51i55dyxpw4wpxk7";
+      rev = "7689181e4f5921d3356736996079ec0310e834c6";
+      sha256 = "08daxcpj18dffsbqs3fckahq06gzs8kl6xr4b4jgijwdl5vqwiri";
    };
    fromGit = true;
  })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; };
--- a/pkgs/tools/security/enpass/default.nix
+++ b/pkgs/tools/security/enpass/default.nix
@ -53,7 +53,6 @@ let
    meta = {
      description = "a well known password manager";
      homepage = https://www.enpass.io/;
-      maintainer = lib.maintainers.ronny;
      license = lib.licenses.unfree;
      platforms = lib.platforms.linux;
    };
--- a/pkgs/tools/system/cron/default.nix
+++ b/pkgs/tools/system/cron/default.nix
@ -23,7 +23,7 @@ stdenv.mkDerivation {
    #define _PATH_SENDMAIL "${sendmailPath}"

    #undef _PATH_DEFPATH
-    #define _PATH_DEFPATH "/run/wrappers/bin:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/run/current-system/sw/bin:/run/current-system/sw/sbin:/usr/bin:/bin"
+    #define _PATH_DEFPATH "/run/wrappers/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:/usr/bin:/bin"
    __EOT__

    # Implicit saved uids do not work here due to way NixOS uses setuid wrappers
--- a/pkgs/tools/text/staccato/default.nix
+++ b/pkgs/tools/text/staccato/default.nix
@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+  name = "staccato-${version}";
+  version = "0.1.6";
+
+  src = fetchFromGitHub {
+    owner = "tshlabs";
+    repo = "staccato";
+    rev = version;
+    sha256 = "1zbd1gx0ik2r7bavcid776j37g6rzd3f6cs94kq1qar4gyf1gqjm";
+  };
+
+  depsSha256 = "1gwfkh3ck8n3zcy43ch2mnc28a6y10p3srhnx9dh8gwnwbpb733c";
+
+  meta = {
+    description = "A command line program that lets you compute statistics from values from a file or standard input";
+    longDescription = ''
+      Staccato (`st` for short) is a command line program that lets you
+      compute statistics from values from a file or standard input. It
+      computes things about the stream of numbers like min, max, mean, median,
+      and standard deviation. It can also compute these things about some
+      subset of the stream, for example the lower 95% of values.
+    '';
+    homepage = "https://docs.rs/crate/staccato";
+    license = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -1028,6 +1028,8 @@ with pkgs;

  socklog = callPackage ../tools/system/socklog { };

+  staccato = callPackage ../tools/text/staccato { };
+
  syscall_limiter = callPackage ../os-specific/linux/syscall_limiter {};

  syslogng = callPackage ../tools/system/syslog-ng { };
@ -2039,6 +2041,8 @@ with pkgs;

  gnuapl = callPackage ../development/interpreters/gnu-apl { };

+  gnu-cobol = callPackage ../development/compilers/gnu-cobol { };
+
  gnufdisk = callPackage ../tools/system/fdisk {
    guile = guile_1_8;
  };
@ -4819,6 +4823,8 @@ with pkgs;
  zpaq = callPackage ../tools/archivers/zpaq { };
  zpaqd = callPackage ../tools/archivers/zpaq/zpaqd.nix { };

+  zsh-git-prompt = callPackage ../shells/zsh-git-prompt { };
+
  zsh-navigation-tools = callPackage ../tools/misc/zsh-navigation-tools { };

  zsh-syntax-highlighting = callPackage ../shells/zsh-syntax-highlighting { };
@ -5348,17 +5354,13 @@ with pkgs;
    inherit (darwin.apple_sdk.frameworks) Security Foundation;
  };

-  go_1_7 = callPackage ../development/compilers/go/1.7.nix ({
+  go_1_7 = callPackage ../development/compilers/go/1.7.nix {
    inherit (darwin.apple_sdk.frameworks) Security Foundation;
-  } // stdenv.lib.optionalAttrs stdenv.isDarwin {
-    stdenv = stdenvAdapters.overrideCC pkgs.stdenv pkgs.clang_38;
-  });
+  };

-  go_1_8 = callPackage ../development/compilers/go/1.8.nix ({
+  go_1_8 = callPackage ../development/compilers/go/1.8.nix {
    inherit (darwin.apple_sdk.frameworks) Security Foundation;
-  } // stdenv.lib.optionalAttrs stdenv.isDarwin {
-    stdenv = stdenvAdapters.overrideCC pkgs.stdenv pkgs.clang_38;
-  });
+  };

  go = go_1_8;

@ -8012,6 +8014,8 @@ with pkgs;

  hound = callPackage ../development/tools/misc/hound { };

+  hpx = callPackage ../development/libraries/hpx { };
+
  hspell = callPackage ../development/libraries/hspell { };

  hspellDicts = callPackage ../development/libraries/hspell/dicts.nix { };
@ -11999,9 +12003,10 @@ with pkgs;
  linuxPackages_latest_xen_dom0 = recurseIntoAttrs (linuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; }));

  # Hardened linux
-  linux_hardened = linux_4_9.override {
+  linux_hardened = let linux = pkgs.linux_4_11; in linux.override {
    extraConfig = import ../os-specific/linux/kernel/hardened-config.nix {
      inherit stdenv;
+      inherit (linux) version;
    };
  };

@ -17015,7 +17020,7 @@ with pkgs;
  quake3pointrelease = callPackage ../games/quake3/content/pointrelease.nix { };

  quakespasm = callPackage ../games/quakespasm { };
-  
+
  ioquake3 = callPackage ../games/quake3/ioquake { };

  quantumminigolf = callPackage ../games/quantumminigolf {};
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -12068,14 +12068,14 @@ in {

  glances = buildPythonPackage rec {
    name = "glances-${version}";
-    version = "2.8.2";
+    version = "2.9.1";
    disabled = isPyPy;

    src = pkgs.fetchFromGitHub {
      owner = "nicolargo";
      repo = "glances";
      rev = "v${version}";
-      sha256 = "1jwaq9k6q8wn197wadiwid7d8aik24rhsypmcl5q0jviwkhhiri9";
+      sha256 = "13pnim8zxqbw5b1jkl1ggqn2rg5kfwhznw42ckizrhg73ngy9yyp";
    };

    doCheck = false;
@ -19907,30 +19907,10 @@ in {
    };
  };

-  pygments = buildPythonPackage rec {
-    version = "2.2.0";
-    name = "Pygments-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/P/Pygments/${name}.tar.gz";
-      sha256 = "1k78qdvir1yb1c634nkv6rbga8wv4289xarghmsbbvzhvr311bnv";
-    };
-
-    propagatedBuildInputs = with self; [ docutils ];
-
-    # Circular dependency with sphinx
-    doCheck = false;
-
-    meta = {
-      homepage = http://pygments.org/;
-      description = "A generic syntax highlighter";
-      license = licenses.bsd2;
-      maintainers = with maintainers; [ nckx garbas ];
-    };
-  };
+  pygments = callPackage ../development/python-modules/Pygments { };

  # For Pelican 3.6.3
-  pygments_2_0 = self.pygments.override rec {
+  pygments_2_0 = self.pygments.overrideAttrs( oldAttrs: rec {
    version = "2.0.2";
    name = "Pygments-${version}";

@ -19938,7 +19918,7 @@ in {
      url = "mirror://pypi/P/Pygments/${name}.tar.gz";
      sha256 = "7320919084e6dac8f4540638a46447a3bd730fca172afc17d2c03eed22cf4f51";
    };
-  };
+  });

  pygpgme = buildPythonPackage rec {
    version = "0.3";