Merge branch 'master' into staging-next

Conflicts: gobby and libinfinity - I took the hand-edited versions instead of those resuting from the mass-replacement. Hydra: ?compare=1473190
2018-08-13 20:42:33 +02:00 · 2018-08-13 20:42:33 +02:00 · 5b0398dc36
commit 5b0398dc36
parent 34baf00b72 249ba3d3ed
70 changed files with 1689 additions and 473 deletions
--- a/doc/languages-frameworks/haskell.section.md
+++ b/doc/languages-frameworks/haskell.section.md
@ -1047,6 +1047,19 @@ As you can see, `packunused` finds out that although the testsuite component has
 no redundant dependencies the library component of `scientific-0.3.5.1` depends
 on `ghc-prim` which is unused in the library.

+### Using hackage2nix with nixpkgs
+
+Hackage package derivations are found in the
+[`hackage-packages.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/haskell-modules/hackage-packages.nix)
+file within `nixpkgs` and are used as the initial package set for
+`haskellPackages`. The `hackage-packages.nix` file is not meant to be edited
+by hand, but rather autogenerated by [`hackage2nix`](https://github.com/NixOS/cabal2nix/tree/master/hackage2nix),
+which by default uses the [`configuration-hackage2nix.yaml`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/haskell-modules/configuration-hackage2nix.yaml)
+file to generate all the derivations.
+
+To modify the contents `configuration-hackage2nix.yaml`, follow the
+instructions on [`hackage2nix`](https://github.com/NixOS/cabal2nix/tree/master/hackage2nix).
+
 ## Other resources

  - The Youtube video [Nix Loves Haskell](https://www.youtube.com/watch?v=BsBhi_r-OeE)
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -2867,11 +2867,6 @@
    github = "nocoolnametom";
    name = "Tom Doggett";
  };
-  nonfreeblob = {
-    email = "nonfreeblob@yandex.com";
-    github = "nonfreeblob";
-    name = "nonfreeblob";
-  };
  notthemessiah = {
    email = "brian.cohen.88@gmail.com";
    github = "notthemessiah";
--- a/nixos/modules/config/shells-environment.nix
+++ b/nixos/modules/config/shells-environment.nix
@ -70,7 +70,7 @@ in
      description = ''
        Shell script code called during global environment initialisation
        after all variables and profileVariables have been set.
-        This code is asumed to be shell-independent, which means you should
+        This code is assumed to be shell-independent, which means you should
        stick to pure sh without sh word split.
      '';
      type = types.lines;
--- a/nixos/modules/programs/zsh/oh-my-zsh.nix
+++ b/nixos/modules/programs/zsh/oh-my-zsh.nix
@ -3,7 +3,30 @@
 with lib;

 let
+
  cfg = config.programs.zsh.ohMyZsh;
+
+  mkLinkFarmEntry = name: dir:
+    let
+      env = pkgs.buildEnv {
+        name = "zsh-${name}-env";
+        paths = cfg.customPkgs;
+        pathsToLink = "/share/zsh/${dir}";
+      };
+    in
+      { inherit name; path = "${env}/share/zsh/${dir}"; };
+
+  mkLinkFarmEntry' = name: mkLinkFarmEntry name name;
+
+  custom =
+    if cfg.custom != null then cfg.custom
+    else if length cfg.customPkgs == 0 then null
+    else pkgs.linkFarm "oh-my-zsh-custom" [
+      (mkLinkFarmEntry' "themes")
+      (mkLinkFarmEntry "completions" "site-functions")
+      (mkLinkFarmEntry' "plugins")
+    ];
+
 in
  {
    options = {
@ -34,10 +57,19 @@ in
        };

        custom = mkOption {
-          default = "";
-          type = types.str;
+          default = null;
+          type = with types; nullOr str;
          description = ''
            Path to a custom oh-my-zsh package to override config of oh-my-zsh.
+            (Can't be used along with `customPkgs`).
+          '';
+        };
+
+        customPkgs = mkOption {
+          default = [];
+          type = types.listOf types.package;
+          description = ''
+            List of custom packages that should be loaded into `oh-my-zsh`.
          '';
        };

@ -67,7 +99,7 @@ in

      environment.systemPackages = [ cfg.package ];

-      programs.zsh.interactiveShellInit = with builtins; ''
+      programs.zsh.interactiveShellInit = ''
        # oh-my-zsh configuration generated by NixOS
        export ZSH=${cfg.package}/share/oh-my-zsh

@ -75,8 +107,8 @@ in
          "plugins=(${concatStringsSep " " cfg.plugins})"
        }

-        ${optionalString (stringLength(cfg.custom) > 0)
-          "ZSH_CUSTOM=\"${cfg.custom}\""
+        ${optionalString (custom != null)
+          "ZSH_CUSTOM=\"${custom}\""
        }

        ${optionalString (stringLength(cfg.theme) > 0)
@ -92,5 +124,15 @@ in

        source $ZSH/oh-my-zsh.sh
      '';
-    };
+
+      assertions = [
+        {
+          assertion = cfg.custom != null -> cfg.customPkgs == [];
+          message = "If `cfg.custom` is set for `ZSH_CUSTOM`, `customPkgs` can't be used!";
+        }
+      ];
+
+    };
+
+    meta.doc = ./oh-my-zsh.xml;
  }
--- a/nixos/modules/programs/zsh/oh-my-zsh.xml
+++ b/nixos/modules/programs/zsh/oh-my-zsh.xml
@ -0,0 +1,125 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="module-programs-zsh-ohmyzsh">
+
+<title>Oh my ZSH</title>
+
+<para><literal><link xlink:href="https://ohmyz.sh/">oh-my-zsh</link></literal> is a framework
+to manage your <link xlink:href="https://www.zsh.org/">ZSH</link> configuration
+including completion scripts for several CLI tools or custom prompt themes.</para>
+
+<section><title>Basic usage</title>
+<para>The module uses the <literal>oh-my-zsh</literal> package with all available features.  The
+initial setup using Nix expressions is fairly similar to the configuration format
+of <literal>oh-my-zsh</literal>.
+
+<programlisting>
+{
+  programs.ohMyZsh = {
+    enable = true;
+    plugins = [ "git" "python" "man" ];
+    theme = "agnoster";
+  };
+}
+</programlisting>
+
+For a detailed explanation of these arguments please refer to the
+<link xlink:href="https://github.com/robbyrussell/oh-my-zsh/wiki"><literal>oh-my-zsh</literal> docs</link>.
+</para>
+<para>The expression generates the needed
+configuration and writes it into your <literal>/etc/zshrc</literal>.
+</para></section>
+
+<section><title>Custom additions</title>
+
+<para>Sometimes third-party or custom scripts such as a modified theme may be needed.
+<literal>oh-my-zsh</literal> provides the
+<link xlink:href="https://github.com/robbyrussell/oh-my-zsh/wiki/Customization#overriding-internals"><literal>ZSH_CUSTOM</literal></link> 
+environment variable for this which points to a directory with additional scripts.</para>
+
+<para>The module can do this as well:
+
+<programlisting>
+{
+  programs.ohMyZsh.custom = "~/path/to/custom/scripts";
+}
+</programlisting>
+</para></section>
+
+<section><title>Custom environments</title>
+
+<para>There are several extensions for <literal>oh-my-zsh</literal> packaged in <literal>nixpkgs</literal>.
+One of them is <link xlink:href="https://github.com/spwhitt/nix-zsh-completions">nix-zsh-completions</link>
+which bundles completion scripts and a plugin for <literal>oh-my-zsh</literal>.</para>
+
+<para>Rather than using a single mutable path for <literal>ZSH_CUSTOM</literal>, it's also possible to
+generate this path from a list of Nix packages:
+
+<programlisting>
+{ pkgs, ... }:
+{
+  programs.ohMyZsh.customPkgs = with pkgs; [
+    pkgs.nix-zsh-completions
+    # and even more...
+  ];
+}
+</programlisting>
+
+Internally a single store path will be created using <literal>buildEnv</literal>.
+Please refer to the docs of
+<link xlink:href="https://nixos.org/nixpkgs/manual/#sec-building-environment"><literal>buildEnv</literal></link>
+for further reference.</para>
+
+<para><emphasis>Please keep in mind that this is not compatible with <literal>programs.ohMyZsh.custom</literal>
+as it requires an immutable store path while <literal>custom</literal> shall remain mutable! An evaluation failure
+will be thrown if both <literal>custom</literal> and <literal>customPkgs</literal> are set.</emphasis>
+</para></section>
+
+<section><title>Package your own customizations</title>
+
+<para>If third-party customizations (e.g. new themes) are supposed to be added to <literal>oh-my-zsh</literal>
+there are several pitfalls to keep in mind:</para>
+
+<itemizedlist>
+  <listitem>
+    <para>To comply with the default structure of <literal>ZSH</literal> the entire output needs to be written to
+    <literal>$out/share/zsh.</literal></para>
+  </listitem>
+  <listitem>
+    <para>Completion scripts are supposed to be stored at <literal>$out/share/zsh/site-functions</literal>. This directory
+    is part of the <literal><link xlink:href="http://zsh.sourceforge.net/Doc/Release/Functions.html">fpath</link></literal>
+    and the package should be compatible with pure <literal>ZSH</literal> setups. The module will automatically link
+    the contents of <literal>site-functions</literal> to completions directory in the proper store path.</para>
+  </listitem>
+  <listitem>
+    <para>The <literal>plugins</literal> directory needs the structure <literal>pluginname/pluginname.plugin.zsh</literal>
+    as structured in the <link xlink:href="https://github.com/robbyrussell/oh-my-zsh/tree/91b771914bc7c43dd7c7a43b586c5de2c225ceb7/plugins">upstream repo.</link>
+    </para>
+  </listitem>
+</itemizedlist>
+
+<para>
+A derivation for <literal>oh-my-zsh</literal> may look like this:
+<programlisting>
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "exemplary-zsh-customization-${version}";
+  version = "1.0.0";
+  src = fetchFromGitHub {
+    # path to the upstream repository
+  };
+
+  dontBuild = true;
+  installPhase = ''
+    mkdir -p $out/share/zsh/site-functions
+    cp {themes,plugins} $out/share/zsh
+    cp completions $out/share/zsh/site-functions
+  '';
+}
+</programlisting>
+</para>
+</section>
+</chapter>
--- a/nixos/modules/services/editors/infinoted.nix
+++ b/nixos/modules/services/editors/infinoted.nix
@ -10,8 +10,8 @@ in {

    package = mkOption {
      type = types.package;
-      default = pkgs.libinfinity.override { daemon = true; };
-      defaultText = "pkgs.libinfinity.override { daemon = true; }";
+      default = pkgs.libinfinity;
+      defaultText = "pkgs.libinfinity";
      description = ''
        Package providing infinoted
      '';
@ -129,7 +129,7 @@ in {
        serviceConfig = {
          Type = "simple";
          Restart = "always";
-          ExecStart = "${cfg.package}/bin/infinoted-${versions.majorMinor cfg.package.version} --config-file=/var/lib/infinoted/infinoted.conf";
+          ExecStart = "${cfg.package.infinoted} --config-file=/var/lib/infinoted/infinoted.conf";
          User = cfg.user;
          Group = cfg.group;
          PermissionsStartOnly = true;
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@ -56,10 +56,6 @@ let

      # Start PulseAudio if enabled.
      ${optionalString (config.hardware.pulseaudio.enable) ''
-        ${optionalString (!config.hardware.pulseaudio.systemWide)
-          "${config.hardware.pulseaudio.package.out}/bin/pulseaudio --start"
-        }
-
        # Publish access credentials in the root window.
        if ${config.hardware.pulseaudio.package.out}/bin/pulseaudio --dump-modules | grep module-x11-publish &> /dev/null; then
          ${config.hardware.pulseaudio.package.out}/bin/pactl load-module module-x11-publish "display=$DISPLAY"
--- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
+++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
@ -42,7 +42,7 @@ def write_loader_conf(profile, generation):
        else:
            f.write("default nixos-generation-%d\n" % (generation))
        if not @editor@:
-            f.write("editor 0");
+            f.write("editor 0\n");
        f.write("console-mode @consoleMode@\n");
    os.rename("@efiSysMountPoint@/loader/loader.conf.tmp", "@efiSysMountPoint@/loader/loader.conf")

--- a/pkgs/applications/audio/pulseeffects/default.nix
+++ b/pkgs/applications/audio/pulseeffects/default.nix
@ -42,13 +42,13 @@ let
  ];
 in stdenv.mkDerivation rec {
  name = "pulseeffects-${version}";
-  version = "4.2.3";
+  version = "4.2.6";

  src = fetchFromGitHub {
    owner = "wwmm";
    repo = "pulseeffects";
    rev = "v${version}";
-    sha256 = "0s3lc0xkr48wzk0b6akq4yw19n0iwfi9jyji8bpdgj5y7kjg5mqm";
+    sha256 = "1b5h760bb1wgn4avirjjri5fcfqvnsr076qnhrdiqcic3vgircsm";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/audio/setbfree/default.nix
+++ b/pkgs/applications/audio/setbfree/default.nix
@ -4,11 +4,11 @@

 stdenv.mkDerivation  rec {
  name = "setbfree-${version}";
-  version = "0.8.5";
+  version = "0.8.7";

  src = fetchurl {
    url = "https://github.com/pantherb/setBfree/archive/v${version}.tar.gz";
-    sha256 = "0qfccny0hh9lq54272mzmxvfz2jmzcgigjkjwn6v9h6n00gi5bw4";
+    sha256 = "07s320r67cz0cdjdsbcwn0fw3xs0wz7lgrybqpws2skvkbls228q";
  };

  patchPhase = ''
--- a/pkgs/applications/audio/x42-plugins/default.nix
+++ b/pkgs/applications/audio/x42-plugins/default.nix
@ -3,12 +3,12 @@
 , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }:

 stdenv.mkDerivation rec {
-  version = "20180320";
+  version = "20180803";
  name = "x42-plugins-${version}";

  src = fetchurl {
    url = "https://gareus.org/misc/x42-plugins/${name}.tar.xz";
-    sha256 = "167ly9nxqq3g0j35i9jv9rvd8qp4i9ncfcjxmg972cp6q8ak8mdl";
+    sha256 = "1v7p6vnkcbzyvmcysabhmn603cndzx9mwzaw5dppy4wd687vhgis";
  };

  nativeBuildInputs = [ pkgconfig ];
--- a/pkgs/applications/editors/gobby/default.nix
+++ b/pkgs/applications/editors/gobby/default.nix
@ -1,23 +1,22 @@
 { avahiSupport ? false # build support for Avahi in libinfinity
-, gnomeSupport ? false # build support for Gnome(gnome-vfs)
-, stdenv, fetchurl, pkgconfig
-, gtkmm2, gsasl, gtksourceview, libxmlxx, libinfinity, intltool
-, gnome_vfs ? null}:
+, stdenv, fetchurl, fetchFromGitHub, autoconf, automake, pkgconfig, wrapGAppsHook
+, gtkmm3, gsasl, gtksourceview3, libxmlxx, libinfinity, intltool, itstool, gnome3 }:

 let
  libinf = libinfinity.override { gtkWidgets = true; inherit avahiSupport; };
-  
 in stdenv.mkDerivation rec {
-
-  name = "gobby-0.5.0";
-  src = fetchurl {
-    url = "http://releases.0x539.de/gobby/${name}.tar.gz";
-    sha256 = "165x0r668ma5blziisvbr8qig3jw9hf7i6w8r7wwvz3wsac3bswc";
+  name = "gobby-unstable-2018-04-03";
+  src = fetchFromGitHub {
+    owner = "gobby";
+    repo = "gobby";
+    rev = "ea4df27c9b6b885434797b0071ce198b23f9f63b";
+    sha256 = "0q7lq64yn16lxvj4jphs8y9194h0xppj8k7y9x8b276krraak2az";
  };

-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gtkmm2 gsasl gtksourceview libxmlxx libinf intltool ]
-    ++ stdenv.lib.optional gnomeSupport gnome_vfs;
+  nativeBuildInputs = [ autoconf automake pkgconfig intltool itstool gnome3.yelp-tools wrapGAppsHook ];
+  buildInputs = [ gtkmm3 gsasl gtksourceview3 libxmlxx libinf ];
+
+  preConfigure = "./autogen.sh";

  meta = with stdenv.lib; {
    homepage = http://gobby.0x539.de/;
--- a/pkgs/applications/editors/sigil/default.nix
+++ b/pkgs/applications/editors/sigil/default.nix
@ -6,10 +6,10 @@

 stdenv.mkDerivation rec {
  name = "sigil-${version}";
-  version = "0.9.9";
+  version = "0.9.10";

  src = fetchFromGitHub {
-    sha256 = "01pvc7k54mx5c7h1qiw92d4j459psv7n9xg94qbinf8vmpvkrcbw";
+    sha256 = "11r7043kbqv67z1aqk929scsg6yllldpl8icl32dw3dai7f1c658";
    rev = version;
    repo = "Sigil";
    owner = "Sigil-Ebook";
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@ -7,7 +7,7 @@

 stdenv.mkDerivation rec {
  name = "dbeaver-ce-${version}";
-  version = "5.1.4";
+  version = "5.1.5";

  desktopItem = makeDesktopItem {
    name = "dbeaver";
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
-    sha256 = "14i7b3l89rkhqq4zgsdbvcs9pp60djv0rjbm86fpk2wi4zkrlzi5";
+    sha256 = "17ai2gxnz1wj5m282sib9qhvy3665km2ig1ixxdklmk8apgdl1xr";
  };

  installPhase = ''
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  name = "josm-${version}";
-  version = "14026";
+  version = "14066";

  src = fetchurl {
    url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
-    sha256 = "1ysi23j2yj5b6cn3xdsrl4xp56klpw4xa7c4gv90z2dllx06mqli";
+    sha256 = "06mhaz5vr19ydqc5irhgcbl0s8fifwvaq60iz2nsnlxb1pw89xia";
  };

  buildInputs = [ jre10 makeWrapper ];
--- a/pkgs/applications/misc/masterpdfeditor/default.nix
+++ b/pkgs/applications/misc/masterpdfeditor/default.nix
@ -1,11 +1,14 @@
 { stdenv, fetchurl, sane-backends, qtbase, qtsvg, nss, autoPatchelfHook }:
+
 let
-  version = "5.1.00";
+  version = "5.1.12";
+
 in stdenv.mkDerivation {
  name = "masterpdfeditor-${version}";
+
  src = fetchurl {
    url = "https://code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz";
-    sha256 = "1s2zhx9xr1ny5s8hmlb99v3z1v26vmx87iixk8cdgndz046p9bg9";
+    sha256 = "1i3pdrhnlj06phm36gs42s6b94pigcfb8wa5dhmplxn0dqp434hq";
  };

  nativeBuildInputs = [ autoPatchelfHook ];
@ -15,21 +18,24 @@ in stdenv.mkDerivation {
  dontStrip = true;

  installPhase = ''
+    runHook preInstall
+
    p=$out/opt/masterpdfeditor
-   mkdir -p $out/bin $p $out/share/applications $out/share/pixmaps
+    mkdir -p $out/bin

    substituteInPlace masterpdfeditor5.desktop \
      --replace 'Exec=/opt/master-pdf-editor-5' "Exec=$out/bin" \
      --replace 'Path=/opt/master-pdf-editor-5' "Path=$out/bin" \
      --replace 'Icon=/opt/master-pdf-editor-5' "Icon=$out/share/pixmaps"
-   cp -v masterpdfeditor5.png $out/share/pixmaps/
-   cp -v masterpdfeditor5.desktop $out/share/applications

-   cp -v masterpdfeditor5 $p/
+    install -Dm644 -t $out/share/pixmaps      masterpdfeditor5.png
+    install -Dm644 -t $out/share/applications masterpdfeditor5.desktop
+    install -Dm755 -t $p                      masterpdfeditor5
+    install -Dm644 license.txt $out/share/$name/LICENSE
    ln -s $p/masterpdfeditor5 $out/bin/masterpdfeditor5
    cp -v -r stamps templates lang fonts $p

-   install -D license.txt $out/share/$name/LICENSE
+    runHook postInstall
  '';

  meta = with stdenv.lib; {
--- a/pkgs/applications/networking/protonmail-bridge/default.nix
+++ b/pkgs/applications/networking/protonmail-bridge/default.nix
@ -2,7 +2,7 @@
  libsecret, libGL, libpulseaudio, glib, makeWrapper, makeDesktopItem }:

 let
-  version = "1.0.5-1";
+  version = "1.0.6-1";

  description = ''
    An application that runs on your computer in the background and seamlessly encrypts
@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {

  src = fetchurl {
    url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb";
-    sha256 = "1fsf4l5c9ii370fgy721a71h34g7vjfddscal3jblb4mm3ywzxfl";
+    sha256 = "1as4xdsik2w9clbrwp1k00491324cg6araz3jq2m013yg1cild28";
  };

  nativeBuildInputs = [ makeWrapper ];
@ -35,11 +35,11 @@ in stdenv.mkDerivation rec {
  '';

  installPhase = ''
-    mkdir -p $out/{bin,lib,share}
-    mkdir -p $out/share/{applications,icons/hicolor/scalable/apps}
+    mkdir -p $out/{bin,lib,share/applications}
+    # mkdir -p $out/share/{applications,icons/hicolor/scalable/apps}

    cp -r usr/lib/protonmail/bridge/Desktop-Bridge{,.sh} $out/lib
-    cp usr/share/icons/protonmail/Desktop-Bridge.svg $out/share/icons/hicolor/scalable/apps/desktop-bridge.svg
+    # cp usr/share/icons/protonmail/Desktop-Bridge.svg $out/share/icons/hicolor/scalable/apps/desktop-bridge.svg
    cp ${desktopItem}/share/applications/* $out/share/applications

    ln -s $out/lib/Desktop-Bridge $out/bin/Desktop-Bridge
--- a/pkgs/applications/office/jameica/default.nix
+++ b/pkgs/applications/office/jameica/default.nix
@ -0,0 +1,90 @@
+{ stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, ant, jdk, jre, xmlstarlet, gtk2, glib, xorg, Cocoa }:
+
+let
+  _version = "2.8.1";
+  _build = "449";
+  version = "${_version}-${_build}";
+  name = "jameica-${version}";
+
+  swtSystem = if stdenv.system == "i686-linux" then "linux"
+  else if stdenv.system == "x86_64-linux" then "linux64"
+  else if stdenv.system == "x86_64-darwin" then "macos64"
+  else throw "Unsupported system: ${stdenv.system}";
+
+  launcher = ''
+    #!${stdenv.shell}
+    exec ${jre}/bin/java -Xmx512m ${ stdenv.lib.optionalString stdenv.isDarwin ''-Xdock:name="Jameica" -XstartOnFirstThread''} de.willuhn.jameica.Main "$@"
+  '';
+
+  desktopItem = makeDesktopItem {
+    name = "jameica";
+    exec = "jameica";
+    comment = "Free Runtime Environment for Java Applications.";
+    desktopName = "Jameica";
+    genericName = "Jameica";
+    categories = "Application;Office;";
+  };
+in
+stdenv.mkDerivation rec {
+  inherit name version;
+
+  nativeBuildInputs = [ ant jdk makeWrapper xmlstarlet ];
+  buildInputs = stdenv.lib.optionals stdenv.isLinux [ gtk2 glib xorg.libXtst ]
+                ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
+
+  src = fetchFromGitHub {
+    owner = "willuhn";
+    repo = "jameica";
+    rev = "V_${builtins.replaceStrings ["."] ["_"] _version}_BUILD_${_build}";
+    sha256 = "1w25lxjskn1yxllbv0vgvcc9f9xvgv9430dm4b59ia9baf98syd2";
+  };
+
+  # there is also a build.gradle, but it only seems to be used to vendor 3rd party libraries
+  # and is not able to build the application itself
+  buildPhase = ''
+    (cd build; ant init compile jar)
+  '';
+
+  # jameica itself loads ./plugin.xml to determine it's version.
+  # Unfortunately, the version attribute there seems to be wrong,
+  # so it thinks it's older than it really is,
+  # and refuses to load plugins destined for its version.
+  # Set version manually to workaround that.
+  postPatch = ''
+    xml ed -u '/system/@version' -v '${version}' plugin.xml > plugin.xml.new
+    mv plugin.xml.new plugin.xml
+  '';
+
+  installPhase = ''
+    mkdir -p $out/libexec $out/lib $out/bin $out/share/applications
+
+    # copy libraries except SWT
+    cp $(find lib -type f -iname '*.jar' | grep -ve 'swt/.*/swt.jar') $out/lib/
+    # copy platform-specific SWT
+    cp lib/swt/${swtSystem}/swt.jar $out/lib
+
+    install -Dm644 releases/${_version}-*/jameica/jameica.jar $out/libexec/
+    install -Dm644 plugin.xml $out/libexec/
+    install -Dm644 build/jameica-icon.png $out/share/pixmaps/jameica.png
+    cp ${desktopItem}/share/applications/* $out/share/applications/
+
+    echo "${launcher}" > $out/bin/jameica
+    chmod +x $out/bin/jameica
+    wrapProgram $out/bin/jameica --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath buildInputs} \
+                                 --set CLASSPATH "$out/libexec/jameica.jar:$out/lib/*" \
+                                 --run "cd $out/libexec"
+                                 # jameica expects its working dir set to the "program directory"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://www.willuhn.de/products/jameica/;
+    description = "Free Runtime Environment for Java Applications.";
+    longDescription = ''
+      Runtime Environment for plugins like Hibiscus (HBCI Online Banking),
+      SynTAX (accounting) and JVerein (club management).
+    '';
+    license = licenses.gpl2Plus;
+    platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
+    maintainers = with maintainers; [ flokli ];
+  };
+}
--- a/pkgs/applications/science/astronomy/gildas/aarch64.patch
+++ b/pkgs/applications/science/astronomy/gildas/aarch64.patch
@ -0,0 +1,12 @@
+diff -ruN gildas-src-jul18a/admin/define-system.sh gildas-src-jul18a.aarch64/admin/define-system.sh
+--- gildas-src-jul18a/admin/define-system.sh	2018-06-12 15:22:32.000000000 +0200
+++ gildas-src-jul18a.aarch64/admin/define-system.sh	2018-07-21 13:05:52.000000000 +0200
+@@ -174,7 +174,7 @@
+     DEFAULT_CONFIG=          # Default config is empty
+     case `uname` in
+         Linux)
+-            if [ `uname -m | grep -c "x86_64"` -ne 0 ]; then
+            if [ `uname -m | grep -c "64"` -ne 0 ]; then
+         	GAG_MACHINE=x86_64
+             else
+         	GAG_MACHINE=pc
--- a/pkgs/applications/science/astronomy/gildas/default.nix
+++ b/pkgs/applications/science/astronomy/gildas/default.nix
@ -7,13 +7,13 @@ let
 in

 stdenv.mkDerivation rec {
-  srcVersion = "jun18a";
-  version = "20180601_a";
+  srcVersion = "jul18a";
+  version = "20180701_a";
  name = "gildas-${version}";

  src = fetchurl {
-    url = "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.gz";
-    sha256 = "0k4x0g69fphb1759cwcw6bbs8imwmq0qwj6zqixxk60skk4n4jvb";
+    url = "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.gz";
+    sha256 = "0kl3zf6b1kv8hgsfrarsnm2gnrdax3vi8f856249y4nxsa7lbv2i";
  };

  enableParallelBuilding = true;
@ -22,20 +22,16 @@ stdenv.mkDerivation rec {

  buildInputs = [ gtk2-x11 lesstif cfitsio python27Env ];

-  patches = [ ./wrapper.patch ./return-error-code.patch ./clang.patch ];
+  patches = [ ./wrapper.patch ./return-error-code.patch ./clang.patch ./mod.patch ./aarch64.patch ];

  configurePhase=''
    substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out
    substituteInPlace admin/wrapper.sh --replace '%%PYTHONHOME%%' ${python27Env}
+    substituteInPlace utilities/main/gag-makedepend.pl --replace '/usr/bin/perl' ${perl}/bin/perl
    source admin/gildas-env.sh -c gfortran -o openmp
    echo "gag_doc:        $out/share/doc/" >> kernel/etc/gag.dico.lcl
  '';

-  buildPhase=''
-    make depend
-    make
-  '';
-
  postInstall=''
    mkdir -p $out/bin
    cp -a ../gildas-exe-${srcVersion}/* $out
--- a/pkgs/applications/science/astronomy/gildas/mod.patch
+++ b/pkgs/applications/science/astronomy/gildas/mod.patch
@ -0,0 +1,17 @@
+diff -ruN gildas-src-jul18a/admin/Makefile.build gildas-src-jul18a.mod/admin/Makefile.build
+--- gildas-src-jul18a/admin/Makefile.build	2018-06-14 14:36:54.000000000 +0200
+++ gildas-src-jul18a.mod/admin/Makefile.build	2018-07-06 13:31:46.000000000 +0200
+@@ -291,6 +291,13 @@
+ 	win-$(LIB_IDENTITY)-und.def -o $@ $(FLDLIBS) $(LIB_DEPENDS) $(ADD_LIBS) $(SYS_LIBS))
+ endif
+ 
+# Dummy rules for modules just so that make consider the module a
+# valid dependency when first parsing the makefiles. This rule should
+# never be applied as the modules are a by-product of the compilation
+# of the object
+$(builddir)/%.mod:
+	echo "dummy" > /dev/null
+
+ # Fortran executables
+ $(bindir)/% : $(builddir)/%.o | $(bindir)
+ 	$(FC) $(ALL_FLDFLAGS) $< $(OBJECTS) -o $@ \
--- a/pkgs/applications/science/biology/vcftools/default.nix
+++ b/pkgs/applications/science/biology/vcftools/default.nix
@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
  name = "${pname}-${version}";
  pname = "vcftools";
-  version = "0.1.15";
+  version = "0.1.16";

  src = fetchFromGitHub {
    repo = pname;
    owner = "vcftools";
    rev = "v${version}";
-    sha256 = "15yxr4kidqb42gkbd6rjra6b07wpl6rgivlh9q73yavh5myafqk4";
+    sha256 = "0msb09d2cnm8rlpg8bsc1lhjddvp3kf3i9dsj1qs4qgsdlzhxkyx";
  };

  buildInputs = [ autoreconfHook pkgconfig zlib perl ];
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@ -7,13 +7,13 @@ with stdenv.lib;

 buildGoPackage rec {
  name = "gitea-${version}";
-  version = "1.4.3";
+  version = "1.5.0";

  src = fetchFromGitHub {
    owner = "go-gitea";
    repo = "gitea";
    rev = "v${version}";
-    sha256 = "0rl20dhj3in8w3ngix42qly077zrwg578aa2nxxznmn9k8xdvfpd";
+    sha256 = "0gp777x8yjbqvz9i79qv3bn3hrlp1bn7ib57r7w5a7jmr9rd0nca";
  };

  patches = [ ./static-root-path.patch ];
--- a/pkgs/applications/video/qstopmotion/default.nix
+++ b/pkgs/applications/video/qstopmotion/default.nix
@ -1,20 +1,29 @@
-{ stdenv, fetchurl, qt5, ffmpeg, guvcview
-, cmake, ninja, libxml2, gettext, pkgconfig, libgphoto2, gphoto2, v4l_utils
-, libv4l, pcre }:
+{ stdenv, lib, fetchurl, qt5, ffmpeg, guvcview, cmake, ninja, libxml2
+, gettext, pkgconfig, libgphoto2, gphoto2, v4l_utils, libv4l, pcre
+, qwt, extra-cmake-modules }:

 stdenv.mkDerivation rec {
  pname = "qstopmotion";
-  version = "2.3.2";
+  version = "2.4.0";
  name = "${pname}-${version}";

  src = fetchurl {
-    url = "mirror://sourceforge/project/${pname}/Version_2_3_2/${name}-Source.tar.gz";
-    sha256 = "1vbiznwyc05jqg0dpmgxmvf7kdzmlck0i8v2c5d69kgrdnaypcrf";
+    url = "mirror://sourceforge/project/${pname}/Version_2_4_0/${name}-Source.tar.gz";
+    sha256 = "0pbyq6nrr9g3crlsng660768167s0fybvcpzbfc0w9kkhs2jwrr2";
  };

-  buildInputs = [ qt5.qtbase ffmpeg guvcview v4l_utils libv4l pcre ];
+  buildInputs = with qt5; [ v4l_utils libv4l pcre qtbase qtmultimedia ffmpeg guvcview
+                            qwt qtquickcontrols qtimageformats qtxmlpatterns ];

-  nativeBuildInputs = [ pkgconfig cmake ninja gettext libgphoto2 gphoto2 libxml2 libv4l ];
+  nativeBuildInputs = [ pkgconfig cmake extra-cmake-modules ninja
+                        gettext libgphoto2 gphoto2 libxml2 libv4l ];
+
+  patchPhase = ''
+    substituteInPlace CMakeLists.txt \
+      --replace "find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml" \
+                "find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml Multimedia"
+    grep -rl 'qwt' . | xargs sed -i 's@<qwt/qwt_slider.h>@<qwt_slider.h>@g'
+  '';

  meta = with stdenv.lib; {
    homepage = http://www.qstopmotion.org;
--- a/pkgs/data/fonts/unifont/default.nix
+++ b/pkgs/data/fonts/unifont/default.nix
@ -2,16 +2,16 @@

 stdenv.mkDerivation rec {
  name = "unifont-${version}";
-  version = "11.0.01";
+  version = "11.0.02";

  ttf = fetchurl {
    url = "mirror://gnu/unifont/${name}/${name}.ttf";
-    sha256 = "03nnfnh4j60a4hy0d4hqpnvhlfx437hp4g1wjfjy91vzrcbmvkwi";
+    sha256 = "0l8p07m566131xdinv1pcfc578jpvn72n6dhqmgivp8myai2xkzx";
  };

  pcf = fetchurl {
    url = "mirror://gnu/unifont/${name}/${name}.pcf.gz";
-    sha256 = "03bqqz2ipy3afhwsfy30c2v97cc27grw11lc0vzcvrgvin9ys2v1";
+    sha256 = "1hcl71fjchngcb2b4mwl4hhx886faaniv86x2xgk8850766qpnmy";
  };

  nativeBuildInputs = [ mkfontscale mkfontdir ];
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {

  outputHashAlgo = "sha256";
  outputHashMode = "recursive";
-  outputHash = "1ncllq42x1mlblf6h44garc3b5hkxv9dkpgbaipzll22p1l29yrf";
+  outputHash = "16ni07cfw38s7cj8bdsfi7fa1qahm3k90cmm4gn40qvz35i17x15";

  meta = with stdenv.lib; {
    description = "Unicode font for Base Multilingual Plane";
--- a/pkgs/desktops/mate/mate-media/default.nix
+++ b/pkgs/desktops/mate/mate-media/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  name = "mate-media-${version}";
-  version = "1.20.1";
+  version = "1.21.0";

  src = fetchurl {
    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1db47m80qfb1xyrg1qxwvmkc53qp97yhvh86fgwjv00x96c3j9s9";
+    sha256 = "0mgx4xjarpyvyaw0p0jnh74447y6zd93fvpi12078vyqr25dsi43";
  };

  buildInputs = [
--- a/pkgs/development/compilers/gambit/default.nix
+++ b/pkgs/development/compilers/gambit/default.nix
@ -1,4 +1,4 @@
-{ callPackage, fetchurl }:
+{ stdenv, callPackage, fetchurl }:

 callPackage ./build.nix {
  version = "4.8.9";
@ -7,4 +7,5 @@ callPackage ./build.nix {
    url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-v4_8_9-devel.tgz";
    sha256 = "1gwzz1ag9hlv266nvfq1bhwzrps3f2yghhffasjjqy8i8xwnry5p";
  };
+  inherit stdenv;
 }
--- a/pkgs/development/compilers/gambit/unstable.nix
+++ b/pkgs/development/compilers/gambit/unstable.nix
@ -1,10 +1,12 @@
-{ callPackage, fetchgit }:
+{ stdenv, callPackage, fetchgit }:

 callPackage ./build.nix {
-  version = "unstable-2018-05-30";
+  version = "unstable-2018-08-06";
+# git-version = "4.8.9-77-g91a4ad2c";
  SRC = fetchgit {
    url = "https://github.com/feeley/gambit.git";
-    rev = "ffe8841b56330eb86fd794b16dc7f83914ecc7c5";
-    sha256 = "1xzkwa2f6zazybbgd5zynhr36krayhr29vsbras5ld63hkrxrp7q";
+    rev = "91a4ad2c28375f067adedcaa61f9d66a4b536f4f";
+    sha256 = "0px1ipvhh0hz8n38h6jv4y1nn163j8llvcy4l7p3hkdns5czwy1p";
  };
+  inherit stdenv;
 }
--- a/pkgs/development/compilers/gerbil/default.nix
+++ b/pkgs/development/compilers/gerbil/default.nix
@ -1,4 +1,4 @@
-{ callPackage, fetchurl, gambit }:
+{ stdenv, callPackage, fetchurl, gambit }:

 callPackage ./build.nix {
  version = "0.12-RELEASE";
@ -8,4 +8,5 @@ callPackage ./build.nix {
    url = "https://github.com/vyzo/gerbil/archive/v0.12.tar.gz";
    sha256 = "0nigr3mgrzai57q2jqac8f39zj8rcmic3277ynyzlgm8hhps71pq";
  };
+  inherit stdenv;
 }
--- a/pkgs/development/compilers/gerbil/unstable.nix
+++ b/pkgs/development/compilers/gerbil/unstable.nix
@ -1,12 +1,13 @@
-{ callPackage, fetchgit, gambit-unstable }:
+{ stdenv, callPackage, fetchgit, gambit-unstable }:

 callPackage ./build.nix {
-  version = "unstable-2018-05-12";
-  git-version = "0.13-DEV-437-gaefdb47f";
+  version = "unstable-2018-08-11";
+  git-version = "0.13-DEV-542-g274e1a22";
  GAMBIT = gambit-unstable;
  SRC = fetchgit {
    url = "https://github.com/vyzo/gerbil.git";
-    rev = "aefdb47f3d1ceaa735fd5c3dcaac2aeb0d4d2436";
-    sha256 = "0xhsilm5kix5lsmykv273npp1gk6dgx9axh266mimwh7j0nxf7ms";
+    rev = "274e1a22b2d2b708d5582594274ab52ee9ba1686";
+    sha256 = "10j44ar4xfl8xmh276zg1ykd3r0vy7w2f2cg4p8slwnk9r251g2s";
  };
+  inherit stdenv;
 }
--- a/pkgs/development/compilers/ponyc/pony-stable.nix
+++ b/pkgs/development/compilers/ponyc/pony-stable.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  name = "pony-stable-${version}";
-  version = "0.1.4";
+  version = "0.1.6";

  src = fetchFromGitHub {
    owner = "ponylang";
    repo = "pony-stable";
    rev = version;
-    sha256 = "18ncxdk37r9sp2wnrgqj29nvqljqq9m154pkdv8b6b5k9knpradx";
+    sha256 = "02lqba75psnxcxj2y8lm1fy1hmwa088nvxjghhpnlkqbwz7wa2sw";
  };

  buildInputs = [ ponyc ];
--- a/pkgs/development/compilers/reason/default.nix
+++ b/pkgs/development/compilers/reason/default.nix
@ -3,13 +3,13 @@

 buildOcaml rec {
  name = "reason";
-  version = "3.3.2";
+  version = "3.3.3";

  src = fetchFromGitHub {
    owner = "facebook";
    repo = "reason";
-    rev = "68a4124c772ee25c4729b005c8643851b1e17b92";
-    sha256 = "01v17m94ds98qk727mwpyx0a362zdf9s8x1fh8gp9jd9v3n6bc2d";
+    rev = "fefe5e4db3a54a7946c2220ee037dd2f407011c9";
+    sha256 = "1x0dbacgq9pa36zgzwrc0gm14wbb6v27y9bf7wcwk55a1ck0am18";
  };

  propagatedBuildInputs = [ menhir merlin_extend ppx_tools_versioned ];
--- a/pkgs/development/coq-modules/coq-ext-lib/default.nix
+++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix
@ -4,7 +4,8 @@ let params =
  {
    "8.5" = { version = "0.9.4"; sha256 = "1y66pamgsdxlq2w1338lj626ln70cwj7k53hxcp933g8fdsa4hp0"; };
    "8.6" = { version = "0.9.5"; sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; };
-    "8.7" = { version = "0.9.5"; sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; };
+    "8.7" = { version = "0.9.7"; sha256 = "00v4bm4glv1hy08c8xsm467az6d1ashrznn8p2bmbmmp52lfg7ag"; };
+    "8.8" = { version = "0.9.8"; sha256 = "0z1ix855kdjl7zw5ca664h5njd1x8mmvf5wi37fck4dj9dgamwlz"; };
  };
  param = params."${coq.coq-version}";
 in
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -86,7 +86,7 @@ self: super: {
      name = "git-annex-${super.git-annex.version}-src";
      url = "git://git-annex.branchable.com/";
      rev = "refs/tags/" + super.git-annex.version;
-      sha256 = "1l6xgvn3l0kkly5jvg57msx09bf1jwdff7m61w8yf2pxsrh5ybxl";
+      sha256 = "0a7h21cwfvprj5xfyivjzg2hbs71xp85l9v6kyp58mlqvwy3zffl";
    };
  }).override {
    dbus = if pkgs.stdenv.isLinux then self.dbus else null;
@ -727,7 +727,7 @@ self: super: {
          owner = "haskell-servant";
          repo = "servant";
          rev = "v${ver}";
-          sha256 = "0bwd5dy3crn08dijn06dr3mdsww98kqxfp8v5mvrdws5glvcxdsg";
+          sha256 = "0kqglih3rv12nmkzxvalhfaaafk4b2irvv9x5xmc48i1ns71y23l";
        }}/doc";
        buildInputs = with pkgs.pythonPackages; [ sphinx recommonmark sphinx_rtd_theme ];
        makeFlags = "html";
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
--- a/pkgs/development/interpreters/jimtcl/default.nix
+++ b/pkgs/development/interpreters/jimtcl/default.nix
@ -5,13 +5,13 @@ let

 in stdenv.mkDerivation rec {
  name = "jimtcl-${version}";
-  version = "0.77";
+  version = "0.78";

  src = fetchFromGitHub {
    owner = "msteveb";
    repo = "jimtcl";
    rev = version;
-    sha256 = "06d9gdgvi6cwd6pjg3xig0kkjqm6kgq3am8yq1xnksyz2n09f0kp";
+    sha256 = "1nrjxjfh69i35ig8sxdlal4ydd3cl0x68c05s6svnf1y2i1bl23j";
  };

  buildInputs = [
--- a/pkgs/development/libraries/libinfinity/default.nix
+++ b/pkgs/development/libraries/libinfinity/default.nix
@ -1,16 +1,17 @@
 { gtkWidgets ? false # build GTK widgets for libinfinity
-, daemon ? false # build infinote daemon
-, documentation ? false # build documentation
 , avahiSupport ? false # build support for Avahi in libinfinity
 , stdenv, fetchurl, pkgconfig, glib, libxml2, gnutls, gsasl
-, gtk2 ? null, gtkdoc ? null, avahi ? null, libdaemon ? null, libidn, gss
+, gobjectIntrospection
+, gtk3 ? null, gtk-doc, docbook_xsl, docbook_xml_dtd_412, avahi ? null, libdaemon, libidn, gss
 , libintl }:

+assert avahiSupport -> avahi != null;
+assert gtkWidgets -> gtk3 != null;
+
 let
-  optional = cond: elem: assert cond -> elem != null; if cond then [elem] else [];
-
-in stdenv.mkDerivation rec {
+  mkFlag = flag: feature: (if flag then "--with-" else "--without-") + feature;

+  self = stdenv.mkDerivation rec {
    name = "libinfinity-${version}";
    version = "0.7.1";
    src = fetchurl {
@ -18,26 +19,27 @@ in stdenv.mkDerivation rec {
      sha256 = "1jw2fhrcbpyz99bij07iyhy9ffyqdn87vl8cb1qz897y3f2f0vk2";
    };

-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ glib libxml2 gsasl libidn gss libintl ]
-    ++ optional gtkWidgets gtk2
-    ++ optional documentation gtkdoc
-    ++ optional avahiSupport avahi
-    ++ optional daemon libdaemon;
+    outputs = [ "bin" "out" "dev" "man" "devdoc" ];
+
+    nativeBuildInputs = [ pkgconfig gtk-doc docbook_xsl docbook_xml_dtd_412 gobjectIntrospection ];
+    buildInputs = [ glib libxml2 gsasl libidn gss libintl libdaemon ]
+      ++ stdenv.lib.optional gtkWidgets gtk3
+      ++ stdenv.lib.optional avahiSupport avahi;

    propagatedBuildInputs = [ gnutls ];

    configureFlags = [
-    (stdenv.lib.enableFeature documentation "gtk-doc")
-    (stdenv.lib.withFeature gtkWidgets "inftextgtk")
-    (stdenv.lib.withFeature gtkWidgets "infgtk")
-    (stdenv.lib.withFeature daemon "infinoted")
-    (stdenv.lib.withFeature daemon "libdaemon")
-    (stdenv.lib.withFeature avahiSupport "avahi")
+      "--enable-gtk-doc"
+      "--enable-introspection"
+      (mkFlag gtkWidgets "inftextgtk")
+      (mkFlag gtkWidgets "infgtk")
+      "--with-infinoted"
+      "--with-libdaemon"
+      (mkFlag avahiSupport "avahi")
    ];

    passthru = {
-    inherit version;
+      infinoted = "${self.bin}/bin/infinoted-${stdenv.lib.versions.majorMinor version}";
    };

    meta = {
@ -47,5 +49,5 @@ in stdenv.mkDerivation rec {
      maintainers = [ stdenv.lib.maintainers.phreedom ];
      platforms = with stdenv.lib.platforms; linux ++ darwin;
    };
-
-}
+  };
+in self
--- a/pkgs/development/libraries/openscenegraph/default.nix
+++ b/pkgs/development/libraries/openscenegraph/default.nix
@ -1,33 +1,72 @@
-{ stdenv, lib, fetchurl, cmake, pkgconfig, doxygen, unzip
-, freetype, libjpeg, jasper, libxml2, zlib, gdal, curl, libX11
-, cairo, poppler, librsvg, libpng, libtiff, libXrandr
-, xineLib, boost
-, withApps ? false
-, withSDL ? false, SDL
-, withQt4 ? false, qt4
+{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen,
+  libX11, libXinerama, libXrandr, libGLU_combined,
+  glib, ilmbase, libxml2, pcre, zlib,
+  jpegSupport ? true, libjpeg,
+  jasperSupport ? true, jasper,
+  exrSupport ? false, openexr,
+  gifSupport ? true, giflib,
+  pngSupport ? true, libpng,
+  tiffSupport ? true, libtiff,
+  gdalSupport ? false, gdal,
+  curlSupport ? true, curl,
+  colladaSupport ? false, opencollada,
+  opencascadeSupport ? false, opencascade,
+  ffmpegSupport ? false, ffmpeg,
+  nvttSupport ? false, nvidia-texture-tools,
+  freetypeSupport ? true, freetype,
+  svgSupport ? false, librsvg,
+  pdfSupport ? false, poppler,
+  vncSupport ? false, libvncserver,
+  lasSupport ? false, libLAS,
+  luaSupport ? false, lua,
+  sdlSupport ? false, SDL2,
+  restSupport ? false, asio, boost,
+  withApps ? false,
+  withExamples ? false, fltk, wxGTK,
 }:

 stdenv.mkDerivation rec {
  name = "openscenegraph-${version}";
-  version = "3.4.0";
+  version = "3.6.2";

-  src = fetchurl {
-    url = "http://trac.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-${version}.zip";
-    sha256 = "03h4wfqqk7rf3mpz0sa99gy715cwpala7964z2npd8jxfn27swjw";
+  src = fetchFromGitHub {
+    owner = "openscenegraph";
+    repo = "OpenSceneGraph";
+    rev = "fb40a0d1db018ff39a08699a7f17f7eb6d949c36";
+    sha256 = "03jk6lclyd4biniaw04w7j0z1spkm69f1c19i37b8v9x3zv1p1id";
  };

-  nativeBuildInputs = [ pkgconfig cmake doxygen unzip ];
+  nativeBuildInputs = [ pkgconfig cmake doxygen ];

  buildInputs = [
-    freetype libjpeg jasper libxml2 zlib gdal curl libX11
-    cairo poppler librsvg libpng libtiff libXrandr boost
-    xineLib
-  ] ++ lib.optional withSDL SDL
-    ++ lib.optional withQt4 qt4;
+    libX11 libXinerama libXrandr libGLU_combined
+    glib ilmbase libxml2 pcre zlib
+  ] ++ lib.optional jpegSupport libjpeg
+    ++ lib.optional jasperSupport jasper
+    ++ lib.optional exrSupport openexr
+    ++ lib.optional gifSupport giflib
+    ++ lib.optional pngSupport libpng
+    ++ lib.optional tiffSupport libtiff
+    ++ lib.optional gdalSupport gdal
+    ++ lib.optional curlSupport curl
+    ++ lib.optional colladaSupport opencollada
+    ++ lib.optional opencascadeSupport opencascade
+    ++ lib.optional ffmpegSupport ffmpeg
+    ++ lib.optional nvttSupport nvidia-texture-tools
+    ++ lib.optional freetypeSupport freetype
+    ++ lib.optional svgSupport librsvg
+    ++ lib.optional pdfSupport poppler
+    ++ lib.optional vncSupport libvncserver
+    ++ lib.optional lasSupport libLAS
+    ++ lib.optional luaSupport lua
+    ++ lib.optional sdlSupport SDL2
+    ++ lib.optionals restSupport [ asio boost ]
+    ++ lib.optionals withExamples [ fltk wxGTK ]
+  ;

  enableParallelBuilding = true;

-  cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF";
+  cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF" ++ lib.optional withExamples "-DBUILD_OSG_EXAMPLES=ON";

  meta = with stdenv.lib; {
    description = "A 3D graphics toolkit";
--- a/pkgs/development/node-packages/node-packages-v6.json
+++ b/pkgs/development/node-packages/node-packages-v6.json
@ -105,6 +105,7 @@
 , "svgo"
 , "tern"
 , "titanium"
+, "triton"
 , "typescript"
 , "typings"
 , "uglify-js"
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@ -3154,6 +3154,15 @@ let
        sha1 = "31ab1ac8b129363463e35b3ebb69f4dfcfba7947";
      };
    };
+    "backoff-2.4.1" = {
+      name = "backoff";
+      packageName = "backoff";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/backoff/-/backoff-2.4.1.tgz";
+        sha1 = "2f68c50e0dd789dbefe24200a62efb04d2456d68";
+      };
+    };
    "backoff-2.5.0" = {
      name = "backoff";
      packageName = "backoff";
@ -3469,6 +3478,15 @@ let
        sha512 = "+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==";
      };
    };
+    "bigspinner-3.1.0" = {
+      name = "bigspinner";
+      packageName = "bigspinner";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bigspinner/-/bigspinner-3.1.0.tgz";
+        sha1 = "dd3a862b2fedf66fee8471320069428d0d84427a";
+      };
+    };
    "bin-version-2.0.0" = {
      name = "bin-version";
      packageName = "bin-version";
@ -5629,6 +5647,15 @@ let
        sha1 = "8d21967625b25ee35fca8e8453ccf10fccd04e45";
      };
    };
+    "cmdln-4.1.2" = {
+      name = "cmdln";
+      packageName = "cmdln";
+      version = "4.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cmdln/-/cmdln-4.1.2.tgz";
+        sha1 = "4345bb5498f2b096ba85ec8c5579a8cb252f7c70";
+      };
+    };
    "co-3.1.0" = {
      name = "co";
      packageName = "co";
@ -10356,6 +10383,15 @@ let
        sha1 = "4d58b815ace5bebfc4ebf03cf98b0a7604a99b86";
      };
    };
+    "extsprintf-1.0.2" = {
+      name = "extsprintf";
+      packageName = "extsprintf";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz";
+        sha1 = "e1080e0658e300b06294990cc70e1502235fd550";
+      };
+    };
    "extsprintf-1.2.0" = {
      name = "extsprintf";
      packageName = "extsprintf";
@ -11616,6 +11652,15 @@ let
        sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327";
      };
    };
+    "fuzzyset.js-0.0.1" = {
+      name = "fuzzyset.js";
+      packageName = "fuzzyset.js";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fuzzyset.js/-/fuzzyset.js-0.0.1.tgz";
+        sha1 = "979e22f9451b4b38f051f7937c919dbacc692958";
+      };
+    };
    "fx-runner-1.0.9" = {
      name = "fx-runner";
      packageName = "fx-runner";
@ -11841,6 +11886,15 @@ let
        sha512 = "bOZafIX+19cCS5KUjHtlJPZW+4joMa5tISIk5CugjmlZE0zZtjwB59wm56JPXVy5ELivw7g4Z9TEI0EDa2CSwQ==";
      };
    };
+    "getpass-0.1.6" = {
+      name = "getpass";
+      packageName = "getpass";
+      version = "0.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz";
+        sha1 = "283ffd9fc1256840875311c1b60e8c40187110e6";
+      };
+    };
    "getpass-0.1.7" = {
      name = "getpass";
      packageName = "getpass";
@ -15676,6 +15730,15 @@ let
        sha1 = "cd13466ea2480dbd8396a570d47d31dda476f8b1";
      };
    };
+    "jsprim-1.4.0" = {
+      name = "jsprim";
+      packageName = "jsprim";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz";
+        sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918";
+      };
+    };
    "jsprim-1.4.1" = {
      name = "jsprim";
      packageName = "jsprim";
@ -17216,6 +17279,15 @@ let
        sha1 = "6952722ffa3049a55a5e1c10ee4a0947a3e5e19b";
      };
    };
+    "lomstream-1.1.0" = {
+      name = "lomstream";
+      packageName = "lomstream";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lomstream/-/lomstream-1.1.0.tgz";
+        sha1 = "2a7f8066ec3ab40bef28ca384842e75340183bf0";
+      };
+    };
    "long-2.4.0" = {
      name = "long";
      packageName = "long";
@ -17432,6 +17504,15 @@ let
        sha1 = "2738bd9f0d3cf4f84490c5736c48699ac632cda3";
      };
    };
+    "lstream-0.0.4" = {
+      name = "lstream";
+      packageName = "lstream";
+      version = "0.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lstream/-/lstream-0.0.4.tgz";
+        sha1 = "d637764ea33a929bd00f34d2a23c2256d0d5fb5b";
+      };
+    };
    "ltgt-1.0.2" = {
      name = "ltgt";
      packageName = "ltgt";
@ -18575,6 +18656,15 @@ let
        sha1 = "3bac3f3924a845d147784fc6558dee900b0151e2";
      };
    };
+    "mooremachine-2.2.1" = {
+      name = "mooremachine";
+      packageName = "mooremachine";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mooremachine/-/mooremachine-2.2.1.tgz";
+        sha1 = "0d9891aa7c2cf32ca73e72f52a3561ed787e2e8c";
+      };
+    };
    "morgan-1.6.1" = {
      name = "morgan";
      packageName = "morgan";
@ -20552,6 +20642,15 @@ let
        sha1 = "151af86bfc1f08c4b9f07d06ab250ffcbeb56581";
      };
    };
+    "once-1.3.2" = {
+      name = "once";
+      packageName = "once";
+      version = "1.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/once/-/once-1.3.2.tgz";
+        sha1 = "d8feeca93b039ec1dcdee7741c92bdac5e28081b";
+      };
+    };
    "once-1.3.3" = {
      name = "once";
      packageName = "once";
@ -24324,6 +24423,33 @@ let
        sha1 = "e1e5b7ad9d4f6aeacd20e28f44a045f26c146dbc";
      };
    };
+    "restify-clients-1.5.2" = {
+      name = "restify-clients";
+      packageName = "restify-clients";
+      version = "1.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/restify-clients/-/restify-clients-1.5.2.tgz";
+        sha1 = "d4b13d82f287e77e2eb5daae14e6ef8534aa7389";
+      };
+    };
+    "restify-errors-3.0.0" = {
+      name = "restify-errors";
+      packageName = "restify-errors";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/restify-errors/-/restify-errors-3.0.0.tgz";
+        sha1 = "3b17177d43954acece4291465a97ce1b58cf3d57";
+      };
+    };
+    "restify-errors-3.1.0" = {
+      name = "restify-errors";
+      packageName = "restify-errors";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/restify-errors/-/restify-errors-3.1.0.tgz";
+        sha1 = "06b5479477874c0856d782a12c8707dcdad53f16";
+      };
+    };
    "restore-cursor-1.0.1" = {
      name = "restore-cursor";
      packageName = "restore-cursor";
@ -24432,6 +24558,15 @@ let
        sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
      };
    };
+    "rimraf-2.4.4" = {
+      name = "rimraf";
+      packageName = "rimraf";
+      version = "2.4.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz";
+        sha1 = "b528ce2ebe0e6d89fb03b265de11d61da0dbcf82";
+      };
+    };
    "rimraf-2.4.5" = {
      name = "rimraf";
      packageName = "rimraf";
@ -24864,6 +24999,15 @@ let
        sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a";
      };
    };
+    "semver-5.1.0" = {
+      name = "semver";
+      packageName = "semver";
+      version = "5.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz";
+        sha1 = "85f2cf8550465c4df000cf7d86f6b054106ab9e5";
+      };
+    };
    "semver-5.1.1" = {
      name = "semver";
      packageName = "semver";
@ -25692,6 +25836,15 @@ let
        sha1 = "96568a565e9d9feb03b93a50651eee14d23adf44";
      };
    };
+    "smartdc-auth-2.5.7" = {
+      name = "smartdc-auth";
+      packageName = "smartdc-auth";
+      version = "2.5.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/smartdc-auth/-/smartdc-auth-2.5.7.tgz";
+        sha1 = "42d45710e791deb92df91326c8eed1bd5a842cb6";
+      };
+    };
    "smtp-connection-1.3.8" = {
      name = "smtp-connection";
      packageName = "smtp-connection";
@ -26601,6 +26754,15 @@ let
        sha1 = "512675a28f08f1e581779e1989ab1e13effb49e4";
      };
    };
+    "sshpk-1.14.1" = {
+      name = "sshpk";
+      packageName = "sshpk";
+      version = "1.14.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz";
+        sha1 = "130f5975eddad963f1d56f92b9ac6c51fa9f83eb";
+      };
+    };
    "sshpk-1.14.2" = {
      name = "sshpk";
      packageName = "sshpk";
@ -26628,6 +26790,15 @@ let
        sha1 = "62e143c18530fda103320b3403e8ad42786d9718";
      };
    };
+    "sshpk-agent-1.7.0" = {
+      name = "sshpk-agent";
+      packageName = "sshpk-agent";
+      version = "1.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sshpk-agent/-/sshpk-agent-1.7.0.tgz";
+        sha512 = "zR4GV5XYSypCusFzfTeTSXVqrFJJsK79Ec2KXZdo/x7qxBGSJPPZFtqMcqpXPaJ9VCK7Zn/vI+/kMrqeQILv4w==";
+      };
+    };
    "ssri-5.3.0" = {
      name = "ssri";
      packageName = "ssri";
@ -27330,6 +27501,15 @@ let
        sha1 = "f7fb93758a69a571140181277eea0c2eb1301fa3";
      };
    };
+    "strsplit-1.0.0" = {
+      name = "strsplit";
+      packageName = "strsplit";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strsplit/-/strsplit-1.0.0.tgz";
+        sha1 = "0fdedc68e91addcfcb2e6be9c262581a6e8c28aa";
+      };
+    };
    "subarg-1.0.0" = {
      name = "subarg";
      packageName = "subarg";
@ -27538,6 +27718,15 @@ let
        sha256 = "c824206b33da96cf5c01c21f1b133a0e3568e07ee4dcc9beefa8226864cd0272";
      };
    };
+    "tabula-1.10.0" = {
+      name = "tabula";
+      packageName = "tabula";
+      version = "1.10.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tabula/-/tabula-1.10.0.tgz";
+        sha1 = "2ed67caf8cad091de80e43622850d899713b2f47";
+      };
+    };
    "taffydb-2.6.2" = {
      name = "taffydb";
      packageName = "taffydb";
@ -29851,6 +30040,15 @@ let
        sha1 = "8a6a4ac3a8c774b6f687fece49bdffd78552e2cd";
      };
    };
+    "verror-1.3.6" = {
+      name = "verror";
+      packageName = "verror";
+      version = "1.3.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz";
+        sha1 = "cff5df12946d297d2baaefaa2689e25be01c005c";
+      };
+    };
    "verror-1.6.0" = {
      name = "verror";
      packageName = "verror";
@ -30103,6 +30301,15 @@ let
        sha1 = "3b899a8ef71c37f3054d79bdbdda31c7bf36f20d";
      };
    };
+    "vstream-0.1.0" = {
+      name = "vstream";
+      packageName = "vstream";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vstream/-/vstream-0.1.0.tgz";
+        sha1 = "13587190f34e72ba7a07ebbaa7e70ac147b1fb7d";
+      };
+    };
    "walk-2.3.14" = {
      name = "walk";
      packageName = "walk";
@ -46946,6 +47153,189 @@ in
    production = true;
    bypassCache = false;
  };
+  triton = nodeEnv.buildNodePackage {
+    name = "triton";
+    packageName = "triton";
+    version = "6.1.2";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/triton/-/triton-6.1.2.tgz";
+      sha1 = "1f4376383ea07de8bffbfd00b445719d57a5f474";
+    };
+    dependencies = [
+      sources."asn1-0.2.4"
+      sources."assert-plus-0.2.0"
+      sources."backoff-2.4.1"
+      sources."balanced-match-1.0.0"
+      sources."bcrypt-pbkdf-1.0.2"
+      sources."bigspinner-3.1.0"
+      sources."brace-expansion-1.1.11"
+      sources."bunyan-1.8.12"
+      sources."clone-0.1.5"
+      (sources."cmdln-4.1.2" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+          sources."extsprintf-1.4.0"
+        ];
+      })
+      sources."concat-map-0.0.1"
+      sources."core-util-is-1.0.2"
+      (sources."dashdash-1.14.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."dtrace-provider-0.8.7"
+      sources."ecc-jsbn-0.1.2"
+      sources."extsprintf-1.0.2"
+      sources."fast-safe-stringify-1.2.3"
+      sources."fuzzyset.js-0.0.1"
+      (sources."getpass-0.1.6" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."glob-5.0.15"
+      (sources."http-signature-1.2.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."is-absolute-0.1.7"
+      sources."is-relative-0.1.3"
+      sources."isarray-1.0.0"
+      sources."isexe-1.1.2"
+      sources."jsbn-0.1.1"
+      sources."json-schema-0.2.3"
+      (sources."jsprim-1.4.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+          sources."verror-1.3.6"
+        ];
+      })
+      sources."keep-alive-agent-0.0.1"
+      sources."lodash-4.17.10"
+      (sources."lomstream-1.1.0" // {
+        dependencies = [
+          sources."assert-plus-0.1.5"
+          sources."extsprintf-1.3.0"
+        ];
+      })
+      sources."lru-cache-4.1.3"
+      sources."lstream-0.0.4"
+      sources."mime-1.6.0"
+      sources."minimatch-3.0.4"
+      sources."minimist-0.0.8"
+      sources."mkdirp-0.5.1"
+      sources."moment-2.22.2"
+      sources."mooremachine-2.2.1"
+      sources."mute-stream-0.0.7"
+      sources."mv-2.1.1"
+      sources."nan-2.10.0"
+      sources."ncp-2.0.0"
+      sources."once-1.3.2"
+      sources."path-is-absolute-1.0.1"
+      sources."precond-0.2.3"
+      sources."process-nextick-args-2.0.0"
+      sources."pseudomap-1.0.2"
+      sources."read-1.0.7"
+      sources."readable-stream-2.3.6"
+      (sources."restify-clients-1.5.2" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+          (sources."restify-errors-3.1.0" // {
+            dependencies = [
+              sources."assert-plus-0.2.0"
+              sources."lodash-3.10.1"
+            ];
+          })
+        ];
+      })
+      (sources."restify-errors-3.0.0" // {
+        dependencies = [
+          sources."assert-plus-0.1.5"
+          sources."lodash-3.10.1"
+        ];
+      })
+      sources."rimraf-2.4.4"
+      sources."safe-buffer-5.1.2"
+      sources."safe-json-stringify-1.2.0"
+      sources."safer-buffer-2.1.2"
+      sources."semver-5.1.0"
+      (sources."smartdc-auth-2.5.7" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+          (sources."dashdash-1.10.1" // {
+            dependencies = [
+              sources."assert-plus-0.1.5"
+            ];
+          })
+          sources."extsprintf-1.0.0"
+          sources."json-schema-0.2.2"
+          (sources."jsprim-0.3.0" // {
+            dependencies = [
+              sources."verror-1.3.3"
+            ];
+          })
+          sources."once-1.3.0"
+          sources."vasync-1.4.3"
+          sources."verror-1.1.0"
+        ];
+      })
+      (sources."sshpk-1.14.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."sshpk-agent-1.7.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."string_decoder-1.1.1"
+      sources."strsplit-1.0.0"
+      (sources."tabula-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."tunnel-agent-0.6.0"
+      sources."tweetnacl-0.14.5"
+      sources."util-deprecate-1.0.2"
+      sources."uuid-3.3.2"
+      (sources."vasync-1.6.3" // {
+        dependencies = [
+          sources."extsprintf-1.2.0"
+          sources."verror-1.6.0"
+        ];
+      })
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+          sources."extsprintf-1.4.0"
+        ];
+      })
+      (sources."vstream-0.1.0" // {
+        dependencies = [
+          sources."assert-plus-0.1.5"
+          sources."extsprintf-1.2.0"
+        ];
+      })
+      sources."which-1.2.4"
+      sources."wordwrap-1.0.0"
+      sources."wrappy-1.0.2"
+      sources."yallist-2.1.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Joyent Triton CLI and client (https://www.joyent.com/triton)";
+      homepage = https://github.com/joyent/node-triton;
+      license = "MPL-2.0";
+    };
+    production = true;
+    bypassCache = false;
+  };
  typescript = nodeEnv.buildNodePackage {
    name = "typescript";
    packageName = "typescript";
--- a/pkgs/development/ocaml-modules/wasm/default.nix
+++ b/pkgs/development/ocaml-modules/wasm/default.nix
@ -21,11 +21,16 @@ stdenv.mkDerivation rec {

  createFindlibDestdir = true;

+  postInstall = ''
+    mkdir $out/bin
+    cp -L interpreter/wasm $out/bin
+  '';
+
  meta = {
-    description = "An OCaml library to read and write Web Assembly (wasm) files and manipulate their AST";
+    description = "An executable and OCaml library to run, read and write Web Assembly (wasm) files and manipulate their AST";
    license = stdenv.lib.licenses.asl20;
    maintainers = [ stdenv.lib.maintainers.vbgl ];
-    inherit (src.meta) homepage;
+    homepage = https://github.com/WebAssembly/spec/tree/master/interpreter;
    inherit (ocaml.meta) platforms;
  };
 }
--- a/pkgs/development/python-modules/browser-cookie3/default.nix
+++ b/pkgs/development/python-modules/browser-cookie3/default.nix
@ -0,0 +1,24 @@
+{ lib, fetchPypi, buildPythonPackage, isPy3k, keyring, pbkdf2, pyaes}:
+buildPythonPackage rec {
+  pname = "browser-cookie3";
+  version = "0.6.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "16nghwsrv08gz4iiyxsy5lgg5ljgrwkp471m7xnsvhhpb3axmnsc";
+  };
+
+  disabled = !isPy3k;
+
+  propagatedBuildInputs = [ keyring pbkdf2 pyaes ];
+
+  # No tests implemented
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Loads cookies from your browser into a cookiejar object";
+    maintainers = with maintainers; [ borisbabic ];
+    homepage = https://github.com/borisbabic/browser_cookie3;
+    license = licenses.gpl3;
+  };
+}
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@ -5,7 +5,7 @@
 # Also, don't clean up environment variables.
 , enableNixHacks ? false
 # Apple dependencies
-, libcxx, CoreFoundation, CoreServices, Foundation
+, cctools, clang, libcxx, CoreFoundation, CoreServices, Foundation
 }:

 let
@ -75,7 +75,34 @@ stdenv.mkDerivation rec {
  '';

  postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # Disable Bazel's Xcode toolchain detection which would configure compilers
+    # and linkers from Xcode instead of from PATH
+    export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
+
+    # Framework search paths aren't added by bintools hook
+    # https://github.com/NixOS/nixpkgs/pull/41914
    export NIX_LDFLAGS="$NIX_LDFLAGS -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks"
+
+    # libcxx includes aren't added by libcxx hook
+    # https://github.com/NixOS/nixpkgs/pull/41589
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1"
+
+    # don't use system installed Xcode to run clang, use Nix clang instead
+    sed -i -e "s;/usr/bin/xcrun clang;${clang}/bin/clang $NIX_CFLAGS_COMPILE $NIX_LDFLAGS -framework CoreFoundation;g" \
+      scripts/bootstrap/compile.sh \
+      src/tools/xcode/realpath/BUILD \
+      src/tools/xcode/stdredirect/BUILD \
+      tools/osx/BUILD
+
+    # clang installed from Xcode has a compatibility wrapper that forwards
+    # invocations of gcc to clang, but vanilla clang doesn't
+    sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl
+
+    sed -i -e 's;/usr/bin/libtool;${cctools}/bin/libtool;g' tools/cpp/unix_cc_configure.bzl
+    wrappers=( tools/cpp/osx_cc_wrapper.sh tools/cpp/osx_cc_wrapper.sh.tpl )
+    for wrapper in "''${wrappers[@]}"; do
+      sed -i -e "s,/usr/bin/install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper
+    done
  '' + ''
    find src/main/java/com/google/devtools -type f -print0 | while IFS="" read -r -d "" path; do
      substituteInPlace "$path" \
@ -119,7 +146,7 @@ stdenv.mkDerivation rec {
    makeWrapper
    which
    customBash
-  ] ++ lib.optionals (stdenv.isDarwin) [ libcxx CoreFoundation CoreServices Foundation ];
+  ] ++ lib.optionals (stdenv.isDarwin) [ cctools clang libcxx CoreFoundation CoreServices Foundation ];

  # If TMPDIR is in the unpack dir we run afoul of blaze's infinite symlink
  # detector (see com.google.devtools.build.lib.skyframe.FileFunction).
--- a/pkgs/development/tools/flootty/default.nix
+++ b/pkgs/development/tools/flootty/default.nix
@ -1,22 +1,18 @@
-{ stdenv, python }:
+{ stdenv, python3Packages }:

-let
-  inherit (python.pkgs) buildPythonApplication fetchPypi;
-in
-
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
  pname = "Flootty";
-  version = "3.2.1";
+  version = "3.2.2";

-  src = fetchPypi {
+  src = python3Packages.fetchPypi {
    inherit pname version;
-    sha256 = "0vjwl6g1bwm6jwp9wjla663cm831zf0rc9361mvpn4imdsfz7hxs";
+    sha256 = "0gfl143ly81pmmrcml91yr0ypvwrs5q4s1sfdc0l2qkqpy233ih7";
  };

  meta = with stdenv.lib; {
    description = "A collaborative terminal. In practice, it's similar to a shared screen or tmux session";
    homepage = "https://floobits.com/help/flootty";
    license = licenses.asl20;
-    maintainers = with maintainers; [ sellout ];
+    maintainers = with maintainers; [ sellout enzime ];
  };
 }
--- a/pkgs/development/tools/kubectx/default.nix
+++ b/pkgs/development/tools/kubectx/default.nix
@ -0,0 +1,38 @@
+{ stdenv, lib, fetchFromGitHub, kubectl, makeWrapper }:
+
+with lib;
+
+stdenv.mkDerivation rec {
+  name = "kubectx";
+  version = "0.5.1";
+
+  src = fetchFromGitHub {
+    owner = "ahmetb";
+    repo = "${name}";
+    rev = "v${version}";
+    sha256 = "1bmmaj5fffx4hy55l6x4vl5gr9rp2yhg4vs5b9sya9rjvdkamdx5";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  dontBuild = true;
+  doCheck = false;
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp kubectx $out/bin
+    cp kubens $out/bin
+
+    for f in $out/bin/*; do
+      wrapProgram $f --prefix PATH : ${makeBinPath [ kubectl ]}
+    done
+  '';
+
+  meta = {
+    description = "Fast way to switch between clusters and namespaces in kubectl!";
+    license = licenses.asl20;
+    homepage = https://github.com/ahmetb/kubectx;
+    maintainers = with maintainers; [ periklis ];
+    platforms = with platforms; unix;
+  };
+}
--- a/pkgs/development/tools/parsing/antlr/2.7.7.nix
+++ b/pkgs/development/tools/parsing/antlr/2.7.7.nix
@ -20,6 +20,7 @@ stdenv.mkDerivation {
      walk parse trees.
    '';
    homepage = http://www.antlr.org/;
+    license = licenses.bsd3;
    platforms = platforms.unix;
  };
 }
--- a/pkgs/development/tools/parsing/antlr/3.4.nix
+++ b/pkgs/development/tools/parsing/antlr/3.4.nix
@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
      walk parse trees.
    '';
    homepage = http://www.antlr.org/;
+    license = licenses.bsd3;
    platforms = platforms.linux ++ platforms.darwin;
  };
 }
--- a/pkgs/development/tools/parsing/antlr/3.5.nix
+++ b/pkgs/development/tools/parsing/antlr/3.5.nix
@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
      walk parse trees.
    '';
    homepage = http://www.antlr.org/;
+    license = licenses.bsd3;
    platforms = platforms.linux;
  };
 }
--- a/pkgs/development/tools/parsing/antlr/4.7.nix
+++ b/pkgs/development/tools/parsing/antlr/4.7.nix
@ -28,6 +28,7 @@ let
      meta = with stdenv.lib; {
        description = "C++ target for ANTLR 4";
        homepage = http://www.antlr.org/;
+        license = licenses.bsd3;
        platforms = platforms.unix;
      };
    };
@ -73,6 +74,7 @@ let
        walk parse trees.
      '';
      homepage = http://www.antlr.org/;
+      license = licenses.bsd3;
      platforms = platforms.unix;
    };
  };
--- a/pkgs/games/ivan/default.nix
+++ b/pkgs/games/ivan/default.nix
@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
    homepage = https://attnam.com/;
    license = licenses.gpl2Plus;
    platforms = platforms.linux;
-    maintainers = with maintainers; [nonfreeblob];
+    maintainers = with maintainers; [];
  };
 }
--- a/pkgs/os-specific/linux/kernel/hardened-config.nix
+++ b/pkgs/os-specific/linux/kernel/hardened-config.nix
@ -103,8 +103,8 @@ PAGE_POISONING_ZERO y
 PANIC_ON_OOPS y
 PANIC_TIMEOUT -1

+${optionalString (versionOlder version "4.18") ''
  GCC_PLUGINS y # Enable gcc plugin options
-
  # Gather additional entropy at boot time for systems that may not have appropriate entropy sources.
  GCC_PLUGIN_LATENT_ENTROPY y

@ -114,6 +114,7 @@ ${optionalString (versionAtLeast version "4.11") ''
  ${optionalString (versionAtLeast version "4.14") ''
    GCC_PLUGIN_STRUCTLEAK_BYREF_ALL y # Also cover structs passed by address
  ''}
+''}

 # Disable various dangerous settings
 ACPI_CUSTOM_METHOD n # Allows writing directly to physical memory
@ -121,8 +122,10 @@ PROC_KCORE n # Exposes kernel text image layout
 INET_DIAG n # Has been used for heap based attacks in the past

 # Use -fstack-protector-strong (gcc 4.9+) for best stack canary coverage.
+${optionalString (versionOlder version "4.18") ''
  CC_STACKPROTECTOR_REGULAR n
  CC_STACKPROTECTOR_STRONG y
+''}

 # Enable compile/run-time buffer overflow detection ala glibc's _FORTIFY_SOURCE
 ${optionalString (versionAtLeast version "4.13") ''
--- a/pkgs/os-specific/linux/kernel/linux-4.18.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.18.nix
@ -0,0 +1,18 @@
+{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
+
+with stdenv.lib;
+
+buildLinux (args // rec {
+  version = "4.18";
+
+  # modDirVersion needs to be x.y.z, will automatically add .0 if needed
+  modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
+
+  # branchVersion needs to be x.y
+  extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
+    sha256 = "1wgay4k8wj08fc711j290fvi81x75yib8iaa6r7csc7mkvsbrn0r";
+  };
+} // (args.argsOverride or {}))
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@ -1,12 +1,12 @@
 { stdenv, fetchurl, lua }:

 stdenv.mkDerivation rec {
-  version = "4.0.10";
+  version = "4.0.11";
  name = "redis-${version}";

  src = fetchurl {
    url = "http://download.redis.io/releases/${name}.tar.gz";
-    sha256 = "194cydhv3hf4v95ifvjvsqrs4jn3ffrkg5lvxj5d3y04lwsp9dhx";
+    sha256 = "1fqvxlpaxr80iykyvpf1fia8rxh4zz8paf5nnjncsssqwwxfflzw";
  };

  buildInputs = [ lua ];
--- a/pkgs/servers/search/groonga/default.nix
+++ b/pkgs/servers/search/groonga/default.nix
@ -7,11 +7,11 @@
 stdenv.mkDerivation rec {

  name    = "groonga-${version}";
-  version = "8.0.2";
+  version = "8.0.5";

  src = fetchurl {
    url    = "https://packages.groonga.org/source/groonga/${name}.tar.gz";
-    sha256 = "0bsf4dbgbddij49xg6d6kl9kb1m5ywdyc1w1xz2giisqk1hdwsz4";
+    sha256 = "1w7yygqp089kmiznxrwhvyny8cfdb4lr2pazh4873r8xxb9dyfvn";
  };

  buildInputs = with stdenv.lib;
--- a/pkgs/servers/sql/postgresql/cstore_fdw/default.nix
+++ b/pkgs/servers/sql/postgresql/cstore_fdw/default.nix
@ -2,7 +2,7 @@

 stdenv.mkDerivation rec {
  name = "cstore_fdw-${version}";
-  version = "1.6.0";
+  version = "1.6.1";

  nativeBuildInputs = [ protobufc ];
  buildInputs = [ postgresql ];
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
    owner  = "citusdata";
    repo   = "cstore_fdw";
    rev    = "refs/tags/v${version}";
-    sha256 = "08jbx4hs2r742flilydp0ajjwv8ffnvq82nidh48irrfa4i7n0l0";
+    sha256 = "1cpkpbv4c82l961anzwp74r1jc8f0n5z5cvwy4lyrqg5jr501nd4";
  };

  installPhase = ''
--- a/pkgs/servers/web-apps/shaarli/default.nix
+++ b/pkgs/servers/web-apps/shaarli/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  name = "shaarli-${version}";
-  version = "0.9.7";
+  version = "0.10.0";

  src = fetchurl {
    url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz";
-    sha256 = "191nnk4p6cpbljij1a30mpidqdvcwn1x6ndb4lgkqwbpnh86q57l";
+    sha256 = "0j7i8ifzjg1s9y8nw4j0as0wdns06zdsjgr99137y9rz5w223pp6";
  };

  outputs = [ "out" "doc" ];
--- a/pkgs/shells/powershell/default.nix
+++ b/pkgs/shells/powershell/default.nix
@ -4,8 +4,8 @@
 let platformString = if stdenv.isDarwin then "osx"
                     else if stdenv.isLinux then "linux"
                     else throw "unsupported platform";
-    platformSha = if stdenv.isDarwin then "1ga4p8xmrxa54v2s6i0q1q7lx2idcmp1jwm0g4jxr54fyn5ay3lf"
-                     else if stdenv.isLinux then "1bv1yjk3rm1czibqagmh719m4r1x8j8bmh3nw40x7izm2sx0qg7v"
+    platformSha = if stdenv.isDarwin then "01j92myljgphf68la9q753m5wgfmd0kwlsk441yic7qshcly5xkw"
+                     else if stdenv.isLinux then "0al1mrlz3m5ksnq86mqm0axb8bjdxa05j2p5y9bmcykrgkdwi3vk"
                     else throw "unsupported platform";
    platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH"
                     else if stdenv.isLinux then "LD_LIBRARY_PATH"
@ -14,7 +14,7 @@ let platformString = if stdenv.isDarwin then "osx"
 in
 stdenv.mkDerivation rec {
  name = "powershell-${version}";
-  version = "6.0.3";
+  version = "6.0.4";

  src = fetchzip {
    url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-x64.tar.gz";
--- a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix
+++ b/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, zsh }:

 stdenv.mkDerivation {
  name = "lambda-mod-zsh-theme-unstable-2017-10-08";
@ -10,9 +10,13 @@ stdenv.mkDerivation {
    rev = "61c373c8aa5556d51522290b82ad44e7166bced1";
  };

+  buildInputs = [ zsh ];
+
  installPhase = ''
-    mkdir -p $out/share/themes
-    cp lambda-mod.zsh-theme $out/share/themes
+    chmod +x lambda-mod.zsh-theme # only executable scripts are found by `patchShebangs`
+    patchShebangs .
+
+    install -Dm0644 lambda-mod.zsh-theme $out/share/zsh/themes/lambda-mod.zsh-theme
  '';

  meta = with stdenv.lib; {
--- a/pkgs/shells/zsh/nix-zsh-completions/default.nix
+++ b/pkgs/shells/zsh/nix-zsh-completions/default.nix
@ -15,15 +15,16 @@ stdenv.mkDerivation rec {
  };

  installPhase = ''
-    mkdir -p $out/share/zsh/site-functions
+    mkdir -p $out/share/zsh/{site-functions,plugins/nix}
    cp _* $out/share/zsh/site-functions
+    cp *.zsh $out/share/zsh/plugins/nix
  '';

-  meta = {
+  meta = with stdenv.lib; {
    homepage = https://github.com/spwhitt/nix-zsh-completions;
    description = "ZSH completions for Nix, NixOS, and NixOps";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.spwhitt stdenv.lib.maintainers.olejorgenb stdenv.lib.maintainers.hedning ];
+    license = licenses.bsd3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ spwhitt olejorgenb hedning ma27 ];
  };
 }
--- a/pkgs/tools/admin/ansible/default.nix
+++ b/pkgs/tools/admin/ansible/default.nix
@ -7,6 +7,8 @@ let
    pname = "ansible";
    inherit version;

+    outputs = [ "out" "man" ];
+
    src = fetchurl {
      url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz";
      inherit sha256;
@ -16,6 +18,12 @@ let
      sed -i "s,/usr/,$out," lib/ansible/constants.py
    '';

+    postInstall = ''
+      for m in docs/man/man1/*; do
+        install -vD $m -t $man/share/man/man1
+      done
+    '';
+
    doCheck = false;
    dontStrip = true;
    dontPatchELF = true;
--- a/pkgs/tools/backup/borg/default.nix
+++ b/pkgs/tools/backup/borg/default.nix
@ -2,11 +2,11 @@

 python3Packages.buildPythonApplication rec {
  pname = "borgbackup";
-  version = "1.1.6";
+  version = "1.1.7";

  src = python3Packages.fetchPypi {
    inherit pname version;
-    sha256 = "a1d2e474c85d3ad3d59b3f8209b5549653c88912082ea0159d27a2e80c910930";
+    sha256 = "f7b51a132e9edfbe1cacb4f478b28caf3622d79fffcb369bdae9f92d8c8a7fdc";
  };

  nativeBuildInputs = with python3Packages; [
@ -50,11 +50,22 @@ python3Packages.buildPythonApplication rec {
    cp scripts/shell_completions/zsh/_borg $out/share/zsh/site-functions/
  '';

+  checkInputs = with python3Packages; [
+    pytest
+  ];
+
+  checkPhase = ''
+    HOME=$(mktemp -d) py.test --pyargs borg.testsuite
+  '';
+
+  # 63 failures, needs pytest-benchmark
+  doCheck = false;
+
  meta = with stdenv.lib; {
    description = "A deduplicating backup program (attic fork)";
    homepage = https://www.borgbackup.org;
    license = licenses.bsd3;
    platforms = platforms.unix; # Darwin and FreeBSD mentioned on homepage
-    maintainers = with maintainers; [ flokli ];
+    maintainers = with maintainers; [ flokli dotlambda ];
  };
 }
--- a/pkgs/tools/graphics/pywal/default.nix
+++ b/pkgs/tools/graphics/pywal/default.nix
@ -2,11 +2,11 @@

 python3Packages.buildPythonApplication rec {
  pname = "pywal";
-  version = "2.0.5";
+  version = "3.1.0";

  src = python3Packages.fetchPypi {
    inherit pname version;
-    sha256 = "117f61db013409ee2657aab9230cc5c2cb2b428c17f7fbcf664909122962165e";
+    sha256 = "1i4i9jjnm4f0zhz4nqbb4253517w33bsh5f246n5930hwrr9xn76";
  };

  # necessary for imagemagick to be found during tests
--- a/pkgs/tools/graphics/vips/default.nix
+++ b/pkgs/tools/graphics/vips/default.nix
@ -5,11 +5,11 @@

 stdenv.mkDerivation rec {
  name = "vips-${version}";
-  version = "8.6.4";
+  version = "8.6.5";

  src = fetchurl {
    url = "https://github.com/jcupitt/libvips/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "1x4ai997yfl4155r4k3m5fa5hj3030c4abi5g49kfarbr60a0ca6";
+    sha256 = "1nymm4vzscb68aifin9q742ff64b4k4ddppq1060w8hf6h7ay0l7";
  };

  buildInputs =
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
@ -4,11 +4,11 @@

 stdenv.mkDerivation rec {
  name = "ibus-hangul-${version}";
-  version = "1.5.0";
+  version = "1.5.1";

  src = fetchurl {
    url = "https://github.com/choehwanjin/ibus-hangul/releases/download/${version}/${name}.tar.gz";
-    sha256 = "120p9w7za6hi521hz8q235fkl4i3p1qqr8nqm4a3kxr0pcq40bd2";
+    sha256 = "0gha8dfdf54rx8fv3yfikbgdg6lqq6l883lhg7q68ybvkjx9bwbs";
  };

  buildInputs = [ gtk3 ibus libhangul python3 ];
--- a/pkgs/tools/misc/skim/default.nix
+++ b/pkgs/tools/misc/skim/default.nix
@ -2,13 +2,13 @@

 rustPlatform.buildRustPackage rec {
  name = "skim-${version}";
-  version = "0.5.0";
+  version = "0.5.1";

  src = fetchFromGitHub {
    owner = "lotabout";
    repo = "skim";
    rev = "v${version}";
-    sha256 = "0hk19mqfmrsyx28lb8h1hixivl6zrc8dg3imygk1ppgn66c0zf00";
+    sha256 = "1k7l93kvf5ad07yn69vjfv6znwb9v38d53xa1ij195x4img9f34j";
  };

  outputs = [ "out" "vim" ];
@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
  patchPhase = ''
    sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim
    # fix Cargo.lock version
-    sed -i -e '168s|0.4.0|0.5.0|' Cargo.lock
+    sed -i -e '168s|0.4.0|0.5.1|' Cargo.lock
  '';

  postInstall = ''
--- a/pkgs/tools/networking/siege/default.nix
+++ b/pkgs/tools/networking/siege/default.nix
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
  meta = with stdenv.lib; {
    description = "HTTP load tester";
    maintainers = with maintainers; [ ocharles raskin ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
    license = licenses.gpl2Plus;
  };
 }
--- a/pkgs/tools/package-management/disnix/disnixos/default.nix
+++ b/pkgs/tools/package-management/disnix/disnixos/default.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl, dysnomia, disnix, socat, pkgconfig, getopt }:

 stdenv.mkDerivation {
-  name = "disnixos-0.7";
+  name = "disnixos-0.7.1";
  
  src = fetchurl {
-    url = https://github.com/svanderburg/disnixos/files/1756702/disnixos-0.7.tar.gz;
-    sha256 = "1qf9h3q1r27vg1ry55lj01knq6i0c213f6vlg7wj958mml7fk37b";
+    url = https://github.com/svanderburg/disnixos/files/2281312/disnixos-0.7.1.tar.gz;
+    sha256 = "00d7mcj77lwbj67vnh81bw6k6pg2asimky4zkq32mh8dslnhpnz6";
  };
  
  nativeBuildInputs = [ pkgconfig ];
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@ -9,28 +9,26 @@ let
  };
 in stdenv.mkDerivation rec {
  name = "vault-${version}";
-  version = "0.10.3";
+  version = "0.10.4";

  src = fetchFromGitHub {
    owner = "hashicorp";
    repo = "vault";
    rev = "v${version}";
-    sha256 = "16sndzbfciw4bccxm7sc83y2pma2bgsmc1kqyb2hp0jsdy4rl3k4";
+    sha256 = "1f11arvj7zp8wwkvv3nn7kyga0ci8psdif6djrnzwjksskdgdbx5";
  };

  nativeBuildInputs = [ go gox removeReferencesTo ];

-  buildPhase = ''
+  preBuild = ''
    patchShebangs ./
    substituteInPlace scripts/build.sh --replace 'git rev-parse HEAD' 'echo ${src.rev}'
    sed -i s/'^GIT_DIRTY=.*'/'GIT_DIRTY="+NixOS"'/ scripts/build.sh

-    mkdir -p src/github.com/hashicorp
+    mkdir -p .git/hooks src/github.com/hashicorp
    ln -s $(pwd) src/github.com/hashicorp/vault

-    mkdir -p .git/hooks
-
-    GOPATH=$(pwd) make
+    export GOPATH=$(pwd)
  '';

  installPhase = ''
@ -47,6 +45,6 @@ in stdenv.mkDerivation rec {
    description = "A tool for managing secrets";
    platforms = platforms.linux ++ platforms.darwin;
    license = licenses.mpl20;
-    maintainers = with maintainers; [ rushmorem offline pradeepchhetri ];
+    maintainers = with maintainers; [ rushmorem lnl7 offline pradeepchhetri ];
  };
 }
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -5553,6 +5553,8 @@ with pkgs;

  trickle = callPackage ../tools/networking/trickle {};

+  inherit (nodePackages) triton;
+
  triggerhappy = callPackage ../tools/inputmethods/triggerhappy {};

  trousers = callPackage ../tools/security/trousers { };
@ -6344,10 +6346,10 @@ with pkgs;

  fpc = callPackage ../development/compilers/fpc { };

-  gambit = callPackage ../development/compilers/gambit { };
-  gambit-unstable = callPackage ../development/compilers/gambit/unstable.nix { };
-  gerbil = callPackage ../development/compilers/gerbil { };
-  gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { };
+  gambit = callPackage ../development/compilers/gambit { stdenv = gccStdenv; };
+  gambit-unstable = callPackage ../development/compilers/gambit/unstable.nix { stdenv = gccStdenv; };
+  gerbil = callPackage ../development/compilers/gerbil { stdenv = gccStdenv; };
+  gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { stdenv = gccStdenv; };

  gccFun = callPackage ../development/compilers/gcc/7;
  gcc = gcc7;
@ -7851,6 +7853,7 @@ with pkgs;

  bazel_0_4 = callPackage ../development/tools/build-managers/bazel/0.4.nix { };
  bazel = callPackage ../development/tools/build-managers/bazel {
+    inherit (darwin) cctools;
    inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation;
  };

@ -8314,6 +8317,8 @@ with pkgs;

  kube-aws = callPackage ../development/tools/kube-aws { };

+  kubectx = callPackage ../development/tools/kubectx { };
+
  kustomize = callPackage ../development/tools/kustomize { };

  Literate = callPackage ../development/tools/literate-programming/Literate {};
@ -10509,9 +10514,7 @@ with pkgs;

  libiec61883 = callPackage ../development/libraries/libiec61883 { };

-  libinfinity = callPackage ../development/libraries/libinfinity {
-    inherit (gnome2) gtkdoc;
-  };
+  libinfinity = callPackage ../development/libraries/libinfinity { };

  libinput = callPackage ../development/libraries/libinput {
    graphviz = graphviz-nox;
@ -13874,6 +13877,16 @@ with pkgs;
      ];
  };

+  linux_4_18 = callPackage ../os-specific/linux/kernel/linux-4.18.nix {
+    kernelPatches =
+      [ kernelPatches.bridge_stp_helper
+        # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
+        # when adding a new linux version
+        # kernelPatches.cpu-cgroup-v2."4.11"
+        kernelPatches.modinst_arg_list_too_long
+      ];
+  };
+
  linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
    kernelPatches = [
      kernelPatches.bridge_stp_helper
@ -14067,7 +14080,7 @@ with pkgs;
  linux = linuxPackages.kernel;

  # Update this when adding the newest kernel major version!
-  linuxPackages_latest = linuxPackages_4_17;
+  linuxPackages_latest = linuxPackages_4_18;
  linux_latest = linuxPackages_latest.kernel;

  # Build the kernel modules for the some of the kernels.
@ -14078,6 +14091,7 @@ with pkgs;
  linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9);
  linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14);
  linuxPackages_4_17 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_17);
+  linuxPackages_4_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_18);
  # Don't forget to update linuxPackages_latest!

  # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds.
@ -16521,9 +16535,7 @@ with pkgs;

  gocr = callPackage ../applications/graphics/gocr { };

-  gobby5 = callPackage ../applications/editors/gobby {
-    inherit (gnome2) gtksourceview;
-  };
+  gobby5 = callPackage ../applications/editors/gobby { };

  gphoto2 = callPackage ../applications/misc/gphoto2 { };

@ -16882,6 +16894,10 @@ with pkgs;

  jalv = callPackage ../applications/audio/jalv { };

+  jameica = callPackage ../applications/office/jameica {
+    inherit (darwin.apple_sdk.frameworks) Cocoa;
+  };
+
  jamin = callPackage ../applications/audio/jamin { };

  japa = callPackage ../applications/audio/japa { };
@ -17993,7 +18009,7 @@ with pkgs;

  qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { };

-  qstopmotion = callPackage ../applications/video/qstopmotion { };
+  qstopmotion = libsForQt5.callPackage ../applications/video/qstopmotion { };

  qsynth = libsForQt5.callPackage ../applications/audio/qsynth { };

--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -230,6 +230,8 @@ in {

  breathe = callPackage ../development/python-modules/breathe { };

+  browser-cookie3 = callPackage ../development/python-modules/browser-cookie3 { };
+
  browsermob-proxy = disabledIf isPy3k (callPackage ../development/python-modules/browsermob-proxy {});

  bugseverywhere = callPackage ../applications/version-management/bugseverywhere {};
@ -2450,22 +2452,6 @@ in {

  flit = callPackage ../development/python-modules/flit { };

-  Flootty = buildPythonPackage rec {
-    name = "Flootty-3.2.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/F/Flootty/${name}.tar.gz";
-      sha256 = "14n2q2k388xbmp5rda5ss879bg5cbibk4zzz7c8mrjsmxhgagmmg";
-    };
-
-    meta = with pkgs.stdenv.lib; {
-      description = "Floobits collaborative terminal";
-      homepage = "https://github.com/Floobits/flootty/";
-      maintainers = with maintainers; [ garbas ];
-      license = licenses.asl20;
-    };
-  };
-
  flowlogs_reader = buildPythonPackage rec {
    name = "flowlogs_reader-1.0.0";