From 7f13a3f5b8e8241c97612f74f8603025d1259c4d Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Tue, 4 Jul 2017 13:42:53 +0300
Subject: [PATCH 01/58] maxx: init at 1.0.0

---
 .../services/x11/desktop-managers/default.nix |  2 +-
 .../services/x11/desktop-managers/maxx.nix    | 46 +++++++++++++
 pkgs/desktops/maxx/default.nix                | 65 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 114 insertions(+), 1 deletion(-)
 create mode 100644 nixos/modules/services/x11/desktop-managers/maxx.nix
 create mode 100644 pkgs/desktops/maxx/default.nix

diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index c207aab5de0a..4b57d9641f50 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -19,7 +19,7 @@ in
   # E.g., if Plasma 5 is enabled, it supersedes xterm.
   imports = [
     ./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix
-    ./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix
+    ./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix ./maxx.nix
   ];
 
   options = {
diff --git a/nixos/modules/services/x11/desktop-managers/maxx.nix b/nixos/modules/services/x11/desktop-managers/maxx.nix
new file mode 100644
index 000000000000..258348ee749e
--- /dev/null
+++ b/nixos/modules/services/x11/desktop-managers/maxx.nix
@@ -0,0 +1,46 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  xcfg = config.services.xserver;
+  cfg = xcfg.desktopManager.maxx;
+  deps = [ pkgs.gcc ] ++ cfg.extraPackages;
+in {
+  options.services.xserver.desktopManager.maxx = {
+    enable = mkEnableOption "MaXX desktop environment";
+
+    extraPackages = mkOption {
+      type = with types; listOf package;
+      default = with pkgs; [
+        xorg.xclock
+      ];
+      description = ''
+        Extra packages visible to session.
+      '';
+    };
+  };
+
+  config = mkIf (xcfg.enable && cfg.enable) {
+    environment.systemPackages = [ pkgs.maxx ];
+
+    # there is hardcoded path in binaries
+    system.activationScripts.setup-maxx = ''
+      mkdir -p /opt
+      ln -sfn ${pkgs.maxx}/opt/MaXX /opt
+    '';
+
+    services.xserver.desktopManager.session = [
+    { name = "MaXX";
+      start = ''
+        export PATH="${makeBinPath deps}:$PATH"
+        export GTK_PATH="${pkgs.gtk-engine-murrine}/lib/gtk-2.0:${pkgs.gtk_engines}/lib/gtk-2.0:$GTK_PATH"
+        export GDK_PIXBUF_MODULE_FILE=$(echo ${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/*/loaders.cache)
+
+        exec ${pkgs.maxx}/opt/MaXX/etc/skel/Xsession.dt
+      '';
+    }];
+  };
+
+  meta.maintainers = [ maintainers.gnidorah ];
+}
diff --git a/pkgs/desktops/maxx/default.nix b/pkgs/desktops/maxx/default.nix
new file mode 100644
index 000000000000..95cbd617dc28
--- /dev/null
+++ b/pkgs/desktops/maxx/default.nix
@@ -0,0 +1,65 @@
+{ stdenv, fetchurl
+, libX11, libXext, libXi, libXau, libXrender, libXft, libXmu, libSM, libXcomposite, libXfixes, libXpm
+, libXinerama, libXdamage, libICE, libXtst
+, fontconfig, pango, cairo, glib, libxml2, atk, gtk2, gdk_pixbuf, mesa_noglu, ncurses5
+, bash }:
+
+let
+  version = "Indy-1.0.0";
+
+  deps = [
+    libX11 libXext libXi libXau libXrender libXft libXmu libSM libXcomposite libXfixes libXpm
+    libXinerama libXdamage libICE libXtst
+    stdenv.cc.cc fontconfig pango cairo glib libxml2 atk gtk2 gdk_pixbuf mesa_noglu ncurses5
+  ];
+in stdenv.mkDerivation {
+  name = "MaXX-${version}";
+
+  srcs = [
+    (fetchurl {
+      url = "http://maxxinteractive.com/downloads/${version}/FEDORA/MaXX-${version}-NO-ARCH.tar.gz";
+      sha256 = "004ia6xl8y2hmbq7j98ppgiwffjc62224x9q6w5z17sjibs8xcvx";
+    })
+    (fetchurl {
+      url = "http://maxxinteractive.com/downloads/${version}/FEDORA/MaXX-${version}-x86_64.tar.gz";
+      sha256 = "134z7hinh01w43m6xiqgh939w5w79860g4kzsd911rfcl3z353av";
+    })
+  ];
+
+  buildPhase = ''
+    while IFS= read -r -d $'\0' i; do
+      if isELF "$i"; then
+        patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$i" || true
+        patchelf --set-rpath "${stdenv.lib.makeLibraryPath deps}" "$i"
+      fi
+    done < <(find "." -type f -print0)
+
+    substituteInPlace bin/adminterm \
+      --replace /bin/bash ${bash}/bin/bash
+
+    substituteInPlace share/misc/HOME/initMaXX-Desktop-Home.sh \
+      --replace "cp " "cp --no-preserve=mode "
+  '';
+
+  installPhase = ''
+    maxx=$out/opt/MaXX
+    mkdir -p "$maxx" $out/share
+
+    mv -- ./* "$maxx"
+    ln -s $maxx/share/icons $out/share
+    ln -s $maxx/share/themes $out/share
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A replica of IRIX Interactive Desktop";
+    homepage = http://www.maxxinteractive.com;
+    license = licenses.free;
+    maintainers = [ maintainers.gnidorah ];
+    platforms = ["x86_64-linux"];
+    hydraPlatforms = [];
+    longDescription = ''
+      A clone of IRIX Interactive Desktop made in agreement with SGI. 
+      Provides simple and fast retro desktop environment.
+    '';
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0e27e56d83e6..a492c1ba146c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17574,6 +17574,8 @@ with pkgs;
     callPackage = newScope pkgs.mate;
   });
 
+  maxx = callPackage ../desktops/maxx { };
+
   pantheon = recurseIntoAttrs rec {
     callPackage = newScope pkgs.pantheon;
     pantheon-terminal = callPackage ../desktops/pantheon/apps/pantheon-terminal { };

From 52deb4b46058b10a50af2b6dc04ff01c62f78c35 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Mon, 24 Jul 2017 13:19:45 +0300
Subject: [PATCH 02/58] maxx: 1.0.0 -> 1.1.0

---
 .../services/x11/desktop-managers/maxx.nix        |  2 +-
 pkgs/desktops/maxx/default.nix                    | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/maxx.nix b/nixos/modules/services/x11/desktop-managers/maxx.nix
index 258348ee749e..bceb23c276e3 100644
--- a/nixos/modules/services/x11/desktop-managers/maxx.nix
+++ b/nixos/modules/services/x11/desktop-managers/maxx.nix
@@ -13,7 +13,7 @@ in {
     extraPackages = mkOption {
       type = with types; listOf package;
       default = with pkgs; [
-        xorg.xclock
+        xorg.xclock xsettingsd
       ];
       description = ''
         Extra packages visible to session.
diff --git a/pkgs/desktops/maxx/default.nix b/pkgs/desktops/maxx/default.nix
index 95cbd617dc28..8cceb5a05d3e 100644
--- a/pkgs/desktops/maxx/default.nix
+++ b/pkgs/desktops/maxx/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl
 , libX11, libXext, libXi, libXau, libXrender, libXft, libXmu, libSM, libXcomposite, libXfixes, libXpm
-, libXinerama, libXdamage, libICE, libXtst
-, fontconfig, pango, cairo, glib, libxml2, atk, gtk2, gdk_pixbuf, mesa_noglu, ncurses5
+, libXinerama, libXdamage, libICE, libXtst, libXaw
+, fontconfig, pango, cairo, glib, libxml2, atk, gtk2, gdk_pixbuf, mesa_noglu, ncurses
 , bash }:
 
 let
-  version = "Indy-1.0.0";
+  version = "Indy-1.1.0";
 
   deps = [
     libX11 libXext libXi libXau libXrender libXft libXmu libSM libXcomposite libXfixes libXpm
-    libXinerama libXdamage libICE libXtst
-    stdenv.cc.cc fontconfig pango cairo glib libxml2 atk gtk2 gdk_pixbuf mesa_noglu ncurses5
+    libXinerama libXdamage libICE libXtst libXaw
+    stdenv.cc.cc fontconfig pango cairo glib libxml2 atk gtk2 gdk_pixbuf mesa_noglu ncurses
   ];
 in stdenv.mkDerivation {
   name = "MaXX-${version}";
@@ -18,11 +18,11 @@ in stdenv.mkDerivation {
   srcs = [
     (fetchurl {
       url = "http://maxxinteractive.com/downloads/${version}/FEDORA/MaXX-${version}-NO-ARCH.tar.gz";
-      sha256 = "004ia6xl8y2hmbq7j98ppgiwffjc62224x9q6w5z17sjibs8xcvx";
+      sha256 = "1d23j08wwrrn5cp7csv70pcz9jppcn0xb1894wkp0caaliy7g31y";
     })
     (fetchurl {
       url = "http://maxxinteractive.com/downloads/${version}/FEDORA/MaXX-${version}-x86_64.tar.gz";
-      sha256 = "134z7hinh01w43m6xiqgh939w5w79860g4kzsd911rfcl3z353av";
+      sha256 = "156p2lra184wyvibrihisd7cr1ivqaygsf0zfm26a12gx23b7708";
     })
   ];
 
@@ -47,7 +47,6 @@ in stdenv.mkDerivation {
 
     mv -- ./* "$maxx"
     ln -s $maxx/share/icons $out/share
-    ln -s $maxx/share/themes $out/share
   '';
 
   meta = with stdenv.lib; {

From 69a4836df5f586468755d4897cba02fc40dac24e Mon Sep 17 00:00:00 2001
From: Nadrieril <nadrieril@gmail.com>
Date: Mon, 7 Aug 2017 23:55:43 +0100
Subject: [PATCH 03/58] firefox syncserver service: run as non-root user by
 default

---
 nixos/doc/manual/release-notes/rl-1709.xml    |  8 +++
 .../networking/firefox/sync-server.nix        | 52 +++++++++++++++++--
 2 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index a32f9963d1c5..90d7bd4b550b 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -154,6 +154,14 @@ rmdir /var/lib/ipfs/.ipfs
       variables as parameters.
     </para>
   </listitem>
+  <listitem>
+    <para>
+      <literal>services.firefox.syncserver</literal> now runs by default as a
+      non-root user. To accomodate this change, the default sqlite database
+      location has also been changed. Migration should work automatically.
+      Refer to the description of the options for more details.
+    </para>
+  </listitem>
 </itemizedlist>
 
 <para>Other notable improvements:</para>
diff --git a/nixos/modules/services/networking/firefox/sync-server.nix b/nixos/modules/services/networking/firefox/sync-server.nix
index c1a14931429a..a9f3fd65d76b 100644
--- a/nixos/modules/services/networking/firefox/sync-server.nix
+++ b/nixos/modules/services/networking/firefox/sync-server.nix
@@ -4,6 +4,10 @@ with lib;
 
 let
   cfg = config.services.firefox.syncserver;
+
+  defaultDbLocation = "/var/db/firefox-sync-server/firefox-sync-server.db";
+  defaultSqlUri = "sqlite:///${defaultDbLocation}";
+
   syncServerIni = pkgs.writeText "syncserver.ini" ''
     [DEFAULT]
     overrides = ${cfg.privateConfig}
@@ -25,6 +29,7 @@ let
     backend = tokenserver.verifiers.LocalVerifier
     audiences = ${removeSuffix "/" cfg.publicUrl}
   '';
+
 in
 
 {
@@ -65,6 +70,18 @@ in
         '';
       };
 
+      user = mkOption {
+        type = types.str;
+        default = "syncserver";
+        description = "User account under which syncserver runs.";
+      };
+
+      group = mkOption {
+        type = types.str;
+        default = "syncserver";
+        description = "Group account under which syncserver runs.";
+      };
+
       publicUrl = mkOption {
         type = types.str;
         default = "http://localhost:5000/";
@@ -85,7 +102,7 @@ in
 
       sqlUri = mkOption {
         type = types.str;
-        default = "sqlite:////var/db/firefox-sync-server.db";
+        default = defaultSqlUri;
         example = "postgresql://scott:tiger@localhost/test";
         description = ''
           The location of the database. This URL is composed of
@@ -126,16 +143,45 @@ in
       description = "Firefox Sync Server";
       wantedBy = [ "multi-user.target" ];
       path = [ pkgs.coreutils syncServerEnv ];
+
+      serviceConfig = {
+        User = cfg.user;
+        Group = cfg.group;
+        PermissionsStartOnly = true;
+      };
+
       preStart = ''
         if ! test -e ${cfg.privateConfig}; then
-          umask u=rwx,g=x,o=x
-          mkdir -p $(dirname ${cfg.privateConfig})
+          mkdir -m 700 -p $(dirname ${cfg.privateConfig})
           echo  > ${cfg.privateConfig} '[syncserver]'
           echo >> ${cfg.privateConfig} "secret = $(head -c 20 /dev/urandom | sha1sum | tr -d ' -')"
         fi
+        chown ${cfg.user}:${cfg.group} ${cfg.privateConfig}
+      '' + optionalString (cfg.sqlUri == defaultSqlUri) ''
+        if ! test -e $(dirname ${defaultDbLocation}); then
+          mkdir -m 700 -p $(dirname ${defaultDbLocation})
+          chown ${cfg.user}:${cfg.group} $(dirname ${defaultDbLocation})
+        fi
+        # Move previous database file if it exists
+        oldDb="/var/db/firefox-sync-server.db"
+        if test -f $oldDb; then
+          mv $oldDb ${defaultDbLocation}
+          chown ${cfg.user}:${cfg.group} ${defaultDbLocation}
+        fi
       '';
       serviceConfig.ExecStart = "${syncServerEnv}/bin/paster serve ${syncServerIni}";
     };
 
+    users.extraUsers = optionalAttrs (cfg.user == "syncserver")
+      (singleton {
+        name = "syncserver";
+        group = cfg.group;
+        isSystemUser = true;
+      });
+
+    users.extraGroups = optionalAttrs (cfg.group == "syncserver")
+      (singleton {
+        name = "syncserver";
+      });
   };
 }

From b73ae0a695f3fec59d4d0c4613496e40e3c795c4 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Mon, 14 Aug 2017 11:13:49 +0300
Subject: [PATCH 04/58] maxx: move deps from module to package

---
 .../services/x11/desktop-managers/maxx.nix        | 15 ---------------
 pkgs/desktops/maxx/default.nix                    | 12 ++++++++++--
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/maxx.nix b/nixos/modules/services/x11/desktop-managers/maxx.nix
index bceb23c276e3..6a698658bdd6 100644
--- a/nixos/modules/services/x11/desktop-managers/maxx.nix
+++ b/nixos/modules/services/x11/desktop-managers/maxx.nix
@@ -5,20 +5,9 @@ with lib;
 let
   xcfg = config.services.xserver;
   cfg = xcfg.desktopManager.maxx;
-  deps = [ pkgs.gcc ] ++ cfg.extraPackages;
 in {
   options.services.xserver.desktopManager.maxx = {
     enable = mkEnableOption "MaXX desktop environment";
-
-    extraPackages = mkOption {
-      type = with types; listOf package;
-      default = with pkgs; [
-        xorg.xclock xsettingsd
-      ];
-      description = ''
-        Extra packages visible to session.
-      '';
-    };
   };
 
   config = mkIf (xcfg.enable && cfg.enable) {
@@ -33,10 +22,6 @@ in {
     services.xserver.desktopManager.session = [
     { name = "MaXX";
       start = ''
-        export PATH="${makeBinPath deps}:$PATH"
-        export GTK_PATH="${pkgs.gtk-engine-murrine}/lib/gtk-2.0:${pkgs.gtk_engines}/lib/gtk-2.0:$GTK_PATH"
-        export GDK_PIXBUF_MODULE_FILE=$(echo ${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/*/loaders.cache)
-
         exec ${pkgs.maxx}/opt/MaXX/etc/skel/Xsession.dt
       '';
     }];
diff --git a/pkgs/desktops/maxx/default.nix b/pkgs/desktops/maxx/default.nix
index 8cceb5a05d3e..5bcc6e841521 100644
--- a/pkgs/desktops/maxx/default.nix
+++ b/pkgs/desktops/maxx/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, makeWrapper
 , libX11, libXext, libXi, libXau, libXrender, libXft, libXmu, libSM, libXcomposite, libXfixes, libXpm
 , libXinerama, libXdamage, libICE, libXtst, libXaw
 , fontconfig, pango, cairo, glib, libxml2, atk, gtk2, gdk_pixbuf, mesa_noglu, ncurses
-, bash }:
+, gcc, xclock, xsettingsd, bash, gtk-engine-murrine, gtk_engines, librsvg }:
 
 let
   version = "Indy-1.1.0";
@@ -26,6 +26,8 @@ in stdenv.mkDerivation {
     })
   ];
 
+  buildInputs = [ makeWrapper ];
+
   buildPhase = ''
     while IFS= read -r -d $'\0' i; do
       if isELF "$i"; then
@@ -47,8 +49,14 @@ in stdenv.mkDerivation {
 
     mv -- ./* "$maxx"
     ln -s $maxx/share/icons $out/share
+
+    wrapProgram $maxx/etc/skel/Xsession.dt \
+      --prefix GTK_PATH : "${gtk-engine-murrine}/lib/gtk-2.0:${gtk_engines}/lib/gtk-2.0" \
+      --prefix GDK_PIXBUF_MODULE_FILE : "$(echo ${librsvg.out}/lib/gdk-pixbuf-2.0/*/loaders.cache)"
   '';
 
+  propagatedUserEnvPkgs = [ gcc xclock xsettingsd ];
+
   meta = with stdenv.lib; {
     description = "A replica of IRIX Interactive Desktop";
     homepage = http://www.maxxinteractive.com;

From de575055be7b960459d065076b5d782b7f070323 Mon Sep 17 00:00:00 2001
From: Albert Peschar <albert@peschar.net>
Date: Tue, 15 Aug 2017 10:02:16 +0200
Subject: [PATCH 05/58] twisted: update to 17.5.0

---
 pkgs/development/python-modules/twisted/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix
index 6898863e8afc..66a6022802fb 100644
--- a/pkgs/development/python-modules/twisted/default.nix
+++ b/pkgs/development/python-modules/twisted/default.nix
@@ -1,17 +1,17 @@
 { stdenv, buildPythonPackage, fetchurl, python,
-  zope_interface, incremental, automat, constantly
+  zope_interface, incremental, automat, constantly, hyperlink
 }:
 buildPythonPackage rec {
   pname = "Twisted";
   name = "${pname}-${version}";
-  version = "17.1.0";
+  version = "17.5.0";
 
   src = fetchurl {
     url = "mirror://pypi/T/Twisted/${name}.tar.bz2";
-    sha256 = "1p245mg15hkxp7hy5cyq2fgvlgjkb4cg0gwkwd148nzy1bbi3wnv";
+    sha256 = "1sh2h23nnizcdyrl2rn7zxijglikxwz7z7grqpvq496zy2aa967i";
   };
 
-  propagatedBuildInputs = [ zope_interface incremental automat constantly ];
+  propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink ];
 
   # Patch t.p._inotify to point to libc. Without this,
   # twisted.python.runtime.platform.supportsINotify() == False

From 0b74f6f16ee6530dc7e0ec8fcf93c5ae1da89315 Mon Sep 17 00:00:00 2001
From: Tobias Happ <tobias.happ@gmx.de>
Date: Tue, 22 Aug 2017 23:31:38 +0200
Subject: [PATCH 06/58] libcouchbase: 2.7.2 -> 2.7.6

---
 pkgs/development/libraries/libcouchbase/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix
index 5f39e2f49714..2fccee0160b3 100644
--- a/pkgs/development/libraries/libcouchbase/default.nix
+++ b/pkgs/development/libraries/libcouchbase/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libcouchbase-${version}";
-  version = "2.7.2";
+  version = "2.7.6";
 
   src = fetchFromGitHub {
     owner = "couchbase";
-    repo ="libcouchbase";
+    repo = "libcouchbase";
     rev = version;
-    sha256 = "1182r9z3cykkgx1vn36l0a50wvh5mr3yj89x0ynyjhfi3iwalrar";
+    sha256 = "13g7r0mcmrj37mihj6g1x1ckpaps659c4qwnw3ixrg7p5mb3p41f";
   };
 
   cmakeFlags = "-DLCB_NO_MOCK=ON";

From 5bd10ff39b4e6d5742b643e08892d06cfb44f375 Mon Sep 17 00:00:00 2001
From: Andrea Scarpino <me@andreascarpino.it>
Date: Wed, 23 Aug 2017 01:11:48 +0200
Subject: [PATCH 07/58] qoauth: 1.0.1 -> 2.0.0

---
 pkgs/development/libraries/qoauth/default.nix | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/qoauth/default.nix b/pkgs/development/libraries/qoauth/default.nix
index 48a63e412343..fa998b9e1984 100644
--- a/pkgs/development/libraries/qoauth/default.nix
+++ b/pkgs/development/libraries/qoauth/default.nix
@@ -1,25 +1,25 @@
-{ stdenv, fetchurl, qt4, qca2, qmake4Hook }:
+{ stdenv, fetchurl, qt5, qca2-qt5 }:
 
 stdenv.mkDerivation {
-  name = "qoauth-1.0.1";
+  name = "qoauth-2.0.0";
 
   src = fetchurl {
-    url = https://github.com/ayoy/qoauth/tarball/v1.0.1;
-    name = "qoauth-1.0.1.tar.gz";
-    sha256 = "1ax0g4dd49a3a1699ams13bkhz690xfwqg8rxp1capbdpf2aa8cp";
+    url = https://github.com/ayoy/qoauth/archive/v2.0.0.tar.gz;
+    name = "qoauth-2.0.0.tar.gz";
+    sha256 = "a28005986410d333e03d077679cdf6c504ec5a33342867dc0f9fb0b74285e333";
   };
 
   patchPhase = "sed -e 's/lib64/lib/g' -i src/src.pro";
 
-  buildInputs = [ qt4 qca2 ];
-  nativeBuildInputs = [ qmake4Hook ];
+  buildInputs = [ qt5.qtbase qca2-qt5 ];
+  nativeBuildInputs = [ qt5.qmake ];
 
-  NIX_CFLAGS_COMPILE = [ "-I${qca2}/include/QtCrypto" ];
-  NIX_LDFLAGS = [ "-lqca" ];
+  NIX_CFLAGS_COMPILE = [ "-I${qca2-qt5}/include/Qca-qt5/QtCrypto" ];
+  NIX_LDFLAGS = [ "-lqca-qt5" ];
 
   meta = {
     description = "Qt library for OAuth authentication";
-    inherit (qt4.meta) platforms;
+    inherit (qt5.qtbase.meta) platforms;
     maintainers = [ ];
   };
 }

From 8b4fec00e09d36fedbadcd28d84320c7c0d186f1 Mon Sep 17 00:00:00 2001
From: Alex Brandt <alunduil@alunduil.com>
Date: Tue, 22 Aug 2017 18:31:08 -0500
Subject: [PATCH 08/58] add alunduil as collection-json maintainer

---
 lib/maintainers.nix                                             | 1 +
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index d904c5368bf4..8bb7072ddcdb 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -33,6 +33,7 @@
   algorith = "Dries Van Daele <dries_van_daele@telenet.be>";
   alibabzo = "Alistair Bill <alistair.bill@gmail.com>";
   all = "Nix Committers <nix-commits@lists.science.uu.nl>";
+  alunduil = "Alex Brandt <alunduil@alunduil.com>";
   ambrop72 = "Ambroz Bizjak <ambrop7@gmail.com>";
   amiddelk = "Arie Middelkoop <amiddelk@gmail.com>";
   amiloradovsky = "Andrew Miloradovsky <miloradovsky@gmail.com>";
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 700219d843e6..31cbbd6db976 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2594,6 +2594,8 @@ package-maintainers:
   abbradar:
     - Agda
     - lambdabot
+  alunduil:
+    - collection-json
 
 dont-distribute-packages:
   # hard restrictions that really belong into meta.platforms

From 0cf68303091d727937cf8ef141087809c4da44a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Wed, 23 Aug 2017 12:17:32 +0200
Subject: [PATCH 09/58] LXQT-config: Adds patch for Cmake >3.8

---
 pkgs/desktops/lxqt/core/lxqt-config/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/lxqt/core/lxqt-config/default.nix b/pkgs/desktops/lxqt/core/lxqt-config/default.nix
index 7b38d2eec6fd..20e785ec5fda 100644
--- a/pkgs/desktops/lxqt/core/lxqt-config/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-config/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, standardPatch, qtbase, qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, libqtxdg, libpthreadstubs, xorg }:
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, lxqt-build-tools, standardPatch, qtbase, qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, libqtxdg, libpthreadstubs, xorg }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
@@ -45,4 +45,13 @@ stdenv.mkDerivation rec {
     platforms = with platforms; unix;
     maintainers = with maintainers; [ romildo ];
   };
+
+  patches = [
+    # Fixes a FTBFS with CMake v3.8
+    (fetchpatch {
+       url = https://github.com/lxde/lxqt-config/commit/bca652a75f8a497a69b1fbc1c7eaa353f6b4eef8.patch;
+       sha256 = "17k26xj97ks9gvcjhiwc5y39fciria4xyxrzcz67zj0flqm3cmrf";
+     })
+  ];
+
 }

From d89ca3d65bc3a02307e7d3052bc2f1e52be2fd1f Mon Sep 17 00:00:00 2001
From: Glenn Searby <glenn.searby@gmail.com>
Date: Wed, 23 Aug 2017 14:31:04 +0100
Subject: [PATCH 10/58] Python linode-api: 4.1.1b2 -> 4.1.2b0

This change is needed as the web API which this Python client depends on
has changed and broken basic functionality.
---
 pkgs/development/python-modules/linode-api/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix
index a89596828f6a..45c33f94b28a 100644
--- a/pkgs/development/python-modules/linode-api/default.nix
+++ b/pkgs/development/python-modules/linode-api/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "linode-api";
-  version = "4.1.1b2"; # NOTE: this is a beta, and the API may change in future versions.
+  version = "4.1.2b0"; # NOTE: this is a beta, and the API may change in future versions.
   name = "${pname}-${version}";
 
   disabled = (pythonOlder "2.7");
@@ -26,7 +26,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1lfqsll3wv1wzn98ymmcbw0yawj8ab3mxniws6kaxf99jd4a0xp4";
+    sha256 = "19yzyb4sbxib8yxmrqm6d8i0fm8cims56q7kiq2ana26nbcm0gr4";
   };
 
   meta = {

From 0df187a17ae5a1c337e12057f719b0f85c965c68 Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Wed, 23 Aug 2017 17:49:40 -0700
Subject: [PATCH 11/58] electron: 1.6.6 -> 1.7.5

---
 pkgs/development/tools/electron/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index fc2651b91574..74884e6f5a8a 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv }:
 
 let
-  version = "1.6.6";
+  version = "1.7.5";
   name = "electron-${version}";
 
   meta = with stdenv.lib; {
@@ -17,7 +17,7 @@ let
 
     src = fetchurl {
       url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";
-      sha256 = "1k6y1wcsb2z9h8wdj5f1z1fprvc3bvsj4rfx58if7q74qiq3q102";
+      sha256 = "1z1dzk6d2mfyms8lj8g6jn76m52izbd1d7c05k8h88m1syfsgav5";
       name = "${name}.zip";
     };
 
@@ -45,7 +45,7 @@ let
 
     src = fetchurl {
       url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip";
-      sha256 = "1hp42iy32lymh9d5zp4vr51qjrr83wjxmbws0c16yw7zchq7fr64";
+      sha256 = "1d3c3y5j99wbyxlzk1nkry0m1xgxy3mi4a6irvlgyxl729dnwi97";
       name = "${name}.zip";
     };
 

From d4ccf3f1b2af6c7666de2f313588652ac171e942 Mon Sep 17 00:00:00 2001
From: John Mercier <moaxcp@gmail.com>
Date: Mon, 21 Aug 2017 06:25:21 -0400
Subject: [PATCH 12/58] visualvm: 1.3.8 -> 1.3.9

---
 .../tools/java/visualvm/default.nix           | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix
index 29d2f13ca9a8..a71ee53dced9 100644
--- a/pkgs/development/tools/java/visualvm/default.nix
+++ b/pkgs/development/tools/java/visualvm/default.nix
@@ -1,23 +1,36 @@
-{ stdenv, fetchzip, lib, makeWrapper, jdk, gtk2 }:
+{ stdenv, fetchzip, lib, makeWrapper, jdk, gtk2, gawk }:
 
 stdenv.mkDerivation rec {
-  name = "visualvm-1.3.8";
+  name = "visualvm-1.3.9";
 
   src = fetchzip {
-    url = "https://java.net/projects/visualvm/downloads/download/release138/visualvm_138.zip";
-    sha256 = "09wsi85z1g7bwyfhb37vw0gy3wl0j1cy35aj59rg7067q262gy1y";
+    url = "https://github.com/visualvm/visualvm.src/releases/download/1.3.9/visualvm_139.zip";
+    sha256 = "1gkdkxssh51jczhgv680i42jjrlia1vbpcqhxvf45xcq9xj95bm5";
   };
 
   nativeBuildInputs = [ makeWrapper ];
 
   installPhase = ''
     rm bin/visualvm.exe
+    rm platform/lib/nbexec64.exe
+    rm platform/lib/nbexec.exe
+    rm profiler/lib/deployed/jdk15/windows-amd64/profilerinterface.dll
+    rm profiler/lib/deployed/jdk15/windows/profilerinterface.dll
+    rm profiler/lib/deployed/jdk16/windows-amd64/profilerinterface.dll
+    rm profiler/lib/deployed/jdk16/windows/profilerinterface.dll
+    rm platform/modules/lib/amd64/jnidispatch-410.dll
+    rm platform/modules/lib/x86/jnidispatch-410.dll
+    rm platform/lib/nbexec.dll
+    rm platform/lib/nbexec64.dll
 
     substituteInPlace etc/visualvm.conf \
       --replace "#visualvm_jdkhome=" "visualvm_jdkhome=" \
       --replace "/path/to/jdk" "${jdk.home}" \
       --replace 'visualvm_default_options="' 'visualvm_default_options="--laf com.sun.java.swing.plaf.gtk.GTKLookAndFeel -J-Dawt.useSystemAAFontSettings=lcd -J-Dswing.aatext=true '
 
+    substituteInPlace platform/lib/nbexec \
+      --replace /usr/bin/\''${awk} ${gawk}/bin/awk
+
     cp -r . $out
 
     # To get the native LAF, JVM needs to see GTK’s .so-s.

From f1711c8fbd3886ba331073b99c93aaa135274d63 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Thu, 24 Aug 2017 09:33:28 +0300
Subject: [PATCH 13/58] openjk: init at 2017-08-11

---
 pkgs/games/openjk/default.nix   | 38 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/games/openjk/default.nix

diff --git a/pkgs/games/openjk/default.nix b/pkgs/games/openjk/default.nix
new file mode 100644
index 000000000000..dc6d3595416b
--- /dev/null
+++ b/pkgs/games/openjk/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, makeWrapper, cmake, libjpeg, zlib, libpng, mesa_noglu, SDL2 }:
+
+stdenv.mkDerivation rec {
+  name = "OpenJK-2017-08-11";
+
+  src = fetchFromGitHub {
+    owner = "JACoders";
+    repo = "OpenJK";
+    rev = "a0828f06e0181c62e110f2f78d30acb5036b4113";
+    sha256 = "1wbb643z2nyhyirzzy3rz03wjqglwmsgnj7w5cl8167f9f9j9w0m";
+  };
+
+  dontAddPrefix = true;
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [ makeWrapper cmake ];
+  buildInputs = [ libjpeg zlib libpng mesa_noglu SDL2 ];
+
+  preConfigure = ''
+    cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$out/opt")
+  '';
+
+  postInstall = ''
+    mkdir -p $out/bin
+    prefix=$out/opt/JediAcademy
+    makeWrapper $prefix/openjk.* $out/bin/jamp --run "cd $prefix"
+    makeWrapper $prefix/openjk_sp.* $out/bin/jasp --run "cd $prefix"
+    makeWrapper $prefix/openjkded.* $out/bin/openjkded --run "cd $prefix"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "An open-source engine for Star Wars Jedi Academy game";
+    homepage = https://github.com/JACoders/OpenJK;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ gnidorah ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8461b882995..6edb8a6ff704 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17388,6 +17388,8 @@ with pkgs;
 
   openclonk = callPackage ../games/openclonk { };
 
+  openjk = callPackage ../games/openjk { };
+
   openmw = callPackage ../games/openmw { };
 
   openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix {

From 2131b0925a48e7ba47861104a45d13d41cd8cf53 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Thu, 24 Aug 2017 17:10:56 +0700
Subject: [PATCH 14/58] luaPackages.luacheck : init at 0.20.0

---
 pkgs/top-level/lua-packages.nix | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index f33b397958ca..91efa306ce4e 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -71,6 +71,32 @@ let
     };
   };
 
+  luacheck = buildLuaPackage rec {
+    pname = "luacheck";
+    version = "0.20.0";
+    name = "${pname}${version}";
+
+    src = fetchFromGitHub {
+      owner = "mpeterv";
+      repo = "luacheck";
+      rev = "${version}";
+      sha256 = "0ahfkmqcjhlb7r99bswy1sly6d7p4pyw5f4x4fxnxzjhbq0c5qcs";
+    };
+
+    propagatedBuildInputs = [ lua ];
+
+    installPhase = ''
+      ${lua}/bin/lua install.lua $out
+      '';
+
+    meta = with stdenv.lib; {
+      description = "A tool for linting and static analysis of Lua code";
+      homepage = https://github.com/mpeterv/luacheck;
+      license = licenses.mit;
+      platforms = platforms.unix;
+    };
+  };
+
   luaevent = buildLuaPackage rec {
     version = "0.4.3";
     name = "luaevent-${version}";

From be8e1b99176b384e7576369060be88432bb18ede Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Thu, 24 Aug 2017 14:35:26 +0200
Subject: [PATCH 15/58] copyq: 2.9.0 -> 3.0.3

- Updated to use qt5
- Added a required cmake patch (like this one for kdenlive
  https://github.com/NixOS/nixpkgs/issues/26160)
- Optional, by default true, dependency on qtwebkit
---
 .../misc/copyq/cmake-modules.patch             | 12 ++++++++++++
 pkgs/applications/misc/copyq/default.nix       | 18 +++++++++++++-----
 2 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/applications/misc/copyq/cmake-modules.patch

diff --git a/pkgs/applications/misc/copyq/cmake-modules.patch b/pkgs/applications/misc/copyq/cmake-modules.patch
new file mode 100644
index 000000000000..f21105763de9
--- /dev/null
+++ b/pkgs/applications/misc/copyq/cmake-modules.patch
@@ -0,0 +1,12 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index d910299e..69888477 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -99,6 +99,7 @@ endif()
+ 
+ # Qt modules
+ if (WITH_QT5)
++    find_package(Qt5 REQUIRED COMPONENTS Network Svg Xml Script)
+     qt5_use_modules(copyq Widgets Network Svg Xml Script ${copyq_Qt5_Modules})
+ else()
+     set(QT_USE_QTNETWORK TRUE)
diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix
index 7461f6853f47..4fd30c547b5c 100644
--- a/pkgs/applications/misc/copyq/default.nix
+++ b/pkgs/applications/misc/copyq/default.nix
@@ -1,19 +1,27 @@
-{ stdenv, fetchFromGitHub, cmake, qt4, libXfixes, libXtst}:
+{ stdenv, fetchFromGitHub, cmake, qt5, libXfixes, libXtst, git
+, webkitSupport ? true
+}:
 
 stdenv.mkDerivation rec {
   name = "CopyQ-${version}";
-  version = "2.9.0";
+  version = "3.0.3";
 
   src  = fetchFromGitHub {
     owner = "hluk";
     repo = "CopyQ";
     rev = "v${version}";
-    sha256 = "1gnqsfh50w3qcnbghkpjr5qs42fgl6643lmg4mg4wam8a852s64f";
+    sha256 = "0wpxqrg4mn8xjsrwsmlhh731s2kr6afnzpqif1way0gi7fqr73jl";
   };
 
+  patches = [
+    ./cmake-modules.patch
+  ];
+
   nativeBuildInputs = [ cmake ];
-  
-  buildInputs = [ qt4 libXfixes libXtst ];
+
+  buildInputs = [
+    git qt5.full libXfixes libXtst
+  ] ++ stdenv.lib.optional webkitSupport qt5.qtwebkit;
 
   meta = with stdenv.lib; {
     homepage    = https://hluk.github.io/CopyQ;

From 2bd21c7bb559c410c785b729f8c9a1016ec276ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20J=C3=B8rgen=20Br=C3=B8nner?= <olejorgenb@yahoo.no>
Date: Thu, 24 Aug 2017 17:04:15 +0200
Subject: [PATCH 16/58] automatically removed whitespace as per .editorconfig

---
 pkgs/top-level/python-packages.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2c52732be98f..56f915f372d5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5460,7 +5460,7 @@ in {
   };
 
   easydict = callPackage ../development/python-modules/easydict { };
-  
+
   EasyProcess = buildPythonPackage rec {
     name = "EasyProcess-0.2.3";
 
@@ -7289,17 +7289,17 @@ in {
   logfury = buildPythonPackage rec {
     name = "logfury-${version}";
     version = "0.1.2";
-  
+
     src = pkgs.fetchurl {
       url = "mirror://pypi/l/logfury/${name}.tar.gz";
       sha256 = "1lywirv3d1lw691mc4mfpz7ak6r49klri43bbfgdnvsfppxminj2";
     };
-  
+
     buildInputs =
       [ self.funcsigs
         self.six
       ];
-  
+
     meta = with pkgs.stdenv.lib; {
       description = "Logfury is for python library maintainers. It allows for responsible, low-boilerplate logging of method calls.";
       homepage = "https://github.com/ppolewicz/logfury";
@@ -28755,17 +28755,17 @@ EOF
 
   cymem = callPackage ../development/python-modules/cymem { };
 
-  ftfy = callPackage ../development/python-modules/ftfy { };    
+  ftfy = callPackage ../development/python-modules/ftfy { };
 
-  murmurhash = callPackage ../development/python-modules/murmurhash { };      
+  murmurhash = callPackage ../development/python-modules/murmurhash { };
+
+  plac = callPackage ../development/python-modules/plac { };
 
-  plac = callPackage ../development/python-modules/plac { };        
-  
   preshed = callPackage ../development/python-modules/preshed { };
 
-  thinc = callPackage ../development/python-modules/thinc { };  
+  thinc = callPackage ../development/python-modules/thinc { };
 
-  spacy = callPackage ../development/python-modules/spacy { };  
+  spacy = callPackage ../development/python-modules/spacy { };
 });
 
 in fix' (extends overrides packages)

From 15ae2cbeea340093d82ce6e935de9f8160e9d855 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Thu, 24 Aug 2017 19:34:08 +0300
Subject: [PATCH 17/58] maxx: use libredirect

---
 .../services/x11/desktop-managers/maxx.nix    |  6 --
 pkgs/desktops/maxx/default.nix                | 58 +++++++++++++------
 2 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/maxx.nix b/nixos/modules/services/x11/desktop-managers/maxx.nix
index 6a698658bdd6..d7bd2fc5eb0c 100644
--- a/nixos/modules/services/x11/desktop-managers/maxx.nix
+++ b/nixos/modules/services/x11/desktop-managers/maxx.nix
@@ -13,12 +13,6 @@ in {
   config = mkIf (xcfg.enable && cfg.enable) {
     environment.systemPackages = [ pkgs.maxx ];
 
-    # there is hardcoded path in binaries
-    system.activationScripts.setup-maxx = ''
-      mkdir -p /opt
-      ln -sfn ${pkgs.maxx}/opt/MaXX /opt
-    '';
-
     services.xserver.desktopManager.session = [
     { name = "MaXX";
       start = ''
diff --git a/pkgs/desktops/maxx/default.nix b/pkgs/desktops/maxx/default.nix
index 5bcc6e841521..3e8ca1f388e9 100644
--- a/pkgs/desktops/maxx/default.nix
+++ b/pkgs/desktops/maxx/default.nix
@@ -1,16 +1,21 @@
-{ stdenv, fetchurl, makeWrapper
+{ stdenv, fetchurl, makeWrapper, libredirect, gcc-unwrapped, bash, gtk-engine-murrine, gtk_engines, librsvg
+
 , libX11, libXext, libXi, libXau, libXrender, libXft, libXmu, libSM, libXcomposite, libXfixes, libXpm
-, libXinerama, libXdamage, libICE, libXtst, libXaw
-, fontconfig, pango, cairo, glib, libxml2, atk, gtk2, gdk_pixbuf, mesa_noglu, ncurses
-, gcc, xclock, xsettingsd, bash, gtk-engine-murrine, gtk_engines, librsvg }:
+, libXinerama, libXdamage, libICE, libXtst, libXaw, fontconfig, pango, cairo, glib, libxml2, atk, gtk2
+, gdk_pixbuf, mesa_noglu, ncurses
+
+, xclock, xsettingsd }:
 
 let
   version = "Indy-1.1.0";
 
   deps = [
-    libX11 libXext libXi libXau libXrender libXft libXmu libSM libXcomposite libXfixes libXpm
-    libXinerama libXdamage libICE libXtst libXaw
-    stdenv.cc.cc fontconfig pango cairo glib libxml2 atk gtk2 gdk_pixbuf mesa_noglu ncurses
+    stdenv.cc.cc libX11 libXext libXi libXau libXrender libXft libXmu libSM libXcomposite libXfixes libXpm
+    libXinerama libXdamage libICE libXtst libXaw fontconfig pango cairo glib libxml2 atk gtk2
+    gdk_pixbuf mesa_noglu ncurses
+  ];
+  runtime_deps = [
+    xclock xsettingsd
   ];
 in stdenv.mkDerivation {
   name = "MaXX-${version}";
@@ -26,15 +31,12 @@ in stdenv.mkDerivation {
     })
   ];
 
-  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];
 
   buildPhase = ''
     while IFS= read -r -d $'\0' i; do
-      if isELF "$i"; then
-        patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$i" || true
-        patchelf --set-rpath "${stdenv.lib.makeLibraryPath deps}" "$i"
-      fi
-    done < <(find "." -type f -print0)
+      substituteInPlace "$i" --replace /opt/MaXX $out/opt/MaXX
+    done < <(find "." -type f -exec grep -Iq /opt/MaXX {} \; -and -print0)
 
     substituteInPlace bin/adminterm \
       --replace /bin/bash ${bash}/bin/bash
@@ -52,15 +54,37 @@ in stdenv.mkDerivation {
 
     wrapProgram $maxx/etc/skel/Xsession.dt \
       --prefix GTK_PATH : "${gtk-engine-murrine}/lib/gtk-2.0:${gtk_engines}/lib/gtk-2.0" \
-      --prefix GDK_PIXBUF_MODULE_FILE : "$(echo ${librsvg.out}/lib/gdk-pixbuf-2.0/*/loaders.cache)"
-  '';
+      --prefix GDK_PIXBUF_MODULE_FILE : "$(echo ${librsvg.out}/lib/gdk-pixbuf-2.0/*/loaders.cache)" \
+      --prefix PATH : ${stdenv.lib.makeBinPath runtime_deps}
 
-  propagatedUserEnvPkgs = [ gcc xclock xsettingsd ];
+    while IFS= read -r -d $'\0' i; do
+      if isELF "$i"; then
+        bin=`patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$i"; echo $?`
+        patchelf --set-rpath "${stdenv.lib.makeLibraryPath deps}" "$i"
+        if [ "$bin" -eq 0 ]; then
+          wrapProgram "$i" \
+            --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
+            --set NIX_REDIRECTS /opt/MaXX=$maxx
+        fi
+      fi
+    done < <(find "$maxx" -type f -print0)
+
+    cp ${gcc-unwrapped}/bin/cpp ${gcc-unwrapped}/libexec/gcc/*/*/cc1 $maxx/bin
+    for i in $maxx/bin/cpp $maxx/bin/cc1
+    do
+      wrapProgram "$i" \
+        --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
+        --set NIX_REDIRECTS /opt/MaXX=$maxx
+    done
+  '';
 
   meta = with stdenv.lib; {
     description = "A replica of IRIX Interactive Desktop";
     homepage = http://www.maxxinteractive.com;
-    license = licenses.free;
+    license = {
+      url = http://www.maxxinteractive.com/site/?page_id=97;
+      free = true;
+    };
     maintainers = [ maintainers.gnidorah ];
     platforms = ["x86_64-linux"];
     hydraPlatforms = [];

From ff68bcd563d853a2aca26c7ca28b0efac9337a54 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Thu, 24 Aug 2017 19:41:27 +0300
Subject: [PATCH 18/58] openjk: comment why we set DCMAKE_INSTALL_PREFIX

---
 pkgs/games/openjk/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/games/openjk/default.nix b/pkgs/games/openjk/default.nix
index dc6d3595416b..02afa0a8edc2 100644
--- a/pkgs/games/openjk/default.nix
+++ b/pkgs/games/openjk/default.nix
@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper cmake ];
   buildInputs = [ libjpeg zlib libpng mesa_noglu SDL2 ];
 
+  # move from $out/JediAcademy to $out/opt/JediAcademy
   preConfigure = ''
     cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$out/opt")
   '';

From 1f4fdbcb7ff0604c3eb1d027c93c7ec80d57a107 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 24 Aug 2017 19:06:43 +0200
Subject: [PATCH 19/58] python.pkgs.obfsproxy: fix build

---
 pkgs/top-level/python-packages.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2c52732be98f..f3ed5f898327 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14587,13 +14587,17 @@ in {
       sha256 = "04ja1cl8xzqnwrd2gi6nlnxbmjri141bzwa5gybvr44d8h3k2nfa";
     };
 
-    patchPhase = ''
+    postPatch = ''
       substituteInPlace setup.py --replace "version=versioneer.get_version()" "version='${version}'"
+      substituteInPlace setup.py --replace "argparse" ""
     '';
 
     propagatedBuildInputs = with self;
       [ pyptlib argparse twisted pycrypto pyyaml ];
 
+    # No tests in archive
+    doCheck = false;
+
     meta = {
       description = "A pluggable transport proxy";
       homepage = https://www.torproject.org/projects/obfsproxy;

From 8511a3378b3a26497bcff1a3acb292a0f300886f Mon Sep 17 00:00:00 2001
From: Mark Cohen <m@mpc.sh>
Date: Tue, 22 Aug 2017 17:21:49 -0400
Subject: [PATCH 20/58] nixos/caddy: improve documentation

There was no documentation for the "config" option, and it wasn't quite
clear whether it was supposed to be a file, a string, or what. This
commit removes that ambiguity.
---
 nixos/modules/services/web-servers/caddy.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix
index ee32a1c86d4d..d8efa24bc6d5 100644
--- a/nixos/modules/services/web-servers/caddy.nix
+++ b/nixos/modules/services/web-servers/caddy.nix
@@ -5,12 +5,22 @@ with lib;
 let
   cfg = config.services.caddy;
   configFile = pkgs.writeText "Caddyfile" cfg.config;
-in
-{
+in {
   options.services.caddy = {
     enable = mkEnableOption "Caddy web server";
 
     config = mkOption {
+      default = "";
+      example = ''
+        example.com {
+        gzip
+        minify
+        log syslog
+
+        root /srv/http
+        }
+      '';
+      type = types.lines;
       description = "Verbatim Caddyfile to use";
     };
 

From 01495f325506dbf233c9142429ad0dd6a2d0a0cc Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 24 Aug 2017 17:49:05 +0000
Subject: [PATCH 21/58] ocamlPackages.js_of_ocaml-compiler: init at 0.3.0

---
 .../ocaml/js_of_ocaml-compiler/default.nix    | 35 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/tools/ocaml/js_of_ocaml-compiler/default.nix

diff --git a/pkgs/development/tools/ocaml/js_of_ocaml-compiler/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml-compiler/default.nix
new file mode 100644
index 000000000000..11df26818c1f
--- /dev/null
+++ b/pkgs/development/tools/ocaml/js_of_ocaml-compiler/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder
+, cmdliner, cppo, yojson
+}:
+
+if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+then throw "js_of_ocaml-compiler is not available for OCaml ${ocaml.version}"
+else
+
+stdenv.mkDerivation rec {
+	name = "js_of_ocaml-compiler-${version}";
+	version = "3.0.0";
+
+	src = fetchFromGitHub {
+		owner = "ocsigen";
+		repo = "js_of_ocaml";
+		rev = version;
+		sha256 = "17w1pqjk521jd4yp34miyif0cxjxchnw59xhj188qfl635ykb4k8";
+	};
+
+	buildInputs = [ ocaml findlib jbuilder cmdliner cppo ];
+
+	propagatedBuildInputs = [ yojson ];
+
+	buildPhase = "jbuilder build -p js_of_ocaml-compiler";
+
+	inherit (jbuilder) installPhase;
+
+	meta = {
+		description = "Compiler from OCaml bytecode to Javascript";
+		license = stdenv.lib.licenses.gpl2;
+		maintainers = [ stdenv.lib.maintainers.vbgl ];
+		inherit (src.meta) homepage;
+		inherit (ocaml.meta) platforms;
+	};
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 29f3ae51a0a3..9462eb3d3da8 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -272,6 +272,8 @@ let
 
     js_of_ocaml = callPackage ../development/tools/ocaml/js_of_ocaml { lwt = lwt2; };
 
+    js_of_ocaml-compiler = callPackage ../development/tools/ocaml/js_of_ocaml-compiler {};
+
     jsonm = callPackage ../development/ocaml-modules/jsonm { };
 
     lablgl = callPackage ../development/ocaml-modules/lablgl { };

From 77404dbf37838dfc6b8a10d8c7298d813481705f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 24 Aug 2017 17:50:00 +0000
Subject: [PATCH 22/58] jbuilder: 1.0+beta7 -> 1.0+beta12

ocamlPackages.sexplib: 0.9.1 -> 0.9.2

ocamlPackages.base: 0.9.1 -> 0.9.3

ocamlPackages.ppx_driver: 0.9.0 -> 0.9.1

ocamlPackages.bin_prot: 0.9.0 -> 0.9.1

ocamlPackages.ppx_inline_test: 0.9.0 -> 0.9.2
---
 .../ocaml-modules/janestreet/default.nix        | 17 ++++++++++-------
 .../tools/ocaml/jbuilder/default.nix            |  6 +++---
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix
index e2958bce0e7c..724bca187067 100644
--- a/pkgs/development/ocaml-modules/janestreet/default.nix
+++ b/pkgs/development/ocaml-modules/janestreet/default.nix
@@ -8,15 +8,15 @@ rec {
 
   sexplib = janePackage {
     name = "sexplib";
-    version = "0.9.1";
-    hash = "087md38l73lp24j2lmwi053jjav00k11r06s6whmff1xlhj70wdj";
+    version = "0.9.2";
+    hash = "0szj7gi5ksy7kif5g71rkr6xhxc41xl8hq6s5zz610cjyngzyzjl";
     meta.description = "Automated S-expression conversion";
   };
 
   base = janePackage {
     name = "base";
-    version = "0.9.1";
-    hash = "09gj30zyv23gv3gkf2pb3d3ywmkgd74dq8sfaps5xarr3grvndhm";
+    version = "0.9.3";
+    hash = "14v3zsr7za9h1gkxdmkk1yagnrfjk3y9snraywv9hsqbhv39ajvv";
     propagatedBuildInputs = [ sexplib ];
     meta.description = "Full standard library replacement for OCaml";
   };
@@ -65,7 +65,8 @@ rec {
 
   ppx_driver = janePackage {
     name = "ppx_driver";
-    hash = "1w3khwnvy18nkh673zrbhcs6051hs7z5z5dib7npkvpxndw22hwj";
+    version = "0.9.1";
+    hash = "1amz49x6v4sh1v2my6618cah0zv5i7jmsapbk9ydps6419g5asay";
     buildInputs = [ ocamlbuild ];
     propagatedBuildInputs = [ ppx_optcomp ];
     meta.description = "Feature-full driver for OCaml AST transformers";
@@ -173,7 +174,8 @@ rec {
 
   bin_prot = janePackage {
     name = "bin_prot";
-    hash = "0cy6lhksx4jypkrnj3ha31p97ghslki0bx5rpnzc2v28mfp6pzh1";
+    version = "0.9.1";
+    hash = "1bgcmkgz6b5i522996x589zsaiy5b3h37887lwbqvpps8by2ayvk";
     propagatedBuildInputs = [ ppx_compare ppx_custom_printf ppx_fields_conv ppx_variants_conv ];
     meta.description = "Binary protocol generator";
   };
@@ -203,7 +205,8 @@ rec {
 
   ppx_inline_test = janePackage {
     name = "ppx_inline_test";
-    hash = "01xml88ahrzqnc7g1ib184jbqxpdfx4gn2wdvi09dpi4i0jahy33";
+    version = "0.9.2";
+    hash = "17j36ihiqprbpa2bk02449k93vaidid2sly5djrk848ccjq8n5aa";
     propagatedBuildInputs = [ ppx_metaquot ];
     meta.description = "Syntax extension for writing in-line tests in OCaml code";
   };
diff --git a/pkgs/development/tools/ocaml/jbuilder/default.nix b/pkgs/development/tools/ocaml/jbuilder/default.nix
index f1bf5e33a617..db34450a7a6e 100644
--- a/pkgs/development/tools/ocaml/jbuilder/default.nix
+++ b/pkgs/development/tools/ocaml/jbuilder/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchzip, ocaml, opam }:
 
 stdenv.mkDerivation {
-  name = "jbuilder-1.0+beta7";
+  name = "jbuilder-1.0+beta12";
   src = fetchzip {
-    url = http://github.com/janestreet/jbuilder/archive/1.0+beta7.tar.gz;
-    sha256 = "10qjqs6gv9y8s580gvssjm56xw72pcxd5lkpzqpz6cz4390d45i8";
+    url = http://github.com/janestreet/jbuilder/archive/1.0+beta12.tar.gz;
+    sha256 = "1gqpp1spcya9951mw2kcavam8v0m5s6zc5pjb7bkv5d71si04rlf";
   };
 
   buildInputs = [ ocaml ];

From 49ab1dcc6984d27d64694ff61821fff08d52f931 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20J=C3=B8rgen=20Br=C3=B8nner?= <olejorgenb@yahoo.no>
Date: Thu, 24 Aug 2017 16:07:01 +0200
Subject: [PATCH 23/58] pythonPackages.matrix-client: init at 0.0.6

---
 .../python-modules/matrix-client/default.nix  | 31 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  1 +
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/python-modules/matrix-client/default.nix

diff --git a/pkgs/development/python-modules/matrix-client/default.nix b/pkgs/development/python-modules/matrix-client/default.nix
new file mode 100644
index 000000000000..d0bbef8a78fd
--- /dev/null
+++ b/pkgs/development/python-modules/matrix-client/default.nix
@@ -0,0 +1,31 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pythonPackages
+}:
+
+buildPythonPackage rec {
+  pname = "matrix-client";
+  version = "0.0.6";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "15kx5px26hwr0sxpyjk4w61fjnabg1b57hwys1nyarc0jx4qjhiq";
+  };
+
+  checkInputs = with pythonPackages; [ tox pytest flake8 responses ];
+
+  propagatedBuildInputs = with pythonPackages; [ requests ];
+
+  checkPhase = ''
+    pytest
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Matrix Client-Server SDK";
+    homepage = https://github.com/matrix-org/matrix-python-sdk;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ olejorgenb ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 56f915f372d5..d00d7f5d1647 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12539,6 +12539,7 @@ in {
     inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa;
   };
 
+  matrix-client = callPackage ../development/python-modules/matrix-client/default.nix { pythonPackages = self; };
 
   mccabe = callPackage ../development/python-modules/mccabe { };
 

From 36dd8edde15e4780df884e2fac245402369ff50e Mon Sep 17 00:00:00 2001
From: evujumenuk <evujumenuk@mailinator.com>
Date: Thu, 24 Aug 2017 20:48:24 +0200
Subject: [PATCH 24/58] containers: remove EXIT_ON_REBOOT

EXIT_ON_REBOOT has been obsolete since sometime in 2014.
---
 nixos/modules/virtualisation/containers.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 6adb2c1681a2..001c6473a98e 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -120,7 +120,6 @@ let
 
       # Run systemd-nspawn without startup notification (we'll
       # wait for the container systemd to signal readiness).
-      EXIT_ON_REBOOT=1 \
       exec ${config.systemd.package}/bin/systemd-nspawn \
         --keep-unit \
         -M "$INSTANCE" -D "$root" $extraFlags \

From 3ac73fbb810a2c1965eaee0b21b90e9d788191cd Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Thu, 24 Aug 2017 20:44:36 +0200
Subject: [PATCH 25/58] maintainers: add myself

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index d904c5368bf4..50efd46e27c1 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -619,6 +619,7 @@
   vrthra = "Rahul Gopinath <rahul@gopinath.org>";
   vyp = "vyp <elisp.vim@gmail.com>";
   wedens = "wedens <kirill.wedens@gmail.com>";
+  willibutz = "Willi Butz <willibutz@posteo.de>";
   willtim = "Tim Philip Williams <tim.williams.public@gmail.com>";
   winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>";
   wizeman = "Ricardo M. Correia <rcorreia@wizy.org>";

From 8ddc3eb988e73d75fc72532a2d36af1d95e494a6 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Thu, 24 Aug 2017 18:17:27 +0200
Subject: [PATCH 26/58] watchman: 4.7.0 -> 4.9.0

---
 pkgs/development/tools/watchman/default.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix
index 379f87b4cf4f..15f265e31e3f 100644
--- a/pkgs/development/tools/watchman/default.nix
+++ b/pkgs/development/tools/watchman/default.nix
@@ -1,20 +1,22 @@
-{ stdenv, lib, config, fetchFromGitHub, autoconf, automake, pcre
-, confFile ? config.watchman.confFile or null
+{ stdenv, lib, config, fetchFromGitHub, autoconf, automake, pcre,
+  libtool, pkgconfig, openssl,
+  confFile ? config.watchman.confFile or null
 }:
 
 stdenv.mkDerivation rec {
   name = "watchman-${version}";
 
-  version = "4.7.0";
+  version = "4.9.0";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "watchman";
     rev = "v${version}";
-    sha256 = "0xnd7jvrmyxhlw2ggd37swv1mk6vw9j91fdxps6njgvnlfg9zs5n";
+    sha256 = "0fdaj5pmicm6j17d5q7px800m5rmam1a400x3hv1iiifnmhgnkal";
   };
 
-  buildInputs = [ autoconf automake pcre ];
+  buildInputs = [ pcre openssl ];
+  nativeBuildInputs = [ autoconf automake pkgconfig libtool ];
 
   configureFlags = [
       "--enable-lenient"
@@ -26,6 +28,10 @@ stdenv.mkDerivation rec {
       "--disable-statedir"
   ];
 
+  prePatch = ''
+    patchShebangs .
+  '';
+
   preConfigure = ''
     ./autogen.sh
   '';

From a8db87efd8938c78d0a7d0fe6cf135a105efbe42 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Thu, 24 Aug 2017 18:20:58 +0200
Subject: [PATCH 27/58] whois: 5.2.17 -> 5.2.18

---
 pkgs/tools/networking/whois/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix
index e6f251768645..ed8f2eebc75f 100644
--- a/pkgs/tools/networking/whois/default.nix
+++ b/pkgs/tools/networking/whois/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, perl, gettext }:
 
 stdenv.mkDerivation rec {
-  version = "5.2.17";
+  version = "5.2.18";
   name = "whois-${version}";
 
   src = fetchFromGitHub {
     owner = "rfc1036";
     repo = "whois";
     rev = "v${version}";
-    sha256 = "15jnzk0js8wxiapz1bw7jnck0fl3mcli56f9635z9x7vk63ss68z";
+    sha256 = "0jzyq1rj6balc6a28swzgspv55xhkc75dw6wsn159in4ap61bzmi";
   };
 
   buildInputs = [ perl gettext ];
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
       select the appropriate WHOIS server for most queries.
     '';
 
-    homepage = http://packages.qa.debian.org/w/whois.html;
+    homepage = https://packages.qa.debian.org/w/whois.html;
     license = licenses.gpl2;
     maintainers = with maintainers; [ fpletz ];
     platforms = platforms.linux;

From bbf7d8c77b3353cbd6a5e1af02b29b59e0c51fbc Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Thu, 24 Aug 2017 20:06:08 +0200
Subject: [PATCH 28/58] wordnet: refactor

---
 pkgs/applications/misc/wordnet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix
index f1bc06d395c7..b93295850bcd 100644
--- a/pkgs/applications/misc/wordnet/default.nix
+++ b/pkgs/applications/misc/wordnet/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, tcl, tk, xlibsWrapper, makeWrapper}:
 
-let version = "3.0"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
+  version = "3.0";
   name = "wordnet-${version}";
   src = fetchurl {
     url = "http://wordnetcode.princeton.edu/${version}/WordNet-${version}.tar.bz2";

From 1c0e7d631db7e731787ff19bf98225a46adc5a45 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Thu, 24 Aug 2017 20:15:03 +0200
Subject: [PATCH 29/58] debianutils: 4.8.1 -> 4.8.2

---
 pkgs/tools/misc/debianutils/default.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/misc/debianutils/default.nix b/pkgs/tools/misc/debianutils/default.nix
index e22539827886..6575c19391c0 100644
--- a/pkgs/tools/misc/debianutils/default.nix
+++ b/pkgs/tools/misc/debianutils/default.nix
@@ -1,16 +1,12 @@
 { stdenv, fetchurl }:
 
-let
-  checksums = {
-    "4.8.1" = "09phylg8ih1crgxjadkdb8idbpj9ap62a7cbh8qdx2gyvh5mqf9c";
-  };
-in stdenv.mkDerivation rec {
-  version = "4.8.1";
+stdenv.mkDerivation rec {
+  version = "4.8.2";
   name = "debianutils-${version}";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/d/debianutils/debianutils_${version}.tar.xz";
-    sha256 = checksums."${version}";
+    sha256 = "0s3w3svcsh984zinkxvpzxi7dc0ginqk0nk299fkrr6k7wlmzssd";
   };
 
   meta = {

From 0fbafd6195a63982bd8e27e55dfd66cd1cdd1602 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Thu, 24 Aug 2017 20:20:25 +0200
Subject: [PATCH 30/58] duc: 1.4.1 -> 1.4.3

---
 pkgs/tools/misc/duc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/duc/default.nix b/pkgs/tools/misc/duc/default.nix
index ba1abb7c86df..06862a634238 100644
--- a/pkgs/tools/misc/duc/default.nix
+++ b/pkgs/tools/misc/duc/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "duc-${version}";
-  version = "1.4.1";
+  version = "1.4.3";
 
   src = fetchFromGitHub {
     owner = "zevv";
     repo = "duc";
     rev = "${version}";
-    sha256 = "0rnar2zacsb9rvdmp1a62xixhy69s5vh0nwgrklqxhb19qkzhdp7";
+    sha256 = "1h7vll8a78ijan9bmnimmsviywmc39x8h9iikx8vm98kwyxi4xif";
   };
 
   buildInputs = [ autoreconfHook pkgconfig tokyocabinet cairo pango ncurses ];

From e1b044646ba5609bc63b5c71ca4d1214093ab4ad Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Thu, 24 Aug 2017 20:26:51 +0200
Subject: [PATCH 31/58] evemu: 2.4.0 -> 2.6.0

---
 pkgs/tools/system/evemu/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/evemu/default.nix b/pkgs/tools/system/evemu/default.nix
index 873abd4812cb..b6f1af7b23fe 100644
--- a/pkgs/tools/system/evemu/default.nix
+++ b/pkgs/tools/system/evemu/default.nix
@@ -4,14 +4,14 @@
 
 stdenv.mkDerivation rec {
   name = "evemu-${version}";
-  version = "2.4.0";
+  version = "2.6.0";
 
   # We could have downloaded a release tarball from cgit, but it changes hash
   # each time it is downloaded :/
   src = fetchgit {
     url = git://git.freedesktop.org/git/evemu;
     rev = "refs/tags/v${version}";
-    sha256 = "07iha13xrpf4z59rzl9cm2h1zkc5xhyipbd3ajd3c1d4hhpn9w9s";
+    sha256 = "1m38fxwy2s82vb2qm9aqxinws12akmqqq7q66is931lc3awqkbah";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Records and replays device descriptions and events to emulate input devices through the kernel's input system";
-    homepage = http://www.freedesktop.org/wiki/Evemu/;
+    homepage = https://www.freedesktop.org/wiki/Evemu/;
     repositories.git = git://git.freedesktop.org/git/evemu;
     license = licenses.gpl2;
     maintainers = [ maintainers.amorsillo ];

From c6ee3231b786116d089c44c5d0763e5b13c8fc95 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Thu, 24 Aug 2017 20:43:07 +0200
Subject: [PATCH 32/58] feh: 2.19.1 -> 2.19.3

---
 pkgs/applications/graphics/feh/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index aace37601b55..2b24b93282f1 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -6,11 +6,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "feh-${version}";
-  version = "2.19.1";
+  version = "2.19.3";
 
   src = fetchurl {
     url = "http://feh.finalrewind.org/${name}.tar.bz2";
-    sha256 = "1d4ycmai3dpajl0bdr9i56646g4h5j1lb95jjn0nckwcddcj927c";
+    sha256 = "1l3yvv0l0ggwlfyhk84p2g9mrqvzqrg1fgalf88kzppvb9jppjay";
   };
 
   outputs = [ "out" "man" "doc" ];
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     description = "A light-weight image viewer";
     homepage = https://derf.homelinux.org/projects/feh/;
     license = licenses.mit;
-    maintainers = [ maintainers.viric ];
+    maintainers = [ maintainers.viric maintainers.willibutz ];
     platforms = platforms.unix;
   };
 }

From 2639bcee5d63a0c81dc1e66fd3fc463344dd9d7b Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Thu, 24 Aug 2017 13:52:29 -0700
Subject: [PATCH 33/58] wineUnstable: 2.14 -> 2.15

---
 pkgs/misc/emulators/wine/sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 479726e13042..0d0f9f21bf2a 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -32,15 +32,15 @@ in rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the SHA256 for staging as well.
-    version = "2.14";
+    version = "2.15";
     url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz";
-    sha256 = "1ilmhwm7vlp4fbl5a5m3rwwfw8g821gkjkd01ih2ixw1a7ck9y83";
+    sha256 = "1cv890khg5zqk844y12daw2ql4vk4garnqfk273hiyw1pw650bfq";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     inherit (unstable) version;
-    sha256 = "0mbklg0q3k5iavmwfbrwq4p8589ayikwq5q9wk87885xv32g176g";
+    sha256 = "0psdkhf4gn4nkpp2fvwy0b2a0s5b6wgf40vlbdf6ii45kj59mn7f";
     owner = "wine-compholio";
     repo = "wine-staging";
     rev = "v${version}";

From 51df72e4f6cdabb67e4c693f006f967aa9b4225c Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Thu, 24 Aug 2017 18:10:32 -0300
Subject: [PATCH 34/58] oblogout: add description for configuration options

---
 nixos/modules/programs/oblogout.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/nixos/modules/programs/oblogout.nix b/nixos/modules/programs/oblogout.nix
index 79a8ddb7ce37..042935d285e3 100644
--- a/nixos/modules/programs/oblogout.nix
+++ b/nixos/modules/programs/oblogout.nix
@@ -27,6 +27,7 @@ in
         type = types.int;
         default = 70;
         description = ''
+          Opacity percentage of Cairo rendered backgrounds.
         '';
       };
 
@@ -34,6 +35,7 @@ in
         type = types.str;
         default = "black";
         description = ''
+          Colour name or hex code (#ffffff) of the background color.
         '';
       };
 
@@ -41,6 +43,9 @@ in
         type = types.str;
         default = "simplistic";
         description = ''
+          Icon theme for the buttons, must be in the themes folder of
+          the package, or in
+          <filename>~/.themes/<name>/oblogout/</filename>.
         '';
       };
 
@@ -48,6 +53,7 @@ in
         type = types.str;
         default =  "cancel, logout, restart, shutdown, suspend, hibernate";
         description = ''
+          List and order of buttons to show.
         '';
       };
 
@@ -55,6 +61,7 @@ in
         type = types.str;
         default =  "Escape";
         description = ''
+          Cancel logout/shutdown shortcut.
         '';
       };
 
@@ -62,6 +69,7 @@ in
         type = types.str;
         default = "S";
         description = ''
+          Shutdown shortcut.
         '';
       };
 
@@ -69,6 +77,7 @@ in
         type = types.str;
         default = "R";
         description = ''
+          Restart shortcut.
         '';
       };
 
@@ -76,6 +85,7 @@ in
         type = types.str;
         default = "U";
         description = ''
+          Suspend shortcut.
         '';
       };
 
@@ -83,6 +93,7 @@ in
         type = types.str;
         default = "L";
         description = ''
+          Logout shortcut.
         '';
       };
 
@@ -90,6 +101,7 @@ in
         type = types.str;
         default = "K";
         description = ''
+          Lock session shortcut.
         '';
       };
 
@@ -97,6 +109,7 @@ in
         type = types.str;
         default =  "H";
         description = ''
+          Hibernate shortcut.
         '';
       };
 
@@ -104,6 +117,7 @@ in
         type = types.str;
         default = "openbox --exit";
         description = ''
+          Command to logout.
         '';
       };
 
@@ -111,6 +125,7 @@ in
         type = types.str;
         default = "";
         description = ''
+          Command to lock screen.
         '';
       };
 
@@ -118,6 +133,7 @@ in
         type = types.str;
         default = "";
         description = ''
+          Command to switch user.
         '';
       };
     };

From 35c4b6d22b2cd520b88b1e5fc63fb7bc275a84b2 Mon Sep 17 00:00:00 2001
From: dywedir <dywedir@protonmail.ch>
Date: Fri, 25 Aug 2017 00:59:11 +0300
Subject: [PATCH 35/58] rustRegistry: 2017-07-23 -> 2017-08-24

---
 pkgs/top-level/rust-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index 1caef26322d7..f49b1e444e50 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -7,13 +7,13 @@
 { stdenv, fetchFromGitHub, git }:
 
 stdenv.mkDerivation {
-  name = "rustRegistry-2017-07-23";
+  name = "rustRegistry-2017-08-24";
 
   src = fetchFromGitHub {
     owner = "rust-lang";
     repo = "crates.io-index";
-    rev = "ed8e6a6761278861db046073cc69d6a5e7dd8c15";
-    sha256 = "1v72m0h31xcay2m64n2wil5wqnl8z4n4adxxpdllcpgj3pj5jai6";
+    rev = "53fd44d796ca10ec0a5a9b657d8c7f8964695a49";
+    sha256 = "1ppg3q001ypdh6w0ymhkcilr5gyr2pnrha9vdixa0gzgw06k7k0s";
   };
   phases = [ "unpackPhase" "installPhase" ];
   installPhase = ''

From 5db77990db448ba45ba79a467415e75df7cb7970 Mon Sep 17 00:00:00 2001
From: dywedir <dywedir@protonmail.ch>
Date: Fri, 25 Aug 2017 01:25:02 +0300
Subject: [PATCH 36/58] ripgrep: 0.5.2 -> 0.6.0

---
 pkgs/tools/text/ripgrep/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix
index da7c5b593e3a..8ddfa7d7be46 100644
--- a/pkgs/tools/text/ripgrep/default.nix
+++ b/pkgs/tools/text/ripgrep/default.nix
@@ -4,16 +4,16 @@ with rustPlatform;
 
 buildRustPackage rec {
   name = "ripgrep-${version}";
-  version = "0.5.2";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "BurntSushi";
     repo = "ripgrep";
     rev = "${version}";
-    sha256 = "128sfczms14zgfbhgmf84jjlivd4q6i581rxirhz3kmpnnby18rz";
+    sha256 = "1cnvwxbznmsn1gand8hhy5zadax5p67lvm46fkj1a1s89f158w3a";
   };
 
-  depsSha256 = "1kjmv4bn5sicx8g5gyzq2zhxmqsqlgckhcg4ypvnjmcyq1ifiv2m";
+  depsSha256 = "1kx9xazhj93xa3cnys39wwr84qqjqrlsbbi5ih71vxppskdpvd6m";
 
   preFixup = ''
     mkdir -p "$out/man/man1"
@@ -23,7 +23,7 @@ buildRustPackage rec {
   meta = with stdenv.lib; {
     description = "A utility that combines the usability of The Silver Searcher with the raw speed of grep";
     homepage = https://github.com/BurntSushi/ripgrep;
-    license = with licenses; [ unlicense ];
+    license = with licenses; [ unlicense /* or */ mit ];
     maintainers = [ maintainers.tailhook ];
     platforms = platforms.all;
   };

From 22ae3aa5b68fb7e74a6730f9f6ddac1be6931db7 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 25 Aug 2017 02:35:31 +0200
Subject: [PATCH 37/58] android-studio-preview: 3.0.0.10 -> 3.0.0.11

---
 pkgs/applications/editors/android-studio/packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/packages.nix b/pkgs/applications/editors/android-studio/packages.nix
index 471f78f0c072..707550984972 100644
--- a/pkgs/applications/editors/android-studio/packages.nix
+++ b/pkgs/applications/editors/android-studio/packages.nix
@@ -27,9 +27,9 @@ in rec {
 
   preview = mkStudio rec {
     pname = "android-studio-preview";
-    version = "3.0.0.10"; # "Android Studio 3.0 Beta 2"
-    build = "171.4263559";
-    sha256Hash = "0bya69qa50s6dbvlzb198b5w6ixs21y6b56v3v1xjb3kndf9y44w";
+    version = "3.0.0.11"; # "Android Studio 3.0 Beta 3"
+    build = "171.4294784";
+    sha256Hash = "11m939hpwnrrz0grnc1x1ff19yjnwzx5w1dzaw9hpm8ylx692mrf";
 
     meta = stable.meta // {
       description = "The Official IDE for Android (preview version)";

From 501f55af87f8a75a4ec18ec39b33646d8e56389f Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 25 Aug 2017 02:43:46 +0200
Subject: [PATCH 38/58] quiterss: 0.18.7 -> 0.18.8

---
 pkgs/applications/networking/newsreaders/quiterss/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix
index 2bd6bd0a8ecb..5ebd01f38c41 100644
--- a/pkgs/applications/networking/newsreaders/quiterss/default.nix
+++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "quiterss-${version}";
-  version = "0.18.7";
+  version = "0.18.8";
 
   src = fetchFromGitHub {
     owner = "QuiteRSS";
     repo = "quiterss";
     rev = "${version}";
-    sha256 = "031n07s8dd0n3d5d4v9pza59iyvaim484n1qdnpbgamls2p8iwn6";
+    sha256 = "09mdxpv04zycrip1p5w6947348xfraicijddvxsr7d498r59b7ff";
   };
 
   nativeBuildInputs = [ pkgconfig qmake ];

From a86b304a26c20928d2ba6d013753c248055ce500 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 25 Aug 2017 07:25:02 +0100
Subject: [PATCH 39/58] grails: 2.4.3 -> 3.3.0

---
 pkgs/development/web/grails/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix
index f3f137da757f..c447173b6087 100644
--- a/pkgs/development/web/grails/default.nix
+++ b/pkgs/development/web/grails/default.nix
@@ -10,11 +10,12 @@ let
     ([ coreutils ncurses gnused gnugrep ] ++ stdenv.lib.optional (jdk != null) jdk);
 in
 stdenv.mkDerivation rec {
-  name = "grails-2.4.3";
+  name = "grails-${version}";
+  version = "3.3.0";
 
   src = fetchurl {
-    url = "http://dist.springframework.org.s3.amazonaws.com/release/GRAILS/${name}.zip";
-    sha256 = "0lqkv0hsiiqa36pfnq5wv7s7nsp9xadmh1ri039bn0llpfck4742";
+    url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip";
+    sha256 = "0lk9ll0x9w2akmlwkams9pxyafmgjmsr3fa45gx1r16nx563qxsg";
   };
 
   buildInputs = [ unzip ];

From ef6e2d13b0c03a4dfb192ed52e4c827ae3d10e11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 25 Aug 2017 07:30:10 +0100
Subject: [PATCH 40/58] grail: 3.1.0 -> 3.1.1

---
 pkgs/development/libraries/grail/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/grail/default.nix b/pkgs/development/libraries/grail/default.nix
index 3a7ed879bff8..c8b1c0bdd9be 100644
--- a/pkgs/development/libraries/grail/default.nix
+++ b/pkgs/development/libraries/grail/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "grail-${version}";
-  version = "3.1.0";
+  version = "3.1.1";
 
   src = fetchurl {
     url = "https://launchpad.net/grail/trunk/${version}/+download/${name}.tar.bz2";
-    sha256 = "c26dced1b3f4317ecf6af36db0e90294d87e43966d56aecc4e97b65368ab78b9";
+    sha256 = "1wwx5ibjdz5pyd0f5cd1n91y67r68dymxpm2lgd829041xjizvay";
   };
 
   buildInputs = [ pkgconfig python3 frame ]

From cfaa4235e3e511bc45f71c1deef4d5654993ceec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 25 Aug 2017 07:41:02 +0100
Subject: [PATCH 41/58] geis: fix compilation

---
 pkgs/development/libraries/geis/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix
index 5a7bff7459e3..6e043f5994df 100644
--- a/pkgs/development/libraries/geis/default.nix
+++ b/pkgs/development/libraries/geis/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     sha256 = "1svhbjibm448ybq6gnjjzj0ak42srhihssafj0w402aj71lgaq4a";
   };
 
-  NIX_CFLAGS_COMPILE = "-Wno-error=pedantic";
+  NIX_CFLAGS_COMPILE = "-Wno-format -Wno-misleading-indentation -Wno-error";
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ python3 dbus_libs evemu frame grail libX11 libXext libXi libXtst xorgserver ];

From f861426de968a91d360ce54c54bd5355fd51fb4e Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 25 Aug 2017 10:09:25 +0200
Subject: [PATCH 42/58] nixos/tlp: mask systemd-rfkill socket

This fixes a spurious error on boot. See #24737.
---
 nixos/modules/services/hardware/tlp.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/hardware/tlp.nix b/nixos/modules/services/hardware/tlp.nix
index 3b108c87edd2..68425822a884 100644
--- a/nixos/modules/services/hardware/tlp.nix
+++ b/nixos/modules/services/hardware/tlp.nix
@@ -57,6 +57,8 @@ in
     powerManagement.scsiLinkPolicy = null;
     powerManagement.cpuFreqGovernor = null;
 
+    systemd.sockets."systemd-rfkill".enable = false;
+
     systemd.services = {
       "systemd-rfkill@".enable = false;
       "systemd-rfkill".enable = false;

From 520a43ced38843d5116594b359854e02fa7ed057 Mon Sep 17 00:00:00 2001
From: Izorkin <Izorkin@gmail.com>
Date: Fri, 25 Aug 2017 11:34:21 +0300
Subject: [PATCH 43/58] Fix zsh completions (#28550)

* Fix zsh completions

* Fix zsh completions (fix commit)

* Fix zsh completions (fix commit)
---
 nixos/modules/programs/zsh/zsh.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index a055291282c9..ee61e2d2382c 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -158,6 +158,11 @@ in
 
         HELPDIR="${pkgs.zsh}/share/zsh/$ZSH_VERSION/help"
 
+        # Tell zsh how to find installed completions
+        for p in ''${(z)NIX_PROFILES}; do
+          fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions $p/share/zsh/vendor-completions)
+        done
+
         ${optionalString cfg.enableCompletion "autoload -U compinit && compinit"}
 
         ${optionalString (cfg.enableAutosuggestions)
@@ -172,11 +177,6 @@ in
 
         ${cfg.promptInit}
 
-        # Tell zsh how to find installed completions
-        for p in ''${(z)NIX_PROFILES}; do
-          fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions $p/share/zsh/vendor-completions)
-        done
-
         # Read system-wide modifications.
         if test -f /etc/zshrc.local; then
           . /etc/zshrc.local

From 8fb2432d94aabe3a136e3a78e82bdff912cfaaa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 25 Aug 2017 11:01:33 +0100
Subject: [PATCH 44/58] jetbrains.clion: 2017.2 -> 2017.2.1

---
 pkgs/applications/editors/jetbrains/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 08fc25fe9c14..035546edc09a 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -216,12 +216,12 @@ in
 
   clion = buildClion rec {
     name = "clion-${version}";
-    version = "2017.2"; /* updated by script */
+    version = "2017.2.1"; /* updated by script */
     description  = "C/C++ IDE. New. Intelligent. Cross-platform";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
-      sha256 = "de7f47ec959be9653aa4d2028fb27f8327800d8370daa0ab2d1093f3469f4b49"; /* updated by script */
+      sha256 = "acd3d09a37a3fa922a85a48635d1b230d559ea68917e2e7895caf16460d50c13"; /* updated by script */
     };
     wmClass = "jetbrains-clion";
     update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml

From ca995e5b68902ee22cf58ad2a95c7b2d3d8bd5e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 25 Aug 2017 11:04:23 +0100
Subject: [PATCH 45/58] jetbrains.gogland: 171.4694.61 -> 172.3757.46

---
 pkgs/applications/editors/jetbrains/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 035546edc09a..79348f010457 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -242,12 +242,12 @@ in
 
   gogland = buildGogland rec {
     name = "gogland-${version}";
-    version = "171.4694.61"; /* updated by script */
+    version = "172.3757.46"; /* updated by script */
     description = "Up and Coming Go IDE";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/go/${name}.tar.gz";
-      sha256 = "8e9462fc7c5cc7dc110ea2257b920a55d7d52ea874a53567e5d19381a1fcb269"; /* updated by script */
+      sha256 = "0d6b710edc434ed5d5ea5c4734b9026e2caeba7e74a027c1eb6fd837c5d4f4fd"; /* updated by script */
     };
     wmClass = "jetbrains-gogland";
     update-channel = "gogland_1.0_EAP";

From c5d3ddba3eab3ada777e0a77f2fbb9d15b309aed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 25 Aug 2017 11:05:55 +0100
Subject: [PATCH 46/58] jetbrains.idea-community: 2017.2.1 -> 2017.2.2

---
 pkgs/applications/editors/jetbrains/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 79348f010457..31fc2fd66960 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -268,12 +268,12 @@ in
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "2017.2.1";
+    version = "2017.2.2"; /* updated by script */
     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 = "1z8gp209jpjzvllnrpxzmbhgaxkklxw8nkm3g2drb7nal2hhs113";
+      sha256 = "c719af3d538bef23d061ef62d4acbf503198ff62322a3c0c5b3c38ab7ac36c4f"; /* updated by script */
     };
     wmClass = "jetbrains-idea-ce";
     update-channel = "IDEA_Release";

From 61e343649682cde32cefcf6523120df943484e09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 25 Aug 2017 11:06:59 +0100
Subject: [PATCH 47/58] jetbrains.idea-ultimate: 2017.2.1 -> 2017.2.2

---
 pkgs/applications/editors/jetbrains/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 31fc2fd66960..fd3025cb07df 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -307,12 +307,12 @@ in
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "2017.2.1";
+    version = "2017.2.2"; /* updated by script */
     description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz";
-      sha256 = "0y3r82i229d7lywixyifv4kkrwivixl75flagaqbkzw3j9wklg3k";
+      sha256 = "b8eb9d612800cc896eb6b6fbefbf9f49d92d2350ae1c3c4598e5e12bf93be401"; /* updated by script */
     };
     wmClass = "jetbrains-idea";
     update-channel = "IDEA_Release";

From 5bf21b3db78ea62b90ed67228188793f80b2385d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 25 Aug 2017 11:07:40 +0100
Subject: [PATCH 48/58] jetbrains.pycharm-community: 2017.2.1 -> 2017.2.2

---
 pkgs/applications/editors/jetbrains/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index fd3025cb07df..a39327b0222c 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -346,12 +346,12 @@ in
 
   pycharm-community = buildPycharm rec {
     name = "pycharm-community-${version}";
-    version = "2017.1.5"; /* updated by script */
+    version = "2017.2.2"; /* updated by script */
     description = "PyCharm Community Edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "1a0bbf0d881527e08aad7a5adaa3ad44e8754c3eb2c3a8ed5ab113491549679b"; /* updated by script */
+      sha256 = "4eacc9bf512406bebf71546ccb4b6c14ea8e06748fd76be6ca409ea1955e1f53"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm-ce";
     update-channel = "PyCharm_Release";

From ed023e03749ea47141aad3bca0289fb0a134a9f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 25 Aug 2017 11:08:18 +0100
Subject: [PATCH 49/58] jetbrains.idea-ultimate: 2017.2.1 -> 2017.2.2

---
 pkgs/applications/editors/jetbrains/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index a39327b0222c..2784f15c1365 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -359,12 +359,12 @@ in
 
   pycharm-professional = buildPycharm rec {
     name = "pycharm-professional-${version}";
-    version = "2017.1.5"; /* updated by script */
+    version = "2017.2.2"; /* updated by script */
     description = "PyCharm Professional Edition";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "52519dfd0e913b5ccb8767155cd4d1fd413967d5010e8474cdc9a1fa688016ce"; /* updated by script */
+      sha256 = "21aedfd189115fcfee0e8c8df88eccbd8f19b998667af3c55ce5d56d4eaa37a9"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm";
     update-channel = "PyCharm_Release";

From 7ea05ea54244f5fa5a308f2f03181179a607675c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 25 Aug 2017 11:08:56 +0100
Subject: [PATCH 50/58] jetbrains.webstorm: 2017.1.4 -> 2017.2.2

fixes #28560
---
 pkgs/applications/editors/jetbrains/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 2784f15c1365..ea1fc1022fd2 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -424,12 +424,12 @@ in
 
   webstorm = buildWebStorm rec {
     name = "webstorm-${version}";
-    version = "2017.1.4";
+    version = "2017.2.2"; /* updated by script */
     description = "Professional IDE for Web and JavaScript development";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
-      sha256 = "0aw2728wknss5vn2fkgz8rkm5vwk031305f32dirfrh51bvmq2zm";
+      sha256 = "d6b7b103f8543e25d2602657f12d029856529895af6354e1a0875ed40bd05180"; /* updated by script */
     };
     wmClass = "jetbrains-webstorm";
     update-channel = "WS_Release";

From b854e83183ab92e05e8697f2f94d10aa60c59492 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 25 Aug 2017 12:50:41 +0100
Subject: [PATCH 51/58] pythonPackages.matrix-client: don't pass pythonPackages

---
 pkgs/development/python-modules/matrix-client/default.nix | 7 ++++---
 pkgs/top-level/python-packages.nix                        | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/matrix-client/default.nix b/pkgs/development/python-modules/matrix-client/default.nix
index d0bbef8a78fd..20af252f58f6 100644
--- a/pkgs/development/python-modules/matrix-client/default.nix
+++ b/pkgs/development/python-modules/matrix-client/default.nix
@@ -1,7 +1,8 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, pythonPackages
+, requests
+, tox, pytest, flake8, responses
 }:
 
 buildPythonPackage rec {
@@ -14,9 +15,9 @@ buildPythonPackage rec {
     sha256 = "15kx5px26hwr0sxpyjk4w61fjnabg1b57hwys1nyarc0jx4qjhiq";
   };
 
-  checkInputs = with pythonPackages; [ tox pytest flake8 responses ];
+  checkInputs = [ tox pytest flake8 responses ];
 
-  propagatedBuildInputs = with pythonPackages; [ requests ];
+  propagatedBuildInputs = [ requests ];
 
   checkPhase = ''
     pytest
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d00d7f5d1647..894742625b38 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12539,7 +12539,7 @@ in {
     inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa;
   };
 
-  matrix-client = callPackage ../development/python-modules/matrix-client/default.nix { pythonPackages = self; };
+  matrix-client = callPackage ../development/python-modules/matrix-client/default.nix { };
 
   mccabe = callPackage ../development/python-modules/mccabe { };
 

From a5386213ad17e6780db6afcd075e470c6a005c58 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 25 Aug 2017 13:37:36 +0200
Subject: [PATCH 52/58] monkeys-audio: Fix build against GCC 6.x

Regression introduced by 1ded0cb24c4cd6b456ff18b6162d2173cc6330fc.

The package defines macros for min() and max(), but those macros are
undefined by the inclusion of stdlib.h since GCC 6.x, so we need to
change tho order of inclusions to include stdlib.h *before* NoWindows.h.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../audio/monkeys-audio/buildfix.diff         | 32 ++++++++++++++++---
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/monkeys-audio/buildfix.diff b/pkgs/applications/audio/monkeys-audio/buildfix.diff
index 3c48f6ad828f..9684e5bf8e43 100644
--- a/pkgs/applications/audio/monkeys-audio/buildfix.diff
+++ b/pkgs/applications/audio/monkeys-audio/buildfix.diff
@@ -1,7 +1,8 @@
-diff -ru monkeys-audio-3.99-u4-b5/src/MACLib/APELink.cpp monkeys-audio-3.99-u4-b5.patched/src/MACLib/APELink.cpp
---- monkeys-audio-3.99-u4-b5/src/MACLib/APELink.cpp	2006-06-01 11:00:57.000000000 +0200
-+++ monkeys-audio-3.99-u4-b5.patched/src/MACLib/APELink.cpp	2012-01-05 14:51:47.000000000 +0100
-@@ -63,10 +63,10 @@
+diff --git a/src/MACLib/APELink.cpp b/src/MACLib/APELink.cpp
+index d349f4b..b00ec83 100644
+--- a/src/MACLib/APELink.cpp
++++ b/src/MACLib/APELink.cpp
+@@ -63,10 +63,10 @@ void CAPELink::ParseData(const char * pData, const str_utf16 * pFilename)
      if (pData != NULL)
      {
          // parse out the information
@@ -16,7 +17,7 @@ diff -ru monkeys-audio-3.99-u4-b5/src/MACLib/APELink.cpp monkeys-audio-3.99-u4-b
  
          if (pHeader && pImageFile && pStartBlock && pFinishBlock)
          {
-@@ -81,7 +81,7 @@
+@@ -81,7 +81,7 @@ void CAPELink::ParseData(const char * pData, const str_utf16 * pFilename)
                  
                  // get the path
                  char cImageFile[MAX_PATH + 1]; int nIndex = 0;
@@ -25,3 +26,24 @@ diff -ru monkeys-audio-3.99-u4-b5/src/MACLib/APELink.cpp monkeys-audio-3.99-u4-b
                  while ((*pImageCharacter != 0) && (*pImageCharacter != '\r') && (*pImageCharacter != '\n'))
                      cImageFile[nIndex++] = *pImageCharacter++;
                  cImageFile[nIndex] = 0;
+diff --git a/src/Shared/All.h b/src/Shared/All.h
+index 328addc..7730e89 100644
+--- a/src/Shared/All.h
++++ b/src/Shared/All.h
+@@ -21,6 +21,8 @@ Global includes
+     #include <windows.h>
+ #endif
+ 
++#include <stdlib.h>
++
+ #ifdef _WIN32
+     #include <mmsystem.h>
+     #include <tchar.h>
+@@ -34,7 +36,6 @@ Global includes
+     #include "NoWindows.h"
+ #endif
+ 
+-#include <stdlib.h>
+ #include <memory.h>
+ #include <stdio.h>
+ #include <math.h>

From dd5f0d9538aa84e42bd666e8679cb448fa8a79fe Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 25 Aug 2017 14:08:11 +0200
Subject: [PATCH 53/58] nixos: Fix build of manual

Regression introduced by 520a43ced38843d5116594b359854e02fa7ed057.

Using XML tag characters for things that are not tags needs to be
properly indicated by an entity.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/modules/programs/oblogout.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/programs/oblogout.nix b/nixos/modules/programs/oblogout.nix
index 042935d285e3..720c29b1eaee 100644
--- a/nixos/modules/programs/oblogout.nix
+++ b/nixos/modules/programs/oblogout.nix
@@ -45,7 +45,7 @@ in
         description = ''
           Icon theme for the buttons, must be in the themes folder of
           the package, or in
-          <filename>~/.themes/<name>/oblogout/</filename>.
+          <filename>~/.themes/&lt;name&gt;/oblogout/</filename>.
         '';
       };
 

From 30c15c9149a6ea37533cd4b7cc8f231bd1f21780 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 25 Aug 2017 14:41:30 +0200
Subject: [PATCH 54/58] Fix a bunch of ghc-8.2.x Haskell builds.

---
 .../haskell-modules/configuration-ghc-8.2.x.nix          | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index d1e22d881c35..fc0c34f03971 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -48,8 +48,6 @@ self: super: {
     sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy";
   });
 
-  ## GHC > 8.0.2
-
   # http://hub.darcs.net/dolio/vector-algorithms/issue/9#comment-20170112T145715
   vector-algorithms = dontCheck super.vector-algorithms;
 
@@ -62,5 +60,12 @@ self: super: {
   # Work around overly restrictive constraints on the version of 'base'.
   ChasingBottoms = doJailbreak super.ChasingBottoms;
   hashable = doJailbreak super.hashable;
+  protolude = doJailbreak super.protolude;
+  quickcheck-instances = doJailbreak super.quickcheck-instances;
+
+  # LTS-9 versions do not compile.
+  path = dontCheck super.path;
+  path-io = super.path-io_1_3_3;
+  trifecta = super.trifecta_1_7_1_1;
 
 }

From 55821dc576b535c2aa33ba535f6ad31c8f5df3ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 25 Aug 2017 14:59:49 +0200
Subject: [PATCH 55/58] git-lfs: adding old 1.5.6 (supports old server
 protocols)

Some git-lfs servers may not be ready for 2.x clients.
---
 .../version-management/git-lfs/1.nix          | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++-
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/version-management/git-lfs/1.nix

diff --git a/pkgs/applications/version-management/git-lfs/1.nix b/pkgs/applications/version-management/git-lfs/1.nix
new file mode 100644
index 000000000000..24c22d423d5d
--- /dev/null
+++ b/pkgs/applications/version-management/git-lfs/1.nix
@@ -0,0 +1,35 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "git-lfs-${version}";
+  version = "1.5.6";
+  rev = "0d02fb7d9a1c599bbf8c55e146e2845a908e04e0";
+  
+  goPackagePath = "github.com/git-lfs/git-lfs";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "git-lfs";
+    repo = "git-lfs";
+    sha256 = "0wddry1lqjccf4522fvhx6grx8h57xsz17lkaf5aybnrgw677w3d";
+  };
+
+  # Tests fail with 'lfstest-gitserver.go:46: main redeclared in this block'
+  excludedPackages = [ "test" ];
+
+  preBuild = ''
+    pushd go/src/github.com/git-lfs/git-lfs
+      go generate ./commands
+    popd
+  '';
+
+  postInstall = ''
+    rm -v $bin/bin/{man,script}
+  '';
+  meta = with stdenv.lib; {
+    description = "Git extension for versioning large files";
+    homepage    = https://git-lfs.github.com/;
+    license     = [ licenses.mit ];
+    maintainers = [ maintainers.twey ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3a3591a83bb5..d5c8f3d2af07 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2134,7 +2134,9 @@ with pkgs;
 
   git-crecord = callPackage ../applications/version-management/git-crecord { };
 
-  git-lfs = callPackage ../applications/version-management/git-lfs { };
+  git-lfs = lowPrio (callPackage ../applications/version-management/git-lfs { });
+
+  git-lfs1 = callPackage ../applications/version-management/git-lfs/1.nix { };
 
   git-ftp = callPackage ../development/tools/git-ftp { };
 

From 3933c4e9435fb0c3d89f670064f78a6512c23db1 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@teamviewer.com>
Date: Fri, 25 Aug 2017 17:33:18 +0200
Subject: [PATCH 56/58] graylog: 2.3.0 -> 2.3.1

---
 pkgs/tools/misc/graylog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix
index 00cb6fd44f2e..516e27dee7f9 100644
--- a/pkgs/tools/misc/graylog/default.nix
+++ b/pkgs/tools/misc/graylog/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "2.3.0";
+  version = "2.3.1";
   name = "graylog-${version}";
 
   src = fetchurl {
     url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
-    sha256 = "03jv8l5hj3hw91vk69pxhc2zvxyzc5sfvxf700rq83wsjh6gb5iz";
+    sha256 = "1zms24w4lnisjqgkj4a8cmnmlvpsqjl1sab5k99dyknq7b31x0sd";
   };
 
   dontBuild = true;

From c905b7895cff498a8ccddfa77ab401676d16ed55 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 25 Aug 2017 18:23:07 +0200
Subject: [PATCH 57/58] twister: 0.9.30 -> 0.9.34

From the upstream changelog:

Version 0.9.34:

 * quick fix to "Assertion mapInfo.count" failed, don't mess with these
   addrman structures!

Version 0.9.33:

 * fix serious connectivity problem: not trying to connect to >=0.9.30
   peers with random ports.

Version 0.9.31:

 * backport from upstream (arvidn/libtorrent@677e642):
   fixed uTP vulnerability from

The fixes in 0.9.31 are a bit more serious and it actually contains two
fixes from what I've been able to dig through:

 * https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-5685
 * https://www.us-cert.gov/ncas/alerts/TA14-017A

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/networking/p2p/twister/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix
index 6cb2c7247d54..2388b9ded18e 100644
--- a/pkgs/applications/networking/p2p/twister/default.nix
+++ b/pkgs/applications/networking/p2p/twister/default.nix
@@ -15,12 +15,12 @@ let
 
 in stdenv.mkDerivation rec {
   name = "twister-${version}";
-  version = "0.9.30";
+  version = "0.9.34";
 
   src = fetchurl {
     url = "https://github.com/miguelfreitas/twister-core/"
         + "archive/v${version}.tar.gz";
-    sha256 = "1i39iqq6z25rh869vi5k76g84rmyh30p05xid7z9sqjrqdfpyyzk";
+    sha256 = "1bi8libivd9y2bn9fc7vbc5q0jnal0pykpzgri6anqaww22y58jq";
   };
 
   configureFlags = [

From 58c0d63100244211f5a898d5c26a76aca038698c Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 25 Aug 2017 18:27:41 +0200
Subject: [PATCH 58/58] twister: Fix build against GCC 6.x

This applies upstream commit miguelfreitas/twister-core@dd4f5a176958ea6.

Tested only by building and executing "twisterd --help", but no serious
testing done otherwise.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/networking/p2p/twister/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix
index 2388b9ded18e..e5a242662ce1 100644
--- a/pkgs/applications/networking/p2p/twister/default.nix
+++ b/pkgs/applications/networking/p2p/twister/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, python2
+{ stdenv, fetchurl, fetchpatch, autoconf, automake, libtool, pkgconfig, python2
 , boost, db, openssl, geoip, libiconv, miniupnpc
 , srcOnly, fetchgit
 }:
@@ -37,6 +37,12 @@ in stdenv.mkDerivation rec {
     boost db openssl geoip miniupnpc libiconv
   ];
 
+  patches = stdenv.lib.singleton (fetchpatch {
+    url = "https://github.com/miguelfreitas/twister-core/commit/"
+        + "dd4f5a176958ea6ed855dc3fcef79680c1c0c92c.patch";
+    sha256 = "06fgmqnjyl83civ3ixiq673k8zjgm8n2w4w46nsh810nprqim8s6";
+  });
+
   postPatch = ''
     sed -i -e '/-htmldir/s|(default: [^)]*)|(default: ${twisterHTML})|' \
       src/init.cpp