Merge branch 'master' into staging

2024-12-25 04:12:44 +03:00 · 2017-03-23 13:31:28 +01:00 · 2017-03-23 13:31:28 +01:00 · c1a9dc3d37
commit c1a9dc3d37
parent f0875982d1 632e81083c
163 changed files with 3073 additions and 1913 deletions
--- a/.mention-bot
+++ b/.mention-bot
@ -2,7 +2,8 @@
  "userBlacklist": [
    "civodul",
    "jhasse",
-    "shlevy"
+    "shlevy",
+    "bbenoist"
  ],
  "alwaysNotifyForPaths": [
    { "name": "FRidh", "files": ["pkgs/top-level/python-packages.nix", "pkgs/development/interpreters/python/*", "pkgs/development/python-modules/*" ] },
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@ -3,7 +3,7 @@
 ## User Guide

 Several versions of Python are available on Nix as well as a high amount of
-packages. The default interpreter is CPython 3.5.
+packages. The default interpreter is CPython 2.7.

 ### Using Python

@ -131,7 +131,7 @@ specify some (optional) [meta information](http://nixos.org/nixpkgs/manual/#chap

 The output of the function is a derivation, which is an attribute with the name
 `toolz` of the set `pythonPackages`. Actually, sets are created for all interpreter versions,
-so `python27Packages`, `python34Packages`, `python35Packages` and `pypyPackages`.
+so e.g. `python27Packages`, `python35Packages` and `pypyPackages`.

 The above example works when you're directly working on
 `pkgs/top-level/python-packages.nix` in the Nixpkgs repository. Often though,
@ -422,8 +422,8 @@ and in this case the `python35` interpreter is automatically used.

 ### Interpreters

-Versions 2.6, 2.7, 3.3, 3.4 and 3.5 of the CPython interpreter are available as respectively
-`python26`, `python27`, `python33`, `python34` and `python35`. The PyPy interpreter
+Versions 2.7, 3.3, 3.4, 3.5 and 3.6 of the CPython interpreter are available as
+respectively `python27`, `python33`, `python34`, `python35` and `python36`. The PyPy interpreter
 is available as `pypy`. The aliases `python2` and `python3` correspond to respectively `python27` and
 `python35`. The default interpreter, `python`, maps to `python2`.
 The Nix expressions for the interpreters can be found in
@ -472,6 +472,7 @@ sets are
 * `pkgs.python33Packages`
 * `pkgs.python34Packages`
 * `pkgs.python35Packages`
+* `pkgs.python36Packages`
 * `pkgs.pypyPackages`

 and the aliases
@ -674,8 +675,8 @@ deterministic bytecode. This has security implications and is relevant for
 those using Python in a `nix-shell`.

 When the environment variable `DETERMINISTIC_BUILD` is set, all bytecode will have timestamp 1.
-The `buildPythonPackage` function sets `DETERMINISTIC_BUILD` as well as
-[PYTHONHASHSEED](https://docs.python.org/3.5/using/cmdline.html#envvar-PYTHONHASHSEED).
+The `buildPythonPackage` function sets `DETERMINISTIC_BUILD=1` and
+[PYTHONHASHSEED=0](https://docs.python.org/3.5/using/cmdline.html#envvar-PYTHONHASHSEED).
 Both are also exported in `nix-shell`.


--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@ -14,6 +14,7 @@
  aboseley = "Adam Boseley <adam.boseley@gmail.com>";
  abuibrahim = "Ruslan Babayev <ruslan@babayev.com>";
  acowley = "Anthony Cowley <acowley@gmail.com>";
+  adelbertc = "Adelbert Chang <adelbertc@gmail.com>";
  adev = "Adrien Devresse <adev@adev.name>";
  Adjective-Object = "Maxwell Huang-Hobbs <mhuan13@gmail.com>";
  adnelson = "Allen Nelson <ithinkican@gmail.com>";
@ -59,7 +60,6 @@
  badi = "Badi' Abdul-Wahid <abdulwahidc@gmail.com>";
  balajisivaraman = "Balaji Sivaraman<sivaraman.balaji@gmail.com>";
  Baughn = "Svein Ove Aas <sveina@gmail.com>";
-  bbenoist = "Baptist BENOIST <return_0@live.com>";
  bcarrell = "Brandon Carrell <brandoncarrell@gmail.com>";
  bcdarwin = "Ben Darwin <bcdarwin@gmail.com>";
  bdimcheff = "Brandon Dimcheff <brandon@dimcheff.com>";
@ -216,6 +216,7 @@
  ivan-tkatchev = "Ivan Tkatchev <tkatchev@gmail.com>";
  j-keck = "Jürgen Keck <jhyphenkeck@gmail.com>";
  jagajaga = "Arseniy Seroka <ars.seroka@gmail.com>";
+  jansol = "Jan Solanti <jan.solanti@paivola.fi>";
  javaguirre = "Javier Aguirre <contacto@javaguirre.net>";
  jb55 = "William Casarin <bill@casarin.me>";
  jbedo = "Justin Bedő <cu@cua0.org>";
@ -380,6 +381,7 @@
  pashev = "Igor Pashev <pashev.igor@gmail.com>";
  patternspandemic = "Brad Christensen <patternspandemic@live.com>";
  pawelpacana = "Paweł Pacana <pawel.pacana@gmail.com>";
+  pbogdan = "Piotr Bogdan <ppbogdan@gmail.com>";
  periklis = "theopompos@gmail.com";
  pesterhazy = "Paulus Esterhazy <pesterhazy@gmail.com>";
  peterhoeg = "Peter Hoeg <peter@hoeg.com>";
--- a/nixos/doc/manual/installation/installing-usb.xml
+++ b/nixos/doc/manual/installation/installing-usb.xml
@ -11,7 +11,9 @@ a USB stick. You can use the <command>dd</command> utility to write the image:
 <command>dd if=<replaceable>path-to-image</replaceable>
 of=<replaceable>/dev/sdb</replaceable></command>. Be careful about specifying the
 correct drive; you can use the <command>lsblk</command> command to get a list of
-block devices.</para>
+block devices. If you're on OS X you can run <command>diskutil list</command>
+to see the list of devices; the device you'll use for the USB must be ejected
+before writing the image.</para>

 <para>The <command>dd</command> utility will write the image verbatim to the drive,
 making it the recommended option for both UEFI and non-UEFI installations. For
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@ -95,15 +95,6 @@ following incompatible changes:</para>
    </para>
  </listitem>

-  <listitem>
-    <para>
-      The Yama LSM is now enabled by default in the kernel,
-      which prevents ptracing non-child processes.
-      This means you will not be able to attach gdb to an existing process,
-      but will need to start that process from gdb (so it is a child).
-    </para>
-  </listitem>
-
  <listitem>
    <para>
      The <literal>stripHash</literal> bash function in <literal>stdenv</literal>
@ -249,6 +240,13 @@ following incompatible changes:</para>
    </para>
  </listitem>

+  <listitem>
+    <para>
+      The <literal>fetch*</literal> functions no longer support md5,
+      please use sha256 instead.
+    </para>
+  </listitem>
+
 </itemizedlist>


--- a/nixos/modules/config/sysctl.nix
+++ b/nixos/modules/config/sysctl.nix
@ -64,5 +64,9 @@ in
    # Removed under grsecurity.
    boot.kernel.sysctl."kernel.kptr_restrict" =
      if (config.boot.kernelPackages.kernel.features.grsecurity or false) then null else 1;
+
+    # Disable YAMA by default to allow easy debugging.
+    boot.kernel.sysctl."kernel.yama.ptrace_scope" = mkDefault 0;
+
  };
 }
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@ -1,5 +1,5 @@
 {
-  x86_64-linux = "/nix/store/4ssykr786d0wp7y6m4xd4qwqs4nrry1z-nix-1.11.7";
-  i686-linux = "/nix/store/61ggxx2072y2g877m01asy0lsn7xpn06-nix-1.11.7";
-  x86_64-darwin = "/nix/store/pxf5ri5kdbfqkhd10sw4lpj8sn385ks5-nix-1.11.7";
+  x86_64-linux = "/nix/store/j6q3pb75q1sbk0xsa5x6a629ph98ycdl-nix-1.11.8";
+  i686-linux = "/nix/store/4m6ps568l988bbr1p2k3w9raq3rblppi-nix-1.11.8";
+  x86_64-darwin = "/nix/store/cc5q944yn3j2hrs8k0kxx9r2mk9mni8a-nix-1.11.8";
 }
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@ -200,5 +200,7 @@ with lib;
    (mkRemovedOptionModule [ "services" "phpfpm" "phpIni" ] "")
    (mkRemovedOptionModule [ "services" "dovecot2" "package" ] "")
    (mkRemovedOptionModule [ "fonts" "fontconfig" "hinting" "style" ] "")
+    (mkRemovedOptionModule [ "services" "xserver" "displayManager" "sddm" "themes" ]
+      "Set the option `services.xserver.displayManager.sddm.package' instead.")
  ];
 }
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@ -177,25 +177,6 @@ in
          # programs to be wrapped.
          WRAPPER_PATH=${config.system.path}/bin:${config.system.path}/sbin

-          # Remove the old /var/setuid-wrappers path from the system...
-          #
-          # TODO: this is only necessary for ugprades 16.09 => 17.x;
-          # this conditional removal block needs to be removed after
-          # the release.
-          if [ -d /var/setuid-wrappers ]; then
-            rm -rf /var/setuid-wrappers
-          fi
-
-          # Remove the old /run/setuid-wrappers-dir path from the
-          # system as well...
-          #
-          # TODO: this is only necessary for ugprades 16.09 => 17.x;
-          # this conditional removal block needs to be removed after
-          # the release.
-          if [ -d /run/setuid-wrapper-dirs ]; then
-            rm -rf /run/setuid-wrapper-dirs
-          fi
-
          # We want to place the tmpdirs for the wrappers to the parent dir.
          wrapperDir=$(mktemp --directory --tmpdir="${parentWrapperDir}" wrappers.XXXXXXXXXX)
          chmod a+rx $wrapperDir
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@ -35,6 +35,7 @@ let
  udevRules = pkgs.runCommand "udev-rules"
    { preferLocalBuild = true;
      allowSubstitutes = false;
+      packages = unique (map toString cfg.packages);
    }
    ''
      mkdir -p $out
@ -45,7 +46,7 @@ let
      echo 'ENV{PATH}="${udevPath}/bin:${udevPath}/sbin"' > $out/00-path.rules

      # Add the udev rules from other packages.
-      for i in ${toString cfg.packages}; do
+      for i in $packages; do
        echo "Adding rules for package $i"
        for j in $i/{etc,lib}/udev/rules.d/*; do
          echo "Copying $j to $out/$(basename $j)"
@ -132,10 +133,11 @@ let
  hwdbBin = pkgs.runCommand "hwdb.bin"
    { preferLocalBuild = true;
      allowSubstitutes = false;
+      packages = unique (map toString ([udev] ++ cfg.packages));
    }
    ''
      mkdir -p etc/udev/hwdb.d
-      for i in ${toString ([udev] ++ cfg.packages)}; do
+      for i in $packages; do
        echo "Adding hwdb files for package $i"
        for j in $i/{etc,lib}/udev/hwdb.d/*; do
          ln -s $j etc/udev/hwdb.d/$(basename $j)
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@ -481,6 +481,7 @@ in {
        mkdir -p ${cfg.statePath}/repositories
        mkdir -p ${gitlabConfig.production.shared.path}/artifacts
        mkdir -p ${gitlabConfig.production.shared.path}/lfs-objects
+        mkdir -p ${gitlabConfig.production.shared.path}/pages
        mkdir -p ${cfg.statePath}/log
        mkdir -p ${cfg.statePath}/shell
        mkdir -p ${cfg.statePath}/tmp/pids
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@ -8,7 +8,7 @@ let

  nix = cfg.package.out;

-  isNix112 = versionAtLeast (getVersion nix) "1.12pre4997";
+  isNix112 = versionAtLeast (getVersion nix) "1.12pre";

  makeNixBuildUser = nr:
    { name = "nixbld${toString nr}";
--- a/nixos/modules/services/misc/octoprint.nix
+++ b/nixos/modules/services/misc/octoprint.nix
@ -117,7 +117,7 @@ in
      '';

      serviceConfig = {
-        ExecStart = "${pkgs.octoprint}/bin/octoprint -b ${cfg.stateDir}";
+        ExecStart = "${pkgs.octoprint}/bin/octoprint serve -b ${cfg.stateDir}";
        User = cfg.user;
        Group = cfg.group;
        PermissionsStartOnly = true;
--- a/nixos/modules/services/monitoring/munin.nix
+++ b/nixos/modules/services/monitoring/munin.nix
@ -193,14 +193,26 @@ in

  }) (mkIf cronCfg.enable {

-    services.cron.systemCronJobs = [
-      "*/5 * * * * munin ${pkgs.munin}/bin/munin-cron --config ${muninConf}"
-    ];
+    systemd.timers.munin-cron = {
+      description = "batch Munin master programs";
+      wantedBy = [ "timers.target" ];
+      timerConfig.OnCalendar = "*:0/5";
+    };
+
+    systemd.services.munin-cron = {
+      description = "batch Munin master programs";
+      unitConfig.Documentation = "man:munin-cron(8)";
+
+      serviceConfig = {
+        Type = "oneshot";
+        User = "munin";
+        ExecStart = "${pkgs.munin}/bin/munin-cron --config ${muninConf}";
+      };
+    };

    system.activationScripts.munin-cron = stringAfter [ "users" "groups" ] ''
      mkdir -p /var/{run,log,www,lib}/munin
      chown -R munin:munin /var/{run,log,www,lib}/munin
    '';
-
  })];
 }
--- a/nixos/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
@ -140,6 +140,7 @@ in
        };

        privoxy.enable = mkOption {
+          type = types.bool;
          default = true;
          description = ''
            Whether to enable and configure the system Privoxy to use Tor's
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@ -185,6 +185,7 @@ let
      ${optionalString (config.index != null) "index ${config.index};"}
      ${optionalString (config.tryFiles != null) "try_files ${config.tryFiles};"}
      ${optionalString (config.root != null) "root ${config.root};"}
+      ${optionalString (config.alias != null) "alias ${config.alias};"}
      ${config.extraConfig}
    }
  '') locations);
@ -403,6 +404,13 @@ in
  config = mkIf cfg.enable {
    # TODO: test user supplied config file pases syntax test

+    assertions = let hostOrAliasIsNull = l: l.root == null || l.alias == null; in [
+      {
+        assertion = all (host: all hostOrAliasIsNull (attrValues host.locations)) (attrValues virtualHosts);
+        message = "Only one of nginx root or alias can be specified on a location.";
+      }
+    ];
+
    systemd.services.nginx = {
      description = "Nginx Web Server";
      after = [ "network.target" ];
--- a/nixos/modules/services/web-servers/nginx/location-options.nix
+++ b/nixos/modules/services/web-servers/nginx/location-options.nix
@ -45,6 +45,15 @@ with lib;
      '';
    };

+    alias = mkOption {
+      type = types.nullOr types.path;
+      default = null;
+      example = "/your/alias/directory";
+      description = ''
+        Alias directory for requests.
+      '';
+    };
+
    extraConfig = mkOption {
      type = types.lines;
      default = "";
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@ -208,11 +208,7 @@ in

      services.xserver.displayManager.sddm = {
        theme = "breeze";
-        themes = [
-          pkgs.extra-cmake-modules # for the setup-hook
-          plasma5.plasma-workspace
-          pkgs.breeze-icons
-        ];
+        package = pkgs.sddmPlasma5;
      };

      security.pam.services.kde = { allowNullPassword = true; };
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
@ -45,6 +45,7 @@ let
    theme-name = ${cfg.theme.name}
    icon-theme-name = ${cfg.iconTheme.name}
    background = ${ldmcfg.background}
+    ${cfg.extraConfig}
    '';

 in
@ -103,6 +104,15 @@ in

      };

+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Extra configuration that should be put in the lightdm-gtk-greeter.conf
+          configuration file.
+        '';
+      };
+
    };

  };
--- a/nixos/modules/services/x11/display-managers/sddm.nix
+++ b/nixos/modules/services/x11/display-managers/sddm.nix
@ -9,7 +9,7 @@ let
  cfg = dmcfg.sddm;
  xEnv = config.systemd.services."display-manager".environment;

-  sddm = pkgs.sddm.override { inherit (cfg) themes; };
+  sddm = cfg.package;

  xserverWrapper = pkgs.writeScript "xserver-wrapper" ''
    #!/bin/sh
@ -105,11 +105,12 @@ in
        '';
      };

-      themes = mkOption {
-        type = types.listOf types.package;
-        default = [];
+      package = mkOption {
+        type = types.package;
+        default = pkgs.sddm;
        description = ''
-          Extra packages providing themes.
+          The SDDM package to install.
+          The default package can be overridden to provide extra themes.
        '';
      };

--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@ -443,9 +443,40 @@ my $confFile = $grubVersion == 1 ? "$bootPath/grub/menu.lst" : "$bootPath/grub/g
 my $tmpFile = $confFile . ".tmp";
 writeFile($tmpFile, $conf);

+
+# check whether to install GRUB EFI or not
+sub getEfiTarget {
+    if ($grubVersion == 1) {
+        return "no"
+    } elsif (($grub ne "") && ($grubEfi ne "")) {
+        # EFI can only be installed when target is set;
+        # A target is also required then for non-EFI grub
+        if (($grubTarget eq "") || ($grubTargetEfi eq "")) { die }
+        else { return "both" }
+    } elsif (($grub ne "") && ($grubEfi eq "")) {
+        # TODO: It would be safer to disallow non-EFI grub installation if no taget is given.
+        #       If no target is given, then grub auto-detects the target which can lead to errors.
+        #       E.g. it seems as if grub would auto-detect a EFI target based on the availability
+        #       of a EFI partition.
+        #       However, it seems as auto-detection is currently relied on for non-x86_64 and non-i386
+        #       architectures in NixOS. That would have to be fixed in the nixos modules first.
+        return "no"
+    } elsif (($grub eq "") && ($grubEfi ne "")) {
+        # EFI can only be installed when target is set;
+        if ($grubTargetEfi eq "") { die }
+        else {return "only" }
+    } else {
+        # prevent an installation if neither grub nor grubEfi is given
+        return "neither"
+    }
+}
+
+my $efiTarget = getEfiTarget();
+
 # Append entries detected by os-prober
 if (get("useOSProber") eq "true") {
-    system(get("shell"), "-c", "pkgdatadir=$grub/share/grub $grub/etc/grub.d/30_os-prober >> $tmpFile");
+    my $targetpackage = ($efiTarget eq "no") ? $grub : $grubEfi;
+    system(get("shell"), "-c", "pkgdatadir=$targetpackage/share/grub $targetpackage/etc/grub.d/30_os-prober >> $tmpFile");
 }

 # Atomically switch to the new config
@ -498,36 +529,7 @@ sub getDeviceTargets {
    }
    return @devices;
 }
-
-# check whether to install GRUB EFI or not
-sub getEfiTarget {
-    if ($grubVersion == 1) {
-        return "no"
-    } elsif (($grub ne "") && ($grubEfi ne "")) {
-        # EFI can only be installed when target is set;
-        # A target is also required then for non-EFI grub
-        if (($grubTarget eq "") || ($grubTargetEfi eq "")) { die }
-        else { return "both" }
-    } elsif (($grub ne "") && ($grubEfi eq "")) {
-        # TODO: It would be safer to disallow non-EFI grub installation if no taget is given.
-        #       If no target is given, then grub auto-detects the target which can lead to errors.
-        #       E.g. it seems as if grub would auto-detect a EFI target based on the availability
-        #       of a EFI partition.
-        #       However, it seems as auto-detection is currently relied on for non-x86_64 and non-i386
-        #       architectures in NixOS. That would have to be fixed in the nixos modules first.
-        return "no"
-    } elsif (($grub eq "") && ($grubEfi ne "")) {
-        # EFI can only be installed when target is set;
-        if ($grubTargetEfi eq "") { die }
-        else {return "only" }
-    } else {
-        # prevent an installation if neither grub nor grubEfi is given
-        return "neither"
-    }
-}
-
 my @deviceTargets = getDeviceTargets();
-my $efiTarget = getEfiTarget();
 my $prevGrubState = readGrubState();
 my @prevDeviceTargets = split/,/, $prevGrubState->devices;

--- a/nixos/tests/munin.nix
+++ b/nixos/tests/munin.nix
@ -29,6 +29,7 @@ import ./make-test.nix ({ pkgs, ...} : {
    startAll;

    $one->waitForUnit("munin-node.service");
+    $one->succeed('systemctl start munin-cron');
    $one->waitForFile("/var/lib/munin/one/one-uptime-uptime-g.rrd");
    $one->waitForFile("/var/www/munin/one/index.html");
  '';
--- a/pkgs/applications/audio/gpodder/default.nix
+++ b/pkgs/applications/audio/gpodder/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python2Packages, mygpoclient, intltool
+{ stdenv, fetchurl, fetchpatch, python2Packages, mygpoclient, intltool
 , ipodSupport ? false, libgpod
 , gnome3
 }:
@ -6,13 +6,31 @@
 python2Packages.buildPythonApplication rec {
  name = "gpodder-${version}";

-  version = "3.9.1";
+  version = "3.9.3";

  src = fetchurl {
    url = "http://gpodder.org/src/${name}.tar.gz";
-    sha256 = "036p9vnkr3if0k548xhhjmcwdaimy3yd24s3xd8vzlp0wdzkzrhn";
+    sha256 = "1s83m90dic2zphwwv6wrvqx950y12v5sakm7q5nj5bnh5k9l2hgl";
  };

+  patches = [
+    (fetchpatch {
+     sha256 = "1xkl1wnp46546jrzsnb9p0yj23776byg3nvsqwbblhqbsfipl48w";
+     name = "Fix-soundcloud-feeds.patch";
+     url = "https://github.com/gpodder/gpodder/commit/e7f34ad090cd276d75c0cd8d92ed97243d75db38.patch";
+    })
+    (fetchpatch {
+     sha256 = "1jlldbinlxis1pi9p2lyczgbcv8nmdj66fxll6ph0klln0w8gvg4";
+     name = "use-https-urls-for-soundcloud.patch";
+     url = "https://github.com/gpodder/gpodder/commit/ef915dd3b6828174bf4f6f0911da410d9aca1b67.patch";
+    })
+    (fetchpatch {
+     sha256 = "1l37ihzk7gfqcl5nnphv0sv80psm6fsg4qkxn6abc6v476axyj9b";
+     name = "updates-soundcloud-support-to-recognize-https";
+     url = "https://github.com/gpodder/gpodder/commit/5c1507671d93096ad0118f908c20dd1f182a72e0.patch";
+    })
+  ];
+
  postPatch = with stdenv.lib; ''
    sed -i -re 's,^( *gpodder_dir *= *).*,\1"'"$out"'",' bin/gpodder

@ -30,22 +48,22 @@ python2Packages.buildPythonApplication rec {
  ];

  propagatedBuildInputs = with python2Packages; [
-    feedparser dbus-python mygpoclient pygtk eyeD3
+    feedparser dbus-python mygpoclient pygtk eyeD3 podcastparser html5lib
  ] ++ stdenv.lib.optional ipodSupport libgpod;

  checkPhase = ''
    LC_ALL=C python -m gpodder.unittests
  '';

-  meta = {
+  meta = with stdenv.lib; {
    description = "A podcatcher written in python";
    longDescription = ''
      gPodder downloads and manages free audio and video content (podcasts)
      for you. Listen directly on your computer or on your mobile devices.
    '';
    homepage = "http://gpodder.org/";
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
-    maintainers = [ stdenv.lib.maintainers.skeidel ];
+    license = licenses.gpl3;
+    platforms = platforms.linux ++ platforms.darwin;
+    maintainers = with maintainers; [ skeidel mic92 ];
  };
 }
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@ -1,4 +1,4 @@
-{ stdenv, makeQtWrapper, fetchFromGitHub, fetchpatch
+{ stdenv, lib, makeQtWrapper, fetchFromGitHub, fetchpatch
 , cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs, lndir
 , libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd
 , themes
@ -28,10 +28,13 @@ let
    nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ];

    buildInputs = [
-      libxcb libpthreadstubs libXdmcp libXau qtbase pam systemd
+      libxcb libpthreadstubs libXdmcp libXau pam systemd
+      qtbase qtdeclarative
    ];

-    propagatedBuildInputs = [ qtdeclarative ];
+    propagatedUserEnvPkgs = builtins.map lib.getBin [
+      qtbase qtdeclarative
+    ];

    cmakeFlags = [
      "-DCONFIG_FILE=/etc/sddm.conf"
@ -80,6 +83,21 @@ stdenv.mkDerivation {
  installPhase = ''
    runHook preInstall

+    propagated=
+    for i in $unwrapped $themes; do
+      findInputs $i propagated propagated-user-env-packages
+      if [ -z "$crossConfig" ]; then
+          findInputs $i propagated propagated-native-build-inputs
+      else
+          findInputs $i propagated propagated-build-inputs
+      fi
+    done
+
+    for pkg in $propagated; do
+      addToSearchPath RUNTIME_XDG_DATA_DIRS "$pkg/share"
+      addToSearchPath RUNTIME_XDG_CONFIG_DIRS "$pkg/etc/xdg"
+    done
+
    makeQtWrapper "$unwrapped/bin/sddm" "$out/bin/sddm"

    mkdir -p "$out/share/sddm"
--- a/pkgs/applications/editors/elvis/default.nix
+++ b/pkgs/applications/editors/elvis/default.nix
@ -1,15 +1,25 @@
-{ fetchurl, stdenv, ncurses }:
+{ fetchurl, fetchpatch, stdenv, ncurses }:

 stdenv.mkDerivation rec {
  name = "elvis-2.2_0";

  src = fetchurl {
-    url = ftp://ftp.cs.pdx.edu/pub/elvis/elvis-2.2_0.tar.gz;
+    url = "http://www.the-little-red-haired-girl.org/pub/elvis/elvis-2.2_0.tar.gz";
    sha256 = "182fj9qzyq6cjq1r849gpam6nq9smwv9f9xwaq84961p56r6d14s";
  };

  buildInputs = [ ncurses ];

+  patches = [ (fetchpatch {
+    url = "https://github.com/mbert/elvis/commit/076cf4ad5cc993be0c6195ec0d5d57e5ad8ac1eb.patch";
+    sha256 = "0yzkc1mxjwg09mfmrk20ksa0vfnb2x83ndybwvawq4xjm1qkcahc";
+  }) ];
+
+  postPatch = ''
+    substituteInPlace configure \
+      --replace '-lcurses' '-lncurses'
+  '';
+
  preConfigure = ''
    mkdir -p $out/share/man/man1
  '';
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@ -1058,27 +1058,29 @@
          license = lib.licenses.free;
        };
      }) {};
-    lmc = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    lmc = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
+    elpaBuild {
        pname = "lmc";
        version = "1.4";
        src = fetchurl {
          url = "https://elpa.gnu.org/packages/lmc-1.4.el";
          sha256 = "0fm4sclx9gg0d0615smz105x320sk45y4ivpjk3nbc67c5l0sh2h";
        };
-        packageRequires = [];
+        packageRequires = [ cl-lib emacs ];
        meta = {
          homepage = "https://elpa.gnu.org/packages/lmc.html";
          license = lib.licenses.free;
        };
      }) {};
-    load-dir = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    load-dir = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+    elpaBuild {
        pname = "load-dir";
-        version = "0.0.3";
+        version = "0.0.5";
        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/load-dir-0.0.3.el";
-          sha256 = "0w5rdc6gr7nm7r0d258mp5sc06n09mmz7kjg8bd3sqnki8iz7s32";
+          url = "https://elpa.gnu.org/packages/load-dir-0.0.5.el";
+          sha256 = "1575ipn155nzzb5yghblxc7v1vpq4i16w1ff7y56qw2498ligpc5";
        };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
        meta = {
          homepage = "https://elpa.gnu.org/packages/load-dir.html";
          license = lib.licenses.free;
--- 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
@ -2746,12 +2746,12 @@
    boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
    melpaBuild {
        pname = "boon";
-        version = "0.4";
+        version = "1.0";
        src = fetchFromGitHub {
          owner = "jyp";
          repo = "boon";
-          rev = "c72d26ca2f9c0672192b5f40302ad0ebfc2d6db6";
-          sha256 = "1grsaajfbhgq1wlraq8v21sfqdnk9ja3gj7y982hh44671haqjvw";
+          rev = "d9f0545708bbbbe3df23b2b91cdd2824beb0df56";
+          sha256 = "0crqwyhzkwpi7c0rqcgmgqx6g4f8fw9gd9nh0ii6p5agiw140yj8";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon";
@ -5892,12 +5892,12 @@
    datetime = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "datetime";
-        version = "0.2";
+        version = "0.2.1";
        src = fetchFromGitHub {
          owner = "doublep";
          repo = "datetime";
-          rev = "6585b2dcb0b3871a2a63656d01baa0c9a300d457";
-          sha256 = "07rb8r3j8293h0ffpwhf7mxnshqi08pb63swhmdzb34hn57cx4jg";
+          rev = "3ecf9985250ecd441e91614b44cf12323af907c0";
+          sha256 = "1x8kj6d9p42lffk15m0c955ibwxxvfxhihij43alwq5xab2l16bv";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/fff9f0748b0ef76130b24e85ed109325256f956e/recipes/datetime";
@ -7052,12 +7052,12 @@
    dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
    melpaBuild {
        pname = "dumb-jump";
-        version = "0.4.3";
+        version = "0.5.0";
        src = fetchFromGitHub {
          owner = "jacktasia";
          repo = "dumb-jump";
-          rev = "3f15f30a7330dd13a1d88891345ab382e9bee7cd";
-          sha256 = "12y5gf65jdmh1m0fygzx4snfixlgc1laaax0w7ajkbhahyn8dwzc";
+          rev = "c96467b3079495353350a6b00fd2e6052b3a3fd0";
+          sha256 = "04jhbapf84if54d648mx1fk7b9vwrnd0apyarwjv7p1azasm6vwl";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/2a60e7c166c2d68e4f719d293014a22139593dde/recipes/dumb-jump";
@ -9070,8 +9070,8 @@
        version = "0.1";
        src = fetchhg {
          url = "https://bitbucket.com/seanfarley/erc-hipchatify";
-          rev = "2b93fb7103f5";
-          sha256 = "1z2vqy8wg5fhv0vfai0zla8swvld3j4378q72knnkyzjqrbn4s5p";
+          rev = "a53227513692";
+          sha256 = "0av0y65hz7fbiiqzmk5mmw6jv7fivhcd1w3s2xn5y5jpgps56mrc";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/b60e01e7064ce486fdac3d1b39fd4a1296b0dac5/recipes/erc-hipchatify";
@ -9213,12 +9213,12 @@
    erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "erlang";
-        version = "19.2.3";
+        version = "19.3";
        src = fetchFromGitHub {
          owner = "erlang";
          repo = "otp";
-          rev = "aa315e1cf1b79ab782e5b4c944595495ebf4e2f4";
-          sha256 = "1lsmjpz2g4hj44fz95w7sswzj40iv7jq5jk64x0095lhvxmlf57c";
+          rev = "a748cafdc7063d9f181ba12088db6458793ced2f";
+          sha256 = "0pp2hl8jf4iafpnsmf0q7jbm313daqzif6ajqcmjyl87m5pssr86";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@ -9839,6 +9839,27 @@
          license = lib.licenses.free;
        };
      }) {};
+    evil-embrace = callPackage ({ emacs, embrace, evil-surround, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-embrace";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "cute-jumper";
+          repo = "evil-embrace.el";
+          rev = "4379adea032b25e359d01a36301b4a5afdd0d1b7";
+          sha256 = "0rj1ippc6yi560xalhd91r7a00lk3d0jk13w464myznkpnasfw3a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d4886f068766514deab5673b4366d6bdd311e3b6/recipes/evil-embrace";
+          sha256 = "10cfkksh3llyfk26x36b7ri0x6a6hrcv275pxk7ckhs1pyhb14y7";
+          name = "evil-embrace";
+        };
+        packageRequires = [ emacs embrace evil-surround ];
+        meta = {
+          homepage = "https://melpa.org/#/evil-embrace";
+          license = lib.licenses.free;
+        };
+      }) {};
    evil-escape = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "evil-escape";
@ -10513,12 +10534,12 @@
    eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "eyebrowse";
-        version = "0.7.4";
+        version = "0.7.5";
        src = fetchFromGitHub {
          owner = "wasamasa";
          repo = "eyebrowse";
-          rev = "e7c3de9c8b3197f3a310d8d9259761fc70dfa3ef";
-          sha256 = "0d2vc50m2wr6f0fd04xm3bzca25im3ka57y7lg6p0bn5fp6a62vl";
+          rev = "56af9e96cfc8c03cfdcf3a60b581a8db9fdcbb20";
+          sha256 = "0wdqvzq847mn3aday87wz0jnbnpl0j4b81y8y5gd7qj1vac1vndn";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/90d052bfc0b94cf177e33b2ffc01a45d254fc1b1/recipes/eyebrowse";
@ -15466,6 +15487,27 @@
          license = lib.licenses.free;
        };
      }) {};
+    helm-ext = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-ext";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "cute-jumper";
+          repo = "helm-ext";
+          rev = "115a3ca9a466fa84c1874ac6175fdf2256c3765c";
+          sha256 = "19bcrgj531par1ayhgwxvzz28fyd7dx5flslxf1vl4qawhn173fz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee74cb0aa3445bc9ae4226c2043ee4de3ac6cd3/recipes/helm-ext";
+          sha256 = "0la2i0b7nialib4wq26cxcak8nq1jzavsw8f0mvbavsb7hfwkpgw";
+          name = "helm-ext";
+        };
+        packageRequires = [ emacs helm ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-ext";
+          license = lib.licenses.free;
+        };
+      }) {};
    helm-firefox = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
    melpaBuild {
        pname = "helm-firefox";
@ -17275,12 +17317,12 @@
    ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "ido-completing-read-plus";
-        version = "3.15";
+        version = "3.16";
        src = fetchFromGitHub {
          owner = "DarwinAwardWinner";
          repo = "ido-ubiquitous";
-          rev = "950afaed5d36fc4447dd3a517ddb0dd281d8aaf6";
-          sha256 = "0gk1bkllzs3fil2fcj3iha43y43370sgrrs5r6j7hzyhnxqmp965";
+          rev = "2bd3a2722d8df0db9dfe25f5763f7dfaf0734624";
+          sha256 = "1zz0k5ddcwkg0wjdzihklgnxq5f6rlsxldhn7h9jzyss5bsgykhj";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-completing-read+";
@ -17380,12 +17422,12 @@
    ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
    melpaBuild {
        pname = "ido-ubiquitous";
-        version = "3.15";
+        version = "3.16";
        src = fetchFromGitHub {
          owner = "DarwinAwardWinner";
          repo = "ido-ubiquitous";
-          rev = "950afaed5d36fc4447dd3a517ddb0dd281d8aaf6";
-          sha256 = "0gk1bkllzs3fil2fcj3iha43y43370sgrrs5r6j7hzyhnxqmp965";
+          rev = "2bd3a2722d8df0db9dfe25f5763f7dfaf0734624";
+          sha256 = "1zz0k5ddcwkg0wjdzihklgnxq5f6rlsxldhn7h9jzyss5bsgykhj";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-ubiquitous";
@ -21031,12 +21073,12 @@
    meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
    melpaBuild {
        pname = "meghanada";
-        version = "0.6.6";
+        version = "0.7.0";
        src = fetchFromGitHub {
          owner = "mopemope";
          repo = "meghanada-emacs";
-          rev = "67e7ca4488aa39eaa8b5236db392730efdac91a9";
-          sha256 = "0k9bv4wdik3lqqpd2ijz3xnlcnjjy589rmqs6z8pwzxsx0vd7wlp";
+          rev = "7a6e26ae74c86cc2afffc21de7567a63feb19a7d";
+          sha256 = "1l23nj6fsnqf2xc766rnz5ib6578rvsbn0cdwmw5li6waqbzvla2";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@ -21450,12 +21492,12 @@
    mmt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "mmt";
-        version = "0.1.1";
+        version = "0.2.0";
        src = fetchFromGitHub {
          owner = "mrkkrp";
          repo = "mmt";
-          rev = "e77b809e39b9ab437b662ee759e990163bc89377";
-          sha256 = "05nmcx3f63ds31cj3qwwp03ksflkfwlcn3z2xyxbny83r0dxbgvc";
+          rev = "f7db836a10720ee50217012e7e2597ebcf624f90";
+          sha256 = "13vbfc5597v0gd87qyhn10f93nb477vjpg3jlpphbax9fvkf4gav";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/d1137bb53ecd92b1a8537abcd2635602c5ab3277/recipes/mmt";
@ -21618,12 +21660,12 @@
    monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "monokai-theme";
-        version = "3.2.1";
+        version = "3.3.0";
        src = fetchFromGitHub {
          owner = "oneKelvinSmith";
          repo = "monokai-emacs";
-          rev = "fc5822fcb11c3c6af67b5fb152f92c3e6e3c49d3";
-          sha256 = "0r81jdwfmgzivfpkxqr425qajgw3dzzs8y2v5lsiwl1d5z8rz52a";
+          rev = "46fe076b5943ccc6fdc9cdacc7e8ad02b64bcd36";
+          sha256 = "03aw9ab54a5fljhwygg62hr2n9kk82xfwcdq17ln5z0951gqi99r";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme";
@ -23363,6 +23405,27 @@
          license = lib.licenses.free;
        };
      }) {};
+    org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-board";
+        version = "1000";
+        src = fetchFromGitHub {
+          owner = "scallywag";
+          repo = "org-board";
+          rev = "ed62187790f415a006194f69bf86c6ca6959b2e4";
+          sha256 = "0kh32xkqiy4bh72mykswpi20x1fvr6m7751d4lnjczx836ncmggy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board";
+          sha256 = "00jsrxc8f85cvrh7364n7337frdj12yknlfp28fhdgk2ph6d7bp4";
+          name = "org-board";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/org-board";
+          license = lib.licenses.free;
+        };
+      }) {};
    org-bookmark-heading = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "org-bookmark-heading";
@ -24760,12 +24823,12 @@
    packed = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "packed";
-        version = "2.0.0";
+        version = "2.0.1";
        src = fetchFromGitHub {
          owner = "tarsius";
          repo = "packed";
-          rev = "d2f01bffc987b226f618dda0663a1e233161518d";
-          sha256 = "16xwgi0zkbbvkbxf0ld6g4xlfd95j45sca57h162wld6l27jrv4f";
+          rev = "536f4a3bda06cc09759fed1aa0cdebb068ff75a1";
+          sha256 = "1ayizqkhxjd3rv3chnl51sl12gsfhxcqqnz0p6r0xbwglx4n3vzi";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee9e95c00f791010f77720068a7f3cd76133a1c/recipes/packed";
@ -25010,12 +25073,12 @@
    parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "parinfer";
-        version = "0.4.7";
+        version = "0.4.9";
        src = fetchFromGitHub {
          owner = "DogLooksGood";
          repo = "parinfer-mode";
-          rev = "a91b1ee5392c6a98c102ddba2f0c15ab67f8ad1b";
-          sha256 = "09337fpv492rzd2ah7d8kxyv5spcgwf58xr943ya09sgi2invkbx";
+          rev = "c67686b24cf14064931d812f29f4114b30696d12";
+          sha256 = "0lpj81hkzw24v1f3s13rw22sm1nm0i177di5v2b8kwy50pjirs8v";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer";
@ -26496,12 +26559,12 @@
    projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
    melpaBuild {
        pname = "projectile-rails";
-        version = "0.13.1";
+        version = "0.14.0";
        src = fetchFromGitHub {
          owner = "asok";
          repo = "projectile-rails";
-          rev = "038c7f9724f684c7862e108150e256a00ff9c5c6";
-          sha256 = "0hjf54nn08ifd8cd3y19g47lwyvacqjx1fmy8x4kpn14fwzs4xnv";
+          rev = "fb28fc8710b614e9ab535788ee58f9a9070561f1";
+          sha256 = "0v7ddlk8mzqa8gvxrrcvd15klap5m31df8vn14z99s3ybj3zk0yb";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails";
@ -27858,22 +27921,22 @@
          license = lib.licenses.free;
        };
      }) {};
-    req-package = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, use-package }:
+    req-package = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, log4e, melpaBuild, use-package }:
    melpaBuild {
        pname = "req-package";
-        version = "0.9";
+        version = "1.0";
        src = fetchFromGitHub {
          owner = "edvorg";
          repo = "req-package";
-          rev = "374c6d1a81b5448a66295be8c132c42ca44eeddb";
-          sha256 = "1xzp2hnkr9lsjx50cxlpki9mvyhjsv0vyc77480jrlnpspakj7qs";
+          rev = "30f76a9c52994562191c90c315002410706f6c0b";
+          sha256 = "0qdr2pshfq6v75s9hx9wgvn56pd7b65vaqaa64dryr7v4yzd4r15";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/f58a801f0791566d0c39493a5f82ff0d15d7ab41/recipes/req-package";
          sha256 = "1438f60dnmc3a2dh6hd0wslrh25nd3af797aif70kv6qc71h87vf";
          name = "req-package";
        };
-        packageRequires = [ dash log4e use-package ];
+        packageRequires = [ dash ht log4e use-package ];
        meta = {
          homepage = "https://melpa.org/#/req-package";
          license = lib.licenses.free;
@ -28867,12 +28930,12 @@
    sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
    melpaBuild {
        pname = "sekka";
-        version = "1.6.5";
+        version = "1.6.6";
        src = fetchFromGitHub {
          owner = "kiyoka";
          repo = "sekka";
-          rev = "001e205b37ae0dded430b9a809425dc7ed730366";
-          sha256 = "113i8i705qkd3nccspacnmk9ysy5kwavg8h9z9djdgki611q700q";
+          rev = "987c1cce65c8f30b12cdb5991e1b1ad9da766916";
+          sha256 = "03930cfqq97f7m6z9da2y9388iyymc56b1vdrl5a6mpggv3wifn7";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka";
@ -32816,12 +32879,12 @@
    vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }:
    melpaBuild {
        pname = "vhdl-tools";
-        version = "5.3";
+        version = "5.4";
        src = fetchFromGitHub {
          owner = "csantosb";
          repo = "vhdl-tools";
-          rev = "f6dfac6851c6bc78f9d72849befd54b09ac64ce7";
-          sha256 = "03qqvv9l83b5cpdcjdcq0wv3ghhx13y3b16rn1d1l0vfndzmnz42";
+          rev = "6f3f8ba58432dfdac59122164c732ccc0dfc475b";
+          sha256 = "076v5zafalv1r14ms90zs1p7yq11fzff4vywrda6dh63i0yk2vxs";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools";
@ -33446,12 +33509,12 @@
    which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "which-key";
-        version = "2.0";
+        version = "2.0.1";
        src = fetchFromGitHub {
          owner = "justbur";
          repo = "emacs-which-key";
-          rev = "ea6f1dc5aacff2f3d909e410db05af01966555aa";
-          sha256 = "0pckvxk2vpwqfypz5vyk0ig6g5697ibnlk8vspvqpanahvgaj0nh";
+          rev = "3c7ecc69d48258af66978a685aedcbc8d1ada512";
+          sha256 = "1q6v4bnw9sl6f138lxkqp979xpbgsb57gxj8a1k7clms16kkn5ci";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key";
@ -33722,8 +33785,8 @@
        version = "0.9.1";
        src = fetchhg {
          url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "3a654cfe6632";
-          sha256 = "1ahmpk0302g375w9ikkzagjvx8qblkzx40w960ka0cqf7nzyk75d";
+          rev = "3447d48e8562";
+          sha256 = "1qym4wfcr3hiq0a1z3myvzalblwwp5xalq9sjx090w3ag3ghgjrg";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
--- a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
+++ b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
@ -5,8 +5,8 @@ stdenv.mkDerivation (rec {

  src = fetchgit {
    url = "https://github.com/ProofGeneral/PG.git";
-    rev = "4bcac92df46da9e68b5e3d565bb118fb63b4feb4";
-    sha256 = "143anwll7mij6iskf3jbbbfzmkp2vnp0q329zpsl2l6v3wk2vv64";
+    rev = "62ec846fcaaef8f3ae94302cbef2972f88a0804f";
+    sha256 = "0vln1bc884qynbl5yci0dkr6ckz3p46q4jrhxgylcx4w0jkhizhm";
  };

  buildInputs = [ emacs texinfo perl which ] ++ stdenv.lib.optional enableDoc texLive;
--- a/pkgs/applications/editors/geany/default.nix
+++ b/pkgs/applications/editors/geany/default.nix
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
    '';
    homepage = http://www.geany.org/;
    license = "GPL";
-    maintainers = [ maintainers.bbenoist ];
+    maintainers = [];
    platforms = platforms.all;
  };
 }
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@ -172,12 +172,12 @@ in

  idea-community = buildIdea rec {
    name = "idea-community-${version}";
-    version = "2016.3.4";
+    version = "2016.3.5";
    description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
    license = stdenv.lib.licenses.asl20;
    src = fetchurl {
      url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
-      sha256 = "712dccd726b43e2187e8025a6effb711d35310b36d553dbf7bf85400ec1cec15";
+      sha256 = "0v5wxjbzrax688knjsf7xd956i8pq5i4svkgnrrc4s390f0ixnl5";
    };
    wmClass = "jetbrains-idea-ce";
  };
--- a/pkgs/applications/graphics/fbida/default.nix
+++ b/pkgs/applications/graphics/fbida/default.nix
@ -1,18 +1,18 @@
 { stdenv, fetchurl, libjpeg, libexif, libungif, libtiff, libpng, libwebp, libdrm
 , pkgconfig, freetype, fontconfig, which, imagemagick, curl, sane-backends, libXpm
-, epoxy, poppler }:
+, epoxy, poppler, lirc }:

 stdenv.mkDerivation rec {
-  name = "fbida-2.12";
+  name = "fbida-2.13";
  
  src = fetchurl {
    url = "http://dl.bytesex.org/releases/fbida/${name}.tar.gz";
-    sha256 = "0bw224vb7jh0lrqaf4jgxk48xglvxs674qcpj5y0axyfbh896cfk";
+    sha256 = "01yv4qqqfbz9v281y2jlxhxdym3ricyb0zkqkgp5b40qrmfik1x8";
  };

  nativeBuildInputs = [ pkgconfig which ];
  buildInputs = [ libexif libjpeg libpng libungif freetype fontconfig libtiff
-   libwebp imagemagick curl sane-backends libdrm libXpm epoxy poppler ];
+   libwebp imagemagick curl sane-backends libdrm libXpm epoxy poppler lirc ];
  
  makeFlags = [ "prefix=$(out)" "verbose=yes" ];

@ -21,10 +21,8 @@ stdenv.mkDerivation rec {
    sed -e 's@ cpp\>@ gcc -E -@' -i GNUmakefile
    '';

-  configurePhase = "make config $makeFlags";
-
  crossAttrs = {
-    makeFlags = makeFlags ++ [ "CC=${stdenv.cross.config}-gcc" "STRIP="];
+    makeFlags = makeFlags ++ [ "CC=${stdenv.cross.config}-gcc" "STRIP=" ];
  };

  meta = with stdenv.lib; {
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@ -22,18 +22,17 @@ stdenv.mkDerivation rec {

  preBuild = ''
    makeFlags="PREFIX=$out exif=1"
-  '';
-
-  libPath = makeLibraryPath ([ imlib2 curl xorg.libXinerama libjpeg libpng libexif xorg.libX11 ]);
+      '';

  postInstall = ''
    wrapProgram "$out/bin/feh" --prefix PATH : "${libjpeg.bin}/bin" \
                               --add-flags '--theme=feh' 
-    '';
-
+        '';
+  
  checkPhase = ''
    PERL5LIB="${perlPackages.TestCommand}/lib/perl5/site_perl" make test
  '';
+
  doCheck = true;

  meta = {
--- a/pkgs/applications/graphics/renderdoc/default.nix
+++ b/pkgs/applications/graphics/renderdoc/default.nix
@ -0,0 +1,53 @@
+{ stdenv, fetchFromGitHub, cmake, qtbase, qtx11extras
+, pkgconfig, xorg, makeQtWrapper, vulkan-loader
+}:
+
+stdenv.mkDerivation rec {
+  name = "renderdoc-${version}";
+  version = "0.34pre";
+
+  src = fetchFromGitHub {
+    owner = "baldurk";
+    repo = "renderdoc";
+    rev = "5e2717daec53e5b51517d3231fb6120bebbe6b7a";
+    sha256 = "1zpvjvsj5c441kyjpmd2d2r0ykb190rbq474nkmp1jk72cggnpq0";
+  };
+
+  buildInputs = [
+    qtbase xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader
+  ];
+  nativeBuildInputs = [ cmake makeQtWrapper pkgconfig ];
+
+  cmakeFlags = [
+    "-DBUILD_VERSION_HASH=${src.rev}-distro-nix"
+    # TODO: use this instead of preConfigure once placeholders land
+    #"-DVULKAN_LAYER_FOLDER=${placeholder out}/share/vulkan/implicit_layer.d/"
+  ];
+  preConfigure = ''
+    cmakeFlags+=" -DVULKAN_LAYER_FOLDER=$out/share/vulkan/implicit_layer.d/"
+  '';
+  preFixup = ''
+    mkdir $out/bin/.bin
+    mv $out/bin/qrenderdoc $out/bin/.bin/qrenderdoc
+    ln -s $out/bin/.bin/qrenderdoc $out/bin/qrenderdoc
+    wrapQtProgram $out/bin/qrenderdoc --suffix LD_LIBRARY_PATH : $out/lib --suffix LD_LIBRARY_PATH : ${vulkan-loader}/lib
+    mv $out/bin/renderdoccmd $out/bin/.bin/renderdoccmd
+    ln -s $out/bin/.bin/renderdoccmd $out/bin/renderdoccmd
+    wrapProgram $out/bin/renderdoccmd --suffix LD_LIBRARY_PATH : $out/lib --suffix LD_LIBRARY_PATH : ${vulkan-loader}/lib
+  '';
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "A single-frame graphics debugger";
+    homepage = https://renderdoc.org/;
+    license = licenses.mit;
+    longDescription = ''
+      RenderDoc is a free MIT licensed stand-alone graphics debugger that
+      allows quick and easy single-frame capture and detailed introspection
+      of any application using Vulkan, D3D11, OpenGL or D3D12 across
+      Windows 7 - 10, Linux or Android.
+    '';
+    maintainers = [maintainers.jansol];
+    platforms = platforms.linux;
+  };
+}
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@ -2,11 +2,11 @@

 python2Packages.buildPythonApplication rec {
  name = "electrum-${version}";
-  version = "2.8.1";
+  version = "2.8.2";

  src = fetchurl {
    url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
-    sha256 = "1398s9d8j04is24il2xjb6xkj666pj21bsr90xglpsmfa1js9z7g";
+    sha256 = "01xphbi7lx64s9380zjfakz5h8blqmxp0ryqlll7px66qpmjn5fq";
  };

  propagatedBuildInputs = with python2Packages; [
--- a/pkgs/applications/misc/emem/default.nix
+++ b/pkgs/applications/misc/emem/default.nix
@ -2,14 +2,14 @@

 stdenv.mkDerivation rec {
  pname = "emem";
-  version = "0.2.45";
+  version = "0.2.47";
  name = "${pname}-${version}";

  inherit jdk;

  src = fetchurl {
    url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar";
-    sha256 = "1qjlz0sqjhx11vw8cc39h0sjgnfkrhgh94pv84z37b8hn42qingb";
+    sha256 = "0hz862g7k42kik9vgzskqr99321llmmakl54ay9vsykvcxs632mx";
  };

  phases = [ "buildPhase" "installPhase" ];
--- a/pkgs/applications/misc/far2l/default.nix
+++ b/pkgs/applications/misc/far2l/default.nix
@ -0,0 +1,63 @@
+{ stdenv, fetchFromGitHub, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash,
+  xdg_utils, xterm, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz }:
+
+stdenv.mkDerivation rec {
+  rev = "c2f2b89db31b1c3cb9bed53267873f4cd7bc996d";
+  build = "2017-03-18-${builtins.substring 0 10 rev}";
+  name = "far2l-2.1.${build}";
+
+  src = fetchFromGitHub {
+    owner = "elfmz";
+    repo = "far2l";
+    rev = rev;
+    sha256 = "1172ajg4n8g4ag14b6nb9lclwh2r6v7ccndmvhnj066w35ixnqgb";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper ];
+
+  buildInputs = [ wxGTK30 glib pcre ];
+
+  postPatch = ''
+    echo 'echo ${build}' > far2l/bootstrap/scripts/vbuild.sh
+
+    substituteInPlace far2l/bootstrap/open.sh              \
+      --replace 'gvfs-trash'  '${gvfs}/bin/gvfs-trash'
+    substituteInPlace far2l/bootstrap/open.sh              \
+      --replace 'xdg-open'    '${xdg_utils}/bin/xdg-open'  \
+      --replace 'xterm'       '${xterm}/bin/xterm'
+    substituteInPlace far2l/vtcompletor.cpp                \
+      --replace '"/bin/bash"' '"${bash}/bin/bash"'
+    substituteInPlace multiarc/src/formats/zip/zip.cpp     \
+      --replace '"unzip '     '"${unzip}/bin/unzip '       \
+      --replace '"zip '       '"${zip}/bin/zip '
+    substituteInPlace multiarc/src/formats/7z/7z.cpp       \
+      --replace '"^7z '       '"^${p7zip}/lib/p7zip/7z '   \
+      --replace '"7z '        '"${p7zip}/lib/p7zip/7z '
+    substituteInPlace multiarc/src/formats/targz/targz.cpp \
+      --replace '"xz '        '"${xz}/bin/xz '             \
+      --replace '"gzip '      '"${gzip}/bin/gzip '         \
+      --replace '"bzip2 '     '"${bzip2}/bin/bzip2 '       \
+      --replace '"tar '       '"${gnutar}/bin/tar '
+  '';
+
+  installPhase = ''
+    mkdir -p $out/{bin,share}
+    rm install/{far2l_askpass,far2l_sudoapp}
+    mv install/far2l $out/bin/far2l
+    mv install $out/share/far2l
+    ln -s -r $out/bin/far2l $out/share/far2l/far2l_askpass
+    ln -s -r $out/bin/far2l $out/share/far2l/far2l_sudoapp
+  '';
+
+  stripDebugList = "bin share";
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "An orthodox file manager";
+    homepage = http://github.com/elfmz/far2l;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.volth ];
+    platforms = platforms.all;
+  };
+}
--- a/pkgs/applications/misc/get_iplayer/default.nix
+++ b/pkgs/applications/misc/get_iplayer/default.nix
@ -1,9 +1,20 @@
-{stdenv, fetchurl, atomicparsley, flvstreamer, ffmpeg, makeWrapper, perl, buildPerlPackage, perlPackages, rtmpdump}:
+{stdenv, fetchFromGitHub, atomicparsley, flvstreamer, ffmpeg, makeWrapper, perl, buildPerlPackage, perlPackages, rtmpdump}:
+
+with stdenv.lib;
+
 buildPerlPackage rec {
  name = "get_iplayer-${version}";
-  version = "2.97";
+  version = "2.99";
+  
+  src = fetchFromGitHub {
+    owner = "get-iplayer";
+    repo = "get_iplayer";
+    rev = "v${version}";
+    sha256 = "085bgwkjnaqp96gvd2s8qmkw69rz91si1sgzqdqbplkzj9bk2qii";
+  };

-  buildInputs = [makeWrapper perl];
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ perl ];
  propagatedBuildInputs = with perlPackages; [HTMLParser HTTPCookies LWP XMLLibXML XMLSimple];

  preConfigure = "touch Makefile.PL";
@ -13,21 +24,15 @@ buildPerlPackage rec {
  installPhase = ''
    mkdir -p $out/bin $out/share/man/man1
    cp get_iplayer $out/bin
-    wrapProgram $out/bin/get_iplayer --suffix PATH : ${stdenv.lib.makeBinPath [ atomicparsley ffmpeg flvstreamer rtmpdump ]} --prefix PERL5LIB : $PERL5LIB
+    wrapProgram $out/bin/get_iplayer --suffix PATH : ${makeBinPath [ atomicparsley ffmpeg flvstreamer rtmpdump ]} --prefix PERL5LIB : $PERL5LIB
    cp get_iplayer.1 $out/share/man/man1
  '';
-  
-  src = fetchurl {
-    url = "https://github.com/get-iplayer/get_iplayer/archive/v${version}.tar.gz";
-    sha256 = "0bb6kmzjmazwfxq5ip7yxm39vssfgz3v5vfx1114wfssp6pw0r44";
-  };

  meta = {
    description = "Downloads TV and radio from BBC iPlayer";
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = licenses.gpl3Plus;
    homepage = https://squarepenguin.co.uk/;
-    downloadPage = https://github.com/get-iplayer/get_iplayer/releases;
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
  };
  
 }
--- a/pkgs/applications/misc/gkrellm/default.nix
+++ b/pkgs/applications/misc/gkrellm/default.nix
@ -1,15 +1,19 @@
 { fetchurl, stdenv, gettext, pkgconfig, glib, gtk2, libX11, libSM, libICE
 , IOKit ? null }:

+with stdenv.lib;
+
 stdenv.mkDerivation rec {
-  name = "gkrellm-2.3.5";
+  name = "gkrellm-2.3.10";
+
  src = fetchurl {
-    url = "http://members.dslextreme.com/users/billw/gkrellm/${name}.tar.bz2";
-    sha256 = "12rc6zaa7kb60b9744lbrlfkxxfniprm6x0mispv63h4kh75navh";
+    url = "http://gkrellm.srcbox.net/releases/${name}.tar.bz2";
+    sha256 = "0rnpzjr0ys0ypm078y63q4aplcgdr5nshjzhmz330n6dmnxci7lb";
  };

-  buildInputs = [gettext pkgconfig glib gtk2 libX11 libSM libICE]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [gettext glib gtk2 libX11 libSM libICE]
+    ++ optionals stdenv.isDarwin [ IOKit ];

  hardeningDisable = [ "format" ];

@ -22,12 +26,11 @@ stdenv.mkDerivation rec {
       sed -i "$i" -e "s|/usr/X11R6|${libX11.dev}|g ; s|-lICE|-lX11 -lICE|g"
     done '';

-  buildPhase = ''
-     make PREFIX="$out" '';
-  installPhase = ''
-     make install PREFIX="$out" '';
+   installPhase = ''
+     make DESTDIR=$out install
+     '';

-  meta = {
+   meta = {
    description = "Themeable process stack of system monitors";
    longDescription =
      '' GKrellM is a single process stack of system monitors which supports
@ -35,10 +38,9 @@ stdenv.mkDerivation rec {
         or any other theme.
      '';

-    homepage = http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html;
-    license = stdenv.lib.licenses.gpl3Plus;
-
+    homepage = http://gkrellm.srcbox.net;
+    license = licenses.gpl3Plus;
    maintainers = [ ];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
  };
 }
--- a/pkgs/applications/misc/gmrun/default.nix
+++ b/pkgs/applications/misc/gmrun/default.nix
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
    '';
    homepage = "http://sourceforge.net/projects/gmrun/";
    license = "GPL";
-    maintainers = [ stdenv.lib.maintainers.bbenoist ];
+    maintainers = [];
    platforms = stdenv.lib.platforms.all;
  };
 }
--- a/pkgs/applications/misc/gmtp/default.nix
+++ b/pkgs/applications/misc/gmtp/default.nix
@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pkgconfig, libmtp, libid3tag, flac, libvorbis, gtk3
+, gsettings_desktop_schemas, wrapGAppsHook
+}:
+
+let version = "1.3.10"; in
+
+stdenv.mkDerivation {
+  name = "gmtp-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/gmtp/gMTP-${version}/gmtp-${version}.tar.gz";
+    sha256 = "b21b9a8e66ae7bb09fc70ac7e317a0e32aff3917371a7241dea73c41db1dd13b";
+  };
+
+  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+  buildInputs = [ libmtp libid3tag flac libvorbis gtk3 gsettings_desktop_schemas ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "A simple MP3 and Media player client for UNIX and UNIX like systems.";
+    homepage = "https://gmtp.sourceforge.io";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.pbogdan ];
+    license = stdenv.lib.licenses.bsd3;
+  };
+}
--- a/pkgs/applications/misc/gpa/default.nix
+++ b/pkgs/applications/misc/gpa/default.nix
@ -1,14 +1,15 @@
 { stdenv, fetchurl, intltool, pkgconfig, gtk2, gpgme, libgpgerror, libassuan }:

 stdenv.mkDerivation rec {
-  name = "gpa-0.9.9";
+  name = "gpa-0.9.10";

  src = fetchurl {
    url = "mirror://gnupg/gpa/${name}.tar.bz2";
-    sha256 = "0d235hcqai7m3qb7m9kvr2r4qg4714f87j9fdplwrlz1p4wdfa38";
+    sha256 = "09xphbi2456qynwqq5n0yh0zdmdi2ggrj3wk4hsyh5lrzlvcrff3";
  };

-  buildInputs = [ intltool pkgconfig gtk2 gpgme libgpgerror libassuan ];
+  nativeBuildInputs = [ intltool pkgconfig ];
+  buildInputs = [ gtk2 gpgme libgpgerror libassuan ];

  meta = with stdenv.lib; {
    description = "Graphical user interface for the GnuPG";
--- a/pkgs/applications/misc/gphoto2/default.nix
+++ b/pkgs/applications/misc/gphoto2/default.nix
@ -3,17 +3,17 @@
 }:

 stdenv.mkDerivation rec {
-  name = "gphoto2-2.5.8";
+  name = "gphoto2-2.5.11";

  src = fetchurl {
    url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
-    sha256 = "0kgfql6c64ha1gahjdwlqhmkslnfywmc2fkys4c5682zv4awvax9";
+    sha256 = "1sgr6rsvzzagcwhc8fxbnvz3k02wr2hab0vrbvcb04k5l3b48a1r";
  };

-  nativeBuildInputs = [ pkgconfig gettext ];
-  buildInputs = [ libgphoto2 libexif popt libjpeg readline libtool ];
+  nativeBuildInputs = [ pkgconfig gettext libtool ];
+  buildInputs = [ libgphoto2 libexif popt libjpeg readline ];

-  meta = {
+  meta = with stdenv.lib; {
    description = "A ready to use set of digital camera software applications";
    longDescription = ''

@ -22,8 +22,8 @@ stdenv.mkDerivation rec {

    '';
    homepage = http://www.gphoto.org/;
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = with stdenv.lib.platforms; unix;
-    maintainers = with stdenv.lib.maintainers; [ jcumming ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.jcumming ];
  };
 }
--- a/pkgs/applications/misc/octoprint/default.nix
+++ b/pkgs/applications/misc/octoprint/default.nix
@ -1,101 +1,100 @@
-{ stdenv, fetchFromGitHub, pythonPackages, fetchurl }:
+{ stdenv, fetchFromGitHub, python2, fetchurl }:

 let

-  tornado_4_0_2 = pythonPackages.buildPythonPackage rec {
-    name = "tornado-${version}";
-    version = "4.0.2";
+  pythonPackages = python2.pkgs.override {
+    overrides = self: super: with self; {
+      backports_ssl_match_hostname = self.backports_ssl_match_hostname_3_4_0_2;

-    propagatedBuildInputs = with pythonPackages; [ backports_ssl_match_hostname_3_4_0_2 certifi ];
+      tornado = buildPythonPackage rec {
+        name = "tornado-${version}";
+        version = "4.0.2";

-    src = fetchurl {
-      url = "mirror://pypi/t/tornado/${name}.tar.gz";
-      sha256 = "1yhvn8i05lp3b1953majg48i8pqsyj45h34aiv59hrfvxcj5234h";
+        propagatedBuildInputs = [ backports_ssl_match_hostname certifi ];
+
+        src = fetchurl {
+          url = "mirror://pypi/t/tornado/${name}.tar.gz";
+          sha256 = "1yhvn8i05lp3b1953majg48i8pqsyj45h34aiv59hrfvxcj5234h";
+        };
+      };
+
+      flask_login = buildPythonPackage rec {
+        name = "Flask-Login-${version}";
+        version = "0.2.2";
+
+        src = fetchurl {
+          url = "mirror://pypi/F/Flask-Login/${name}.tar.gz";
+          sha256 = "09ygn0r3i3jz065a5psng6bhlsqm78msnly4z6x39bs48r5ww17p";
+        };
+
+        propagatedBuildInputs = [ flask ];
+        buildInputs = [ nose ];
+
+        # No tests included
+        doCheck = false;
+      };
+
+      jinja2 = buildPythonPackage rec {
+        pname = "Jinja2";
+        version = "2.8.1";
+        name = "${pname}-${version}";
+
+        src = fetchurl {
+          url = "mirror://pypi/J/Jinja2/${name}.tar.gz";
+          sha256 = "14aqmhkc9rw5w0v311jhixdm6ym8vsm29dhyxyrjfqxljwx1yd1m";
+        };
+
+        propagatedBuildInputs = [ markupsafe ];
+
+        # No tests included
+        doCheck = false;
+      };
    };
  };

-  sockjs-tornado = pythonPackages.buildPythonPackage rec {
-    name = "sockjs-tornado-${version}";
-    version = "1.0.3";
-
-    src = fetchurl {
-      url = "mirror://pypi/s/sockjs-tornado/${name}.tar.gz";
-      sha256 = "16cff40nniqsyvda1pb2j3b4zwmrw7y2g1vqq78lp20xpmhnwwkd";
-    };
-
-    # This is needed for compatibility with OctoPrint
-    propagatedBuildInputs = [ tornado_4_0_2 ];
-  };
-
-  websocket_client = pythonPackages.buildPythonPackage rec {
-    name = "websocket_client-0.32.0";
-
-    src = fetchurl {
-      url = "mirror://pypi/w/websocket-client/${name}.tar.gz";
-      sha256 = "cb3ab95617ed2098d24723e3ad04ed06c4fde661400b96daa1859af965bfe040";
-    };
-
-    propagatedBuildInputs = with pythonPackages; [ six backports_ssl_match_hostname_3_4_0_2 unittest2 argparse ];
-  };
-
-  flask_login = pythonPackages.buildPythonPackage rec {
-    name = "Flask-Login-${version}";
-    version = "0.2.2";
-
-    src = fetchurl {
-      url = "mirror://pypi/F/Flask-Login/${name}.tar.gz";
-      sha256 = "09ygn0r3i3jz065a5psng6bhlsqm78msnly4z6x39bs48r5ww17p";
-    };
-
-    propagatedBuildInputs = with pythonPackages; [ flask ];
-
-    # FIXME
-    doCheck = false;
-  };
-
 in pythonPackages.buildPythonApplication rec {
  name = "OctoPrint-${version}";
-  version = "1.3.1";
+  version = "1.3.2";

  src = fetchFromGitHub {
    owner = "foosel";
    repo = "OctoPrint";
    rev = version;
-    sha256 = "1av755agyym1k5ig9av0q9ysf26ldfixz82x73v3g47a1m28pxq9";
+    sha256 = "0wyrxi754xa111b88fqvaw2s5ib2a925dlrgym5mn93i027m50wk";
  };

  # We need old Tornado
  propagatedBuildInputs = with pythonPackages; [
    awesome-slugify flask_assets rsa requests2 pkginfo watchdog
-    semantic-version flask_principal werkzeug flaskbabel tornado_4_0_2
+    semantic-version flask_principal werkzeug flaskbabel tornado
    psutil pyserial flask_login netaddr markdown sockjs-tornado
    pylru pyyaml sarge feedparser netifaces click websocket_client
    scandir chainmap future
  ];

+  buildInputs = with pythonPackages; [ nose mock ddt ];
+
  # Jailbreak dependencies.
-  # Currently broken for new: tornado, pyserial, flask_login
  postPatch = ''
    sed -i \
-      -e 's,werkzeug>=[^"]*,werkzeug,g' \
-      -e 's,requests>=[^"]*,requests,g' \
      -e 's,pkginfo>=[^"]*,pkginfo,g' \
-      -e 's,semantic_version>=[^"]*,semantic_version,g' \
-      -e 's,psutil>=[^"]*,psutil,g' \
-      -e 's,Flask-Babel>=[^"]*,Flask-Babel,g' \
      -e 's,Flask-Principal>=[^"]*,Flask-Principal,g' \
-      -e 's,markdown>=[^"]*,markdown,g' \
-      -e 's,Flask-Assets>=[^"]*,Flask-Assets,g' \
-      -e 's,rsa>=[^"]*,rsa,g' \
-      -e 's,PyYAML>=[^"]*,PyYAML,g' \
-      -e 's,flask>=[^"]*,flask,g' \
-      -e 's,Click>=[^"]*,Click,g' \
      -e 's,websocket-client>=[^"]*,websocket-client,g' \
+      -e 's,Click>=[^"]*,Click,g' \
+      -e 's,rsa>=[^"]*,rsa,g' \
+      -e 's,flask>=[^"]*,flask,g' \
+      -e 's,Flask-Babel>=[^"]*,Flask-Babel,g' \
+      -e 's,Flask-Assets>=[^"]*,Flask-Assets,g' \
+      -e 's,PyYAML>=[^"]*,PyYAML,g' \
      -e 's,scandir>=[^"]*,scandir,g' \
-      -e 's,Jinja2>=[^"]*,Jinja2,g' \
+      -e 's,werkzeug>=[^"]*,werkzeug,g' \
+      -e 's,psutil>=[^"]*,psutil,g' \
+      -e 's,requests>=[^"]*,requests,g' \
      setup.py
  '';

+  checkPhase = "nosetests";
+
  meta = with stdenv.lib; {
    homepage = "http://octoprint.org/";
    description = "The snappy web interface for your 3D printer";
--- a/pkgs/applications/misc/pdfpc/default.nix
+++ b/pkgs/applications/misc/pdfpc/default.nix
@ -4,13 +4,13 @@
 stdenv.mkDerivation rec {
  name = "${product}-${version}";
  product = "pdfpc";
-  version = "4.0.5";
+  version = "4.0.6";

  src = fetchFromGitHub {
    repo = "pdfpc";
    owner = "pdfpc";
    rev = "v${version}";
-    sha256 = "13spngkp0lq2qlw4mxsngx4ckr201axzn5ppjax0bhlckirvzr2s";
+    sha256 = "05cfx45i0xnwvclrbwlmqsjj2sk1galk62dc0mrkhr6293mbp1mx";
  };

  nativeBuildInputs = [ cmake pkgconfig vala ];
--- a/pkgs/applications/misc/terminal-parrot/default.nix
+++ b/pkgs/applications/misc/terminal-parrot/default.nix
@ -0,0 +1,22 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+    name = "terminal-parrot-1.1.0";
+    version = "1.1.0";
+    goPackagePath = "github.com/jmhobbs/terminal-parrot";
+
+    src = fetchFromGitHub {
+        owner = "jmhobbs";
+        repo = "terminal-parrot";
+        rev = "22c9bde916c12d8b13cf80ab252995dbf47837d1";
+        sha256 = "1mrxmifsmndf6hdq1956p1gyrrp3abh3rmwjcmxar8x2wqbv748y";
+    };
+
+    meta = with stdenv.lib; {
+        description = "Shows colorful, animated party parrot in your terminial";
+        homepage = https://github.com/jmhobbs/terminal-parrot;
+        license = licenses.mit;
+        platforms = platforms.all;
+        maintainers = [ maintainers.heel ];
+    };
+}
--- a/pkgs/applications/misc/tnef/default.nix
+++ b/pkgs/applications/misc/tnef/default.nix
@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, lib, autoreconfHook }:

 stdenv.mkDerivation rec {
-  version = "1.4.12";
+  version = "1.4.14";
  name = "tnef-${version}";

  src = fetchFromGitHub {
    owner = "verdammelt";
    repo = "tnef";
    rev = "${version}";
-    sha256 = "02hwdaaa3yk0lbzb40fgxlkyhc1wicl6ncajpvfcz888z6yxps2c";
+    sha256 = "0p7yji5hqq7k4pcba1cnv4jkl0fkg7jd77c1q164wk0vwinpmsc2";
  };

  doCheck = true;
--- a/pkgs/applications/misc/xfe/default.nix
+++ b/pkgs/applications/misc/xfe/default.nix
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
    '';
    homepage = "http://sourceforge.net/projects/xfe/";
    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.bbenoist ];
+    maintainers = [];
    platforms = stdenv.lib.platforms.linux;
  };
 }
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
  beta = {
-    sha256 = "0bbr5wr5icrw5101dlhyn20pg28mah7w4vk365i4gf6a1zvyrd8n";
-    sha256bin64 = "0dx9ivjc7avm0zgw0jcx5mmlzapwc2lp1sdjpwgd4y0iai1zr3yw";
-    version = "57.0.2987.98";
+    sha256 = "1rpmi9dl98948a2ll7q0sagyx8v27mmwa2j6fmvfx6r1mwpvbrgz";
+    sha256bin64 = "1xj1fl0k0ck4pxl4q0cdhi55sqfmwbb1vcjj70idlz166ll8lpxh";
+    version = "58.0.3029.19";
  };
  dev = {
-    sha256 = "1i6qr1ypjww3q59lqg60xpns8xqxxrkd0yrpyx96alb1bp22x85p";
-    sha256bin64 = "1ahp99p4hi8r2bvkdpnkakwkpmmnndjn299axc7cafz85zs6z9vl";
-    version = "58.0.3029.14";
+    sha256 = "1rpmi9dl98948a2ll7q0sagyx8v27mmwa2j6fmvfx6r1mwpvbrgz";
+    sha256bin64 = "1wx5r3vmmki419llki0ls6y4z6r93zm66v2h4vnxswjb77svl578";
+    version = "58.0.3029.19";
  };
  stable = {
-    sha256 = "0bbr5wr5icrw5101dlhyn20pg28mah7w4vk365i4gf6a1zvyrd8n";
-    sha256bin64 = "1qs8pmfasf3j84pjf4fnf6yb0pfa2hdgicskvfmr1sqy7c7yg348";
-    version = "57.0.2987.98";
+    sha256 = "1r495ffcwxsd4pxn5akfr7k9iiv1dj0zq6w9i6xxii8knf8a40va";
+    sha256bin64 = "04ig9q8j4xbgq749qprfddlgpm6g28jjvwwnqmvinymnrh4vc7cn";
+    version = "57.0.2987.110";
  };
 }
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@ -4,12 +4,12 @@ let
         then "linux-amd64"
         else "darwin-amd64";
  checksum = if stdenv.isLinux
-             then "8bb6f9d336ca7913556e463c5b65eb8d69778c518df2fab0d20be943fbf0efc1"
-             else "94c9f2d511aec3d4b7dcc5f0ce6f846506169b4eb7235e1dc137d08edf408098";
+             then "fa434644d1afd92637369a033fd65b717d8dfa910127d335e8a82c8fad74cc35"
+             else "64420d467e03ceb666a4f22b89e08b93c06f76f5917fe539860b04cd5e5e515f";
 in
 stdenv.mkDerivation rec {
  pname = "helm";
-  version = "2.1.3";
+  version = "2.2.3";
  name = "${pname}-${version}";

  src = fetchurl {
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@ -27,7 +27,7 @@ let
      export HOME=$TMP
    '';

-    doCheck = builtins.compareVersions version "0.8.8" >= 0;
+    doCheck = builtins.compareVersions version "0.9.0" >= 0;

    meta = with stdenv.lib; {
      description = "Tool for building, changing, and versioning infrastructure";
--- a/pkgs/applications/networking/instant-messengers/oneteam/default.nix
+++ b/pkgs/applications/networking/instant-messengers/oneteam/default.nix
@ -1,64 +0,0 @@
-{ stdenv, fetchFromGitHub
-, perl, xulrunner, cmake, perlPackages, zip, unzip, pkgconfig
-, libpulseaudio, glib, gtk2, pixman, nspr, nss, libXScrnSaver
-, scrnsaverproto
-}:
-
-stdenv.mkDerivation rec {
-  name = "oneteam-unstable-2013-02-21";
-
-  src = fetchFromGitHub {
-    repo = "oneteam";
-    owner = "processone";
-    rev = "c51bc545c3a32db4ea8b96e43b84fcfc6b8d3d2a";
-    sha256 = "19104fwdaf0nnsr5w755fg8wwww5sh96wmn939gxa5ah155nf2w3";
-  };
-
-  nativeBuildInputs = [ pkgconfig cmake zip unzip ];
-
-  buildInputs =
-    [ perl xulrunner libpulseaudio glib gtk2 pixman nspr
-      nss libXScrnSaver scrnsaverproto
-    ] ++ [ perlPackages.SubName gtk2 glib ];
-
-  postPatch = ''
-    sed -e '1i#include <netinet/in.h>' -i src/rtp/otRTPDecoder.cpp src/rtp/otRTPEncoder.cpp
-  '';
-
-  cmakeBuildDir = "cmake-build";
-  cmakeFlags = ["-D XPCOM_GECKO_SDK=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"];
-
-  buildPhase = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr"
-    cd src/components
-    perl build.pl XULAPP 1
-    cd ../../
-  '';
-
-  installPhase = ''
-    TARGET_DIR="$out/share/oneteam/app"
-    BUILD_DIR="$PWD"
-    mkdir -p "$TARGET_DIR"
-    cd "$TARGET_DIR"
-    unzip "$BUILD_DIR/oneteam.xulapp"
-    mkdir -p "$out/bin"
-    echo "#! ${stdenv.shell}" > "$out/bin/oneteam"
-    echo "\"${xulrunner}/bin/xulrunner\" \"$TARGET_DIR/application.ini\"" > "$out/bin/oneteam"
-    chmod a+x "$out/bin/oneteam"
-    mkdir -p "$out/share/doc"
-    cp -r "$BUILD_DIR/docs" "$out/share/doc/oneteam"
-  '';
-
-  meta = {
-    description = "An XMPP client";
-    maintainers = with stdenv.lib.maintainers; [ raskin ];
-    license = stdenv.lib.licenses.gpl2;
-    homepage="http://oneteam.im";
-  };
-
-  passthru = {
-    updateInfo = {
-      downloadPage = "git://github.com/processone/oneteam";
-    };
-  };
-}
--- a/pkgs/applications/networking/p2p/tribler/default.nix
+++ b/pkgs/applications/networking/p2p/tribler/default.nix
@ -1,14 +1,17 @@
-{ stdenv, fetchurl, pythonPackages, makeWrapper, nettools, libtorrentRasterbar, imagemagick
-, enablePlayer ? false, vlc ? null }:
-
+{ stdenv, fetchgit, pythonPackages, makeWrapper, nettools, libtorrentRasterbar, imagemagick
+, enablePlayer ? true, vlc ? null }:

 stdenv.mkDerivation rec {
-  name = "tribler-${version}";
-  version = "v6.4.3";
+  pname = "tribler";
+  name = "${pname}-${version}";
+  version = "7.0.0-beta";
+  revision = "1d3ddb8";

-  src = fetchurl {
-    url = "https://github.com/Tribler/tribler/releases/download/${version}/Tribler-${version}.tar.xz";
-    sha256 = "1n5qi3jlby41w60zg6dvl933ypyiflq3rb0qkwhxi4b26s3vwvgr";
+  src = fetchgit {
+    url = "https://github.com/Tribler/tribler";
+    rev = revision;
+    sha256 = "16mk76qgg7fgca11yvpygicxqbkc0kn6r82x73fly2310pagd845";
+    fetchSubmodules = true;
  };

  buildInputs = [
@ -20,42 +23,56 @@ stdenv.mkDerivation rec {

  pythonPath = [
    libtorrentRasterbar
-    pythonPackages.wxPython
    pythonPackages.apsw
    pythonPackages.twisted
-    pythonPackages.gmpy
    pythonPackages.netifaces
-    pythonPackages.pillow
    pythonPackages.pycrypto
    pythonPackages.pyasn1
    pythonPackages.requests
    pythonPackages.setuptools
    pythonPackages.m2crypto
+    pythonPackages.pyqt5
+    pythonPackages.chardet
+    pythonPackages.cherrypy
+    pythonPackages.cryptography
+    pythonPackages.libnacl
+    pythonPackages.configobj
+    pythonPackages.matplotlib
+    pythonPackages.plyvel
+    pythonPackages.decorator
+    pythonPackages.feedparser
  ];

-  installPhase =
-    ''
-      find . -name '*.png' -exec convert -strip {} {} \;
-      # Nasty hack; call wrapPythonPrograms to set program_PYTHONPATH.
-      wrapPythonPrograms
+  postPatch = ''
+    ${stdenv.lib.optionalString enablePlayer ''
+      substituteInPlace "./TriblerGUI/vlc.py" --replace "ctypes.CDLL(p)" "ctypes.CDLL('${vlc}/lib/libvlc.so')"
+      substituteInPlace "./TriblerGUI/widgets/videoplayerpage.py" --replace "if vlc and vlc.plugin_path" "if vlc"
+      substituteInPlace "./TriblerGUI/widgets/videoplayerpage.py" --replace "os.environ['VLC_PLUGIN_PATH'] = vlc.plugin_path" "os.environ['VLC_PLUGIN_PATH'] = '${vlc}/lib/vlc/plugins'"
+    ''}
+  '';

-      mkdir -p $out/share/tribler
-      cp -prvd Tribler $out/share/tribler/
+  installPhase = ''
+    find . -name '*.png' -exec convert -strip {} {} \;
+    mkdir -pv $out
+    # Nasty hack; call wrapPythonPrograms to set program_PYTHONPATH.
+    wrapPythonPrograms
+    cp -prvd ./* $out/
+    makeWrapper ${pythonPackages.python}/bin/python $out/bin/tribler \
+        --set _TRIBLERPATH $out \
+        --set PYTHONPATH $out:$program_PYTHONPATH \
+        --set NO_AT_BRIDGE 1 \
+        --run 'cd $_TRIBLERPATH' \
+        --add-flags "-O $out/run_tribler.py" \
+        ${stdenv.lib.optionalString enablePlayer ''
+          --prefix LD_LIBRARY_PATH : ${vlc}/lib
+        ''}
+  '';

-      makeWrapper ${pythonPackages.python}/bin/python $out/bin/tribler \
-          --set _TRIBLERPATH $out/share/tribler \
-          --set PYTHONPATH $out/share/tribler:$program_PYTHONPATH \
-          --run 'cd $_TRIBLERPATH' \
-          --add-flags "-O $out/share/tribler/Tribler/Main/tribler.py" \
-          ${stdenv.lib.optionalString enablePlayer ''
-            --prefix LD_LIBRARY_PATH : ${vlc}/lib
-          ''}
-    '';
-
-  meta = {
+  meta = with stdenv.lib; {
+    maintainers = with maintainers; [ xvapx ];
    homepage = http://www.tribler.org/;
    description = "A completely decentralised P2P filesharing client based on the Bittorrent protocol";
-    license = stdenv.lib.licenses.lgpl21;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.lgpl21;
+    platforms = platforms.linux;
  };
 }
--- a/pkgs/applications/science/biology/bedtools/default.nix
+++ b/pkgs/applications/science/biology/bedtools/default.nix
@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
  };

  buildInputs = [ zlib python ];
-  buildPhase = "make prefix=$out SHELL=${stdenv.shell} -j $NIX_BUILD_CORES";
-  installPhase = "make prefix=$out SHELL=${stdenv.shell} install";
+  cc = if stdenv.cc.isClang then "clang++" else "g++";
+  buildPhase = "make prefix=$out SHELL=${stdenv.shell} CXX=${cc} -j $NIX_BUILD_CORES";
+  installPhase = "make prefix=$out SHELL=${stdenv.shell} CXX=${cc} install";

  meta = with stdenv.lib; {
    description = "A powerful toolset for genome arithmetic.";
--- a/pkgs/applications/science/misc/golly/beta.nix
+++ b/pkgs/applications/science/misc/golly/beta.nix
@ -0,0 +1,59 @@
+{stdenv, fetchurl, fetchgit
+, wxGTK, perl, python2, zlib, mesa, libX11
+, automake, autoconf
+}:
+let
+  s = # Generated upstream information
+  rec {
+    baseName="golly";
+    version="2.8";
+    name="${baseName}-${version}";
+    hash="0a4vn2hm7h4b47v2iwip1z3n9y8isf79v08aipl2iqms2m3p5204";
+  };
+in
+stdenv.mkDerivation rec {
+  name = "golly-${version}";
+  version = "2.8.99.2.20161122";
+  #src = fetchurl {
+  #  url="mirror://sourceforge/project/golly/golly/golly-2.8/golly-2.8-src.tar.gz";
+  #  sha256="0a4vn2hm7h4b47v2iwip1z3n9y8isf79v08aipl2iqms2m3p5204";
+  #};
+  src = fetchgit {
+    url = "git://git.code.sf.net/p/golly/code";
+    rev = "93495edf3c9639332c6eb43ca7149c69629ee5d8";
+    sha256 = "1j308s9zlqkr3wnl1l32s5zk7r3g4ijwawkkysl8j5ik9sibi2gk";
+  };
+
+  setSourceRoot = ''
+    export sourceRoot="$(echo */gui-wx/configure)"
+  '';
+
+  nativeBuildInputs = [autoconf automake];
+
+  buildInputs = [
+    wxGTK perl python2 zlib mesa libX11
+  ];
+
+  # Link against Python explicitly as it is needed for scripts
+  makeFlags=[
+    "AM_LDFLAGS="
+  ];
+  NIX_LDFLAGS="-lpython${python2.majorVersion} -lperl";
+  preConfigure=''
+    export NIX_LDFLAGS="$NIX_LDFLAGS -L$(dirname "$(find ${perl} -name libperl.so)")"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE
+      -DPYTHON_SHLIB=$(basename "$(
+        readlink -f ${python2}/lib/libpython*.so)")"
+
+    sh autogen.sh
+  '';
+
+  meta = {
+    inherit version;
+    description = "Cellular automata simulation program";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+    downloadPage = "http://sourceforge.net/projects/golly/files/golly";
+  };
+}
--- a/pkgs/applications/science/misc/golly/default.upstream
+++ b/pkgs/applications/science/misc/golly/default.upstream
@ -2,3 +2,4 @@ url http://sourceforge.net/projects/golly/files/golly/
 version_link '[-][0-9.]+/$'
 SF_version_tarball 'src'
 SF_redirect
+minimize_overwrite
--- a/pkgs/applications/search/recoll/default.nix
+++ b/pkgs/applications/search/recoll/default.nix
@ -7,16 +7,14 @@
 assert stdenv.system != "powerpc-linux";

 stdenv.mkDerivation rec {
-  ver = "1.21.3";
+  ver = "1.23.1";
  name = "recoll-${ver}";

  src = fetchurl {
    url = "http://www.lesbonscomptes.com/recoll/${name}.tar.gz";
-    sha256 = "66f039f08b149d5e4840664d4a636f6b55145b02072f87aab83282ebe0cd593a";
+    sha256 = "0si407qm47ndy0l6zv57lqb5za4aiv0lyghnzb211g03szjkfpg8";
  };

-  patches = [ ./nodeblayout.patch ./versionawk.patch ];
-
  configureFlags = [ "--with-inotify" ];

  buildInputs = [ qt4 xapian file python bison];
@ -61,6 +59,6 @@ stdenv.mkDerivation rec {
    homepage = http://www.lesbonscomptes.com/recoll/;
    license = licenses.gpl2;
    platforms = platforms.unix;
-    maintainers = with maintainers; [ jcumming ];
+    maintainers = [ maintainers.jcumming ];
  };
 }
--- a/pkgs/applications/version-management/gitlab/Gemfile
+++ b/pkgs/applications/version-management/gitlab/Gemfile
@ -7,7 +7,6 @@ gem 'rails-deprecated_sanitizer', '~> 1.0.3'
 gem 'responders', '~> 2.0'

 gem 'sprockets', '~> 3.7.0'
-gem 'sprockets-es6', '~> 0.9.2'

 # Default values for AR models
 gem 'default_value_for', '~> 3.0.0'
@ -36,7 +35,7 @@ gem 'omniauth-twitter',       '~> 1.2.0'
 gem 'omniauth_crowd',         '~> 2.2.0'
 gem 'omniauth-authentiq',     '~> 0.2.0'
 gem 'rack-oauth2',            '~> 1.2.1'
-gem 'jwt'
+gem 'jwt',                    '~> 1.5.6'

 # Spam and anti-bot protection
 gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails'
@ -48,6 +47,9 @@ gem 'rqrcode-rails3', '~> 0.1.7'
 gem 'attr_encrypted', '~> 3.0.0'
 gem 'u2f', '~> 0.2.1'

+# GitLab Pages
+gem 'validates_hostname', '~> 1.0.6'
+
 # Browser detection
 gem 'browser', '~> 2.2'

@ -109,7 +111,7 @@ gem 'org-ruby',             '~> 0.9.12'
 gem 'creole',               '~> 0.5.0'
 gem 'wikicloth',            '0.8.1'
 gem 'asciidoctor',          '~> 1.5.2'
-gem 'asciidoctor-plantuml', '0.0.6'
+gem 'asciidoctor-plantuml', '0.0.7'
 gem 'rouge',                '~> 2.0'
 gem 'truncato',             '~> 0.7.8'

@ -219,10 +221,12 @@ gem 'oj', '~> 2.17.4'
 gem 'chronic', '~> 0.10.2'
 gem 'chronic_duration', '~> 0.10.6'

+gem 'webpack-rails', '~> 0.9.9'
+gem 'rack-proxy', '~> 0.6.0'
+
 gem 'sass-rails', '~> 5.0.6'
 gem 'coffee-rails', '~> 4.1.0'
 gem 'uglifier', '~> 2.7.2'
-gem 'gitlab-turbolinks-classic', '~> 2.5', '>= 2.5.6'

 gem 'addressable',        '~> 2.3.8'
 gem 'bootstrap-sass',     '~> 3.3.0'
@ -280,6 +284,7 @@ group :development, :test do
  gem 'rspec-retry',        '~> 0.4.5'
  gem 'spinach-rails',      '~> 0.2.1'
  gem 'spinach-rerun-reporter', '~> 0.0.2'
+  gem 'rspec_profiling'

  # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
  gem 'minitest', '~> 5.7.0'
@ -291,13 +296,9 @@ group :development, :test do
  gem 'capybara-screenshot', '~> 1.0.0'
  gem 'poltergeist',         '~> 1.9.0'

-  gem 'teaspoon', '~> 1.1.0'
-  gem 'teaspoon-jasmine', '~> 2.2.0'
-
  gem 'spring',                   '~> 1.7.0'
  gem 'spring-commands-rspec',    '~> 1.0.4'
  gem 'spring-commands-spinach',  '~> 1.1.0'
-  gem 'spring-commands-teaspoon', '~> 0.0.2'

  gem 'rubocop', '~> 0.46.0', require: false
  gem 'rubocop-rspec', '~> 1.9.1', require: false
--- a/pkgs/applications/version-management/gitlab/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/Gemfile.lock
@ -56,7 +56,7 @@ GEM
      faraday_middleware-multi_json (~> 0.0)
      oauth2 (~> 1.0)
    asciidoctor (1.5.3)
-    asciidoctor-plantuml (0.0.6)
+    asciidoctor-plantuml (0.0.7)
      asciidoctor (~> 1.5)
    ast (2.3.0)
    attr_encrypted (3.0.3)
@ -74,10 +74,6 @@ GEM
      descendants_tracker (~> 0.0.4)
      ice_nine (~> 0.11.0)
      thread_safe (~> 0.3, >= 0.3.1)
-    babel-source (5.8.35)
-    babel-transpiler (0.7.0)
-      babel-source (>= 4.0, < 6)
-      execjs (~> 2.0)
    babosa (1.0.2)
    base32 (0.3.2)
    bcrypt (3.1.11)
@ -268,8 +264,6 @@ GEM
      mime-types (>= 1.16, < 3)
      posix-spawn (~> 0.3)
    gitlab-markup (1.5.1)
-    gitlab-turbolinks-classic (2.5.6)
-      coffee-rails
    gitlab_omniauth-ldap (1.2.1)
      net-ldap (~> 0.9)
      omniauth (~> 1.0)
@ -381,7 +375,7 @@ GEM
    json (1.8.3)
    json-schema (2.6.2)
      addressable (~> 2.3.8)
-    jwt (1.5.4)
+    jwt (1.5.6)
    kaminari (0.17.0)
      actionpack (>= 3.0.0)
      activesupport (>= 3.0.0)
@ -550,6 +544,8 @@ GEM
      rack (>= 1.1)
    rack-protection (1.5.3)
      rack
+    rack-proxy (0.6.0)
+      rack
    rack-test (0.6.3)
      rack (>= 1.0)
    rails (4.2.7.1)
@ -644,6 +640,11 @@ GEM
    rspec-retry (0.4.5)
      rspec-core
    rspec-support (3.5.0)
+    rspec_profiling (0.0.4)
+      activerecord
+      pg
+      rails
+      sqlite3
    rubocop (0.46.0)
      parser (>= 2.3.1.1, < 3.0)
      powerpack (~> 0.1)
@ -662,7 +663,7 @@ GEM
      sexp_processor (~> 4.1)
    rubyntlm (0.5.2)
    rubypants (0.2.0)
-    rubyzip (1.2.0)
+    rubyzip (1.2.1)
    rufus-scheduler (3.1.10)
    rugged (0.24.0)
    safe_yaml (1.0.4)
@ -732,19 +733,14 @@ GEM
      spring (>= 0.9.1)
    spring-commands-spinach (1.1.0)
      spring (>= 0.9.1)
-    spring-commands-teaspoon (0.0.2)
-      spring (>= 0.9.1)
    sprockets (3.7.0)
      concurrent-ruby (~> 1.0)
      rack (> 1, < 3)
-    sprockets-es6 (0.9.2)
-      babel-source (>= 5.8.11)
-      babel-transpiler
-      sprockets (>= 3.0.0)
    sprockets-rails (3.1.1)
      actionpack (>= 4.0)
      activesupport (>= 4.0)
      sprockets (>= 3.0.0)
+    sqlite3 (1.3.11)
    stackprof (0.2.10)
    state_machines (0.4.0)
    state_machines-activemodel (0.4.0)
@ -757,10 +753,6 @@ GEM
    sys-filesystem (1.1.6)
      ffi
    sysexits (1.2.0)
-    teaspoon (1.1.5)
-      railties (>= 3.2.5, < 6)
-    teaspoon-jasmine (2.2.0)
-      teaspoon (>= 1.0.0)
    temple (0.7.7)
    test_after_commit (1.1.0)
      activerecord (>= 3.2)
@ -795,6 +787,9 @@ GEM
      get_process_mem (~> 0)
      unicorn (>= 4, < 6)
    uniform_notifier (1.10.0)
+    validates_hostname (1.0.6)
+      activerecord (>= 3.0)
+      activesupport (>= 3.0)
    version_sorter (2.1.0)
    virtus (1.0.5)
      axiom-types (~> 0.1)
@ -812,6 +807,8 @@ GEM
    webmock (1.21.0)
      addressable (>= 2.3.6)
      crack (>= 0.3.2)
+    webpack-rails (0.9.9)
+      rails (>= 3.2.0)
    websocket-driver (0.6.3)
      websocket-extensions (>= 0.1.0)
    websocket-extensions (0.1.2)
@ -838,7 +835,7 @@ DEPENDENCIES
  allocations (~> 1.0)
  asana (~> 0.4.0)
  asciidoctor (~> 1.5.2)
-  asciidoctor-plantuml (= 0.0.6)
+  asciidoctor-plantuml (= 0.0.7)
  attr_encrypted (~> 3.0.0)
  awesome_print (~> 1.2.0)
  babosa (~> 1.0.2)
@ -888,7 +885,6 @@ DEPENDENCIES
  github-linguist (~> 4.7.0)
  gitlab-flowdock-git-hook (~> 1.0.1)
  gitlab-markup (~> 1.5.1)
-  gitlab-turbolinks-classic (~> 2.5, >= 2.5.6)
  gitlab_omniauth-ldap (~> 1.2.1)
  gollum-lib (~> 4.2)
  gollum-rugged_adapter (~> 0.4.2)
@ -909,7 +905,7 @@ DEPENDENCIES
  jquery-rails (~> 4.1.0)
  jquery-ui-rails (~> 5.0.0)
  json-schema (~> 2.6.2)
-  jwt
+  jwt (~> 1.5.6)
  kaminari (~> 0.17.0)
  knapsack (~> 1.11.0)
  kubeclient (~> 2.2.0)
@ -952,6 +948,7 @@ DEPENDENCIES
  rack-attack (~> 4.4.1)
  rack-cors (~> 0.4.0)
  rack-oauth2 (~> 1.2.1)
+  rack-proxy (~> 0.6.0)
  rails (= 4.2.7.1)
  rails-deprecated_sanitizer (~> 1.0.3)
  rainbow (~> 2.1.0)
@ -968,6 +965,7 @@ DEPENDENCIES
  rqrcode-rails3 (~> 0.1.7)
  rspec-rails (~> 3.5.0)
  rspec-retry (~> 0.4.5)
+  rspec_profiling
  rubocop (~> 0.46.0)
  rubocop-rspec (~> 1.9.1)
  ruby-fogbugz (~> 0.2.1)
@ -992,15 +990,11 @@ DEPENDENCIES
  spring (~> 1.7.0)
  spring-commands-rspec (~> 1.0.4)
  spring-commands-spinach (~> 1.1.0)
-  spring-commands-teaspoon (~> 0.0.2)
  sprockets (~> 3.7.0)
-  sprockets-es6 (~> 0.9.2)
  stackprof (~> 0.2.10)
  state_machines-activerecord (~> 0.4.0)
  sys-filesystem (~> 1.1.6)
-  teaspoon (~> 1.1.0)
-  teaspoon-jasmine (~> 2.2.0)
-  test_after_commit (~> 0.4.2)
+  test_after_commit (~> 1.1)
  thin (~> 1.7.0)
  timecop (~> 0.8.0)
  truncato (~> 0.7.8)
@ -1010,12 +1004,14 @@ DEPENDENCIES
  unf (~> 0.1.4)
  unicorn (~> 5.1.0)
  unicorn-worker-killer (~> 0.4.4)
+  validates_hostname (~> 1.0.6)
  version_sorter (~> 2.1.0)
  virtus (~> 1.0.1)
  vmstat (~> 2.3.0)
  web-console (~> 2.0)
  webmock (~> 1.21.0)
+  webpack-rails (~> 0.9.9)
  wikicloth (= 0.8.1)

 BUNDLED WITH
-   1.13.7
+   1.14.5
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@ -1,5 +1,5 @@
-{ stdenv, lib, bundler, fetchFromGitHub, bundlerEnv, libiconv, ruby
-, tzdata, git, nodejs, procps
+{ stdenv, lib, bundler, fetchurl, fetchFromGitHub, bundlerEnv, libiconv, ruby
+, tzdata, git, nodejs, procps, dpkg
 }:

 /* When updating the Gemfile add `gem "activerecord-nulldb-adapter"`
@ -18,19 +18,27 @@ let
    };
  };

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

 stdenv.mkDerivation rec {
  name = "gitlab-${version}";
-  version = "8.16.6";

-  buildInputs = [ env ruby bundler tzdata git nodejs procps ];
+  buildInputs = [
+    env ruby bundler tzdata git nodejs procps dpkg
+  ];

  src = fetchFromGitHub {
    owner = "gitlabhq";
    repo = "gitlabhq";
    rev = "v${version}";
-    sha256 = "03rzms2frwx4c09l2rig1amlxj965s2iq421i52j8wj2khb7pd7g";
+    sha256 = "1yrbbf55pz7863xngl2mxwj9w4imdlqvmqywd1zpnswdsjqxa5xj";
  };

  patches = [
@ -64,9 +72,15 @@ stdenv.mkDerivation rec {

  buildPhase = ''
    mv config/gitlab.yml.example config/gitlab.yml
-    GITLAB_DATABASE_ADAPTER=nulldb \
-      SKIP_STORAGE_VALIDATION=true \
-      rake assets:precompile RAILS_ENV=production
+
+    dpkg -x ${gitlabDeb} .
+    mv -v opt/gitlab/embedded/service/gitlab-rails/public/assets public
+    rm -rf opt
+
+    export GITLAB_DATABASE_ADAPTER=nulldb
+    export SKIP_STORAGE_VALIDATION=true
+    rake assets:precompile RAILS_ENV=production
+
    mv config/gitlab.yml config/gitlab.yml.example
    rm config/secrets.yml
    mv config config.dist
@ -77,6 +91,10 @@ stdenv.mkDerivation rec {
    cp -r . $out/share/gitlab
    ln -sf /run/gitlab/uploads $out/share/gitlab/public/uploads
    ln -sf /run/gitlab/config $out/share/gitlab/config
+
+    # rake tasks to mitigate CVE-2017-0882
+    # see https://about.gitlab.com/2017/03/20/gitlab-8-dot-17-dot-4-security-release/
+    cp ${./reset_token.rake} $out/share/gitlab/lib/tasks/reset_token.rake
  '';

  passthru = {
--- a/pkgs/applications/version-management/gitlab/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gemset.nix
@ -146,10 +146,10 @@
  asciidoctor-plantuml = {
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0rd8yh0by5sxhg1c3cb1mzkp4jp3j8v6vzbyv1mx492s9ml451fx";
+      sha256 = "00ax9r822n4ykl6jizaxp03wqzknr7nn20mmqjpiwajy9j0zvr88";
      type = "gem";
    };
-    version = "0.0.6";
+    version = "0.0.7";
  };
  ast = {
    source = {
@ -207,22 +207,6 @@
    };
    version = "0.1.1";
  };
-  babel-source = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1ncq8h82k6hypzfb5dk7z95mmcdwnhsxmc53xz17m1nbklm25vvr";
-      type = "gem";
-    };
-    version = "5.8.35";
-  };
-  babel-transpiler = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0w0minwxj56w96xps1msm6n75fs0y7r1vqcr9zlsn74fksnz81jc";
-      type = "gem";
-    };
-    version = "0.7.0";
-  };
  babosa = {
    source = {
      remotes = ["https://rubygems.org"];
@ -944,14 +928,6 @@
    };
    version = "1.5.1";
  };
-  gitlab-turbolinks-classic = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1zfqwa1pahhcz1yxvwigg94bck2zsqk2jsrc0wdcybhr0iwi5jra";
-      type = "gem";
-    };
-    version = "2.5.6";
-  };
  gitlab_omniauth-ldap = {
    source = {
      remotes = ["https://rubygems.org"];
@ -1235,10 +1211,10 @@
  jwt = {
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0s5llb4mhpy0phzbrc4jd2jd2b91h1axy4bhci7g1bdz1w2m3a2i";
+      sha256 = "124zz1142bi2if7hl5pcrcamwchv4icyr5kaal9m2q6wqbdl6aw4";
      type = "gem";
    };
-    version = "1.5.4";
+    version = "1.5.6";
  };
  kaminari = {
    source = {
@ -1848,6 +1824,14 @@
    };
    version = "1.5.3";
  };
+  rack-proxy = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1bpbcb9ch94ha2q7gdri88ry7ch0z6ian289kah9ayxyqg19j6f4";
+      type = "gem";
+    };
+    version = "0.6.0";
+  };
  rack-test = {
    source = {
      remotes = ["https://rubygems.org"];
@ -2152,6 +2136,14 @@
    };
    version = "3.5.0";
  };
+  rspec_profiling = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01qrs189r0q08ys8vax269ff858q9ypsc94n1d700m9da44zi3wg";
+      type = "gem";
+    };
+    version = "0.0.4";
+  };
  rubocop = {
    source = {
      remotes = ["https://rubygems.org"];
@ -2227,10 +2219,10 @@
  rubyzip = {
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "10a9p1m68lpn8pwqp972lv61140flvahm3g9yzbxzjks2z3qlb2s";
+      sha256 = "06js4gznzgh8ac2ldvmjcmg9v1vg9llm357yckkpylaj6z456zqz";
      type = "gem";
    };
-    version = "1.2.0";
+    version = "1.2.1";
  };
  rufus-scheduler = {
    source = {
@ -2464,14 +2456,6 @@
    };
    version = "1.1.0";
  };
-  spring-commands-teaspoon = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1g7n4m2s9d0frh7y1xibzpphqajfnx4fvgfc66nh545dd91w2nqz";
-      type = "gem";
-    };
-    version = "0.0.2";
-  };
  sprockets = {
    source = {
      remotes = ["https://rubygems.org"];
@ -2480,14 +2464,6 @@
    };
    version = "3.7.0";
  };
-  sprockets-es6 = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0508h3vnjz08c64k11za6cqnbvvifka9pmdrycamzzjd4dmf10y3";
-      type = "gem";
-    };
-    version = "0.9.2";
-  };
  sprockets-rails = {
    source = {
      remotes = ["https://rubygems.org"];
@ -2496,6 +2472,14 @@
    };
    version = "3.1.1";
  };
+  sqlite3 = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "19r06wglnm6479ffj9dl0fa4p5j2wi6dj7k6k3d0rbx7036cv3ny";
+      type = "gem";
+    };
+    version = "1.3.11";
+  };
  stackprof = {
    source = {
      remotes = ["https://rubygems.org"];
@ -2552,22 +2536,6 @@
    };
    version = "1.2.0";
  };
-  teaspoon = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1xz5f1w8jm2fg1g194kf17gh36imd7sgs9cx0adqx1l22p7jrkvv";
-      type = "gem";
-    };
-    version = "1.1.5";
-  };
-  teaspoon-jasmine = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "00wygrv1jm4aj15p1ab9d5fdrj6y83kv26xgp52mx4lp78h2ms9q";
-      type = "gem";
-    };
-    version = "2.2.0";
-  };
  temple = {
    source = {
      remotes = ["https://rubygems.org"];
@ -2728,6 +2696,14 @@
    };
    version = "1.10.0";
  };
+  validates_hostname = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04p1l0v98j4ffvaks1ig9mygx5grpbpdgz7haq3mygva9iy8ykja";
+      type = "gem";
+    };
+    version = "1.0.6";
+  };
  version_sorter = {
    source = {
      remotes = ["https://rubygems.org"];
@ -2776,6 +2752,14 @@
    };
    version = "1.21.0";
  };
+  webpack-rails = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "02jxkpdbi48yhcgldgl5jxnhnad83rdgpkkcwh8w1h6iyg04d42j";
+      type = "gem";
+    };
+    version = "0.9.9";
+  };
  websocket-driver = {
    source = {
      remotes = ["https://rubygems.org"];
--- a/pkgs/applications/version-management/gitlab/reset_token.rake
+++ b/pkgs/applications/version-management/gitlab/reset_token.rake
@ -0,0 +1,43 @@
+# Taken from:
+# https://about.gitlab.com/2017/03/20/gitlab-8-dot-17-dot-4-security-release/
+
+# lib/tasks/reset_token.rake
+require_relative '../../app/models/concerns/token_authenticatable.rb'
+
+STDOUT.sync = true
+
+namespace :tokens do
+  desc "Reset all GitLab user auth tokens"
+  task reset_all: :environment do
+    reset_all_users_token(:reset_authentication_token!)
+  end
+
+  desc "Reset all GitLab email tokens"
+  task reset_all_email: :environment do
+    reset_all_users_token(:reset_incoming_email_token!)
+  end
+
+  def reset_all_users_token(token)
+    TmpUser.find_in_batches do |batch|
+      puts "Processing batch starting with user ID: #{batch.first.id}"
+
+      batch.each(&token)
+    end
+  end
+end
+
+class TmpUser < ActiveRecord::Base
+  include TokenAuthenticatable
+
+  self.table_name = 'users'
+
+  def reset_authentication_token!
+    write_new_token(:authentication_token)
+    save!(validate: false)
+  end
+
+  def reset_incoming_email_token!
+    write_new_token(:incoming_email_token)
+    save!(validate: false)
+  end
+end
--- a/pkgs/applications/version-management/pijul/default.nix
+++ b/pkgs/applications/version-management/pijul/default.nix
@ -4,21 +4,21 @@ with rustPlatform;

 buildRustPackage rec {
  name = "pijul-${version}";
-  version = "0.3";
+  version = "0.3.3";

  src = fetchurl {
    url = "https://pijul.org/releases/${name}.tar.gz";
-    sha256 = "2c7b354b4ab142ac50a85d70c80949ff864377b37727b862d103d3407e2c7818";
+    sha256 = "933e68703916ee7b50cd09f928bb072bdfc3388b69ff657578c23080f7df22b8";
  };

-  sourceRoot = "pijul/pijul";
+  sourceRoot = "${name}/pijul";

  buildInputs = [ perl ]++ stdenv.lib.optionals stdenv.isDarwin
    (with darwin.apple_sdk.frameworks; [ Security ]);

  doCheck = false;
  
-  depsSha256 = "03bb92mn16d38l49x4p1z21k7gvq3l3ki10brr13p7yv45rwvmzc";
+  depsSha256 = "1aiyjl8jbmr8yys5bsd2mg1i7jryzb8kxqlmxp7kjn2qx7b4q2zd";

  meta = with stdenv.lib; {
    description = "A distributed version control system";
--- a/pkgs/applications/video/handbrake/default.nix
+++ b/pkgs/applications/video/handbrake/default.nix
@ -77,6 +77,10 @@ stdenv.mkDerivation rec {
    (if useGtk then "--disable-gtk-update-checks" else "--disable-gtk")
  ];

+  NIX_LDFLAGS = [
+    "-lx265"
+  ];
+
  preBuild = ''
    cd build
  '';
--- a/pkgs/build-support/fetchdarcs/default.nix
+++ b/pkgs/build-support/fetchdarcs/default.nix
@ -1,13 +1,16 @@
 {stdenv, darcs, nix}: {url, rev ? null, context ? null, md5 ? "", sha256 ? ""}:

+if md5 != "" then
+  throw "fetchdarcs does not support md5 anymore, please use sha256"
+else
 stdenv.mkDerivation {
  name = "fetchdarcs";
  builder = ./builder.sh;
  buildInputs = [darcs];

-  outputHashAlgo = if sha256 == "" then "md5" else "sha256";
+  outputHashAlgo = "sha256";
  outputHashMode = "recursive";
-  outputHash = if sha256 == "" then md5 else sha256;
-  
+  outputHash = sha256;
+
  inherit url rev context;
 }
--- a/pkgs/build-support/fetchegg/default.nix
+++ b/pkgs/build-support/fetchegg/default.nix
@ -4,14 +4,17 @@
 { stdenv, chicken }:
 { name, version, md5 ? "", sha256 ? "" }:

+if md5 != "" then
+  throw "fetchegg does not support md5 anymore, please use sha256"
+else
 stdenv.mkDerivation {
  name = "chicken-${name}-export";
  builder = ./builder.sh;
  buildInputs = [ chicken ];

-  outputHashAlgo = if sha256 == "" then "md5" else "sha256";
+  outputHashAlgo = "sha256";
  outputHashMode = "recursive";
-  outputHash = if sha256 == "" then md5 else sha256;
+  outputHash = sha256;

  inherit version;

--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@ -39,18 +39,20 @@ in
   server admins start using the new version?
 */

-assert md5 != "" || sha256 != "";
 assert deepClone -> leaveDotGit;

+if md5 != "" then
+  throw "fetchgit does not support md5 anymore, please use sha256"
+else
 stdenv.mkDerivation {
  inherit name;
  builder = ./builder.sh;
  fetcher = "${./nix-prefetch-git}";  # This must be a string to ensure it's called with bash.
  buildInputs = [git];

-  outputHashAlgo = if sha256 == "" then "md5" else "sha256";
+  outputHashAlgo = "sha256";
  outputHashMode = "recursive";
-  outputHash = if sha256 == "" then md5 else sha256;
+  outputHash = sha256;

  inherit url rev leaveDotGit fetchSubmodules deepClone branchName;

--- a/pkgs/build-support/fetchgx/default.nix
+++ b/pkgs/build-support/fetchgx/default.nix
@ -18,7 +18,7 @@ stdenv.mkDerivation {

  buildPhase = ''
    export GOPATH=$(pwd)/vendor
-    mkdir vendor
+    mkdir -p vendor
    gx install
  '';

--- a/pkgs/build-support/fetchhg/default.nix
+++ b/pkgs/build-support/fetchhg/default.nix
@ -1,5 +1,8 @@
 {stdenv, mercurial, nix}: {name ? null, url, rev ? null, md5 ? null, sha256 ? null, fetchSubrepos ? false}:

+if md5 != null then
+  throw "fetchhg does not support md5 anymore, please use sha256"
+else
 # TODO: statically check if mercurial as the https support if the url starts woth https.
 stdenv.mkDerivation {
  name = "hg-archive" + (if name != null then "-${name}" else "");
@ -8,14 +11,11 @@ stdenv.mkDerivation {

  impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;

-  # Nix <= 0.7 compatibility.
-  id = md5;
-
  subrepoClause = if fetchSubrepos then "S" else "";

-  outputHashAlgo = if md5 != null then "md5" else "sha256";
+  outputHashAlgo = "sha256";
  outputHashMode = "recursive";
-  outputHash = if md5 != null then md5 else sha256;
+  outputHash = sha256;

  inherit url rev;
  preferLocalBuild = true;
--- a/pkgs/build-support/fetchnuget/default.nix
+++ b/pkgs/build-support/fetchnuget/default.nix
@ -8,9 +8,12 @@ attrs @
 , md5 ? ""
 , ...
 }:
+if md5 != "" then
+  throw "fetchnuget does not support md5 anymore, please use sha256"
+else
  buildDotnetPackage ({
    src = fetchurl {
-      inherit url sha256 md5;
+      inherit url sha256;
      name = "${baseName}.${version}.zip";
    };

--- a/pkgs/build-support/fetchsvn/default.nix
+++ b/pkgs/build-support/fetchsvn/default.nix
@ -25,14 +25,17 @@ let
  name_ = if name == null then "${repoName}-r${toString rev}" else name;
 in

+if md5 != "" then
+  throw "fetchsvn does not support md5 anymore, please use sha256"
+else
 stdenv.mkDerivation {
  name = name_;
  builder = ./builder.sh;
  buildInputs = [subversion];

-  outputHashAlgo = if sha256 == "" then "md5" else "sha256";
+  outputHashAlgo = "sha256";
  outputHashMode = "recursive";
-  outputHash = if sha256 == "" then md5 else sha256;
+  outputHash = sha256;

  inherit url rev sshSupport openssh ignoreExternals ignoreKeywords;

--- a/pkgs/build-support/fetchsvnssh/default.nix
+++ b/pkgs/build-support/fetchsvnssh/default.nix
@ -1,16 +1,20 @@
 {stdenv, subversion, sshSupport ? false, openssh ? null, expect}: 
 {username, password, url, rev ? "HEAD", md5 ? "", sha256 ? ""}:

+
+if md5 != "" then
+  throw "fetchsvnssh does not support md5 anymore, please use sha256"
+else
 stdenv.mkDerivation {
  name = "svn-export-ssh";
  builder = ./builder.sh;
  buildInputs = [subversion expect];

-  outputHashAlgo = if sha256 == "" then "md5" else "sha256";
+  outputHashAlgo = "sha256";
  outputHashMode = "recursive";
-  outputHash = if sha256 == "" then md5 else sha256;
-  
+  outputHash = sha256;
+
  sshSubversion = ./sshsubversion.exp;
-  
+
  inherit username password url rev sshSupport openssh;
 }
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@ -87,12 +87,14 @@ assert sha512 != "" -> builtins.compareVersions "1.11" builtins.nixVersion <= 0;
 let

  hasHash = showURLs || (outputHash != "" && outputHashAlgo != "")
-    || md5 != "" || sha1 != "" || sha256 != "" || sha512 != "";
+    || sha1 != "" || sha256 != "" || sha512 != "";
  urls_ = if urls != [] then urls else [url];

 in

-if (!hasHash) then throw "Specify hash for fetchurl fixed-output derivation: ${stdenv.lib.concatStringsSep ", " urls_}" else stdenv.mkDerivation {
+if md5 != "" then throw "fetchsvnssh does not support md5 anymore, please use sha256 or sha512"
+else if (!hasHash) then throw "Specify hash for fetchurl fixed-output derivation: ${stdenv.lib.concatStringsSep ", " urls_}"
+else stdenv.mkDerivation {
  name =
    if showURLs then "urls"
    else if name != "" then name
@ -110,9 +112,9 @@ if (!hasHash) then throw "Specify hash for fetchurl fixed-output derivation: ${s

  # New-style output content requirements.
  outputHashAlgo = if outputHashAlgo != "" then outputHashAlgo else
-      if sha512 != "" then "sha512" else if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5";
+      if sha512 != "" then "sha512" else if sha256 != "" then "sha256" else "sha1";
  outputHash = if outputHash != "" then outputHash else
-      if sha512 != "" then sha512 else if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5;
+      if sha512 != "" then sha512 else if sha256 != "" then sha256 else sha1;

  outputHashMode = if (recursiveHash || executable) then "recursive" else "flat";

--- a/pkgs/data/fonts/babelstone-han/default.nix
+++ b/pkgs/data/fonts/babelstone-han/default.nix
@ -0,0 +1,30 @@
+{stdenv, fetchurl, unzip}:
+
+stdenv.mkDerivation rec {
+  name = "babelstone-han-${version}";
+  version = "9.0.2";
+
+  src = fetchurl {
+    url = "http://www.babelstone.co.uk/Fonts/8672/BabelStoneHan.zip";
+    sha256 = "09zlrp3mqdsbxpq4sssd8gj5isnxfbr56pcdp7mnr27nv4pvp6ha";
+  };
+
+  buildInputs = [ unzip ];
+
+  sourceRoot = ".";
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    cp -v *.ttf $out/share/fonts/truetype
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Unicode CJK font with over 32600 Han characters";
+    homepage = http://www.babelstone.co.uk/Fonts/Han.html;
+
+    license = licenses.free;
+    platforms = platforms.all;
+    hydraPlatforms = [];
+    maintainers = [ maintainers.volth ];
+  };
+}
--- a/pkgs/desktops/gnome-3/3.22/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/mutter/default.nix
@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
  inherit (import ./src.nix fetchurl) name src;

  # fatal error: gio/gunixfdlist.h: No such file or directory
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0 -Wno-error=format -Wno-error=sign-compare";

  configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra --with-xwayland-path=${xwayland}/bin/Xwayland";

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
  '';

  patches = [
-  #./x86.patch ./math.patch
+    ./x86.patch # ./math.patch
  ];

  enableParallelBuilding = true;
--- a/pkgs/desktops/gnome-3/3.22/core/mutter/x86.patch
+++ b/pkgs/desktops/gnome-3/3.22/core/mutter/x86.patch
@ -18,16 +18,3 @@
   MetaRectangle unconstrained_rect;
   MetaRectangle constrained_rect;
   MetaMoveResizeResultFlags result = 0;
--- a/src/core/startup-notification.c	2016-06-06 12:13:27.100251933 +0200
-+++ b/src/core/startup-notification.c	2016-06-06 12:13:42.554956773 +0200
-@@ -418,7 +418,7 @@
-   elapsed = ctod->now - timestamp;
- 
-   meta_topic (META_DEBUG_STARTUP,
-              "Sequence used %ld ms vs. %d max: %s\n",
-+              "Sequence used %" G_GINT64_FORMAT " ms vs. %d max: %s\n",
-               elapsed, STARTUP_TIMEOUT,
-               meta_startup_notification_sequence_get_id (sequence));
- 
-[?25l[J[J[J[34h[?25h[?1049h[?1h=[1;44r[34l[34h[?25h[23m[24m[0m[H[J[?25l[2;1H[1m[34m~                                                                                              [3;1H~                                                                                              [4;1H~                                                                                              [5;1H~                                                                                              [6;1H~                                                                                              [7;1H~                                                                                              [8;1H~                                                                                              [9;1H~                                                                                              [10;1H~                                                                                              [11;1H~                                                                                              [12;1H~                                                                                              [13;1H~                                                                                              [14;1H~                                                                                              [15;1H~                                                                                              [16;1H~                                                                                              [17;1H~                                                                                              [18;1H~                                                                                              [19;1H~                                                                                              [20;1H~                                                                                              [21;1H~                                                                                              [22;1H~                                                                                              [23;1H~                                                                                              [24;1H~                                                                                              [25;1H~                                                                                              [26;1H~                                                                                              [27;1H~                                                                                              [28;1H~                                                                                              [29;1H~                                                                                              [30;1H~                                                                                              [31;1H~                                                                                              [32;1H~                                                                                              [33;1H~                                                                                              [34;1H~                                                                                              [35;1H~                                                                                              [36;1H~                                                                                              [37;1H~                                                                                              [38;1H~                                                                                              [39;1H~                                                                                              [40;1H~                                                                                              [41;1H~                                                                                              [42;1H~                                                                                              [43;1H~                                                                                              [1;1H[34h[?25h[?25l[0m[44;1HType  :quit<Enter>  to exit Vim[1;1H[34h[?25h[?25l[34h[?25h[?25l[34h[?25h[?25l[34h[?25h[?25l[34h[?25h[?25l[34h[?25h[?25l[34h[?25h[44;1H
-[?1l>[?1049l
--- a/pkgs/desktops/plasma-5/fetch.sh
+++ b/pkgs/desktops/plasma-5/fetch.sh
@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/plasma/5.9.3/ -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/plasma/5.9.4/ -A '*.tar.xz' )
--- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
@ -17,12 +17,15 @@ plasmaPackage {

  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
  buildInputs = [
+    isocodes libdbusmenu libSM libXcursor pam wayland
+  ];
+  propagatedBuildInputs = [
    baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative
    kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff
    knotifyconfig kpackage krunner ktexteditor ktextwidgets kwallet kwayland
    kwin kxmlrpcclient libkscreen libksysguard networkmanager-qt phonon
-    plasma-framework qtgraphicaleffects qtquickcontrols qtquickcontrols2
-    qtscript qtx11extras solid isocodes libdbusmenu libSM libXcursor pam wayland
+    plasma-framework solid qtgraphicaleffects qtquickcontrols qtquickcontrols2
+    qtscript qtx11extras
  ];

  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@ -3,323 +3,323 @@

 {
  bluedevil = {
-    version = "5.9.3";
+    version = "5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/bluedevil-5.9.3.tar.xz";
-      sha256 = "0cfk0khcd62ficsmpxhiqwfdgwzv771ndlf0s7b8ghqqyckq6bld";
-      name = "bluedevil-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/bluedevil-5.9.4.tar.xz";
+      sha256 = "1a31vsaiy7kzbw79kjiia5a966xc9ba3phxhyqmdzvllf9jw5xdc";
+      name = "bluedevil-5.9.4.tar.xz";
    };
  };
  breeze = {
-    version = "5.9.3";
+    version = "5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/breeze-5.9.3.tar.xz";
-      sha256 = "0f1h7ky9chsnbm8r85lwipc1sh7kb32jdaj3wl9qd7k0q4j115x0";
-      name = "breeze-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/breeze-5.9.4.tar.xz";
+      sha256 = "07i13g9iyq9j2vx22z7krnkahil3qljxpzgmqai8m67gwhgvn1zj";
+      name = "breeze-5.9.4.tar.xz";
    };
  };
  breeze-grub = {
-    version = "5.9.3";
+    version = "5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/breeze-grub-5.9.3.tar.xz";
-      sha256 = "1hbvmyj1f5f8v0pc70w93ck27xw25m4x70vnbhgqi91y5dd1gh49";
-      name = "breeze-grub-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/breeze-grub-5.9.4.tar.xz";
+      sha256 = "0rn7dgmw495575lcsnlgvx8r8sjjaaw3b1s0l43d2r186zay0nkr";
+      name = "breeze-grub-5.9.4.tar.xz";
    };
  };
  breeze-gtk = {
-    version = "5.9.3";
+    version = "5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/breeze-gtk-5.9.3.tar.xz";
-      sha256 = "12qa4wllgr52ycdprlxq0h4pgykbbs0vbmmmiardpzlrplm0an26";
-      name = "breeze-gtk-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/breeze-gtk-5.9.4.tar.xz";
+      sha256 = "1xjrhi6cq5dd5qslphdjrg018ni1z9xdac7cg33wl8bsvzcl0xgl";
+      name = "breeze-gtk-5.9.4.tar.xz";
    };
  };
  breeze-plymouth = {
-    version = "5.9.3";
+    version = "5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/breeze-plymouth-5.9.3.tar.xz";
-      sha256 = "0vz0hgx3hl03h4rkfrcaydaddljam3jbg6gd7n600a068p74s2mm";
-      name = "breeze-plymouth-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/breeze-plymouth-5.9.4.tar.xz";
+      sha256 = "1vwlvnbsc67xzqvrpgkva1rlim075x9ffjlsxfk38gmq00b7s88g";
+      name = "breeze-plymouth-5.9.4.tar.xz";
    };
  };
  discover = {
-    version = "5.9.3";
+    version = "5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/discover-5.9.3.tar.xz";
-      sha256 = "0xkf08k4jz5ym406bpnjf3xsx0il9wka4jp2k38bkl3sxh2s900f";
-      name = "discover-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/discover-5.9.4.tar.xz";
+      sha256 = "1pf2qawa32x94ljqscfbpmkbxk5awlqbf9jw9w7rfqwd5z9cgzzf";
+      name = "discover-5.9.4.tar.xz";
    };
  };
  kactivitymanagerd = {
-    version = "5.9.3";
+    version = "5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/kactivitymanagerd-5.9.3.tar.xz";
-      sha256 = "0ywby3ijq4hjljy5qwd7rybpk2x4scairjffiy5n1jg7lq6sm44r";
-      name = "kactivitymanagerd-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/kactivitymanagerd-5.9.4.tar.xz";
+      sha256 = "04i4zmbblsx3xz3vq4m88qd3ky0r5v26ivjchzpcpgkczqv85x1j";
+      name = "kactivitymanagerd-5.9.4.tar.xz";
    };
  };
  kde-cli-tools = {
-    version = "5.9.3";
+    version = "5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/kde-cli-tools-5.9.3.tar.xz";
-      sha256 = "1p9zjp9jmknyh82d6av3xhy461fsdppjxrxbmrlm9z6nsjyp0m0a";
-      name = "kde-cli-tools-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/kde-cli-tools-5.9.4.tar.xz";
+      sha256 = "1a2ssv7mphqnzwphd8nkh0g0g4w9b2r0ah0a9wd5ssnr5xg3izm8";
+      name = "kde-cli-tools-5.9.4.tar.xz";
    };
  };
  kdecoration = {
-    version = "5.9.3";
+    version = "5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/kdecoration-5.9.3.tar.xz";
-      sha256 = "1z37llaqf9mrb4aif75dfvbhr51rrgfpncv70v916jddcf90q4i9";
-      name = "kdecoration-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/kdecoration-5.9.4.tar.xz";
+      sha256 = "12cfp4svhxfygbjhymnmwyryx6r117mkdy2iq9adbq5af3gak972";
+      name = "kdecoration-5.9.4.tar.xz";
    };
  };
  kde-gtk-config = {
-    version = "5.9.3";
+    version = "5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/kde-gtk-config-5.9.3.tar.xz";
-      sha256 = "1wxk3brwq105258ndx5l98n78q2h2idigkpp5s2xzmzw05m3gg6r";
-      name = "kde-gtk-config-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/kde-gtk-config-5.9.4.tar.xz";
+      sha256 = "0cg3myr3jr9i4vxpqbd8gs7yrscxn15a96zqvgsbjczlfmxanq86";
+      name = "kde-gtk-config-5.9.4.tar.xz";
    };
  };
  kdeplasma-addons = {
-    version = "5.9.3";
+    version = "5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/kdeplasma-addons-5.9.3.tar.xz";
-      sha256 = "1k3fsrafrd72qymyi2ij36al7k92mnssz90kmmh830pszif16js3";
-      name = "kdeplasma-addons-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/kdeplasma-addons-5.9.4.tar.xz";
+      sha256 = "019d3d3pkw1c6l7dggasr7g7yj9kl3xd2hsawch1s9ba420fd6fp";
+      name = "kdeplasma-addons-5.9.4.tar.xz";
    };
  };
  kgamma5 = {
-    version = "5.9.3";
+    version = "5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/kgamma5-5.9.3.tar.xz";
-      sha256 = "02s3j1c5gjcv7b79448sizs6hdw91jysq9prkzznprw6jbb615v1";
-      name = "kgamma5-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/kgamma5-5.9.4.tar.xz";
+      sha256 = "0qwgjdrjfc48d8j62iwz6d61nxd7ddcsxn7wmxgbgl3l36p5j0jv";
+      name = "kgamma5-5.9.4.tar.xz";
    };
  };
  khotkeys = {
-    version = "5.9.3";
+    version = "5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/khotkeys-5.9.3.tar.xz";
-      sha256 = "0jv77rpx01cl15qf9vzndpks2q2lgq8dhjq4pg34zh8khr03snlf";
-      name = "khotkeys-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/khotkeys-5.9.4.tar.xz";
+      sha256 = "0lhgkvnrzsxpw6vpn0xam1a4dgkfb0k9h3nchaf93fyl8745j4q0";
+      name = "khotkeys-5.9.4.tar.xz";
    };
  };
  kinfocenter = {
-    version = "5.9.3";
+    version = "5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/kinfocenter-5.9.3.tar.xz";
-      sha256 = "14zaqrjf77008dc5c071hw75vd4dwvvmgkyz74vhs94i7bspzy6a";
-      name = "kinfocenter-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/kinfocenter-5.9.4.tar.xz";
+      sha256 = "14vf27s501r6ac2gxashwi3ynlcncjp03rahz61wry1dsm9wsc4x";
+      name = "kinfocenter-5.9.4.tar.xz";
    };
  };
  kmenuedit = {
-    version = "5.9.3";
+    version = "5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/kmenuedit-5.9.3.tar.xz";
-      sha256 = "1m7naiy6jq031psdx4jsxq7vsldn9j4girq820m24inh2ky105zk";
-      name = "kmenuedit-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/kmenuedit-5.9.4.tar.xz";
+      sha256 = "1lx7g67qc7amx8jsna7b13hhq85pv4969d9824qfciwywj19sx4x";
+      name = "kmenuedit-5.9.4.tar.xz";
    };
  };
  kscreen = {
-    version = "5.9.3";
+    version = "5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/kscreen-5.9.3.tar.xz";
-      sha256 = "1z3cihgjqrkg5h4y4gm1ah60r0vfpxrngry10fcc6343arbyk1bb";
-      name = "kscreen-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/kscreen-5.9.4.tar.xz";
+      sha256 = "1g4i4rwnmni3q3crbywkp0s199bp0bl8cx97d37cp9qh6drsgrxx";
+      name = "kscreen-5.9.4.tar.xz";
    };
  };
  kscreenlocker = {
-    version = "5.9.3";
+    version = "5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/kscreenlocker-5.9.3.tar.xz";
-      sha256 = "0ccpgfp1gz07yiw98sqjlc097cac4z9qdcrwxm65bvqjj777by1a";
-      name = "kscreenlocker-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/kscreenlocker-5.9.4.tar.xz";
+      sha256 = "0cn194bmab7qgv1x7gg81l0mj3k9x1is9whn8h7g02pzn5c6gqlj";
+      name = "kscreenlocker-5.9.4.tar.xz";
    };
  };
  ksshaskpass = {
-    version = "5.9.3";
+    version = "5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/ksshaskpass-5.9.3.tar.xz";
-      sha256 = "0jk6k5bn2aqjjl3li5qpmihk57d5hc197cpqjaj61a0bapab42hw";
-      name = "ksshaskpass-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/ksshaskpass-5.9.4.tar.xz";
+      sha256 = "1w1m55i8i9f3npcczqiy1knarbh2j4cp8ispif1s4j6k3vixqnka";
+      name = "ksshaskpass-5.9.4.tar.xz";
    };
  };
  ksysguard = {
-    version = "5.9.3";
+    version = "5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/ksysguard-5.9.3.tar.xz";
-      sha256 = "0paypcwah41p2ygmfwzhw8mdfh47a6x0190yngxn8j0jhzfyllca";
-      name = "ksysguard-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/ksysguard-5.9.4.tar.xz";
+      sha256 = "04hzqkna22vsa12z04cy50s2jzglllfhd5vz33vk2wj6zgghwd0h";
+      name = "ksysguard-5.9.4.tar.xz";
    };
  };
  kwallet-pam = {
-    version = "5.9.3";
+    version = "5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/kwallet-pam-5.9.3.tar.xz";
-      sha256 = "1pmsfp6pn1r3crg5z5v7sz413v9qvn0j4n9l88zbw538lz2scpna";
-      name = "kwallet-pam-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/kwallet-pam-5.9.4.tar.xz";
+      sha256 = "0l6ganmp2ml0icfkrqcq4vngm8f4pl76p6w13a3m8x2k2wrsbynw";
+      name = "kwallet-pam-5.9.4.tar.xz";
    };
  };
  kwayland-integration = {
-    version = "5.9.3";
+    version = "5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/kwayland-integration-5.9.3.tar.xz";
-      sha256 = "1r3cryv10lkvl1nrpq21w4kj9jd270m3p3dw07d888b891rgmzb7";
-      name = "kwayland-integration-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/kwayland-integration-5.9.4.tar.xz";
+      sha256 = "11vqi293azv5cpz2rrngxsqqaj7swcmxivgm688yz6wzbm8gyd1x";
+      name = "kwayland-integration-5.9.4.tar.xz";
    };
  };
  kwin = {
-    version = "5.9.3";
+    version = "5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/kwin-5.9.3.tar.xz";
-      sha256 = "119cy472x5ssrr54v14pbs85gfrsjhz99ms8flb1xp38jb14xxhk";
-      name = "kwin-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/kwin-5.9.4.tar.xz";
+      sha256 = "0qckhk6vd31mwhawb0i636l4vx99v0v84nam2dhpd0rcdk2b0dm1";
+      name = "kwin-5.9.4.tar.xz";
    };
  };
  kwrited = {
-    version = "5.9.3";
+    version = "5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/kwrited-5.9.3.tar.xz";
-      sha256 = "0liqspd4m6xly48vv85abnaxfvsjcbgg58843j9fpnzkk9nlj98q";
-      name = "kwrited-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/kwrited-5.9.4.tar.xz";
+      sha256 = "1prbn0f6a1cywn2ivzv39bxfc5nxmgxp7gqlxqg87ajig43gvdb7";
+      name = "kwrited-5.9.4.tar.xz";
    };
  };
  libkscreen = {
-    version = "5.9.3";
+    version = "5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/libkscreen-5.9.3.tar.xz";
-      sha256 = "1nxhbxmr0kmyp745bf3vd21xcjpv7jac9bdagraiqfcmwj4f86gb";
-      name = "libkscreen-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/libkscreen-5.9.4.tar.xz";
+      sha256 = "1h39910ry59wd179fk02ck10ydaby3il4q3rnxlnn9qph0kiy3pv";
+      name = "libkscreen-5.9.4.tar.xz";
    };
  };
  libksysguard = {
-    version = "5.9.3";
+    version = "5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/libksysguard-5.9.3.tar.xz";
-      sha256 = "0fj7rycawarg7iydml0xw20nkyxlwa2nl5chxbbcs5mnmvpfv6ig";
-      name = "libksysguard-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/libksysguard-5.9.4.tar.xz";
+      sha256 = "1gpfqr8prk96vwy9dkxlgf4lc3ck04a31src9mix8a6wrr01ppqm";
+      name = "libksysguard-5.9.4.tar.xz";
    };
  };
  milou = {
-    version = "5.9.3";
+    version = "5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/milou-5.9.3.tar.xz";
-      sha256 = "1pmk9czmpz0mfqmkv7gl9wdlj8b7wwixv1zb43q24a471qby2xf3";
-      name = "milou-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/milou-5.9.4.tar.xz";
+      sha256 = "18xzx99ml6gcglly9p98rscs6dxhdgn9pkc5mn7apwnp7865kbfw";
+      name = "milou-5.9.4.tar.xz";
    };
  };
  oxygen = {
-    version = "5.9.3";
+    version = "5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/oxygen-5.9.3.tar.xz";
-      sha256 = "1v529wp9ll1hzb48xswigzf2r23k84f4cd7am2fnj73p3a0rg5ia";
-      name = "oxygen-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/oxygen-5.9.4.tar.xz";
+      sha256 = "0fmysq3j0v18hz6hfp7qgrj3ghmaf3c1gam9c9263sf9q1dghk0q";
+      name = "oxygen-5.9.4.tar.xz";
    };
  };
  plasma-desktop = {
-    version = "5.9.3";
+    version = "5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/plasma-desktop-5.9.3.tar.xz";
-      sha256 = "0582n21nd15834mxc54pq1nx9a5z8ds3yz0x0lc5m35ps7abh7im";
-      name = "plasma-desktop-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/plasma-desktop-5.9.4.tar.xz";
+      sha256 = "1p3iq5rmfznsi4174zjavs945wysf763ha46vd83mz0w7583j6cd";
+      name = "plasma-desktop-5.9.4.tar.xz";
    };
  };
  plasma-integration = {
-    version = "5.9.3";
+    version = "5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/plasma-integration-5.9.3.tar.xz";
-      sha256 = "1yq3i0sqsn0m2y62npyad1nv17hgc0fm35cfq5fdjd96sr356znl";
-      name = "plasma-integration-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/plasma-integration-5.9.4.tar.xz";
+      sha256 = "1mk59p214184m2q8wfik8gkfxxikrvric0v8c09lamybg15pas8m";
+      name = "plasma-integration-5.9.4.tar.xz";
    };
  };
  plasma-nm = {
-    version = "5.9.3";
+    version = "5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/plasma-nm-5.9.3.tar.xz";
-      sha256 = "1i5djnbimkwcbjh6bi0cdw98qskli4jd1c8a8dbwqqh5pyqbrf66";
-      name = "plasma-nm-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/plasma-nm-5.9.4.tar.xz";
+      sha256 = "0sbvyyhx7gxg1li5y1h7jv1s3krp2ch6zzhm9ad1l17w589kij9x";
+      name = "plasma-nm-5.9.4.tar.xz";
    };
  };
  plasma-pa = {
-    version = "5.9.3";
+    version = "5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/plasma-pa-5.9.3.tar.xz";
-      sha256 = "0br83bnm6g7lzw4hwkppk8l6scbzblr3m3mi64a852lnxxvdwn01";
-      name = "plasma-pa-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/plasma-pa-5.9.4.tar.xz";
+      sha256 = "0hincgm6x613sw3mywq64i27laahqzy7qjiv24g8h3ppw75a32i8";
+      name = "plasma-pa-5.9.4.tar.xz";
    };
  };
  plasma-sdk = {
-    version = "5.9.3";
+    version = "5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/plasma-sdk-5.9.3.tar.xz";
-      sha256 = "104rhybchdjqnglzp3bpjv8052n2gi44bn58nyb6wz6gkzg3xzrb";
-      name = "plasma-sdk-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/plasma-sdk-5.9.4.tar.xz";
+      sha256 = "0nw49kaw7323dmaq8hh4zrhvy6ga6svg2g0zhxj0cjjwgbk31pfw";
+      name = "plasma-sdk-5.9.4.tar.xz";
    };
  };
  plasma-tests = {
-    version = "5.9.3";
+    version = "5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/plasma-tests-5.9.3.tar.xz";
-      sha256 = "1wpbfna9yjvzc5fhgnw2hwnq04vzb3qfy42zrwbijy8sl6csgzzp";
-      name = "plasma-tests-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/plasma-tests-5.9.4.tar.xz";
+      sha256 = "0m6dlx29785kh1pxm0xyym85k475s8gdjds6ywgpblj9lh5rm4v5";
+      name = "plasma-tests-5.9.4.tar.xz";
    };
  };
  plasma-workspace = {
-    version = "5.9.3";
+    version = "5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/plasma-workspace-5.9.3.tar.xz";
-      sha256 = "0lnb36qnkw5z7w1y5ykiz6xfhc4h21dzlbhddipvd97bxycad6vg";
-      name = "plasma-workspace-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/plasma-workspace-5.9.4.tar.xz";
+      sha256 = "0pazgn45a445wknd3xp7jnsg6k5ddqv4pjrz2ggkbaz9mrllgbqm";
+      name = "plasma-workspace-5.9.4.tar.xz";
    };
  };
  plasma-workspace-wallpapers = {
-    version = "5.9.3";
+    version = "5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/plasma-workspace-wallpapers-5.9.3.tar.xz";
-      sha256 = "1ikjj41nn5hn9r3glfhqsizawhkpw3cvybqq0ym4zky9lvbxzxb0";
-      name = "plasma-workspace-wallpapers-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/plasma-workspace-wallpapers-5.9.4.tar.xz";
+      sha256 = "0jngl7a86xr09g87iydw8fi4ggh6hmz5vaznx4xqh403xf9pl281";
+      name = "plasma-workspace-wallpapers-5.9.4.tar.xz";
    };
  };
  polkit-kde-agent = {
-    version = "1-5.9.3";
+    version = "1-5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/polkit-kde-agent-1-5.9.3.tar.xz";
-      sha256 = "0kfafag3bqp03aaa5dn7f8mkc174s80mwn98linl1dn12np2wv2q";
-      name = "polkit-kde-agent-1-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/polkit-kde-agent-1-5.9.4.tar.xz";
+      sha256 = "10x3vgdjkvzmnv5zl65q0mj6gxlcl620kyva1cx3qhq93w68jfjc";
+      name = "polkit-kde-agent-1-5.9.4.tar.xz";
    };
  };
  powerdevil = {
-    version = "5.9.3";
+    version = "5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/powerdevil-5.9.3.tar.xz";
-      sha256 = "1sphmngckfns5sx0n95njf39m02fg3q7bdafwrw8i4lv2svb1axj";
-      name = "powerdevil-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/powerdevil-5.9.4.tar.xz";
+      sha256 = "1fpp06criw51lpg21f3xm4gd9yzjj08lr5j8908qz2dywqlp91rv";
+      name = "powerdevil-5.9.4.tar.xz";
    };
  };
  sddm-kcm = {
-    version = "5.9.3";
+    version = "5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/sddm-kcm-5.9.3.tar.xz";
-      sha256 = "142na2cnx5v459798fq6gx30k9v0i10myfyvgv562n1x79nbkyl0";
-      name = "sddm-kcm-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/sddm-kcm-5.9.4.tar.xz";
+      sha256 = "1zrda4vzvqh6vs93yl2g4b63siqb5cqhrp4kknzm571djiar26ll";
+      name = "sddm-kcm-5.9.4.tar.xz";
    };
  };
  systemsettings = {
-    version = "5.9.3";
+    version = "5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/systemsettings-5.9.3.tar.xz";
-      sha256 = "15ihvbkp91dz1z1z5dqgqyziiklzq2zkl3ns8dqzs3pbpki7jbqc";
-      name = "systemsettings-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/systemsettings-5.9.4.tar.xz";
+      sha256 = "03h5dagghjg6qhjbf0fnlhwh2v1nh7w22g00g1qzi8yrads1icy1";
+      name = "systemsettings-5.9.4.tar.xz";
    };
  };
  user-manager = {
-    version = "5.9.3";
+    version = "5.9.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/user-manager-5.9.3.tar.xz";
-      sha256 = "1s91zgh1rcqrpyh9fiklwqj2m78ify5fv83kh9zvyl4bapgyb0gn";
-      name = "user-manager-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/user-manager-5.9.4.tar.xz";
+      sha256 = "1cjwkxb5qzj8sbkhcyyzw1axzddb2pwbd16wmaqpiz9qh2k4mr64";
+      name = "user-manager-5.9.4.tar.xz";
    };
  };
 }
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@ -76,7 +76,8 @@ let version = "5.4.0";
      ++ optional langAda ../gnat-cflags.patch
      ++ optional langFortran ../gfortran-driving.patch

-      # This could be applied unconditionally but I don't want to cause a full Linux rebuild.
+      # This could be applied unconditionally but I don't want to cause a full
+      # Linux rebuild.
      ++ optional stdenv.cc.isClang ./libcxx38-and-above.patch;

    javaEcj = fetchurl {
@ -234,6 +235,13 @@ stdenv.mkDerivation ({

  libc_dev = stdenv.cc.libc_dev;

+  # This should kill all the stdinc frameworks that gcc and friends like to
+  # insert into default search paths.
+  prePatch = if stdenv.isDarwin then ''
+    substituteInPlace gcc/config/darwin-c.c \
+      --replace 'if (stdinc)' 'if (0)'
+  '' else null;
+
  postPatch =
    if (stdenv.isGNU
        || (libcCross != null                  # e.g., building `gcc.crossDrv'
--- a/pkgs/development/compilers/gcc/gfortran-darwin.nix
+++ b/pkgs/development/compilers/gcc/gfortran-darwin.nix
@ -1,52 +0,0 @@
-# This is a derivation specific to OS X (Darwin)
-{gmp, mpfr, libmpc, isl_0_14, cloog, zlib, fetchurl, stdenv
-
-, Libsystem
-}:
-
-stdenv.mkDerivation rec {
-  name = "gfortran-${version}";
-  version = "5.1.0";
-
-  buildInputs = [ gmp mpfr libmpc isl_0_14 cloog zlib ];
-
-  src = fetchurl {
-    url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
-    sha256 = "1bd5vj4px3s8nlakbgrh38ynxq4s654m6nxz7lrj03mvkkwgvnmp";
-  };
-
-  patches = ./gfortran-darwin.patch;
-
-  hardeningDisable = [ "format" ];
-
-  configureFlags = ''
-    --disable-bootstrap
-    --disable-cloog-version-check
-    --disable-isl-version-check
-    --disable-multilib
-    --enable-checking=release
-    --enable-languages=fortran
-    --with-cloog=${cloog}
-    --with-gmp=${gmp.dev}
-    --with-isl=${isl_0_14}
-    --with-mpc=${libmpc}
-    --with-mpfr=${mpfr.dev}
-    --with-native-system-header-dir=${Libsystem}/include
-    --with-system-zlib
-  '';
-
-  postConfigure = ''
-    export DYLD_LIBRARY_PATH=`pwd`/`uname -m`-apple-darwin`uname -r`/libgcc
-  '';
-
-  makeFlags = [ "CC=clang" ];
-
-  passthru.cc = stdenv.cc.cc;
-
-  meta = with stdenv.lib; {
-    description = "GNU Fortran compiler, part of the GNU Compiler Collection";
-    homepage    = "https://gcc.gnu.org/fortran/";
-    license     = licenses.gpl3Plus;
-    platforms   = platforms.darwin;
-  };
-}
--- a/pkgs/development/compilers/gcc/gfortran-darwin.patch
+++ b/pkgs/development/compilers/gcc/gfortran-darwin.patch
@ -1,26 +0,0 @@
--- a/gcc/config/darwin-c.c	2015-01-09 22:18:42.000000000 +0200
-+++ b/gcc/config/darwin-c.c	2015-06-27 04:17:58.000000000 +0300
-@@ -490,8 +490,7 @@
- 
- static const char *framework_defaults [] =
-   {
-    "/System/Library/Frameworks",
-    "/Library/Frameworks",
-+// stdenvDarwinPure
-   };
- 
- /* Register the GNU objective-C runtime include path if STDINC.  */
- 
- /* Register the GNU objective-C runtime include path if STDINC.  */
--- a/gcc/cppdefault.c	2015-01-05 14:33:28.000000000 +0200
-+++ b/gcc/cppdefault.c	2015-06-27 04:16:15.000000000 +0300
-@@ -35,6 +35,9 @@
- # undef CROSS_INCLUDE_DIR
- #endif
- 
-+// stdenvDarwinPure
-+# undef LOCAL_INCLUDE_DIR
-+
- const struct default_include cpp_include_defaults[]
- #ifdef INCLUDE_DEFAULTS
- = INCLUDE_DEFAULTS;
--- a/pkgs/development/compilers/llvm/3.7/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.7/clang/default.nix
@ -42,6 +42,7 @@ let
    passthru = {
      lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both
      isClang = true;
+      inherit llvm;
    } // stdenv.lib.optionalAttrs stdenv.isLinux {
      inherit gcc;
    };
--- a/pkgs/development/compilers/llvm/3.8/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix
@ -53,6 +53,7 @@ let
    passthru = {
      lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both
      isClang = true;
+      inherit llvm;
    } // stdenv.lib.optionalAttrs stdenv.isLinux {
      inherit gcc;
    };
--- a/pkgs/development/compilers/llvm/3.9/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix
@ -53,6 +53,7 @@ let
    passthru = {
      lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both
      isClang = true;
+      inherit llvm;
    } // stdenv.lib.optionalAttrs stdenv.isLinux {
      inherit gcc;
    };
--- a/pkgs/development/compilers/llvm/4/clang/default.nix
+++ b/pkgs/development/compilers/llvm/4/clang/default.nix
@ -53,6 +53,7 @@ let
    passthru = {
      lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both
      isClang = true;
+      inherit llvm;
    } // stdenv.lib.optionalAttrs stdenv.isLinux {
      inherit gcc;
    };
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@ -79,11 +79,11 @@ stdenv.mkDerivation ( rec {
  # Stripping breaks linking for ponyc
  dontStrip = true;

-  meta = {
+  meta = with stdenv.lib; {
    description = "Pony is an Object-oriented, actor-model, capabilities-secure, high performance programming language";
    homepage = http://www.ponylang.org;
-    license = stdenv.lib.licenses.bsd2;
-    maintainers = with stdenv.lib.maintainers; [ doublec kamilchm ];
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ doublec kamilchm ];
+    platforms = subtractLists platforms.i686 platforms.unix;
  };
 })
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -753,6 +753,9 @@ self: super: {
  # https://github.com/pontarius/pontarius-xmpp/issues/105
  pontarius-xmpp = dontCheck super.pontarius-xmpp;

+  # fails with sandbox
+  yi-keymap-vim = dontCheck super.yi-keymap-vim;
+
  # https://github.com/bmillwood/applicative-quoters/issues/6
  applicative-quoters = doJailbreak super.applicative-quoters;

--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@ -41,6 +41,12 @@ stdenv.mkDerivation rec {
    ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ mesa libX11 ])
    ;

+  # REMOVE ON VERSION BUMP
+  # Needed for Octave-4.2.1 on darwin. See https://savannah.gnu.org/bugs/?50234
+  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    sed 's/inline file_stat::~file_stat () { }/file_stat::~file_stat () { }/' -i ./liboctave/system/file-stat.cc
+  '';
+
  doCheck = !stdenv.isDarwin;

  enableParallelBuilding = true;
--- a/pkgs/development/libraries/SDL_mixer/default.nix
+++ b/pkgs/development/libraries/SDL_mixer/default.nix
@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
    description = "SDL multi-channel audio mixer library";
    homepage    = http://www.libsdl.org/projects/SDL_mixer/;
    maintainers = with maintainers; [ lovek323 ];
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
  };
 }
--- a/pkgs/development/libraries/fox/clang.patch
+++ b/pkgs/development/libraries/fox/clang.patch
@ -0,0 +1,13 @@
+diff --git a/src/FXReactor.cpp b/src/FXReactor.cpp
+index 1ecdb45..9058a30 100644
+--- a/src/FXReactor.cpp
+++ b/src/FXReactor.cpp
+@@ -452,7 +452,7 @@ FXint FXReactor::processActiveHandles(FXTime block,FXuint flags){
+     }
+ 
+   // Normal case
+-  if(0<=hand){
+  if(0==hand){
+ 
+     // Any handles active?
+     if(0<nhand){
--- a/pkgs/development/libraries/fox/default.nix
+++ b/pkgs/development/libraries/fox/default.nix
@ -1,20 +1,19 @@
 { stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft
 , CoreServices ? null }:

-let
-  version = "1.7.9";
-in
-
 stdenv.mkDerivation rec {
  name = "fox-${version}";
+  version = "1.7.9";

  src = fetchurl {
    url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz";
    sha256 = "1jb9368xsin3ppdf6979n5s7in3s9klbxqbwcp0z8misjixl7nzg";
  };

+  patches = [ ./clang.patch ];
+
  buildInputs = [ libpng xlibsWrapper libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
+    ++ stdenv.lib.optional stdenv.isDarwin CoreServices;

  doCheck = true;

@ -22,17 +21,17 @@ stdenv.mkDerivation rec {

  hardeningDisable = [ "format" ];

-  meta = {
+  meta = with stdenv.lib; {
    description = "C++ based class library for building Graphical User Interfaces";
    longDescription = ''
-        FOX stands for Free Objects for X.
-        It is a C++ based class library for building Graphical User Interfaces.
-        Initially, it was developed for LINUX, but the scope of this project has in the course of time become somewhat more ambitious.
-        Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms.
-      '';
+      FOX stands for Free Objects for X.
+      It is a C++ based class library for building Graphical User Interfaces.
+      Initially, it was developed for LINUX, but the scope of this project has in the course of time become somewhat more ambitious.
+      Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms.
+    '';
    homepage = "http://fox-toolkit.org";
-    license = stdenv.lib.licenses.lgpl3;
-    maintainers = [ stdenv.lib.maintainers.bbenoist ];
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.lgpl3;
+    maintainers = [];
+    platforms = platforms.all;
  };
 }
--- a/pkgs/development/libraries/fox/fox-1.6.nix
+++ b/pkgs/development/libraries/fox/fox-1.6.nix
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
      '';
    homepage = "http://fox-toolkit.org";
    license = stdenv.lib.licenses.lgpl3;
-    maintainers = [ stdenv.lib.maintainers.bbenoist ];
+    maintainers = [];
    platforms = stdenv.lib.platforms.mesaPlatforms;
  };
 }
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/frameworks/5.31/ -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/frameworks/5.32/ -A '*.tar.xz' )
--- a/pkgs/development/libraries/kde-frameworks/kio/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix
@ -17,12 +17,5 @@ kdeFramework {
    ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui solid qtscript
    qtx11extras
  ];
-  patches = (copyPathsToStore (lib.readPathsFromFile ./. ./series))
-    ++ [
-      (fetchpatch {
-        name = "SanitizeURLsBeforePassingThemToFindProxyForURL.patch";
-        url = "https://cgit.kde.org/kio.git/patch/?id=f9d0cb47cf94e209f6171ac0e8d774e68156a6e4";
-        sha256 = "1s6rcp8rrlhc6rgy3b303y0qq0s8371n12r5lk9zbkw14wjvbix0";
-      })
-    ];
+  patches = (copyPathsToStore (lib.readPathsFromFile ./. ./series));
 }
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@ -3,595 +3,595 @@

 {
  attica = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/attica-5.31.0.tar.xz";
-      sha256 = "0gfqxaqvw05rdgjqs2cn5bgnmijcsl16myf919fdc75xkdpg1h56";
-      name = "attica-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/attica-5.32.0.tar.xz";
+      sha256 = "16vl3gpwqcvfms82grv1bvqlxj085bqssv5ixjx007826pd8qhp5";
+      name = "attica-5.32.0.tar.xz";
    };
  };
  baloo = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/baloo-5.31.0.tar.xz";
-      sha256 = "0n3cwq7g9zik3xjp895vl1j62b538rg6zcsm2x4h2nnq3njrnfbz";
-      name = "baloo-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/baloo-5.32.0.tar.xz";
+      sha256 = "0a4qwinkp4gmcbx4j0qxbj5qb40h7594s39za7sc7bymadicasy1";
+      name = "baloo-5.32.0.tar.xz";
    };
  };
  bluez-qt = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/bluez-qt-5.31.0.tar.xz";
-      sha256 = "12g9jc6b8f03dka5sbjf19g536y8d1xvzkrwp2m0w98zcd0q33jl";
-      name = "bluez-qt-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/bluez-qt-5.32.0.tar.xz";
+      sha256 = "0pl6cp0rgjkh7d06ik35rw7qd96j5sh2flgjx4vi21zl5vf3vgyh";
+      name = "bluez-qt-5.32.0.tar.xz";
    };
  };
  breeze-icons = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/breeze-icons-5.31.0.tar.xz";
-      sha256 = "1ylask25jrwyk53c81jy73k9i8cylnab3a42yyrf3f25qbvhr845";
-      name = "breeze-icons-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/breeze-icons-5.32.0.tar.xz";
+      sha256 = "1n51kahzk09v52yhi7k4kqgavqlz3ghqv5cx2ssz2djpyavs18r3";
+      name = "breeze-icons-5.32.0.tar.xz";
    };
  };
  extra-cmake-modules = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/extra-cmake-modules-5.31.0.tar.xz";
-      sha256 = "1srdvjgn72687r48f0x32vn7q5czvk9k1w1393bcws2l0icil9w4";
-      name = "extra-cmake-modules-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/extra-cmake-modules-5.32.0.tar.xz";
+      sha256 = "1iqakxzr6bcs9wgyi8if1smpq6px0bvlcyddyk0hxhindzl7pn5i";
+      name = "extra-cmake-modules-5.32.0.tar.xz";
    };
  };
  frameworkintegration = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/frameworkintegration-5.31.0.tar.xz";
-      sha256 = "1wfiny11fm0k6w1ly7ca7xj3f7a1mn3b1gpvlcpaqbrib6b3dgcj";
-      name = "frameworkintegration-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/frameworkintegration-5.32.0.tar.xz";
+      sha256 = "022scc4pgl68973wq29l1kc9j9lspvlmpr3bc6zlyg57m8agapwa";
+      name = "frameworkintegration-5.32.0.tar.xz";
    };
  };
  kactivities = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kactivities-5.31.0.tar.xz";
-      sha256 = "1v33pkjwjjp6lrqhch7l66xyyvln1pgbs0wbgi8q9c024s92jqqz";
-      name = "kactivities-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kactivities-5.32.0.tar.xz";
+      sha256 = "0xin4shaj0zsfsww84mwk5n4ldaqy730jhc369px2j2nq57sg9g7";
+      name = "kactivities-5.32.0.tar.xz";
    };
  };
  kactivities-stats = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kactivities-stats-5.31.0.tar.xz";
-      sha256 = "1ngydmby0dzf802bjszhn3qsc0vgrhc0ya511x7jc9h49mgbp2jy";
-      name = "kactivities-stats-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kactivities-stats-5.32.0.tar.xz";
+      sha256 = "1b3z7bcap3vjc0155y0a9xkbd477fklmpj8dr3rs0ccyc6qxxbvw";
+      name = "kactivities-stats-5.32.0.tar.xz";
    };
  };
  kapidox = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kapidox-5.31.0.tar.xz";
-      sha256 = "1lnqcgmxdy8l0qzn2jb9kww2lg1a33izw0hy78fkm7drg67g26za";
-      name = "kapidox-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kapidox-5.32.0.tar.xz";
+      sha256 = "1z6hdsppwrmqkcanrppxhqcrjvblg9i02rh3bz5m3pn66wwz0sdw";
+      name = "kapidox-5.32.0.tar.xz";
    };
  };
  karchive = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/karchive-5.31.0.tar.xz";
-      sha256 = "1yafkgd5q9j1y3shivh5jayc4pss1skzyf3f1rmzl4psn2r6rsay";
-      name = "karchive-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/karchive-5.32.0.tar.xz";
+      sha256 = "1dzvphqnc09mmaydqggpxg6zwwyr56p6l4jdf1rf6ns90fzxy0m4";
+      name = "karchive-5.32.0.tar.xz";
    };
  };
  kauth = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kauth-5.31.0.tar.xz";
-      sha256 = "0y4gc3n8d36wrpdmgq2jif82lkqr3xhb7v8lgg6kgaxb1d7fi2r8";
-      name = "kauth-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kauth-5.32.0.tar.xz";
+      sha256 = "00kdq16n9w6nf1bpwzl5lp5c2xq74g8nn6081kvnjcd4ld66ncmq";
+      name = "kauth-5.32.0.tar.xz";
    };
  };
  kbookmarks = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kbookmarks-5.31.0.tar.xz";
-      sha256 = "0xdrx3gr291gkrfj360pw3aax0mz0zhhvjw7c4fcp35m0sqg1kvp";
-      name = "kbookmarks-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kbookmarks-5.32.0.tar.xz";
+      sha256 = "03a024phcjv46afbp5lbmj2p8hb6srfzyaslc6ln6ms473bf5k4w";
+      name = "kbookmarks-5.32.0.tar.xz";
    };
  };
  kcmutils = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kcmutils-5.31.0.tar.xz";
-      sha256 = "00ngh556sxswrfhhy5vkfi8sk5jbb0srvx4np49xwpmh5xb6qzk9";
-      name = "kcmutils-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kcmutils-5.32.0.tar.xz";
+      sha256 = "1mr9h7wc22bfrbm92ajsjfcs16c5xpkrxbxzcma3a0s7jhy6qrm9";
+      name = "kcmutils-5.32.0.tar.xz";
    };
  };
  kcodecs = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kcodecs-5.31.0.tar.xz";
-      sha256 = "1nyn4b61ymbxv1xnbq3z79dbvapsy6jg51w52l0gnqkiy2zlbz13";
-      name = "kcodecs-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kcodecs-5.32.0.tar.xz";
+      sha256 = "0yybkp52i8nm4qjady6jqswn6v70cqbvjqwgrghjnc88b2cly253";
+      name = "kcodecs-5.32.0.tar.xz";
    };
  };
  kcompletion = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kcompletion-5.31.0.tar.xz";
-      sha256 = "0jx1lsz1fh8h20a5ixdv9q5yx6r5r7jr8hi68v7b66anmpnh2m3g";
-      name = "kcompletion-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kcompletion-5.32.0.tar.xz";
+      sha256 = "0fn8imr3m219r38a0rafbnylcpjq4rqhz1w66mx80sc7l10mhcni";
+      name = "kcompletion-5.32.0.tar.xz";
    };
  };
  kconfig = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kconfig-5.31.0.tar.xz";
-      sha256 = "1z9jf5rizdj7c7x918zmdv4v01glpl3z44mrx7yfp2cqnjniwhxi";
-      name = "kconfig-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kconfig-5.32.0.tar.xz";
+      sha256 = "1pajh1l08b995shp6l75ri9z4vr6wjapvrkmrmv8hksnxvfi97dp";
+      name = "kconfig-5.32.0.tar.xz";
    };
  };
  kconfigwidgets = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kconfigwidgets-5.31.0.tar.xz";
-      sha256 = "19y3s5qcb3mzw8xiyp57zb2sjclcmxzj3xp0iwzs41r4lqmlwajs";
-      name = "kconfigwidgets-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kconfigwidgets-5.32.0.tar.xz";
+      sha256 = "1cq0a3k6pvl9f098ssqqk2rddxh0xn1kk4p5kfyd7w0m3c604zw3";
+      name = "kconfigwidgets-5.32.0.tar.xz";
    };
  };
  kcoreaddons = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kcoreaddons-5.31.0.tar.xz";
-      sha256 = "0175vgii8l5yx1bbbjljblkkq03nqfhb3v7in2657glag6imcb7m";
-      name = "kcoreaddons-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kcoreaddons-5.32.0.tar.xz";
+      sha256 = "1n1xzvwwji9pwyxrvwp4rmpc7qzp9nlis26xmn81k607jn587ksx";
+      name = "kcoreaddons-5.32.0.tar.xz";
    };
  };
  kcrash = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kcrash-5.31.0.tar.xz";
-      sha256 = "0mj6dahalwks39d881nvmrd3rqm2aid06iq6s8p2grhnncf6cd4j";
-      name = "kcrash-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kcrash-5.32.0.tar.xz";
+      sha256 = "1zrkjrpj88ymdy5vbn9db73vxppswvmbn2gkn4gpx773dsmflhz3";
+      name = "kcrash-5.32.0.tar.xz";
    };
  };
  kdbusaddons = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kdbusaddons-5.31.0.tar.xz";
-      sha256 = "1dv9yzicd2d1k0qjgjbryks0f6s0v76hr0csdb7j22nwn9pb4cfk";
-      name = "kdbusaddons-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kdbusaddons-5.32.0.tar.xz";
+      sha256 = "1a15jjsrkza0ll2viyk834pgdxsdgdacm0982xxwl5z937f75609";
+      name = "kdbusaddons-5.32.0.tar.xz";
    };
  };
  kdeclarative = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kdeclarative-5.31.0.tar.xz";
-      sha256 = "0hw3rkmlw6j056b3wvhpaj778xfxajcqidpf5x3nyfjmqjvxsgw1";
-      name = "kdeclarative-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kdeclarative-5.32.0.tar.xz";
+      sha256 = "1y5g3yi1l0g1mkqhhakg265r25zm23qc2fqg55rq0g7l9ss7w7g9";
+      name = "kdeclarative-5.32.0.tar.xz";
    };
  };
  kded = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kded-5.31.0.tar.xz";
-      sha256 = "0zsikbzi8i8bmlpa4kgdpcpsifkwwclsfdgafd7yf5svc4hyyl51";
-      name = "kded-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kded-5.32.0.tar.xz";
+      sha256 = "0pmmsvqwkw86yvxxf9i6lg13vg80m0kmhjjs88lbm60cgvr5jhq6";
+      name = "kded-5.32.0.tar.xz";
    };
  };
  kdelibs4support = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/portingAids/kdelibs4support-5.31.0.tar.xz";
-      sha256 = "1yh4lr56mnwsbc0gysj1c58w1r62dlxxds16xnp5j0lyir7wx0pl";
-      name = "kdelibs4support-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/portingAids/kdelibs4support-5.32.0.tar.xz";
+      sha256 = "1wan5ad5rhhrwvwjjjd87n790r6d8r118gs2kw49s91pdj3iv9pb";
+      name = "kdelibs4support-5.32.0.tar.xz";
    };
  };
  kdesignerplugin = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kdesignerplugin-5.31.0.tar.xz";
-      sha256 = "1g510f8dfvaddcq5hrvsaiwayp2hzkdryzn62zff29ipd7qpcd2x";
-      name = "kdesignerplugin-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kdesignerplugin-5.32.0.tar.xz";
+      sha256 = "1hapj8x8nky3m6lx2ianmxwprf00jqyjsknjz3pi4vk3i714vhnf";
+      name = "kdesignerplugin-5.32.0.tar.xz";
    };
  };
  kdesu = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kdesu-5.31.0.tar.xz";
-      sha256 = "0mzvvr3zz28pgp42i3f54g5k3wplvjdg41d8jb9k6m5qcj8aryax";
-      name = "kdesu-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kdesu-5.32.0.tar.xz";
+      sha256 = "0zsy1hivy5bbczrpkpgj72mlx0km2nm53kpgrj2hfdy3ss0vn3hl";
+      name = "kdesu-5.32.0.tar.xz";
    };
  };
  kdewebkit = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kdewebkit-5.31.0.tar.xz";
-      sha256 = "0x9v8i37apbik2krxr9n2pgq5xmcgjlhzflbrwwqaq30c2l8aid0";
-      name = "kdewebkit-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kdewebkit-5.32.0.tar.xz";
+      sha256 = "0y7262pqzdx0hxkyqrbawgx99rn6q85m1slr4nbn914kn350xpy0";
+      name = "kdewebkit-5.32.0.tar.xz";
    };
  };
  kdnssd = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kdnssd-5.31.0.tar.xz";
-      sha256 = "1bbk9qsvx49zbjvdg0xi9s2x51f331n8wnyd320j3ay0mp4yq2kk";
-      name = "kdnssd-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kdnssd-5.32.0.tar.xz";
+      sha256 = "1xakbs2wm627zn01ni8fyrz64xl5jw4by0pdrb70aad7w37dijrw";
+      name = "kdnssd-5.32.0.tar.xz";
    };
  };
  kdoctools = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kdoctools-5.31.0.tar.xz";
-      sha256 = "1m7l4bk5h75mcrgislp4rc7fj1szv1ij30y5yizncg2c3aq2czxk";
-      name = "kdoctools-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kdoctools-5.32.0.tar.xz";
+      sha256 = "0i7zgg7iw6w0sdr6cv3yf4blcr61i8zczgmyqa964ka6p3ywwjs9";
+      name = "kdoctools-5.32.0.tar.xz";
    };
  };
  kemoticons = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kemoticons-5.31.0.tar.xz";
-      sha256 = "0zvps3jrx02dzy82mwf5l7dirpnj616081yhkp2m0xw3qa3i16xk";
-      name = "kemoticons-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kemoticons-5.32.0.tar.xz";
+      sha256 = "1ncjs9iy6z6rhk83ff7fj1b68rkylnry0h698rh4jvs98gpw8sgj";
+      name = "kemoticons-5.32.0.tar.xz";
    };
  };
  kfilemetadata = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kfilemetadata-5.31.0.tar.xz";
-      sha256 = "123cin3fhai85zzz5hfr6h87cjrqvsyl9i809j7q0fshjx8c9wpd";
-      name = "kfilemetadata-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kfilemetadata-5.32.0.tar.xz";
+      sha256 = "01d91gmrxlax0g13ib841vc4qwmv6r4qdr10wfs77rrxsvw7z08f";
+      name = "kfilemetadata-5.32.0.tar.xz";
    };
  };
  kglobalaccel = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kglobalaccel-5.31.0.tar.xz";
-      sha256 = "1l7phfk17z9rrdlcjz97zyyqlj9pps0gdpphrfqrz1fyx5ifybmc";
-      name = "kglobalaccel-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kglobalaccel-5.32.0.tar.xz";
+      sha256 = "0dxwjznnqlgnvn15pl34rxlzk3i21cvzn8xbgqmxakny8qiib9ry";
+      name = "kglobalaccel-5.32.0.tar.xz";
    };
  };
  kguiaddons = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kguiaddons-5.31.0.tar.xz";
-      sha256 = "0bvjnbsskps2pfh0y72klxfanm54c0iflll5awaps750flb3bbp3";
-      name = "kguiaddons-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kguiaddons-5.32.0.tar.xz";
+      sha256 = "0rbfd0rykmwl9hs1q22pqg2by8vi9y1pgs2ishgnan4sc4w87wjb";
+      name = "kguiaddons-5.32.0.tar.xz";
    };
  };
  khtml = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/portingAids/khtml-5.31.0.tar.xz";
-      sha256 = "19pf3ir3r8igrx3h90sn383kxmyjdxgmwaw66p6vjb83243dy57h";
-      name = "khtml-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/portingAids/khtml-5.32.0.tar.xz";
+      sha256 = "1bkxfldw55khycbpcqpwi86rpv6qyqsndvjncfd5a5knnsynwdyf";
+      name = "khtml-5.32.0.tar.xz";
    };
  };
  ki18n = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/ki18n-5.31.0.tar.xz";
-      sha256 = "1q496i4a3kq2bfxpfnz6bfxk2shfdshrxcf253ab58l76l3jcy9g";
-      name = "ki18n-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/ki18n-5.32.0.tar.xz";
+      sha256 = "068xvw2hy4hlpj85wgjjdj0nc37fygpd8wb1dnpqcvzzy8rc1rsf";
+      name = "ki18n-5.32.0.tar.xz";
    };
  };
  kiconthemes = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kiconthemes-5.31.0.tar.xz";
-      sha256 = "0kangszmlhzbwvvplnxk2i938xl8j8jpd8kpf2n9skxkqfd19qr5";
-      name = "kiconthemes-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kiconthemes-5.32.0.tar.xz";
+      sha256 = "00azbyk5y3jgdqv03a2nd0627kdkhq1bkghvw7w62kcnih9k8lq5";
+      name = "kiconthemes-5.32.0.tar.xz";
    };
  };
  kidletime = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kidletime-5.31.0.tar.xz";
-      sha256 = "03ajdhxv2jdggqhy02s6xgbaf4pa2chj0f6d5kgz9r0wx6kxmh25";
-      name = "kidletime-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kidletime-5.32.0.tar.xz";
+      sha256 = "0rkxx3bnspjwm4vcy4rdfahk6vcfpkh8fldww0zfdn7s7pigqwch";
+      name = "kidletime-5.32.0.tar.xz";
    };
  };
  kimageformats = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kimageformats-5.31.0.tar.xz";
-      sha256 = "17cz2xmmm5g55kndq983vy6cg7adpbiw7ahn0lpvviinnsf53s12";
-      name = "kimageformats-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kimageformats-5.32.0.tar.xz";
+      sha256 = "05hn8n4sc3rj5c30ki068f76k1gfgvq19zcw5jlqpnn1l5db5fvz";
+      name = "kimageformats-5.32.0.tar.xz";
    };
  };
  kinit = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kinit-5.31.0.tar.xz";
-      sha256 = "082kq25163x40bq12x84ccrk3zrzmn5xpb5m4zgi06zcvzb8rl9l";
-      name = "kinit-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kinit-5.32.0.tar.xz";
+      sha256 = "0103lflppdw55l9xiqs68lzaq9897m5qnkmy6fp7dm9wfh9aplqn";
+      name = "kinit-5.32.0.tar.xz";
    };
  };
  kio = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kio-5.31.0.tar.xz";
-      sha256 = "1rry7v9g2430hkz44b4xjcbs3lr64srs8822a52vx1w69jpkn5s9";
-      name = "kio-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kio-5.32.0.tar.xz";
+      sha256 = "19da02l0aj0l07x9bbklhvx9slci3v1d8q80jvam4vyzs4qdyjin";
+      name = "kio-5.32.0.tar.xz";
    };
  };
  kitemmodels = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kitemmodels-5.31.0.tar.xz";
-      sha256 = "0zb9cm5v3ylqhg8l5sp3jskghm5izzihha5ik09y7fabl52cd6v5";
-      name = "kitemmodels-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kitemmodels-5.32.0.tar.xz";
+      sha256 = "0lxld7jdixpq23sycv8n4ckzmdr34aycrsf2zffziw6r59f0mzki";
+      name = "kitemmodels-5.32.0.tar.xz";
    };
  };
  kitemviews = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kitemviews-5.31.0.tar.xz";
-      sha256 = "04r4pd5rkdgbszyg7l050r53f38skhh2p2mi3xkz4ckci132srlv";
-      name = "kitemviews-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kitemviews-5.32.0.tar.xz";
+      sha256 = "1h1zgawdi4vbgymdl5215lx7hpcx9jqxy7vjf5hwgs6b2cls1sws";
+      name = "kitemviews-5.32.0.tar.xz";
    };
  };
  kjobwidgets = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kjobwidgets-5.31.0.tar.xz";
-      sha256 = "16grnlccmqcs84gpz62s1iz5amdwsprr76gd0q845bd49crgacfa";
-      name = "kjobwidgets-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kjobwidgets-5.32.0.tar.xz";
+      sha256 = "0lhv3mg2liija0g8x14jpv1mdhb0zjh868p1cs24bs9xrw1l8984";
+      name = "kjobwidgets-5.32.0.tar.xz";
    };
  };
  kjs = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/portingAids/kjs-5.31.0.tar.xz";
-      sha256 = "027n2ivh5kfmrm06xgcryxm14hbxyf83cx6rbc34093kk905ghg1";
-      name = "kjs-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/portingAids/kjs-5.32.0.tar.xz";
+      sha256 = "022n2hl1s5kap3pqaz4y28wn5z5qh6jcypz5kini2ic94xf7ydrg";
+      name = "kjs-5.32.0.tar.xz";
    };
  };
  kjsembed = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/portingAids/kjsembed-5.31.0.tar.xz";
-      sha256 = "1mss7lahczvwhmybxnbcynqwa56gjrxiyq79fcicybp7h7rvqw14";
-      name = "kjsembed-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/portingAids/kjsembed-5.32.0.tar.xz";
+      sha256 = "0h0p4mcvmdgvjv2xd8s4x2i554nh08mc258gxhb41bs6vm3yhiz4";
+      name = "kjsembed-5.32.0.tar.xz";
    };
  };
  kmediaplayer = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/portingAids/kmediaplayer-5.31.0.tar.xz";
-      sha256 = "0vxzw5grw53bxp0nvwmiqyw9sbpglhrnfg4d1ldlg4a1gibfijx4";
-      name = "kmediaplayer-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/portingAids/kmediaplayer-5.32.0.tar.xz";
+      sha256 = "1s86dfzrqxrmbqmxq4yyyy1p507d9ns6d7sy6z67dhykgahacqf4";
+      name = "kmediaplayer-5.32.0.tar.xz";
    };
  };
  knewstuff = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/knewstuff-5.31.0.tar.xz";
-      sha256 = "06qrgzfxrpmckyjq21ajvw08n5f5bdyqqgrnrbr1cjsfcx7xwdfl";
-      name = "knewstuff-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/knewstuff-5.32.0.tar.xz";
+      sha256 = "1i3ldy9wwnjhpgdd2d0bg4304k88riin89zqzdl52lpqa6hjl3fp";
+      name = "knewstuff-5.32.0.tar.xz";
    };
  };
  knotifications = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/knotifications-5.31.0.tar.xz";
-      sha256 = "0nz5dkzgkv4mzcsg2mn9zzcqh484cyh5n1y8sx1831r808jd2wly";
-      name = "knotifications-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/knotifications-5.32.0.tar.xz";
+      sha256 = "06ap7m8c2py49pqrnhadbyl69y3nsyamzahbpwipqgh9k62sy34y";
+      name = "knotifications-5.32.0.tar.xz";
    };
  };
  knotifyconfig = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/knotifyconfig-5.31.0.tar.xz";
-      sha256 = "1zdzfqqd32ykd5ibrkssl3p47v704jxs16br1rhrr32ymv4qcbpi";
-      name = "knotifyconfig-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/knotifyconfig-5.32.0.tar.xz";
+      sha256 = "14qc6wj4j5i45vzqsvl2wlc07c6x30hb2680gwfqsvwgiaszkzv4";
+      name = "knotifyconfig-5.32.0.tar.xz";
    };
  };
  kpackage = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kpackage-5.31.0.tar.xz";
-      sha256 = "1hg8f2i10wcs31xhvw40dwgbgfrwx93w5bi5wlbrw55jcs040dfr";
-      name = "kpackage-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kpackage-5.32.0.tar.xz";
+      sha256 = "070zasl5c58n01fk18mjgccfizymc9griwicxizqjgzzbgvkns3r";
+      name = "kpackage-5.32.0.tar.xz";
    };
  };
  kparts = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kparts-5.31.0.tar.xz";
-      sha256 = "093g5zsdqqyx9z69afsmgyszd807pv3wpzwn37x1glg399dsv7fa";
-      name = "kparts-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kparts-5.32.0.tar.xz";
+      sha256 = "0hrx0mdvw301nbdyw5fkvgkw60ya6kmfw6hfzmj48bws8mi33rs5";
+      name = "kparts-5.32.0.tar.xz";
    };
  };
  kpeople = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kpeople-5.31.0.tar.xz";
-      sha256 = "1f71c2q8a9m463ghpq50gbhkvf5szkvvfwbamlrwwygpb89fzfjy";
-      name = "kpeople-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kpeople-5.32.0.tar.xz";
+      sha256 = "1xqi8zr76hajgyv016iaqlmnr5b84s71fbx412q153g92jglp4mk";
+      name = "kpeople-5.32.0.tar.xz";
    };
  };
  kplotting = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kplotting-5.31.0.tar.xz";
-      sha256 = "15yv1rh1vlxhv77j50inq9kkwalhs2r1mjba82fnxy8z569i66cm";
-      name = "kplotting-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kplotting-5.32.0.tar.xz";
+      sha256 = "0a0pfmdlx84526lb2jvx94i2pf85km57fm2ygis4z5mjgbzsmb6v";
+      name = "kplotting-5.32.0.tar.xz";
    };
  };
  kpty = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kpty-5.31.0.tar.xz";
-      sha256 = "0hfs1gdi1fqaaki5aa9b93j4pl33g4s82yxpbyc0h9k2891aq196";
-      name = "kpty-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kpty-5.32.0.tar.xz";
+      sha256 = "0h4318rc9902cvqj69capb8lh7s84y44jd59d11fyhq21jhy152s";
+      name = "kpty-5.32.0.tar.xz";
    };
  };
  kross = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/portingAids/kross-5.31.0.tar.xz";
-      sha256 = "0lc9ijn60bw0y9nrlva2fd0hf0b4x6488jjmymrnrc8zzjnigyqp";
-      name = "kross-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/portingAids/kross-5.32.0.tar.xz";
+      sha256 = "0mgicb2rfhzp0hr1zckp1qzqzbdx0zy82mcjibrlsp7spmvynw5a";
+      name = "kross-5.32.0.tar.xz";
    };
  };
  krunner = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/krunner-5.31.0.tar.xz";
-      sha256 = "0xqayhd179387m02arxdcl1lgk8f2h0fxlzyigy6ja6wylbwphrw";
-      name = "krunner-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/krunner-5.32.0.tar.xz";
+      sha256 = "1k4rg9vqr6h5aj7v51fx3i5z9kxlfpacahs81hkwksi6if8ik4kr";
+      name = "krunner-5.32.0.tar.xz";
    };
  };
  kservice = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kservice-5.31.0.tar.xz";
-      sha256 = "0hjlcnypg96np88hgfvqd8g5z4cxgi4a0j5mnlfx65jrzpv5hsjg";
-      name = "kservice-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kservice-5.32.0.tar.xz";
+      sha256 = "02xk3ajspprmx964zhwh2l3axm4gns9h0m0pvcb1v5j8pfh9v70q";
+      name = "kservice-5.32.0.tar.xz";
    };
  };
  ktexteditor = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/ktexteditor-5.31.0.tar.xz";
-      sha256 = "099axcwl8z4npvcrirycc82zg7sf9ac3yxrwpsp0f337gdl1qvln";
-      name = "ktexteditor-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/ktexteditor-5.32.0.tar.xz";
+      sha256 = "1sybw8k3f36mcs5qh3b51v7ynbqn4pbiiabkyxfmyi82i09m2jgw";
+      name = "ktexteditor-5.32.0.tar.xz";
    };
  };
  ktextwidgets = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/ktextwidgets-5.31.0.tar.xz";
-      sha256 = "0n0v42b4bq1f6f120bjhr69qwgnvwlhnnqsh75nl9jvv8g3lyspy";
-      name = "ktextwidgets-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/ktextwidgets-5.32.0.tar.xz";
+      sha256 = "1s2fd4n4hfkzscxv0cdfjynjzi1f57pfi9a3fp6rrm5c5645zk7r";
+      name = "ktextwidgets-5.32.0.tar.xz";
    };
  };
  kunitconversion = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kunitconversion-5.31.0.tar.xz";
-      sha256 = "190d2v3bv7ccg2wqjmd6p46d4zz59r1mf86l2wkqw212rr59pafx";
-      name = "kunitconversion-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kunitconversion-5.32.0.tar.xz";
+      sha256 = "0crc8riwafcx6fwhgrc8vfbwmdygd6vlz1fbbgni09gamm8mbcin";
+      name = "kunitconversion-5.32.0.tar.xz";
    };
  };
  kwallet = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kwallet-5.31.0.tar.xz";
-      sha256 = "0r7n49ii8y1ygc7ncysjif4mrmsd9jq4yfm251m7lrp82drza26n";
-      name = "kwallet-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kwallet-5.32.0.tar.xz";
+      sha256 = "0psc4n6lck9gbx2nn7mgv33x4z2r0xp1mx1xcsgy8smvalrfv5xa";
+      name = "kwallet-5.32.0.tar.xz";
    };
  };
  kwayland = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kwayland-5.31.0.tar.xz";
-      sha256 = "0f134spj1vz3f43bdrb93kr54s50x4a9xvkfhl3inlxmglbk3h8b";
-      name = "kwayland-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kwayland-5.32.0.tar.xz";
+      sha256 = "1kzvq7qx102rfdv975x5sd37lsl6wn0mzm2m1f9fnnn2rvii3h5d";
+      name = "kwayland-5.32.0.tar.xz";
    };
  };
  kwidgetsaddons = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kwidgetsaddons-5.31.0.tar.xz";
-      sha256 = "0yrhss1x8q4nanpq2gbzqjds9s7hjl3zzkwnd8hahh9fyg8w9815";
-      name = "kwidgetsaddons-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kwidgetsaddons-5.32.0.tar.xz";
+      sha256 = "1aksy326ppdfcx20zl9hxsd8j0br32j6dlx4i1xxbd976csys9b2";
+      name = "kwidgetsaddons-5.32.0.tar.xz";
    };
  };
  kwindowsystem = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kwindowsystem-5.31.0.tar.xz";
-      sha256 = "0jzhsdfzzhxfgjqd4pl98ckbbqfwkv6qy5szh82078gxc2rf1wna";
-      name = "kwindowsystem-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kwindowsystem-5.32.0.tar.xz";
+      sha256 = "1c3kd23c4wwzdhfcyhv41czw3y2kk1492xn6ah9n3r98akrhgar1";
+      name = "kwindowsystem-5.32.0.tar.xz";
    };
  };
  kxmlgui = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kxmlgui-5.31.0.tar.xz";
-      sha256 = "1rnznapp1vflg66k0jk8n8v9zci20bs0v88hci3rf0qfd5cmgnzr";
-      name = "kxmlgui-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kxmlgui-5.32.0.tar.xz";
+      sha256 = "1pxi4z7z3bzwcnfwq0pvjsmds401fkisyr353lyxf4rvcpwj3a65";
+      name = "kxmlgui-5.32.0.tar.xz";
    };
  };
  kxmlrpcclient = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kxmlrpcclient-5.31.0.tar.xz";
-      sha256 = "1lrv1qxbfm1ss2hb171p9s3f3iwn8zfrsipin0gvfwnjrldi4fkb";
-      name = "kxmlrpcclient-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kxmlrpcclient-5.32.0.tar.xz";
+      sha256 = "1kaczibdfdph5mpg1dldsmqb1six57w7ch3v0v7av5h6j6sx0xaq";
+      name = "kxmlrpcclient-5.32.0.tar.xz";
    };
  };
  modemmanager-qt = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/modemmanager-qt-5.31.0.tar.xz";
-      sha256 = "0s2dfz9zvn6f9xpzs412iniipaai5zs9m06lpxss0w1nq5ig856r";
-      name = "modemmanager-qt-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/modemmanager-qt-5.32.0.tar.xz";
+      sha256 = "0ywyiq1kj4ya5knn0r12j9m1ig9mlyfypnrzihlvipddjrqs7jyd";
+      name = "modemmanager-qt-5.32.0.tar.xz";
    };
  };
  networkmanager-qt = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/networkmanager-qt-5.31.0.tar.xz";
-      sha256 = "18wbmd4nsgwzqlp254k1ahy8iyydx59fshb3wci5sgxnsn435np4";
-      name = "networkmanager-qt-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/networkmanager-qt-5.32.0.tar.xz";
+      sha256 = "0bcy7nzfvx2xah3kxklmrjn08qbjddiny7wf7nkxsbc3kkhrxqyd";
+      name = "networkmanager-qt-5.32.0.tar.xz";
    };
  };
  oxygen-icons5 = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/oxygen-icons5-5.31.0.tar.xz";
-      sha256 = "0ka4zll8v8wahqg50vpm9mrxlyh9244y0yrprbwxzl9xpx113ppi";
-      name = "oxygen-icons5-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/oxygen-icons5-5.32.0.tar.xz";
+      sha256 = "05v3blgs4qbjl8s6470baahy9a98cfi3mplzp462axcgkqdj1nwf";
+      name = "oxygen-icons5-5.32.0.tar.xz";
    };
  };
  plasma-framework = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/plasma-framework-5.31.0.tar.xz";
-      sha256 = "0hq3d96d9xhx6wqrrhnyygwajg69vfxbjc8dlpf5nwc3kqv2wim2";
-      name = "plasma-framework-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/plasma-framework-5.32.0.tar.xz";
+      sha256 = "1hrnmilc30d1kh20cky329i5ji3qyy7m4f8jzax5cgl7nrjca31h";
+      name = "plasma-framework-5.32.0.tar.xz";
    };
  };
  prison = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/prison-5.31.0.tar.xz";
-      sha256 = "0qaqj5gazby4fdq9yii67cmr04i007blhl27h9c5p169khh9ck2s";
-      name = "prison-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/prison-5.32.0.tar.xz";
+      sha256 = "0q5cs60293bdm3mynhx39rjsh87mfxngxsqa2fqm2gsqjvlciyvr";
+      name = "prison-5.32.0.tar.xz";
    };
  };
  solid = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/solid-5.31.0.tar.xz";
-      sha256 = "05rgzdzwbnmnvzkf4gz3z5i1ggwyd21y0yli7shas4i8l29kjd7m";
-      name = "solid-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/solid-5.32.0.tar.xz";
+      sha256 = "1jhymivravgix0sa0szkax50j09l5fl55xi3fbyjxlb4cil114v5";
+      name = "solid-5.32.0.tar.xz";
    };
  };
  sonnet = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/sonnet-5.31.0.tar.xz";
-      sha256 = "16vzdhppb2w5vyfr332bcvw4dyw9cz4apxain28d43p0ir03xxz3";
-      name = "sonnet-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/sonnet-5.32.0.tar.xz";
+      sha256 = "17sjv48b3z5fgplsy16ilcw6p7mlqjs61ib6jqd1mqzv4xrr27yi";
+      name = "sonnet-5.32.0.tar.xz";
    };
  };
  syntax-highlighting = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/syntax-highlighting-5.31.0.tar.xz";
-      sha256 = "0igd6jpbck94gl8gs5a5dgj2cxbv370prnk22037clqry6y38v1a";
-      name = "syntax-highlighting-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/syntax-highlighting-5.32.0.tar.xz";
+      sha256 = "1d9m7x53mwggwmhhba1c7b8v4f8qjql889y674ldpzs2nrk5y7x3";
+      name = "syntax-highlighting-5.32.0.tar.xz";
    };
  };
  threadweaver = {
-    version = "5.31.0";
+    version = "5.32.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/threadweaver-5.31.0.tar.xz";
-      sha256 = "0wsdv135mxpka0rfg9zwhnzp0svfkvd4idyj38rgipxbada0hb7f";
-      name = "threadweaver-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/threadweaver-5.32.0.tar.xz";
+      sha256 = "1qpy2rzqyd4ap5fibkfk87z66ijh2h79cd7f0h506jh2dbx20g0h";
+      name = "threadweaver-5.32.0.tar.xz";
    };
  };
 }
--- a/pkgs/development/libraries/mailcore2/default.nix
+++ b/pkgs/development/libraries/mailcore2/default.nix
@ -21,6 +21,7 @@ stdenv.mkDerivation rec {

  postPatch = ''
    substituteInPlace CMakeLists.txt \
+       --replace " icule iculx" "" \
       --replace "tidy/tidy.h" "tidy.h" \
       --replace "/usr/include/tidy" "${libtidy}/include" \
       --replace "/usr/include/libxml2" "${libxml2.dev}/include/libxml2"
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@ -16,7 +16,9 @@ in stdenv.mkDerivation rec {
    sha256 = "1wrx2ig6yvgywjs25hzy4szgml21hwhd7ds0ghyfybhkiq7lyg6x";
  };

-  buildInputs = [ nspr perl zlib sqlite ];
+  buildInputs = [ perl zlib sqlite ];
+
+  propagatedBuildInputs = [ nspr ];

  prePatch = ''
    xz -d < ${nssPEM} | patch -p1
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@ -286,7 +286,7 @@ stdenv.mkDerivation {
    homepage = http://www.qt.io;
    description = "A cross-platform application framework for C++";
    license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
-    maintainers = with maintainers; [ bbenoist qknight ttuegel ];
+    maintainers = with maintainers; [ qknight ttuegel ];
    platforms = platforms.linux;
  };

--- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
@ -307,7 +307,7 @@ stdenv.mkDerivation {
    homepage = http://www.qt.io;
    description = "A cross-platform application framework for C++";
    license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
-    maintainers = with maintainers; [ bbenoist qknight ttuegel ];
+    maintainers = with maintainers; [ qknight ttuegel ];
    platforms = platforms.unix;
  };
 }
--- a/Show More
+++ b/Show More