From 055759d27a34a0b5654c7cc1380f60023eb2f91e Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@gmail.com>
Date: Sat, 30 Sep 2017 11:59:35 +0000
Subject: [PATCH 01/36] yabause: Qt4 -> Qt5, disable emu-compatibility.com in
 About menu emu-compatibility.com is now defunct and thus should not be in
 About menu.

Other minor changes:
* linkage-rwx-linux-elf.diff -> linkage-rwx-linux-elf.patch
* Mark some inputs as optional
* Do not build with Doxygen by default: it does not produce any outputs
* Do not build with OpenAL by default: SDL2 handles sound when present
* Do not build with FreeGLUT by default: deprecated at upstream
---
 pkgs/misc/emulators/yabause/default.nix       | 36 +++++++++----------
 .../yabause/emu-compatibility.com.patch       | 10 ++++++
 ...x-elf.diff => linkage-rwx-linux-elf.patch} |  0
 pkgs/top-level/all-packages.nix               |  5 +--
 4 files changed, 30 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/misc/emulators/yabause/emu-compatibility.com.patch
 rename pkgs/misc/emulators/yabause/{linkage-rwx-linux-elf.diff => linkage-rwx-linux-elf.patch} (100%)

diff --git a/pkgs/misc/emulators/yabause/default.nix b/pkgs/misc/emulators/yabause/default.nix
index 23d91040b125..2fc60b543e67 100644
--- a/pkgs/misc/emulators/yabause/default.nix
+++ b/pkgs/misc/emulators/yabause/default.nix
@@ -1,35 +1,33 @@
-{ stdenv, fetchurl, config
-, cmake, pkgconfig
-, doxygen
-, qt
-, libXmu, mesa, openal, SDL2, freeglut
-}:
+{ stdenv, fetchurl, cmake, pkgconfig, qtbase, mesa
+, freeglut ? null, openal ? null, SDL2 ? null }:
 
 stdenv.mkDerivation rec {
-  name = "yabause-${meta.version}";
+  name = "yabause-${version}";
+  # 0.9.15 only works with OpenGL 3.2 or later:
+  # https://github.com/Yabause/yabause/issues/349
+  version = "0.9.14";
 
   src = fetchurl {
-    url = "http://download.tuxfamily.org/yabause/releases/${meta.version}/${name}.tar.gz";
+    url = "https://download.tuxfamily.org/yabause/releases/${version}/${name}.tar.gz";
     sha256 = "0nkpvnr599g0i2mf19sjvw5m0rrvixdgz2snav4qwvzgfc435rkm";
   };
 
-  patches = [ ./linkage-rwx-linux-elf.diff ];
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ qtbase mesa freeglut openal SDL2 ];
 
-  buildInputs =
-  [ cmake pkgconfig doxygen qt libXmu mesa openal SDL2 freeglut ];
+  patches = [ ./emu-compatibility.com.patch ./linkage-rwx-linux-elf.patch ];
 
-  cmakeConfigureFlags = [    
-    "-DYAB_PORTS='qt'"
-    "-DYAB_OPTIMIZED_DMA='ON'"
-    "-DYAB_NETWORK='ON'" ] ;
+  cmakeFlags = [
+    "-DYAB_NETWORK=ON"
+    "-DYAB_OPTIMIZED_DMA=ON"
+    "-DYAB_PORTS=qt"
+  ] ;
 
   meta = with stdenv.lib; {
-    version = "0.9.14";
     description = "An open-source Sega Saturn emulator";
-    homepage = http://yabause.org/;
+    homepage = https://yabause.org/;
     license = licenses.gpl2Plus;
-    maintainers = [ maintainers.AndersonTorres ];
+    maintainers = with maintaines; [ AndersonTorres ];
     platforms = platforms.linux;
   };
 }
-# TODO: Qt5
diff --git a/pkgs/misc/emulators/yabause/emu-compatibility.com.patch b/pkgs/misc/emulators/yabause/emu-compatibility.com.patch
new file mode 100644
index 000000000000..5f13d2ee1837
--- /dev/null
+++ b/pkgs/misc/emulators/yabause/emu-compatibility.com.patch
@@ -0,0 +1,10 @@
+--- a/src/qt/ui/UIYabause.ui	2017-09-28 13:23:04.636014753 +0000
++++ b/src/qt/ui/UIYabause.ui	2017-09-28 13:23:21.945763537 +0000
+@@ -230,7 +230,6 @@
+     <property name="title">
+      <string>&amp;Help</string>
+     </property>
+-    <addaction name="aHelpEmuCompatibility"/>
+     <addaction name="aHelpAbout"/>
+    </widget>
+    <widget class="QMenu" name="mTools">
diff --git a/pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.diff b/pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.patch
similarity index 100%
rename from pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.diff
rename to pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dcefe7f9ed4b..eba9b71f7073 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19446,8 +19446,9 @@ with pkgs;
 
   xzoom = callPackage ../tools/X11/xzoom {};
 
-  yabause = callPackage ../misc/emulators/yabause {
-    qt = qt4;
+  yabause = libsForQt5.callPackage ../misc/emulators/yabause {
+    freeglut = null;
+    openal = null;
   };
 
   yadm = callPackage ../applications/version-management/yadm { };

From b70be53c1504c64e0575384e06c91599d5c61a6a Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 23 Sep 2017 12:20:14 -0500
Subject: [PATCH 02/36] pyqt: 5.8.1 -> 5.9

---
 pkgs/development/python-modules/pyqt/5.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix
index 5d98544da886..9b3700bcd2a5 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -2,7 +2,7 @@
 , lndir, makeWrapper, qmake }:
 
 let
-  version = "5.8.1";
+  version = "5.9";
   inherit (pythonPackages) buildPythonPackage python dbus-python sip;
 in buildPythonPackage {
   name = "PyQt-${version}";
@@ -18,7 +18,7 @@ in buildPythonPackage {
 
   src = fetchurl {
     url = "mirror://sourceforge/pyqt/PyQt5/PyQt-${version}/PyQt5_gpl-${version}.tar.gz";
-    sha256 = "0biak7l574i2gc8lj1s45skajbxsmmx66nlvs6xaakzkc6r293qy";
+    sha256 = "15hh4z5vd45dcswjla58q6rrfr6ic7jfz2n7c8lwfb10rycpj3mb";
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper qmake ];

From 3ef63d67a054c34fce0e26d4e0c52c63eabe2c4e Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 23 Sep 2017 16:31:19 -0500
Subject: [PATCH 03/36] sip: 4.19.1 -> 4.19.3

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

diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix
index b6094f37c3a5..af885fcf5a2a 100644
--- a/pkgs/development/python-modules/sip/default.nix
+++ b/pkgs/development/python-modules/sip/default.nix
@@ -2,13 +2,13 @@
 
 if isPyPy then throw "sip not supported for interpreter ${python.executable}" else buildPythonPackage rec {
   pname = "sip";
-  version = "4.19.1";
+  version = "4.19.3";
   name = "${pname}-${version}";
   format = "other";
 
   src = fetchurl {
     url = "mirror://sourceforge/pyqt/sip/${name}/${name}.tar.gz";
-    sha256 = "501852b8325349031b769d1c03d6eab04f7b9b97f790ec79f3d3d04bf065d83e";
+    sha256 = "0x2bghbprwl3az1ni3p87i0bq8r99694la93kg65vi0cz12gh3bl";
   };
 
   configurePhase = ''

From a8f2ad6245cf468c8ae89f84078c205e8ff45456 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Mon, 2 Oct 2017 18:26:39 -0700
Subject: [PATCH 04/36] kubecfg: init at 0.5.0

---
 .../networking/cluster/kubecfg/default.nix    | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/kubecfg/default.nix

diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix
new file mode 100644
index 000000000000..7f17bd57c194
--- /dev/null
+++ b/pkgs/applications/networking/cluster/kubecfg/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildGoPackage, fetchFromGitHub, ... }:
+
+let version = "0.5.0"; in
+
+buildGoPackage {
+  name = "kubecfg-${version}";
+
+  src = fetchFromGitHub {
+    owner = "ksonnet";
+    repo = "kubecfg";
+    rev = "v${version}";
+    sha256 = "1s8w133p8qkj3dr73jimajm9ddp678lw9k9symj8rjw5p35igr93";
+  };
+
+  goPackagePath = "github.com/ksonnet/kubecfg";
+
+  meta = {
+    description = "A tool for managing Kubernetes resources as code";
+    homepage = https://github.com/ksonnet/kubecfg;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ benley ];
+    platforms = lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6cbb7961f3ed..4c14d1acd21e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15206,6 +15206,8 @@ with pkgs;
 
   ktorrent = libsForQt5.callPackage ../applications/networking/p2p/ktorrent { };
 
+  kubecfg = callPackage ../applications/networking/cluster/kubecfg { };
+
   kubernetes = callPackage ../applications/networking/cluster/kubernetes {  };
 
   kubernetes-helm = callPackage ../applications/networking/cluster/helm { };

From 5ae175744af57dc5a002fc8902a7fcd0d488f860 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 29 Sep 2017 08:52:16 +0900
Subject: [PATCH 05/36] nspr: 4.15 -> 4.16

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

diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index c2aea07d102c..8f7bebf649c9 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl
 , CoreServices ? null }:
 
-let version = "4.15"; in
+let version = "4.16"; in
 
 stdenv.mkDerivation {
   name = "nspr-${version}";
 
   src = fetchurl {
     url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
-    sha256 = "101dksqm1z0hzd7ap82ccbxjr48s6q3xhshdl81qkj6hqdmy1p97";
+    sha256 = "1l9wlnb9y0bzicv448jjl9kssqn044dc2qrkwzp4ll35fvch4ccv";
   };
 
   outputs = [ "out" "dev" ];

From 6e2744ab0ff384ed43bcab5bfa564bc4289b4b55 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 29 Sep 2017 08:52:45 +0900
Subject: [PATCH 06/36] nss: 3.31 -> 3.32.1

---
 pkgs/development/libraries/nss/default.nix | 58 +++++++++++-----------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 80975c8ef5dc..c88cfb8826ec 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -9,11 +9,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nss-${version}";
-  version = "3.31";
+  version = "3.32.1";
 
   src = fetchurl {
-    url = "mirror://mozilla/security/nss/releases/NSS_3_31_RTM/src/${name}.tar.gz";
-    sha256 = "0pd643a8ns7q5az5ai3ascrw666i2kbfiyy1c9hlhw9jd8jn21g9";
+    url = "mirror://mozilla/security/nss/releases/NSS_3_32_1_RTM/src/${name}.tar.gz";
+    sha256 = "0lj6c94102aa81bnjisnix09zfjly9aa1d6vrzxmcjmzynkrrrad";
   };
 
   buildInputs = [ perl zlib sqlite ];
@@ -25,37 +25,13 @@ in stdenv.mkDerivation rec {
   '';
 
   patches =
-    [ # Install a nss.pc (pkgconfig) file and nss-config script
-      # Upstream issue: https://bugzilla.mozilla.org/show_bug.cgi?id=530672
-      (fetchurl {
-        name = "nss-3.28-gentoo-fixups.patch";
-        url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/"
-            + "dev-libs/nss/files/nss-3.28-gentoo-fixups.patch"
-            + "?id=05c31f8cca591b3ce8219e4def7c26c7b1b130d6";
-        sha256 = "0z58axd1n7vq4kdp5mrb3dsg6di39a1g40s3shl6n2dzs14c1y2q";
-      })
+    [
       # Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch
       ./85_security_load.patch
     ];
 
   patchFlags = "-p0";
 
-  postPatch = ''
-    # Fix up the patch from Gentoo.
-    sed -i \
-      -e "/^PREFIX =/s|= /usr|= $out|" \
-      -e '/@libdir@/s|gentoo/nss|lib|' \
-      -e '/ln -sf/d' \
-      nss/config/Makefile
-
-    # Note for spacing/tab nazis: The TAB characters are intentional!
-    cat >> nss/config/Makefile <<INSTALL_TARGET
-    install:
-    	mkdir -p \$(DIST)/lib/pkgconfig
-    	cp nss.pc \$(DIST)/lib/pkgconfig
-    INSTALL_TARGET
-  '';
-
   outputs = [ "out" "dev" "tools" ];
 
   preConfigure = "cd nss";
@@ -79,9 +55,31 @@ in stdenv.mkDerivation rec {
     mv $out/*.OBJ/* $out/
     rmdir $out/*.OBJ
 
-    cp -av config/nss-config $out/bin/nss-config
-
     ln -s lib $out/lib64
+
+    # Upstream issue: https://bugzilla.mozilla.org/show_bug.cgi?id=530672
+    # https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/nss/files/nss-3.32-gentoo-fixups.patch?id=af1acce6c6d2c3adb17689261dfe2c2b6771ab8a
+    NSS_MAJOR_VERSION=`grep "NSS_VMAJOR" lib/nss/nss.h | awk '{print $3}'`
+    NSS_MINOR_VERSION=`grep "NSS_VMINOR" lib/nss/nss.h | awk '{print $3}'`
+    NSS_PATCH_VERSION=`grep "NSS_VPATCH" lib/nss/nss.h | awk '{print $3}'`
+    PREFIX="$out"
+
+    mkdir -p $out/lib/pkgconfig
+    sed -e "s,%prefix%,$PREFIX," \
+        -e "s,%exec_prefix%,$PREFIX," \
+        -e "s,%libdir%,$PREFIX/lib64," \
+        -e "s,%includedir%,$PREFIX/include/nss," \
+        -e "s,%NSS_VERSION%,$NSS_MAJOR_VERSION.$NSS_MINOR_VERSION.$NSS_PATCH_VERSION,g" \
+        -e "s,%NSPR_VERSION%,4.16,g" \
+        pkg/pkg-config/nss.pc.in > $out/lib/pkgconfig/nss.pc
+    chmod 0644 $out/lib/pkgconfig/nss.pc
+
+    sed -e "s,@prefix@,$PREFIX," \
+        -e "s,@MOD_MAJOR_VERSION@,$NSS_MAJOR_VERSION," \
+        -e "s,@MOD_MINOR_VERSION@,$NSS_MINOR_VERSION," \
+        -e "s,@MOD_PATCH_VERSION@,$NSS_PATCH_VERSION," \
+        pkg/pkg-config/nss-config.in > $out/bin/nss-config
+    chmod 0755 $out/bin/nss-config
   '';
 
   postFixup = ''

From a9d2c56df2e99c7d0a848a055b7c608b0ac762ab Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 29 Sep 2017 08:53:04 +0900
Subject: [PATCH 07/36] icu4c: 58.2 -> 59.1

---
 pkgs/development/libraries/icu/default.nix | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix
index 173c9bb58ad9..5f81ae694cba 100644
--- a/pkgs/development/libraries/icu/default.nix
+++ b/pkgs/development/libraries/icu/default.nix
@@ -2,15 +2,7 @@
 
 let
   pname = "icu4c";
-  version = "58.2";
-
-  # this patch should no longer be needed in 58.3
-  # https://bugs.gentoo.org/show_bug.cgi?id=599142#c14
-  keywordFix = fetchurl {
-    url = "http://bugs.icu-project.org/trac/changeset/39484?format=diff";
-    name = "icu-changeset-39484.diff";
-    sha256 = "0hxhpgydalyxacaaxlmaddc1sjwh65rsnpmg0j414mnblq74vmm8";
-  };
+  version = "59.1";
 in
 stdenv.mkDerivation {
   name = pname + "-" + version;
@@ -18,7 +10,7 @@ stdenv.mkDerivation {
   src = fetchurl {
     url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-"
       + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz";
-    sha256 = "036shcb3f8bm1lynhlsb4kpjm9s9c2vdiir01vg216rs2l8482ib";
+    sha256 = "1zkmbg2932ggvpgjp8pys0cj6z8bw087y8858009shkrjfpzscki";
   };
 
   outputs = [ "out" "dev" ];
@@ -33,10 +25,6 @@ stdenv.mkDerivation {
     echo Source root reset to ''${sourceRoot}
   '';
 
-  patchFlags = "-p4";
-
-  patches = [ keywordFix ];
-
   preConfigure = ''
     sed -i -e "s|/bin/sh|${stdenv.shell}|" configure
   '' + stdenv.lib.optionalString stdenv.isArm ''

From 0c2b37a75d4e8232f8a20326894f41cb49bed8b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=B2=20Balzarotti?= <anothersms@gmail.com>
Date: Thu, 5 Oct 2017 11:28:35 +0200
Subject: [PATCH 08/36] ntk: 2017-04-22 -> 1.3.1000

---
 pkgs/development/libraries/audio/ntk/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/audio/ntk/default.nix b/pkgs/development/libraries/audio/ntk/default.nix
index 35144862ce9b..7df258877d79 100644
--- a/pkgs/development/libraries/audio/ntk/default.nix
+++ b/pkgs/development/libraries/audio/ntk/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, fetchgit, cairo, libjpeg, libXft, pkgconfig, python2 }:
+{ stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkgconfig, python2 }:
 
 stdenv.mkDerivation rec {
   name = "ntk-${version}";
-  version = "2017-04-22";
-  src = fetchgit {
-    url = "git://git.tuxfamily.org/gitroot/non/fltk.git";
-    rev = "92365eca0f9a6f054abc70489c009aba0fcde0ff";
-    sha256 = "0pph7hf07xaa011zr40cs62f3f7hclfbv5kcrl757gcp2s5pi2iq";
+  version = "1.3.1000";
+  src = fetchFromGitHub {
+    owner = "original-male";
+    repo = "ntk";
+    rev = "v${version}";
+    sha256 = "0j38mhnfqy6swcrnc5zxcwlqi8b1pgklyghxk6qs1lf4japv2zc0";
   };
 
   buildInputs = [
@@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
     version = "${version}";
     homepage = http://non.tuxfamily.org/;
     license = stdenv.lib.licenses.lgpl21;
-    maintainers = [ stdenv.lib.maintainers.magnetophon ];
+    maintainers = with stdenv.lib.maintainers; [ magnetophon nico202 ];
     platforms = stdenv.lib.platforms.linux;
   };
 }

From f192ce9730a87bde7c9445bf7df5b0aeba2e04d9 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 5 Oct 2017 09:47:30 -0400
Subject: [PATCH 09/36] rkt: 1.28.1 -> 1.29.0

---
 pkgs/applications/virtualization/rkt/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index a23537847a19..452f082e20e7 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -4,15 +4,15 @@
 let
   # Always get the information from
   # https://github.com/coreos/rkt/blob/v${VERSION}/stage1/usr_from_coreos/coreos-common.mk
-  coreosImageRelease = "1235.0.0";
-  coreosImageSystemdVersion = "231";
+  coreosImageRelease = "1478.0.0";
+  coreosImageSystemdVersion = "233";
 
   # TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor.
   stage1Flavours = [ "coreos" "fly" ];
   stage1Dir = "lib/rkt/stage1-images";
 
 in stdenv.mkDerivation rec {
-  version = "1.28.1";
+  version = "1.29.0";
   name = "rkt-${version}";
   BUILDDIR="build-${name}";
 
@@ -20,12 +20,12 @@ in stdenv.mkDerivation rec {
     owner = "coreos";
     repo = "rkt";
     rev = "v${version}";
-    sha256 = "1xn2cz30gq0500gmp5aml03hmk066fq9i04jizb5sc0j41fmsgja";
+    sha256 = "0wnhii15pr4z190iladfcl4jzj9sgyl1bn5v63a3yy6nkmz9cfda";
   };
 
   stage1BaseImage = fetchurl {
     url = "http://alpha.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz";
-    sha256 = "05gk28a7zzp3j0d1y96cr1xwy9gdl4s0lpnbakzqppa4w3c4m3lq";
+    sha256 = "0s4qdkkfp0iirfnm5ds3b3hxq0249kvpygyhflma8z90ivkzk5wq";
   };
 
   buildInputs = [

From 69ad8a5d923917c89350f5f32c9000ec926d7c0d Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Thu, 28 Sep 2017 09:13:15 +0900
Subject: [PATCH 10/36] firefox: 55.0.3 -> 56.0

---
 .../networking/browsers/firefox/common.nix       | 16 ++++++++++++++--
 .../networking/browsers/firefox/packages.nix     |  4 ++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index de19e6118511..1b72f9e18c30 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -8,8 +8,7 @@
 , yasm, mesa, sqlite, unzip, makeWrapper
 , hunspell, libevent, libstartup_notification, libvpx
 , cairo, icu, libpng, jemalloc
-, autoconf213, which, gnused, cargo, rustc
-
+, autoconf213, which, gnused, cargo, rustc, llvmPackages
 , debugBuild ? false
 
 ### optionals
@@ -50,6 +49,7 @@ assert stdenv.cc ? libc && stdenv.cc.libc != null;
 
 let
   flag = tf: x: [(if tf then "--enable-${x}" else "--disable-${x}")];
+  gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
 in
 
 stdenv.mkDerivation (rec {
@@ -74,6 +74,8 @@ stdenv.mkDerivation (rec {
   ++ lib.optionals ffmpegSupport [ gstreamer gst-plugins-base ]
   ++ lib.optional  gtk3Support gtk3;
 
+  NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss";
+
   nativeBuildInputs =
     [ autoconf213 which gnused pkgconfig perl python cargo rustc ]
     ++ lib.optional gtk3Support wrapGAppsHook;
@@ -88,6 +90,12 @@ stdenv.mkDerivation (rec {
     make -f client.mk configure-files
 
     configureScript="$(realpath ./configure)"
+
+    cxxLib=$( echo -n ${gcc}/include/c++/* )
+    archLib=$cxxLib/$( ${gcc}/bin/gcc -dumpmachine )
+
+    test -f layout/style/ServoBindings.toml && sed -i -e '/"-DMOZ_STYLO"/ a , "-cxx-isystem", "'$cxxLib'", "-isystem", "'$archLib'"' layout/style/ServoBindings.toml
+
     cd obj-*
   '' + lib.optionalString googleAPISupport ''
     # Google API key used by Chromium and Firefox.
@@ -120,6 +128,10 @@ stdenv.mkDerivation (rec {
     "--disable-gconf"
     "--enable-default-toolkit=cairo-gtk${if gtk3Support then "3" else "2"}"
   ]
+  ++ lib.optionals (stdenv.lib.versionAtLeast version "56") [
+    "--with-libclang-path=${llvmPackages.clang-unwrapped}/lib"
+    "--with-clang-path=${llvmPackages.clang}/bin/clang"
+  ]
 
   # TorBrowser patches these
   ++ lib.optionals (!isTorBrowserLike) [
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index e2a8e201fef7..5a3d9ee2b990 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -6,10 +6,10 @@ rec {
 
   firefox = common rec {
     pname = "firefox";
-    version = "55.0.3";
+    version = "56.0";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "3cacc87b97871f3a8c5e97c17ef7025079cb5c81f32377d9402cdad45815ac6c4c4762c79187f1e477910161c2377c42d41de62a50b6741d5d7c1cd70e8c6416";
+      sha512 = "3aeb0ff54e10c83894f61734daa4f0801a1bb499d4667adad9c78520e588eae809d0e4d61e9227206466d62c3b453e2ce9ca8198f59f5354cd1b6804c00f0990";
     };
 
     patches =

From faf8b82482004106673eb25329d1511ccf761bfd Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Thu, 28 Sep 2017 09:13:16 +0900
Subject: [PATCH 11/36] firefox-esr: 52.3.0esr -> 52.4.0esr

---
 pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 5a3d9ee2b990..b2e993e35e00 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -32,10 +32,10 @@ rec {
 
   firefox-esr = common rec {
     pname = "firefox-esr";
-    version = "52.3.0esr";
+    version = "52.4.0esr";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "36da8f14b50334e36fca06e09f15583101cadd10e510268255587ea9b09b1fea918da034d6f1d439ab8c34612f6cebc409a0b8d812dddb3f997afebe64d09fe9";
+      sha512 = "be3be7f9dbf4bd0344d5d76f26d1a5090bb012154d25833d5cd58e5e707c080515b42ed751e1f7e58b15b96939d7da634cafb6e8aa9bb1627ff420836b802183";
     };
 
     meta = firefox.meta // {

From 7525a3c89f09ad3f8f314b72d39b23b641f117f8 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Thu, 5 Oct 2017 16:44:59 +0200
Subject: [PATCH 12/36] sonic-pi: 2.9.0 -> 3.0.1

---
 pkgs/applications/audio/sonic-pi/default.nix  | 72 +++++++++++++------
 .../audio/sonic-pi/fixed-prefixes.patch       | 36 ----------
 pkgs/top-level/all-packages.nix               |  2 +-
 3 files changed, 52 insertions(+), 58 deletions(-)
 delete mode 100644 pkgs/applications/audio/sonic-pi/fixed-prefixes.patch

diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix
index 3c7be51554d8..d1c48ce44ed8 100644
--- a/pkgs/applications/audio/sonic-pi/default.nix
+++ b/pkgs/applications/audio/sonic-pi/default.nix
@@ -1,24 +1,33 @@
 { stdenv
 , fetchFromGitHub
-, qscintilla
-, supercollider
+, fftwSinglePrec
 , ruby
+, libffi
+, aubio
 , cmake
 , pkgconfig
-, qt48Full
+, qt5
+, libsForQt5
+, boost
 , bash
 , makeWrapper
+, jack2Full
 }:
 
-stdenv.mkDerivation rec {
-  version = "2.9.0";
+let
+  supercollider = libsForQt5.callPackage ../../../development/interpreters/supercollider {
+    fftw = fftwSinglePrec;
+  };
+
+in stdenv.mkDerivation rec {
+  version = "3.0.1";
   name = "sonic-pi-${version}";
 
   src = fetchFromGitHub {
     owner = "samaaron";
     repo = "sonic-pi";
     rev = "v${version}";
-    sha256 = "19db5dxrf6h1v2w3frds5g90nb6izd9ppp7cs2xi6i0m67l6jrwb";
+    sha256 = "1l1892hijp1dj2h799sfjr699q6xp660n0siibab5kv238521a81";
   };
 
   buildInputs = [
@@ -26,24 +35,18 @@ stdenv.mkDerivation rec {
     cmake
     makeWrapper
     pkgconfig
-    qscintilla
-    qt48Full
+    qt5.qtbase
+    libsForQt5.qscintilla
+    libsForQt5.qwt
     ruby
+    libffi
+    aubio
     supercollider
+    boost
   ];
 
-  meta = {
-    homepage = http://sonic-pi.net/;
-    description = "Free live coding synth for everyone originally designed to support computing and music lessons within schools";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.Phlogistique ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-
   dontUseCmakeConfigure = true;
 
-  patches = [ ./fixed-prefixes.patch ];
-
   preConfigure = ''
     patchShebangs .
     substituteInPlace app/gui/qt/mainwindow.cpp \
@@ -52,18 +55,45 @@ stdenv.mkDerivation rec {
   '';
 
   buildPhase = ''
+    export SONIC_PI_HOME=$TMPDIR
+    export AUBIO_LIB=${aubio}/lib/libaubio.so
+
     pushd app/server/bin
       ./compile-extensions.rb
+      ./i18n-tool.rb -t
     popd
 
     pushd app/gui/qt
-      ./rp-build-app
+      cp -f ruby_help.tmpl ruby_help.h
+      ../../server/bin/qt-doc.rb -o ruby_help.h
+
+      substituteInPlace SonicPi.pro \
+        --replace "LIBS += -lrt -lqt5scintilla2" \
+                  "LIBS += -lrt -lqscintilla2 -lqwt"
+
+      lrelease SonicPi.pro
+      qmake SonicPi.pro 
+
+      make
     popd
   '';
 
   installPhase = ''
+    runHook preInstall
+
     cp -r . $out
-    wrapProgram $out/bin/sonic-pi --prefix PATH : \
-      ${ruby}/bin:${bash}/bin
+    wrapProgram $out/bin/sonic-pi \
+      --prefix PATH : ${ruby}/bin:${bash}/bin:${supercollider}/bin:${jack2Full}/bin \
+      --set AUBIO_LIB "${aubio}/lib/libaubio.so"
+
+    runHook postInstall
   '';
+
+  meta = {
+    homepage = http://sonic-pi.net/;
+    description = "Free live coding synth for everyone originally designed to support computing and music lessons within schools";
+    license = stdenv.lib.licenses.mit;
+    maintainers = with stdenv.lib.maintainers; [ Phlogistique kamilchm ];
+    platforms = stdenv.lib.platforms.linux;
+  };
 }
diff --git a/pkgs/applications/audio/sonic-pi/fixed-prefixes.patch b/pkgs/applications/audio/sonic-pi/fixed-prefixes.patch
deleted file mode 100644
index 7b045a41cba1..000000000000
--- a/pkgs/applications/audio/sonic-pi/fixed-prefixes.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/app/gui/qt/mainwindow.cpp b/app/gui/qt/mainwindow.cpp
-index 0af6cf7..97c17ad 100644
---- a/app/gui/qt/mainwindow.cpp
-+++ b/app/gui/qt/mainwindow.cpp
-@@ -677,28 +677,9 @@ void MainWindow::startServer(){
- 
-     serverProcess = new QProcess();
- 
--    QString root = rootPath();
--
--  #if defined(Q_OS_WIN)
--    QString prg_path = root + "/app/server/native/windows/ruby/bin/ruby.exe";
--    QString prg_arg = root + "/app/server/bin/sonic-pi-server.rb";
--    sample_path = root + "/etc/samples";
--  #elif defined(Q_OS_MAC)
--    QString prg_path = root + "/server/native/osx/ruby/bin/ruby";
--    QString prg_arg = root + "/server/bin/sonic-pi-server.rb";
--    sample_path = root + "/etc/samples";
--  #else
--    //assuming Raspberry Pi
--    QString prg_path = root + "/app/server/native/raspberry/ruby/bin/ruby";
--    QFile file(prg_path);
--    if(!file.exists()) {
--      // use system ruby if bundled ruby doesn't exist
--      prg_path = "/usr/bin/ruby";
--    }
--
--    QString prg_arg = root + "/app/server/bin/sonic-pi-server.rb";
--    sample_path = root + "/etc/samples";
--  #endif
-+    QString prg_path = "@ruby@";
-+    QString prg_arg = "@out@/app/server/bin/sonic-pi-server.rb";
-+    sample_path = "@out@/etc/samples";
- 
-     prg_path = QDir::toNativeSeparators(prg_path);
-     prg_arg = QDir::toNativeSeparators(prg_arg);
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a5e106a014ff..97c2bbea8885 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16376,7 +16376,7 @@ with pkgs;
   viber = callPackage ../applications/networking/instant-messengers/viber { };
 
   sonic-pi = callPackage ../applications/audio/sonic-pi {
-    ruby = ruby_2_2;
+    ruby = ruby_2_3;
   };
 
   st = callPackage ../applications/misc/st {

From ddfcc15bb8a68548c807fbfe7eb80618311d446d Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 6 Oct 2017 21:47:56 +0900
Subject: [PATCH 13/36] firefox: 56.0 -> 56.0.1

---
 pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index b2e993e35e00..4b3322140419 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -6,10 +6,10 @@ rec {
 
   firefox = common rec {
     pname = "firefox";
-    version = "56.0";
+    version = "56.0.1";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "3aeb0ff54e10c83894f61734daa4f0801a1bb499d4667adad9c78520e588eae809d0e4d61e9227206466d62c3b453e2ce9ca8198f59f5354cd1b6804c00f0990";
+      sha512 = "6a07de6bfb71ccdef04b0f2ced720e309d037dd89fe983178ac59ea972147360552e2b8e33d8caa476008cabf53a99003807b0e817150b7a39e0bc143d82b88f";
     };
 
     patches =

From 821e3c294ff20c6a82e93f7c2d30c52386b625f8 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 6 Oct 2017 23:28:28 +0900
Subject: [PATCH 14/36] icu: make 58.2 coexists with 59.1

---
 pkgs/development/libraries/icu/58.nix              | 14 ++++++++++++++
 pkgs/development/libraries/icu/59.nix              |  4 ++++
 .../libraries/icu/{default.nix => base.nix}        |  6 ++++--
 pkgs/top-level/all-packages.nix                    |  6 +++++-
 4 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/icu/58.nix
 create mode 100644 pkgs/development/libraries/icu/59.nix
 rename pkgs/development/libraries/icu/{default.nix => base.nix} (93%)

diff --git a/pkgs/development/libraries/icu/58.nix b/pkgs/development/libraries/icu/58.nix
new file mode 100644
index 000000000000..e5b80f4b2700
--- /dev/null
+++ b/pkgs/development/libraries/icu/58.nix
@@ -0,0 +1,14 @@
+args @ { stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }:
+let
+  keywordFix = fetchurl {
+    url = "http://bugs.icu-project.org/trac/changeset/39484?format=diff";
+    name = "icu-changeset-39484.diff";
+    sha256 = "0hxhpgydalyxacaaxlmaddc1sjwh65rsnpmg0j414mnblq74vmm8";
+  };
+in
+import ./base.nix {
+  version = "58.2";
+  sha256 = "036shcb3f8bm1lynhlsb4kpjm9s9c2vdiir01vg216rs2l8482ib";
+  patches = [ keywordFix ];
+  patchFlags = "-p4";
+} args
diff --git a/pkgs/development/libraries/icu/59.nix b/pkgs/development/libraries/icu/59.nix
new file mode 100644
index 000000000000..9ca66ca525fd
--- /dev/null
+++ b/pkgs/development/libraries/icu/59.nix
@@ -0,0 +1,4 @@
+import ./base.nix {
+  version = "59.1";
+  sha256 = "1zkmbg2932ggvpgjp8pys0cj6z8bw087y8858009shkrjfpzscki";
+}
diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/base.nix
similarity index 93%
rename from pkgs/development/libraries/icu/default.nix
rename to pkgs/development/libraries/icu/base.nix
index 5f81ae694cba..78e0c5740446 100644
--- a/pkgs/development/libraries/icu/default.nix
+++ b/pkgs/development/libraries/icu/base.nix
@@ -1,8 +1,8 @@
+{ version, sha256, patches ? [], patchFlags ? "" }:
 { stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }:
 
 let
   pname = "icu4c";
-  version = "59.1";
 in
 stdenv.mkDerivation {
   name = pname + "-" + version;
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   src = fetchurl {
     url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-"
       + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz";
-    sha256 = "1zkmbg2932ggvpgjp8pys0cj6z8bw087y8858009shkrjfpzscki";
+    inherit sha256;
   };
 
   outputs = [ "out" "dev" ];
@@ -25,6 +25,8 @@ stdenv.mkDerivation {
     echo Source root reset to ''${sourceRoot}
   '';
 
+  inherit patchFlags patches;
+
   preConfigure = ''
     sed -i -e "s|/bin/sh|${stdenv.shell}|" configure
   '' + stdenv.lib.optionalString stdenv.isArm ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5a50abf27219..c7128d7cc96b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8634,7 +8634,10 @@ with pkgs;
 
   hyena = callPackage ../development/libraries/hyena { };
 
-  icu = callPackage ../development/libraries/icu { };
+  icu58 = callPackage ../development/libraries/icu/58.nix { };
+  icu59 = callPackage ../development/libraries/icu/59.nix { };
+
+  icu = icu59;
 
   id3lib = callPackage ../development/libraries/id3lib { };
 
@@ -14544,6 +14547,7 @@ with pkgs;
       libpng = libpng_apng;
       python = python2;
       gnused = gnused_422;
+      icu = icu59;
     };
   });
 

From b82fbeef683a9d8c3b52bf7eed3dd1db99e55ba9 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 4 Oct 2017 16:33:21 -0500
Subject: [PATCH 15/36] radiotray-ng: init at 0.1.7

Use patch from upstream to fix menu separators.

Tested execution using
'nix-shell --pure -p radiotray-ng'
and added dependencies until that didn't crash.

Seems to work outside as well,
but hopefully fixes problems for others.
---
 .../audio/radiotray-ng/default.nix            | 96 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 98 insertions(+)
 create mode 100644 pkgs/applications/audio/radiotray-ng/default.nix

diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix
new file mode 100644
index 000000000000..4bc9371dd17b
--- /dev/null
+++ b/pkgs/applications/audio/radiotray-ng/default.nix
@@ -0,0 +1,96 @@
+{ stdenv, fetchFromGitHub, fetchpatch
+, cmake, pkgconfig
+# Transport
+, curl
+# Libraries
+, boost
+, jsoncpp
+, libbsd
+, pcre
+# GUI/Desktop
+, dbus
+, glibmm
+, gnome3
+, hicolor_icon_theme
+, libappindicator-gtk3
+, libnotify
+, libxdg_basedir
+# GStreamer
+, gst_all_1
+# User-agent info
+, lsb-release
+# rt2rtng
+, python2
+# Testing
+, gmock
+# Fixup
+, wrapGAppsHook
+, makeWrapper
+}:
+
+let
+  gstInputs = with gst_all_1; [
+    gstreamer gst-plugins-base
+    gst-plugins-good gst-plugins-bad gst-plugins-ugly
+    gst-libav
+  ];
+  # For the rt2rtng utility for converting bookmark file to -ng format
+  pythonInputs = with python2.pkgs; [ python2 lxml ];
+in
+stdenv.mkDerivation rec {
+  name = "radiotray-ng-${version}";
+  version = "0.1.7";
+
+  src = fetchFromGitHub {
+    owner = "ebruck";
+    repo = "radiotray-ng";
+    rev = "v${version}";
+    sha256 = "1m853gzh9r249crn0xyrq22x154r005j58b0kq3nsrgi5cps2zdv";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook makeWrapper ];
+
+  buildInputs = [
+    curl
+    boost jsoncpp libbsd pcre
+    glibmm hicolor_icon_theme gnome3.gsettings_desktop_schemas libappindicator-gtk3 libnotify
+    libxdg_basedir
+    lsb-release
+  ] ++ stdenv.lib.optional doCheck gmock
+    ++ gstInputs
+    ++ pythonInputs;
+
+  prePatch = ''
+    substituteInPlace debian/CMakeLists.txt \
+      --replace /usr $out
+    substituteInPlace include/radiotray-ng/common.hpp \
+      --replace /usr $out
+  '';
+
+  patches = [
+    (fetchpatch {
+      # Fix menu separators and minor touchup to 'version'
+      url = "https://github.com/ebruck/radiotray-ng/commit/827e9f1baaa03ab4d8a5fb3aab043e72950eb965.patch";
+      sha256 = "1aykl6lq4pga34xg5r9mc616gxnd63q6gr8qzg57w6874cj3csrr";
+    })
+  ];
+
+  enableParallelBuilding = true;
+
+  doCheck = true;
+
+  checkPhase = "ctest";
+
+  preFixup = ''
+    gappsWrapperArgs+=(--suffix PATH : ${stdenv.lib.makeBinPath [ dbus ]})
+    wrapProgram $out/bin/rt2rtng --prefix PYTHONPATH : $PYTHONPATH
+  '';
+
+  meta = with stdenv.lib; {
+    description = "An internet radio player for linux";
+    homepage = https://github.com/ebruck/radiotray-ng;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ dtzWill ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8582966e81dc..f1875016dbab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16187,6 +16187,8 @@ with pkgs;
 
   renoise = callPackage ../applications/audio/renoise {};
 
+  radiotray-ng = callPackage ../applications/audio/radiotray-ng { };
+
   rapcad = libsForQt56.callPackage ../applications/graphics/rapcad { boost = boost159; };
 
   rapidsvn = callPackage ../applications/version-management/rapidsvn { };

From 8840eaf223e41339b3d36d960f44ba8443c839c0 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 6 Oct 2017 18:49:58 -0400
Subject: [PATCH 16/36] keybase: Fix modules

---
 nixos/modules/services/network-filesystems/kbfs.nix | 1 +
 nixos/modules/services/networking/keybase.nix       | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/network-filesystems/kbfs.nix b/nixos/modules/services/network-filesystems/kbfs.nix
index cf1d7617cca6..8b972ba971e6 100644
--- a/nixos/modules/services/network-filesystems/kbfs.nix
+++ b/nixos/modules/services/network-filesystems/kbfs.nix
@@ -55,6 +55,7 @@ in {
         Restart = "on-failure";
         PrivateTmp = true;
       };
+      wantedBy = [ "default.target" ];
     };
 
     services.keybase.enable = true;
diff --git a/nixos/modules/services/networking/keybase.nix b/nixos/modules/services/networking/keybase.nix
index ca5c279ac6f0..7c7982ee8eac 100644
--- a/nixos/modules/services/networking/keybase.nix
+++ b/nixos/modules/services/networking/keybase.nix
@@ -28,11 +28,12 @@ in {
       description = "Keybase service";
       serviceConfig = {
         ExecStart = ''
-          ${pkgs.keybase}/bin/keybase service
+          ${pkgs.keybase}/bin/keybase -d service --auto-forked
         '';
         Restart = "on-failure";
         PrivateTmp = true;
       };
+      wantedBy = [ "default.target" ];
     };
 
     environment.systemPackages = [ pkgs.keybase ];

From 7837cfe3a12789de126d161a86f2bc614b467588 Mon Sep 17 00:00:00 2001
From: sternenseemann <git@lukasepple.de>
Date: Sat, 9 Sep 2017 18:31:46 +0200
Subject: [PATCH 17/36] jackline: 2017-05-24 -> 2017-08-17

---
 .../networking/instant-messengers/jackline/default.nix      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix
index bc6e7a5f7def..6545b90980e3 100644
--- a/pkgs/applications/networking/instant-messengers/jackline/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix
@@ -3,14 +3,14 @@
 assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.02.2";
 
 stdenv.mkDerivation rec {
-  version = "2017-05-24";
+  version = "2017-08-17";
   name = "jackline-${version}";
 
   src = fetchFromGitHub {
     owner  = "hannesm";
     repo   = "jackline";
-    rev    = "49a326d5696aa24f3ac18534c8860e03d0d58548";
-    sha256 = "0p741mzq4kkqyly8njga1f5dxdnfz31wy2lpvs5542pq0iwvdj7k";
+    rev    = "26688f07c3edc3b83e7aa0b9136cd1e9dcb58ed5";
+    sha256 = "0yspgjhp7zy9rzvwl4pxppf5wkpa07y0122s7n09kvr0fzsh6aqf";
   };
 
   buildInputs = with ocamlPackages; [

From 4afb28a89295d896077b5a8560d2c56527dda168 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 6 Oct 2017 21:49:05 -0300
Subject: [PATCH 18/36] flat-plat: 20170917 -> 20171005 and renamed to
 materia-theme

---
 .../themes/{flat-plat => materia-theme}/default.nix  | 12 ++++++------
 pkgs/top-level/all-packages.nix                      |  5 +++--
 2 files changed, 9 insertions(+), 8 deletions(-)
 rename pkgs/misc/themes/{flat-plat => materia-theme}/default.nix (68%)

diff --git a/pkgs/misc/themes/flat-plat/default.nix b/pkgs/misc/themes/materia-theme/default.nix
similarity index 68%
rename from pkgs/misc/themes/flat-plat/default.nix
rename to pkgs/misc/themes/materia-theme/default.nix
index cd652440efae..755a0b737ca3 100644
--- a/pkgs/misc/themes/flat-plat/default.nix
+++ b/pkgs/misc/themes/materia-theme/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, gnome3, libxml2, gtk-engine-murrine, gdk_pixbuf, librsvg }:
 
 stdenv.mkDerivation rec {
-  name = "flat-plat-gtk-theme-${version}";
-  version = "20170917";
+  name = "materia-theme-${version}";
+  version = "20171005";
 
   src = fetchFromGitHub {
     owner = "nana-4";
-    repo = "Flat-Plat";
+    repo = "materia-theme";
     rev = "v${version}";
-    sha256 = "17r4wl27yx49xg0l3s5d67174r63p4cw6cbdmzl81if7iab69hv0";
+    sha256 = "0znm7mx2nv2sgvy8fyams1ckp1ly3nbbs0k09d24w1zzd90xhzqp";
   };
 
   nativeBuildInputs = [ gnome3.glib libxml2 ];
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "A Material Design-like theme for GTK+ based desktop environments";
-    homepage = https://github.com/nana-4/Flat-Plat;
+    description = "A Material Design-like theme for GNOME/GTK+ based desktop environments (formerly Flat-Plat)";
+    homepage = https://github.com/nana-4/materia-theme;
     license = licenses.gpl2;
     platforms = platforms.all;
     maintainers = [ maintainers.mounium ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a9efda627134..1cef7b8b6f3c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18994,8 +18994,6 @@ with pkgs;
 
   fceux = callPackage ../misc/emulators/fceux { };
 
-  flat-plat = callPackage ../misc/themes/flat-plat { };
-
   flockit = callPackage ../tools/backup/flockit { };
 
   foldingathome = callPackage ../misc/foldingathome { };
@@ -19078,6 +19076,9 @@ with pkgs;
 
   martyr = callPackage ../development/libraries/martyr { };
 
+  # previously known as flat-plat
+  materia-theme = callPackage ../misc/themes/materia-theme { };
+
   mess = callPackage ../misc/emulators/mess {
     inherit (pkgs.gnome2) GConf;
   };

From 9c5ef048c42a8b9de16d076e98589681f80d9c15 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 4 Oct 2017 00:48:58 +0200
Subject: [PATCH 19/36] bitcoin-classic: build with qt5

fixes #30075
---
 pkgs/applications/altcoins/bitcoin-abc.nix     | 4 ++--
 pkgs/applications/altcoins/bitcoin-classic.nix | 8 +++++---
 pkgs/applications/altcoins/default.nix         | 6 +++---
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix b/pkgs/applications/altcoins/bitcoin-abc.nix
index d3800062b119..665b88bfd328 100644
--- a/pkgs/applications/altcoins/bitcoin-abc.nix
+++ b/pkgs/applications/altcoins/bitcoin-abc.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost
-, zlib, miniupnpc, qt5, utillinux, protobuf, qrencode, libevent
+, zlib, miniupnpc, qtbase, qttools, utillinux, protobuf, qrencode, libevent
 , withGui }:
 
 with stdenv.lib;
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
   buildInputs = [ openssl db48 boost zlib
                   miniupnpc utillinux protobuf libevent ]
-                  ++ optionals withGui [ qt5.qtbase qt5.qttools qrencode ];
+                  ++ optionals withGui [ qtbase qttools qrencode ];
 
   configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
                      ++ optionals withGui [ "--with-gui=qt5" ];
diff --git a/pkgs/applications/altcoins/bitcoin-classic.nix b/pkgs/applications/altcoins/bitcoin-classic.nix
index d2878a17fb3a..471e5a687afa 100644
--- a/pkgs/applications/altcoins/bitcoin-classic.nix
+++ b/pkgs/applications/altcoins/bitcoin-classic.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost
-, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent
+, zlib, miniupnpc, qtbase, qttools, utillinux, protobuf, qrencode, libevent
 , withGui }:
 
 with stdenv.lib;
@@ -16,13 +16,15 @@ stdenv.mkDerivation rec {
     sha256 = "129gkg035gv7zmc463jl2spvdh0fl4q8v4jdaslfnp34hbwi1p07";
   };
 
+  patches = [ ./fix-bitcoin-qt-build.patch ];
+
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
   buildInputs = [ openssl db48 boost zlib
                   miniupnpc utillinux protobuf libevent ]
-                  ++ optionals withGui [ qt4 qrencode ];
+                  ++ optionals withGui [ qtbase qttools qrencode ];
 
   configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
-                     ++ optionals withGui [ "--with-gui=qt4" ];
+                     ++ optionals withGui [ "--with-gui=qt5" ];
 
   meta = {
     description = "Peer-to-peer electronic cash system (Classic client)";
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index 395a440690b1..0264ce397762 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -1,17 +1,17 @@
-{ callPackage, boost155, boost162, boost163, openssl_1_1_0, haskellPackages, darwin }:
+{ callPackage, boost155, boost162, boost163, openssl_1_1_0, haskellPackages, darwin, libsForQt5 }:
 
 rec {
 
   bitcoin  = callPackage ./bitcoin.nix { withGui = true; };
   bitcoind = callPackage ./bitcoin.nix { withGui = false; };
 
-  bitcoin-abc  = callPackage ./bitcoin-abc.nix { withGui = true; };
+  bitcoin-abc  = libsForQt5.callPackage ./bitcoin-abc.nix { withGui = true; };
   bitcoind-abc = callPackage ./bitcoin-abc.nix { withGui = false; };
 
   bitcoin-unlimited  = callPackage ./bitcoin-unlimited.nix { withGui = true; };
   bitcoind-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = false; };
 
-  bitcoin-classic  = callPackage ./bitcoin-classic.nix { withGui = true; };
+  bitcoin-classic  = libsForQt5.callPackage ./bitcoin-classic.nix { withGui = true; };
   bitcoind-classic = callPackage ./bitcoin-classic.nix { withGui = false; };
 
   bitcoin-xt  = callPackage ./bitcoin-xt.nix { withGui = true; };

From 7067d30812eacc9bed5a8b9d53546a4c865d240c Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sat, 7 Oct 2017 16:56:36 +0200
Subject: [PATCH 20/36] quaternion: 2017-06-29 -> 2017-10-07

---
 .../networking/instant-messengers/quaternion/default.nix    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
index a2510c777385..08625d321235 100644
--- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix
+++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
@@ -2,7 +2,7 @@
 
 mkDerivation rec {
   name = "quaternion-git-${version}";
-  version = "2017-06-29";
+  version = "2017-10-07";
 
   # quaternion and tensor share the same libqmatrixclient library as a git submodule
   #
@@ -13,8 +13,8 @@ mkDerivation rec {
 
   src = fetchgit {
     url             = "https://github.com/QMatrixClient/Quaternion.git";
-    rev             = "1febc0178fd3d02b7426f58981b54924ad60c84d";
-    sha256          = "1whjhlphdhk7kgw2zqc0wj3k2i9gkp79qq2bnrh4mbcp3qmcqngr";
+    rev             = "1007f2ca4ad5e8cc5dba437d6a0cdea07d1f1332";
+    sha256          = "0hvc81ld7fcwyrxsr2q3yvzh0rzhgmflby4nmyzcbjds7b7pv0xq";
     fetchSubmodules = true;
   };
 

From 4db70fe8c823feea8a8275040f678a4c6e0c10d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 7 Oct 2017 10:06:28 -0500
Subject: [PATCH 21/36] bitcoind-abc/bitcoind-classic: fix evaluation

---
 pkgs/applications/altcoins/bitcoin-abc.nix     | 2 +-
 pkgs/applications/altcoins/bitcoin-classic.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix b/pkgs/applications/altcoins/bitcoin-abc.nix
index 665b88bfd328..a113aadcd628 100644
--- a/pkgs/applications/altcoins/bitcoin-abc.nix
+++ b/pkgs/applications/altcoins/bitcoin-abc.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost
-, zlib, miniupnpc, qtbase, qttools, utillinux, protobuf, qrencode, libevent
+, zlib, miniupnpc, qtbase ? null , qttools ? null, utillinux, protobuf, qrencode, libevent
 , withGui }:
 
 with stdenv.lib;
diff --git a/pkgs/applications/altcoins/bitcoin-classic.nix b/pkgs/applications/altcoins/bitcoin-classic.nix
index 471e5a687afa..9a2145d91cfb 100644
--- a/pkgs/applications/altcoins/bitcoin-classic.nix
+++ b/pkgs/applications/altcoins/bitcoin-classic.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost
-, zlib, miniupnpc, qtbase, qttools, utillinux, protobuf, qrencode, libevent
+, zlib, miniupnpc, qtbase ? null, qttools ? null, utillinux, protobuf, qrencode, libevent
 , withGui }:
 
 with stdenv.lib;

From 15b7e102b673ddef5068af14f0b2272f32f20880 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <layus.on@gmail.com>
Date: Sat, 7 Oct 2017 17:38:14 +0200
Subject: [PATCH 22/36] Safer defaults for immutable znc config (#30155)

* Safer defaults for immutable znc config

I just lost all the options I configured in ZNC, because the mutable config was overwritten.
I accept any suggestions on the way to implement this, but overwriting a mutable config by default seems weird. If we want to do this, we should ensure that ZNC does not allow to edit the config via the webmin when cfg.mutable is false.

* Do not backup old config files.

There seems to be little need for backups if mutable becomes a voluntary opt-out.

* fixup
---
 nixos/modules/services/networking/znc.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix
index 3d9cec46a582..72313ab2ee14 100644
--- a/nixos/modules/services/networking/znc.nix
+++ b/nixos/modules/services/networking/znc.nix
@@ -329,7 +329,7 @@ in
       };
 
       mutable = mkOption {
-        default = false;
+        default = true;
         type = types.bool;
         description = ''
           Indicates whether to allow the contents of the `dataDir` directory to be changed

From a7159d3cdae0fc8a38b2a3a24b0fc240ebf85d9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 7 Oct 2017 17:45:04 +0200
Subject: [PATCH 23/36] icu: keep default version on 58

... to avoid mass rebuilds for now. (Bumped in parent merge.)
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5febf560d2a3..833becfccf91 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8648,7 +8648,7 @@ with pkgs;
   icu58 = callPackage ../development/libraries/icu/58.nix { };
   icu59 = callPackage ../development/libraries/icu/59.nix { };
 
-  icu = icu59;
+  icu = icu58;
 
   id3lib = callPackage ../development/libraries/id3lib { };
 

From 351b1ad8e25f97abc68257f5d993467e901f4f68 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Sat, 7 Oct 2017 18:41:30 +0100
Subject: [PATCH 24/36] subversion18: 1.8.18 -> 1.8.19

For CVE-2017-9800, see
https://subversion.apache.org/security/CVE-2017-9800-advisory.txt
---
 pkgs/applications/version-management/subversion/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index 0a5a3fbd0c64..e069c39f059f 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -104,8 +104,8 @@ let
 
 in {
   subversion18 = common {
-    version = "1.8.18";
-    sha256 = "19lpqdrl86mjfdpayhn3f9rkmpb6zs2iny38cnxq6wcj7snh0sz5";
+    version = "1.8.19";
+    sha256 = "1gp6426gkdza6ni2whgifjcmjb4nq34ljy07yxkrhlarvfq6ks2n";
   };
 
   subversion19 = common {

From bd387654f572a42bd02642e33e37ac7f0416cdfc Mon Sep 17 00:00:00 2001
From: Carter Charbonneau <zcarterc@gmail.com>
Date: Sat, 7 Oct 2017 12:55:00 -0600
Subject: [PATCH 25/36] ffmpegthumbnailer: build with jpeg support

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

diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix
index c6167252866a..9e76c1e64001 100644
--- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix
+++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, fetchFromGitHub, stdenv, ffmpeg, cmake, libpng, pkgconfig
+{ pkgs, fetchFromGitHub, stdenv, ffmpeg, cmake, libpng, pkgconfig, libjpeg
 }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
-  buildInputs = [ ffmpeg libpng ];
+  buildInputs = [ ffmpeg libpng libjpeg ];
 
   meta = with stdenv.lib;  {
     homepage = https://github.com/dirkvdb/ffmpegthumbnailer;

From 3ca090d2b45e797bfa15d17640c94c3af663af80 Mon Sep 17 00:00:00 2001
From: joncojonathan <joncojonathan@gmail.com>
Date: Sat, 7 Oct 2017 19:37:09 +0100
Subject: [PATCH 26/36] gramps: 4.1.1 -> 4.2.6

Motivation for change: GRAMPS was a long way out of date.

Additional information: BSDDB3 unmasked as this is supported by the current Python3 version (commited separately).
---
 pkgs/applications/misc/gramps/default.nix | 24 +++++++++++++++--------
 pkgs/top-level/all-packages.nix           |  4 +++-
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix
index 4dcb5be8a21d..8b66b23df01a 100644
--- a/pkgs/applications/misc/gramps/default.nix
+++ b/pkgs/applications/misc/gramps/default.nix
@@ -1,23 +1,31 @@
-{ stdenv, fetchurl, gtk3, pythonPackages, intltool,
-  pango, gsettings_desktop_schemas }:
+{ stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool,
+  pango, gsettings_desktop_schemas,
+# Optional packages:
+ enableOSM ? true, osm-gps-map
+ }:
 
 let
   inherit (pythonPackages) python buildPythonApplication;
 in buildPythonApplication rec {
-  version = "4.1.1";
+  version = "4.2.6";
   name = "gramps-${version}";
 
-  buildInputs = [ intltool gtk3 ];
+  buildInputs = [ intltool gtk3 ] 
+    # Map support
+    ++ stdenv.lib.optional enableOSM osm-gps-map
+  ;
 
   # Currently broken
   doCheck = false;
 
-  src = fetchurl {
-    url = "mirror://sourceforge/gramps/Stable/${version}/${name}.tar.gz";
-    sha256 = "0jdps7yx2mlma1hdj64wssvnqd824xdvw0bmn2dnal5fn3h7h060";
+  src = fetchFromGitHub {
+    owner = "gramps-project";
+    repo = "gramps";
+    rev = "v${version}";
+    sha256 = "0k0bx6msc2kvkg0nwa9v2mp3qy7lmnxjd97n6a1zdzlq8yzw29f1";
   };
 
-  pythonPath = with pythonPackages; [ pygobject3 pycairo ] ++ [ pango ];
+  pythonPath = with pythonPackages; [ bsddb3 PyICU pygobject3 pycairo ] ++ [ pango ];
 
   # Same installPhase as in buildPythonApplication but without --old-and-unmanageble
   # install flag.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 71c0f127b378..932e48352d00 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14837,7 +14837,9 @@ with pkgs;
 
   gphoto2fs = callPackage ../applications/misc/gphoto2/gphotofs.nix { };
 
-  gramps = callPackage ../applications/misc/gramps { };
+  gramps = callPackage ../applications/misc/gramps { 
+        pythonPackages = python3Packages;
+  };
 
   graphicsmagick = callPackage ../applications/graphics/graphicsmagick { };
   graphicsmagick_q16 = callPackage ../applications/graphics/graphicsmagick { quantumdepth = 16; };

From f0667f81f5682f0e2a81e57906cf04ca8b877968 Mon Sep 17 00:00:00 2001
From: joncojonathan <joncojonathan@gmail.com>
Date: Sat, 7 Oct 2017 19:47:31 +0100
Subject: [PATCH 27/36] bsddb3 Refactored to disable tests.

Motivation for change: Tests disabled as BSDDB3 works with Python3 but the tests do not.
---
 pkgs/top-level/python-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3a1dfc970cc2..312ddabe7f30 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2093,7 +2093,8 @@ in {
     buildInputs = [ pkgs.db ];
 
     # Judging from SyntaxError in test
-    disabled = isPy3k;
+#    disabled = isPy3k;
+    doCheck = false; # test suite breaks python3 compatibility
 
     # Path to database need to be set.
     # Somehow the setup.py flag is not propagated.

From 547fba51407afed4c3885cd935cf23702e386be8 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Sat, 7 Oct 2017 20:10:32 +0100
Subject: [PATCH 28/36] ruby_2_2: 2.2.7 -> 2.2.8

For multiple CVE's:

- CVE-2017-0898
- CVE-2017-10784
- CVE-2017-14033
- CVE-2017-14064

See https://www.ruby-lang.org/en/news/2017/09/14/ruby-2-2-8-released/
---
 pkgs/development/interpreters/ruby/default.nix   | 8 ++++----
 pkgs/development/interpreters/ruby/patchsets.nix | 2 +-
 pkgs/top-level/all-packages.nix                  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 2e7d7f97819a..bef890ad3739 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -196,11 +196,11 @@ in {
     };
   };
 
-  ruby_2_2_7 = generic {
-    version = rubyVersion "2" "2" "7" "";
+  ruby_2_2_8 = generic {
+    version = rubyVersion "2" "2" "8" "";
     sha256 = {
-      src = "199xz5bvmp26c7vyzw47cpxkd8jk826kc8nlpavqzj5vqp388h9p";
-      git = "0i0nsm9ldjp39m9xq47v8w6wlg821ikczz530493cs150qkqa0a1";
+      src = "12i6v5i0djl4xx3x7fq12snqb5d4drqjmnwqs05fby4bagcbjdwg";
+      git = "16nw0795nhrj13crp5x4jis8hmi3gsyjl96pwk698wlrb89lf9bw";
     };
   };
 
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index 5bc1b858425b..3d3b17cd2f70 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -24,7 +24,7 @@ rec {
     "${patchSet}/patches/ruby/2.1.8/railsexpress/08-funny-falcon-method-cache.patch"
     "${patchSet}/patches/ruby/2.1.8/railsexpress/09-heap-dump-support.patch"
   ];
-  "2.2.7" = ops useRailsExpress [
+  "2.2.8" = ops useRailsExpress [
     "${patchSet}/patches/ruby/2.2/head/railsexpress/01-zero-broken-tests.patch"
     "${patchSet}/patches/ruby/2.2/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.2/head/railsexpress/03-display-more-detailed-stack-trace.patch"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8582966e81dc..a9bd1b6da368 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6700,7 +6700,7 @@ with pkgs;
   inherit (callPackage ../development/interpreters/ruby {})
     ruby_2_0_0
     ruby_2_1_10
-    ruby_2_2_7
+    ruby_2_2_8
     ruby_2_3_5
     ruby_2_4_2;
 
@@ -6708,7 +6708,7 @@ with pkgs;
   ruby = ruby_2_3;
   ruby_2_0 = ruby_2_0_0;
   ruby_2_1 = ruby_2_1_10;
-  ruby_2_2 = ruby_2_2_7;
+  ruby_2_2 = ruby_2_2_8;
   ruby_2_3 = ruby_2_3_5;
   ruby_2_4 = ruby_2_4_2;
 

From 5dc3b2fdc6739c371e9235ddeb42b1ecaf14c2d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 7 Oct 2017 20:02:19 +0200
Subject: [PATCH 29/36] xf86-video-amdgpu: 1.3.0 -> 1.4.0

---
 pkgs/servers/x11/xorg/default.nix       | 6 +++---
 pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index b7d779f88127..12ba110acbf5 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1820,11 +1820,11 @@ let
   }) // {inherit ;};
 
   xf86videoamdgpu = (mkDerivation "xf86videoamdgpu" {
-    name = "xf86-video-amdgpu-1.3.0";
+    name = "xf86-video-amdgpu-1.4.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.3.0.tar.bz2;
-      sha256 = "0w2f7xz44pym2k5kr76p983dwbc2f2p2jazpff999giqi4i0yqy1";
+      url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.4.0.tar.bz2;
+      sha256 = "0z56ifw3xiq9dychv8chg1cny0hq4v3c1r9pqcybk5fp7nzw9jpq";
     };
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 8d9b66f21aef..362ca3f2e7e9 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -127,7 +127,7 @@ mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2
 mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2
 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2
 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2
-mirror://xorg/individual/driver/xf86-video-amdgpu-1.3.0.tar.bz2
+mirror://xorg/individual/driver/xf86-video-amdgpu-1.4.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ati-7.9.0.tar.bz2

From 56ca2a5347ec73698ffecce57eb7b9ee2ea325fc Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 7 Oct 2017 15:33:40 -0400
Subject: [PATCH 30/36] atom-beta: 1.21.0-beta0 -> 1.22.0-beta0

---
 pkgs/applications/editors/atom/beta.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/atom/beta.nix b/pkgs/applications/editors/atom/beta.nix
index 41a68656d007..61f927ef76bc 100644
--- a/pkgs/applications/editors/atom/beta.nix
+++ b/pkgs/applications/editors/atom/beta.nix
@@ -1,12 +1,12 @@
 { stdenv, pkgs, fetchurl, lib, makeWrapper, gvfs, atomEnv}:
 
 stdenv.mkDerivation rec {
-  name = "atom-${version}";
-  version = "1.21.0-beta0";
+  name = "atom-beta-${version}";
+  version = "1.22.0-beta0";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "1syxlyb62vp9hmjdiazhmvq8w52b90l8mvf502xkdav4vi3yxzfz";
+    sha256 = "0xsj0vvaxjw60gg6niaws2lf9lkrh1sz7ypk41g6l4hdgmqyg6fi";
     name = "${name}.deb";
   };
 

From 20b48cbd97bdcfd2a84ce71d5217874f8eb05926 Mon Sep 17 00:00:00 2001
From: Unknown <zraexy@gmail.com>
Date: Sat, 7 Oct 2017 12:30:41 -0800
Subject: [PATCH 31/36] kmplayer: 0.11.3d -> 0.12.0b

---
 pkgs/applications/video/kmplayer/default.nix  | 41 ++++++++++++-------
 .../kmplayer_part-plugin_metadata.patch       | 11 +++++
 .../applications/video/kmplayer/no-docs.patch | 12 ++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 4 files changed, 50 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/applications/video/kmplayer/kmplayer_part-plugin_metadata.patch
 create mode 100644 pkgs/applications/video/kmplayer/no-docs.patch

diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix
index 59b9893ded14..f0d7fa353707 100644
--- a/pkgs/applications/video/kmplayer/default.nix
+++ b/pkgs/applications/video/kmplayer/default.nix
@@ -1,30 +1,41 @@
-{ stdenv, fetchurl
-, automoc4, cmake, gettext, makeWrapper, perl, pkgconfig
-, kdelibs4, cairo, dbus_glib, mplayer
+{
+  mkDerivation, lib, fetchurl,
+  extra-cmake-modules, makeWrapper,
+  qtsvg, qtx11extras, ki18n, kdelibs4support, kio, kmediaplayer, kwidgetsaddons,
+  phonon, cairo, mplayer
 }:
 
-stdenv.mkDerivation {
-  name = "kmplayer-0.11.3d";
+mkDerivation rec {
+  majorMinorVersion = "0.12";
+  patchVersion = "0b";
+  version = "${majorMinorVersion}.${patchVersion}";
+  name = "kmplayer-${version}";
 
   src = fetchurl {
-    #url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.3d.tar.bz2;
-    url = "mirror://gentoo/distfiles/kmplayer-0.11.3d.tar.bz2";
-    sha256 = "1yvbkb1hh5y7fqfvixjf2rryzm0fm0fpkx4lmvhi7k7d0v4wpgky";
+    url = "mirror://kde/stable/kmplayer/${majorMinorVersion}/kmplayer-${version}.tar.bz2";
+    sha256 = "0wzdxym4fc83wvqyhcwid65yv59a2wvp1lq303cn124mpnlwx62y";
   };
 
-  buildInputs = [ kdelibs4 cairo dbus_glib ];
+  patches = [
+    ./kmplayer_part-plugin_metadata.patch # Qt 5.9 doesn't like an empty string for the optional "FILE" argument of "Q_PLUGIN_METADATA"
+    ./no-docs.patch # Don't build docs due to errors (kdelibs4support propagates kdoctools)
+  ];
 
-  nativeBuildInputs = [ automoc4 cmake gettext makeWrapper perl pkgconfig ];
+  nativeBuildInputs = [ extra-cmake-modules makeWrapper ];
+
+  buildInputs = [
+    qtsvg qtx11extras ki18n kdelibs4support kio kmediaplayer kwidgetsaddons
+    phonon cairo
+  ];
 
   postInstall = ''
     wrapProgram $out/bin/kmplayer --suffix PATH : ${mplayer}/bin
   '';
 
-  meta = {
+  meta = with lib; {
     description = "MPlayer front-end for KDE";
-    license = "GPL";
-    homepage = http://kmplayer.kde.org;
-    broken = true; # Also unavailable on this mirror
-    maintainers = [ stdenv.lib.maintainers.sander ];
+    license = with licenses; [ gpl2 lgpl2 fdl12 ];
+    homepage = https://kmplayer.kde.org/;
+    maintainers = with maintainers; [ sander zraexy ];
   };
 }
diff --git a/pkgs/applications/video/kmplayer/kmplayer_part-plugin_metadata.patch b/pkgs/applications/video/kmplayer/kmplayer_part-plugin_metadata.patch
new file mode 100644
index 000000000000..9b6652b0be58
--- /dev/null
+++ b/pkgs/applications/video/kmplayer/kmplayer_part-plugin_metadata.patch
@@ -0,0 +1,11 @@
+--- a/src/kmplayer_part.h
++++ b/src/kmplayer_part.h
+@@ -36,7 +36,7 @@
+ 
+ class KMPlayerFactory : public KPluginFactory {
+     Q_OBJECT
+-    Q_PLUGIN_METADATA(IID "org.kde.KPluginFactory" FILE "")
++    Q_PLUGIN_METADATA(IID "org.kde.KPluginFactory")
+     Q_INTERFACES(KPluginFactory)
+ public:
+     KMPlayerFactory();
diff --git a/pkgs/applications/video/kmplayer/no-docs.patch b/pkgs/applications/video/kmplayer/no-docs.patch
new file mode 100644
index 000000000000..c93453f908c9
--- /dev/null
+++ b/pkgs/applications/video/kmplayer/no-docs.patch
@@ -0,0 +1,12 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -79,9 +79,6 @@
+ 
+ add_subdirectory(src)
+ add_subdirectory(icons)
+-if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/doc" AND KF5DocTools_VERSION)
+-  add_subdirectory(doc)
+-endif(KF5DocTools_VERSION)
+ add_subdirectory(data)
+ 
+ if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 833becfccf91..d51dfb6d57ed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15240,7 +15240,7 @@ with pkgs;
 
   kiwix = callPackage ../applications/misc/kiwix { };
 
-  kmplayer = kde4.callPackage ../applications/video/kmplayer { };
+  kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { };
 
   kodestudio = callPackage ../applications/editors/kodestudio { };
 

From c1135606c0c1056e25847b2ffe80d2161d5aadc2 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sat, 7 Oct 2017 22:33:00 +0200
Subject: [PATCH 32/36] maintainers: add andir

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 0076d9740ab1..e84714236f64 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -41,6 +41,7 @@
   amorsillo = "Andrew Morsillo <andrew.morsillo@gmail.com>";
   AndersonTorres = "Anderson Torres <torres.anderson.85@gmail.com>";
   anderspapitto = "Anders Papitto <anderspapitto@gmail.com>";
+  andir = "Andreas Rammhold <andreas@rammhold.de>";
   andres = "Andres Loeh <ksnixos@andres-loeh.de>";
   andrewrk = "Andrew Kelley <superjoe30@gmail.com>";
   andsild = "Anders Sildnes <andsild@gmail.com>";

From 8e9acc83437665d01bec0c53234cf068a962f9b0 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sat, 7 Oct 2017 21:05:25 +0200
Subject: [PATCH 33/36] dnstracer: init at 1.9

---
 pkgs/tools/networking/dnstracer/default.nix | 23 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/tools/networking/dnstracer/default.nix

diff --git a/pkgs/tools/networking/dnstracer/default.nix b/pkgs/tools/networking/dnstracer/default.nix
new file mode 100644
index 000000000000..bb7c688480f0
--- /dev/null
+++ b/pkgs/tools/networking/dnstracer/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  version = "1.9";
+  name = "dnstracer";
+
+  src = fetchurl {
+    url = "http://www.mavetju.org/download/dnstracer-${version}.tar.gz";
+    sha256 = "177y58smnq2xhx9lbmj1gria371iv3r1d132l2gjvflkjsphig1f";
+  };
+
+  outputs = [ "out" "man" ];
+
+  setOutputFlags = false;
+
+  meta = with stdenv.lib; {
+    description = "Dnstracer determines where a given Domain Name Server (DNS) gets its information from, and follows the chain of DNS servers back to the servers which know the data.";
+    homepage = http://www.mavetju.org/unix/general.php;
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ andir ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8582966e81dc..82a9161e8554 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19672,4 +19672,6 @@ with pkgs;
   };
 
   duti = callPackage ../os-specific/darwin/duti {};
+
+  dnstracer = callPackage ../tools/networking/dnstracer {};
 }

From fadb906b2f7091a9b973a6b1d79a4858e975b785 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Sat, 7 Oct 2017 21:45:43 +0100
Subject: [PATCH 34/36] powertop module: add kmod to path

powertop attempt to load some kernel modules like msr by calling
modprobe. This is the counterpart to
88e43eb39bcda5f8fdf41d566bc6799596177cd0 which has the powertop
executable search PATH for modprobe rather than hardcoding /sbin, and
actually adds the directory containing modprobe to its PATH for the
systemd service.
---
 nixos/modules/tasks/powertop.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/tasks/powertop.nix b/nixos/modules/tasks/powertop.nix
index 0ec4974789b4..609831506e16 100644
--- a/nixos/modules/tasks/powertop.nix
+++ b/nixos/modules/tasks/powertop.nix
@@ -16,6 +16,7 @@ in {
       powertop = {
         wantedBy = [ "multi-user.target" ];
         description = "Powertop tunings";
+        path = [ pkgs.kmod ];
         serviceConfig = {
           Type = "oneshot";
           RemainAfterExit = "yes";

From 58b6d3fdcbf57f3be543c1fc0e04948b46944291 Mon Sep 17 00:00:00 2001
From: Joerg Thalheim <joerg@thalheim.io>
Date: Sat, 7 Oct 2017 22:25:21 +0100
Subject: [PATCH 35/36] python.pkgs.spambayes: 1.1b1 -> 1.1b2

---
 .../python-modules/spambayes/default.nix      | 21 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 16 +-------------
 2 files changed, 22 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/development/python-modules/spambayes/default.nix

diff --git a/pkgs/development/python-modules/spambayes/default.nix b/pkgs/development/python-modules/spambayes/default.nix
new file mode 100644
index 000000000000..3386fdd1e2a3
--- /dev/null
+++ b/pkgs/development/python-modules/spambayes/default.nix
@@ -0,0 +1,21 @@
+{ buildPythonPackage, isPy3k, fetchPypi, bsddb3, pydns, lockfile }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "spambayes";
+  version = "1.1b2";
+
+  disabled = isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1542dwdsmkav38cfjlbgf3bzz3z8nk7wzq173ya8ipk7g8g6s64d";
+  };
+
+  propagatedBuildInputs = [ bsddb3 pydns lockfile ];
+
+  meta = {
+    description = "Statistical anti-spam filter, initially based on the work of Paul Graham";
+    homepage = http://spambayes.sourceforge.net/;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3a1dfc970cc2..6ca543f1fef3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19829,21 +19829,7 @@ in {
     };
   };
 
-  spambayes = buildPythonPackage rec {
-    name = "spambayes-1.1b1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://sourceforge/spambayes/${name}.tar.gz";
-      sha256 = "0kqvjb89b02wp41p650ydfspi1s8d7akx1igcrw62diidqbxp04n";
-    };
-
-    propagatedBuildInputs = with self; [ bsddb3 pydns lockfile ];
-
-    meta = {
-      description = "Statistical anti-spam filter, initially based on the work of Paul Graham";
-      homepage = http://spambayes.sourceforge.net/;
-    };
-  };
+  spambayes = callPackage ../development/python-modules/spambayes { };
 
   shapely = callPackage ../development/python-modules/shapely { };
 

From 10dcf5897c6f39c4a266055e66addd6bc0c754a1 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <layus.on@gmail.com>
Date: Sun, 8 Oct 2017 01:43:40 +0200
Subject: [PATCH 36/36] 18.03 release notes: mention ZNC mutability change

---
 nixos/doc/manual/release-notes/rl-1803.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml
index 830e7cdd2696..47522fe3cc92 100644
--- a/nixos/doc/manual/release-notes/rl-1803.xml
+++ b/nixos/doc/manual/release-notes/rl-1803.xml
@@ -71,6 +71,8 @@ following incompatible changes:</para>
 <itemizedlist>
   <listitem>
     <para>
+      ZNC option <option>services.znc.mutable</option> now defaults to <literal>true</literal>.
+      That means that old configuration is not overwritten by default when update to the znc options are made.
     </para>
   </listitem>
 </itemizedlist>