From 74442da768d4dc74f182b3623416a2bbeea32460 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 11 Apr 2018 19:18:29 +0200
Subject: [PATCH 01/30] nixos: remove PKG_CONFIG_PATH and PERL5LIB environment
 variables

These make libraries installed in the system or even user profiles
magically available.
---
 nixos/modules/programs/environment.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix
index 401d152941a0..06ebb7bc729b 100644
--- a/nixos/modules/programs/environment.nix
+++ b/nixos/modules/programs/environment.nix
@@ -33,8 +33,6 @@ in
     environment.profileRelativeEnvVars =
       { PATH = [ "/bin" ];
         INFOPATH = [ "/info" "/share/info" ];
-        PKG_CONFIG_PATH = [ "/lib/pkgconfig" ];
-        PERL5LIB = [ "/lib/perl5/site_perl" ];
         KDEDIRS = [ "" ];
         STRIGI_PLUGIN_PATH = [ "/lib/strigi/" ];
         QT_PLUGIN_PATH = [ "/lib/qt4/plugins" "/lib/kde4/plugins" ];

From 0bfa4e8195900771aeb732ef23febb2fc99fe4dd Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Thu, 3 May 2018 13:52:41 +0200
Subject: [PATCH 02/30] boogie: enable usage as a vim plugin

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

diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 43182b3f2aaa..e5be04182ca0 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -318,11 +318,23 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     postInstall = ''
         mkdir -pv "$out/lib/dotnet/${baseName}"
         ln -sv "${pkgs.z3}/bin/z3" "$out/lib/dotnet/${baseName}/z3.exe"
+
+        # so that this derivation can be used as a vim plugin to install syntax highlighting
+        vimdir=$out/share/vim-plugins/boogie
+        install -Dt $vimdir/syntax/ Util/vim/syntax/boogie.vim
+        mkdir $vimdir/ftdetect
+        echo 'au BufRead,BufNewFile *.bpl set filetype=boogie' > $vimdir/ftdetect/bpl.vim
     '';
 
     meta = with stdenv.lib; {
       description = "An intermediate verification language";
       homepage = "https://github.com/boogie-org/boogie";
+      longDescription = ''
+        Boogie is an intermediate verification language (IVL), intended as a
+        layer on which to build program verifiers for other languages.
+
+        This derivation may be used as a vim plugin to provide syntax highlighting.
+      '';
       license = licenses.mspl;
       maintainers = [ maintainers.taktoa ];
       platforms = with platforms; (linux ++ darwin);

From b0d0b1adfe917f2fadd49fc4931fbfb61f762c60 Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Thu, 24 May 2018 14:43:31 -0700
Subject: [PATCH 03/30] clang_6: fix sanitizers under libstdc++

---
 pkgs/build-support/cc-wrapper/default.nix     |  4 ++--
 pkgs/development/compilers/llvm/6/default.nix | 13 +++++++++----
 pkgs/test/cc-wrapper/default.nix              |  2 --
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index a0955088eb7b..7a18993d607f 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -9,7 +9,7 @@
 , stdenvNoCC, nativeTools, propagateDoc ? !nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
 , cc ? null, libc ? null, bintools, coreutils ? null, shell ? stdenvNoCC.shell
 , extraPackages ? [], extraBuildCommands ? ""
-, isGNU ? false, isClang ? cc.isClang or false, isCompilerRT ? false, gnugrep ? null
+, isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null
 , buildPackages ? {}
 }:
 
@@ -90,7 +90,7 @@ stdenv.mkDerivation {
     # Binutils, and Apple's "cctools"; "bintools" as an attempt to find an
     # unused middle-ground name that evokes both.
     inherit bintools;
-    inherit libc nativeTools nativeLibc nativePrefix isGNU isClang isCompilerRT default_cxx_stdlib_compile;
+    inherit libc nativeTools nativeLibc nativePrefix isGNU isClang default_cxx_stdlib_compile;
 
     emacsBufferSetup = pkgs: ''
       ; We should handle propagation here too
diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix
index da5a97a9bbaa..17c743c04082 100644
--- a/pkgs/development/compilers/llvm/6/default.nix
+++ b/pkgs/development/compilers/llvm/6/default.nix
@@ -38,10 +38,16 @@ let
 
     clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
 
-    libstdcxxClang = wrapCCWith {
+    libstdcxxClang = wrapCCWith rec {
       cc = tools.clang-unwrapped;
-      extraPackages = [ libstdcxxHook ];
-      extraBuildCommands = stdenv.lib.optionalString stdenv.targetPlatform.isLinux ''
+      extraPackages = [ libstdcxxHook targetLlvmLibraries.compiler-rt ];
+      extraBuildCommands = ''
+        rsrc="$out/resource-root"
+        mkdir "$rsrc"
+        ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc"
+        ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
+        echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
+      '' + stdenv.lib.optionalString stdenv.targetPlatform.isLinux ''
         echo "--gcc-toolchain=${tools.clang-unwrapped.gcc}" >> $out/nix-support/cc-cflags
       '';
     };
@@ -53,7 +59,6 @@ let
         targetLlvmLibraries.libcxxabi
         targetLlvmLibraries.compiler-rt
       ];
-      isCompilerRT = true;
       extraBuildCommands = ''
         rsrc="$out/resource-root"
         mkdir "$rsrc"
diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix
index 06113e40561b..87d070f56162 100644
--- a/pkgs/test/cc-wrapper/default.nix
+++ b/pkgs/test/cc-wrapper/default.nix
@@ -38,11 +38,9 @@ stdenv.mkDerivation {
 
     NIX_LDFLAGS="-L$NIX_BUILD_TOP/foo/lib -rpath $NIX_BUILD_TOP/foo/lib" $CC -lfoo -o ldflags-check ${./ldflags-main.c}
     ./ldflags-check
-  '' + stdenv.lib.optionalString (stdenv.cc.isCompilerRT or false) ''
 
     $CC -o sanitizers -fsanitize=address,undefined ${./sanitizers.c}
     ./sanitizers
-  '' + ''
 
     touch $out
   '';

From 29950fe57b92fc53a7682e58a352a2dce7d6321b Mon Sep 17 00:00:00 2001
From: Herman Fries <baracoder@googlemail.com>
Date: Sun, 27 May 2018 22:24:10 +0200
Subject: [PATCH 04/30] spring: Fix stdlib.h: No such file or directory

include_next fatal error: stdlib.h: No such file or directory
The fix is the same as here and works:
https://github.com/NixOS/nixpkgs/pull/28748

It seams to have to do with header paths.
---
 pkgs/games/spring/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index 3bb69359f162..610998b34347 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, lzma, boost, libdevil, zlib, p7zip
 , openal, libvorbis, glew, freetype, xorg, SDL2, libGLU_combined, binutils
 , asciidoc, libxslt, docbook_xsl, docbook_xsl_ns, curl, makeWrapper
-, jdk ? null, python ? null, systemd, libunwind, glibc, which, minizip
+, jdk ? null, python ? null, systemd, libunwind, which, minizip
 , withAI ? true # support for AI Interfaces and Skirmish AIs
 }:
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL2
     xorg.libX11 xorg.libXcursor libGLU_combined glew asciidoc libxslt docbook_xsl curl makeWrapper
-    docbook_xsl_ns systemd libunwind glibc.dev glibc.static which minizip ]
+    docbook_xsl_ns systemd libunwind which minizip ]
     ++ stdenv.lib.optional withAI jdk
     ++ stdenv.lib.optional withAI python;
 
@@ -50,6 +50,5 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     maintainers = [ maintainers.phreedom maintainers.qknight maintainers.domenkozar ];
     platforms = platforms.linux;
-    broken = true;
   };
 }

From 34c116ab128be144217d020bf992918b71d7c455 Mon Sep 17 00:00:00 2001
From: Herman Fries <baracoder@googlemail.com>
Date: Sun, 27 May 2018 22:42:19 +0200
Subject: [PATCH 05/30] spring: 103.0 -> 104.0

---
 pkgs/games/spring/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index 610998b34347..9ce5c7db83fb 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -8,11 +8,11 @@
 stdenv.mkDerivation rec {
 
   name = "spring-${version}";
-  version = "103.0";
+  version = "104.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/springrts/spring_${version}_src.tar.lzma";
-    sha256 = "1fmnwk8ig36429pkp1rafzg4hyzp7i6mwy27p7fdxrdj1q4blx9l";
+    sha256 = "05pclcbw7v481pqz7bgirlk37494hy4hx4jghhnlzhdaz1cvzc6f";
   };
 
   # The cmake included module correcly finds nix's glew, however

From b37cb1de2b6051a3b65fb14e22ca10a30fb5955d Mon Sep 17 00:00:00 2001
From: "nagato.pain" <iuns@outlook.fr>
Date: Mon, 28 May 2018 17:15:40 -0700
Subject: [PATCH 06/30] pythonPackages.pdfminer_six: init at 20170720

---
 .../python-modules/pdfminer_six/default.nix   | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/python-modules/pdfminer_six/default.nix

diff --git a/pkgs/development/python-modules/pdfminer_six/default.nix b/pkgs/development/python-modules/pdfminer_six/default.nix
new file mode 100644
index 000000000000..462c4d558567
--- /dev/null
+++ b/pkgs/development/python-modules/pdfminer_six/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, six, pycryptodome, chardet, nose, pytest }:
+
+buildPythonPackage rec {
+  pname = "pdfminer_six";
+  version = "20170720";
+
+  src = fetchFromGitHub {
+    owner = "pdfminer";
+    repo = "pdfminer.six";
+    rev = "${version}";
+    sha256 = "0vax5k0a8qn8x86ybpzqydk7x3hajsk8b6xf3y610j19mgag6wvs";
+  };
+
+  propagatedBuildInputs = [ six pycryptodome chardet ];
+  
+  checkInputs = [ nose pytest ];
+  checkPhase = ''
+    # some crappy hack to ensure the test do not fail for python3
+    # for some reason importing from the folder tools fails :\
+    cp tools/dumppdf.py tests/
+    cp tools/pdf2txt.py tests/
+    sed -i '/from tools import dumppdf/c\    import dumppdf' tests/test_tools_dumppdf.py
+    sed -i '/import tools.pdf2txt as pdf2txt/c\import pdf2txt as pdf2txt' tests/test_tools_pdf2txt.py
+    pytest
+  '';
+
+  meta = with stdenv.lib; {
+    description = "fork of PDFMiner using six for Python 2+3 compatibility";
+    homepage = https://github.com/pdfminer/pdfminer.six;
+    license = licenses.mit;
+    maintainers = with maintainers; [ psyanticy ];
+  };
+}
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 42f5f6c17112..4d926cb22892 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -311,6 +311,8 @@ in {
 
   outcome = callPackage ../development/python-modules/outcome {};
 
+  pdfminer_six = callPackage ../development/python-modules/pdfminer_six { };
+
   plantuml = callPackage ../tools/misc/plantuml { };
 
   Pmw = callPackage ../development/python-modules/Pmw { };

From a3caa7bd05f7a5070a02efa49eb7fd806b73b549 Mon Sep 17 00:00:00 2001
From: Assassinkin <iuns@outlook.fr>
Date: Tue, 29 May 2018 13:30:41 +0100
Subject: [PATCH 07/30] pythonPackages.pdfminer: replacing pdfminer with
 pdfminer_six

---
 .../python-modules/pdfminer_six/default.nix   | 10 ++------
 pkgs/top-level/python-packages.nix            | 24 +------------------
 2 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/pkgs/development/python-modules/pdfminer_six/default.nix b/pkgs/development/python-modules/pdfminer_six/default.nix
index 462c4d558567..71d439d4c201 100644
--- a/pkgs/development/python-modules/pdfminer_six/default.nix
+++ b/pkgs/development/python-modules/pdfminer_six/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, six, pycryptodome, chardet, nose, pytest }:
+{ stdenv, buildPythonPackage, python, fetchFromGitHub, six, pycryptodome, chardet, nose, pytest }:
 
 buildPythonPackage rec {
   pname = "pdfminer_six";
@@ -15,13 +15,7 @@ buildPythonPackage rec {
   
   checkInputs = [ nose pytest ];
   checkPhase = ''
-    # some crappy hack to ensure the test do not fail for python3
-    # for some reason importing from the folder tools fails :\
-    cp tools/dumppdf.py tests/
-    cp tools/pdf2txt.py tests/
-    sed -i '/from tools import dumppdf/c\    import dumppdf' tests/test_tools_dumppdf.py
-    sed -i '/import tools.pdf2txt as pdf2txt/c\import pdf2txt as pdf2txt' tests/test_tools_pdf2txt.py
-    pytest
+    ${python.interpreter} -m pytest
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4d926cb22892..f02a44d925a8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -311,7 +311,7 @@ in {
 
   outcome = callPackage ../development/python-modules/outcome {};
 
-  pdfminer_six = callPackage ../development/python-modules/pdfminer_six { };
+  pdfminer = callPackage ../development/python-modules/pdfminer_six { };
 
   plantuml = callPackage ../tools/misc/plantuml { };
 
@@ -3784,28 +3784,6 @@ in {
     };
   };
 
-
-  pdfminer = buildPythonPackage rec {
-    version = "20140328";
-    name = "pdfminer-${version}";
-
-    disabled = ! isPy27;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pdfminer/pdfminer-${version}.tar.gz";
-      sha256 = "0qpjv4b776dwvpf5a7v19g41qsz97bv0qqsyvm7a31k50n9pn65s";
-    };
-
-    propagatedBuildInputs = with self; [  ];
-
-    meta = {
-      description = "Tool for extracting information from PDF documents";
-      homepage = http://euske.github.io/pdfminer/index.html;
-      license = licenses.mit;
-      maintainers = with maintainers; [ ];
-    };
-  };
-
   peppercorn = buildPythonPackage rec {
     name = "peppercorn-0.5";
 

From c52dff6d841361071804fb66ed58ba1cf4d59aeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 13 May 2018 10:05:54 +0100
Subject: [PATCH 08/30] linuxPackages.bcc: make it useable as a python library

---
 pkgs/os-specific/linux/bcc/default.nix        | 48 +++++++++++++------
 .../bcc/fix-deadlock-detector-import.patch    | 14 ++++++
 pkgs/os-specific/linux/bcc/libbcc-path.patch  | 11 +++++
 pkgs/top-level/all-packages.nix               |  4 +-
 4 files changed, 62 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/os-specific/linux/bcc/fix-deadlock-detector-import.patch
 create mode 100644 pkgs/os-specific/linux/bcc/libbcc-path.patch

diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix
index 2e2c872fb187..4f0a423600f8 100644
--- a/pkgs/os-specific/linux/bcc/default.nix
+++ b/pkgs/os-specific/linux/bcc/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, llvmPackages, kernel
-, flex, bison, elfutils, python, pythonPackages, luajit, netperf, iperf, libelf
+, flex, bison, elfutils, python, luajit, netperf, iperf, libelf
 , systemtap
 }:
 
-stdenv.mkDerivation rec {
+python.pkgs.buildPythonApplication rec {
   version = "0.5.0";
   name = "bcc-${version}";
 
@@ -14,9 +14,11 @@ stdenv.mkDerivation rec {
     sha256 = "0bb3244xll5sqx0lvrchg71qy2zg0yj6r5h4v5fvrg1fjhaldys9";
   };
 
+  format = "other";
+
   buildInputs = [
     llvmPackages.llvm llvmPackages.clang-unwrapped kernel
-    elfutils python pythonPackages.netaddr luajit netperf iperf
+    elfutils luajit netperf iperf
     systemtap.stapBuild
   ];
 
@@ -26,18 +28,31 @@ stdenv.mkDerivation rec {
       url = "https://github.com/iovisor/bcc/commit/bd7fa55bb39b8978dafd0b299e35616061e0a368.patch";
       sha256 = "1sgxhsq174iihyk1x08py73q8fh78d7y3c90k5nh8vcw2pf1xbnf";
     })
+
+    # This is needed until we fix
+    # https://github.com/NixOS/nixpkgs/issues/40427
+    ./fix-deadlock-detector-import.patch
   ];
 
   nativeBuildInputs = [ makeWrapper cmake flex bison ]
     # libelf is incompatible with elfutils-libelf
     ++ stdenv.lib.filter (x: x != libelf) kernel.moduleBuildDependencies;
 
-  cmakeFlags =
-    [ "-DBCC_KERNEL_MODULES_DIR=${kernel.dev}/lib/modules"
-      "-DREVISION=${version}"
-      "-DENABLE_USDT=ON"
-      "-DENABLE_CPP_API=ON"
-    ];
+  cmakeFlags = [
+    "-DBCC_KERNEL_MODULES_DIR=${kernel.dev}/lib/modules"
+    "-DREVISION=${version}"
+    "-DENABLE_USDT=ON"
+    "-DENABLE_CPP_API=ON"
+  ];
+
+  postPatch = ''
+    substituteAll ${./libbcc-path.patch} ./libbcc-path.patch
+    patch -p1 < libbcc-path.patch
+  '';
+
+  propagatedBuildInputs = [
+    python.pkgs.netaddr
+  ];
 
   postInstall = ''
     mkdir -p $out/bin $out/share
@@ -47,12 +62,17 @@ stdenv.mkDerivation rec {
 
     find $out/share/bcc/tools -type f -executable -print0 | \
     while IFS= read -r -d ''$'\0' f; do
-      pythonLibs="$out/lib/python2.7/site-packages:${pythonPackages.netaddr}/lib/${python.libPrefix}/site-packages"
-      rm -f $out/bin/$(basename $f)
-      makeWrapper $f $out/bin/$(basename $f) \
-        --prefix LD_LIBRARY_PATH : $out/lib \
-        --prefix PYTHONPATH : "$pythonLibs"
+      bin=$out/bin/$(basename $f)
+      if [ ! -e $bin ]; then
+        ln -s $f $bin
+      fi
     done
+
+    sed -i -e "s!lib=.*!lib=$out/bin!" $out/bin/{java,ruby,node,python}gc
+  '';
+
+  postFixup = ''
+    wrapPythonProgramsIn "$out/share/bcc/tools" "$out $pythonPath"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/os-specific/linux/bcc/fix-deadlock-detector-import.patch b/pkgs/os-specific/linux/bcc/fix-deadlock-detector-import.patch
new file mode 100644
index 000000000000..87ce618a0dd9
--- /dev/null
+++ b/pkgs/os-specific/linux/bcc/fix-deadlock-detector-import.patch
@@ -0,0 +1,14 @@
+--- source.org/tools/deadlock_detector.py	1980-01-02 00:00:00.000000000 +0000
++++ source/tools/deadlock_detector.py	2018-05-29 13:57:11.807126673 +0100
+@@ -44,9 +44,8 @@
+ #
+ # 01-Feb-2017   Kenny Yu   Created this.
+ 
+-from __future__ import (
+-    absolute_import, division, unicode_literals, print_function
+-)
++from __future__ import absolute_import, division, unicode_literals, print_function
++
+ from bcc import BPF
+ from collections import defaultdict
+ import argparse
diff --git a/pkgs/os-specific/linux/bcc/libbcc-path.patch b/pkgs/os-specific/linux/bcc/libbcc-path.patch
new file mode 100644
index 000000000000..187bb3aadd00
--- /dev/null
+++ b/pkgs/os-specific/linux/bcc/libbcc-path.patch
@@ -0,0 +1,11 @@
+--- source.org/src/python/bcc/libbcc.py	2018-05-13 08:35:06.850522883 +0100
++++ source/src/python/bcc/libbcc.py	2018-05-13 08:36:24.602733151 +0100
+@@ -14,7 +14,7 @@
+ 
+ import ctypes as ct
+ 
+-lib = ct.CDLL("libbcc.so.0", use_errno=True)
++lib = ct.CDLL("@out@/lib/libbcc.so.0", use_errno=True)
+ 
+ # keep in sync with bpf_common.h
+ lib.bpf_module_create_b.restype = ct.c_void_p
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f0106586d03a..993707c0e419 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13548,7 +13548,9 @@ with pkgs;
 
     batman_adv = callPackage ../os-specific/linux/batman-adv {};
 
-    bcc = callPackage ../os-specific/linux/bcc { };
+    bcc = callPackage ../os-specific/linux/bcc {
+      python = python3;
+    };
 
     bbswitch = callPackage ../os-specific/linux/bbswitch {};
 

From 01f91267e26d5b765c300d49ac28deb97778ef2b Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 29 May 2018 18:42:45 +0200
Subject: [PATCH 09/30] gitAndTools.svn-all-fast-export: 1.0.11 -> 1.0.12

patch for https://github.com/svn-all-fast-export/svn2git/pull/40 is
contained in this release, so we can drop it here.
---
 .../git-and-tools/svn-all-fast-export/default.nix   | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
index 2dfa61952a57..e3ceccdcf3bd 100644
--- a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch, qmake, qtbase, qttools, subversion, apr }:
 
 let
-  version = "1.0.11";
+  version = "1.0.12";
 in
 stdenv.mkDerivation {
   name = "svn-all-fast-export-${version}";
@@ -10,18 +10,9 @@ stdenv.mkDerivation {
     owner = "svn-all-fast-export";
     repo = "svn2git";
     rev = version;
-    sha256 = "0lhnw8f15j4wkpswhrjd7bp9xkhbk32zmszaxayzfhbdl0g7pzwj";
+    sha256 = "158w2ynz16dlp992g8nfk7v2f5962z88b4xyv5dyjvbl4l1v7r0v";
   };
 
-  # https://github.com/svn-all-fast-export/svn2git/pull/40
-  patches = [
-    (fetchpatch {
-      name = "pr40.patch";
-      sha256 = "0mwncklzncsifql9zlxlbj3clsif5p2v1xs8nmxrw44mqvaysjw3";
-      url = https://github.com/svn-all-fast-export/svn2git/compare/f00d5a5...flokli:nixos-20180326.patch;
-    })
-  ];
-
   nativeBuildInputs = [ qmake qttools ];
   buildInputs = [ apr.dev subversion.dev qtbase ];
 

From 72fa40f72ddaff7042846a435d019804474c3d54 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 29 May 2018 13:06:17 -0400
Subject: [PATCH 10/30] lib: Fix `nix-env -qaP -f . --xml --meta`

A merge undid my fix in d437f2c365a12fb3894eb87f52decf53c745f475.
---
 lib/systems/for-meta.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/systems/for-meta.nix b/lib/systems/for-meta.nix
index d545bcbeb7d3..96e8b6f86eb0 100644
--- a/lib/systems/for-meta.nix
+++ b/lib/systems/for-meta.nix
@@ -22,9 +22,9 @@ in rec {
   freebsd = [ patterns.isFreeBSD ];
   # Should be better, but MinGW is unclear, and HURD is bit-rotted.
   gnu     = [
-    { kernel = parse.kernels.linux; abi = parse.abis.gnu; }
-    { kernel = parse.kernels.linux; abi = parse.abis.gnueabi; }
-    { kernel = parse.kernels.linux; abi = parse.abis.gnueabihf; }
+    { kernel = parse.kernels.linux; abi = abis.gnu; }
+    { kernel = parse.kernels.linux; abi = abis.gnueabi; }
+    { kernel = parse.kernels.linux; abi = abis.gnueabihf; }
   ];
   illumos = [ patterns.isSunOS ];
   linux   = [ patterns.isLinux ];

From 842f1af65e52d1e3acac927cc9a933651f2822c9 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 29 May 2018 15:22:48 +0000
Subject: [PATCH 11/30] yoda: fix build after #28029

---
 pkgs/development/libraries/physics/yoda/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix
index 7519d0da03fc..6cda6bd310be 100644
--- a/pkgs/development/libraries/physics/yoda/default.nix
+++ b/pkgs/development/libraries/physics/yoda/default.nix
@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  hardeningDisable = [ "format" ];
+
   meta = {
     description = "Provides small set of data analysis (specifically histogramming) classes";
     license     = stdenv.lib.licenses.gpl2;

From 51af2c330b2222f51383ecf11e89b8ec7571455e Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 29 May 2018 17:09:28 +0000
Subject: [PATCH 12/30] kytea: fix build after #28029

It moved our -O2 before their -O3, but -O3 inlines "checkValueVecEqual(&,&)" into
"checkValueVecEqual(*,*)".
---
 pkgs/tools/text/kytea/default.nix  |  4 +++-
 pkgs/tools/text/kytea/gcc-O3.patch | 13 +++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/text/kytea/gcc-O3.patch

diff --git a/pkgs/tools/text/kytea/default.nix b/pkgs/tools/text/kytea/default.nix
index 142bb721277f..eb537c67a631 100644
--- a/pkgs/tools/text/kytea/default.nix
+++ b/pkgs/tools/text/kytea/default.nix
@@ -10,12 +10,14 @@ stdenv.mkDerivation rec {
     sha256 = "0ilzzwn5vpvm65bnbyb9f5rxyxy3jmbafw9w0lgl5iad1ka36jjk";
   };
 
+  patches = [ ./gcc-O3.patch ];
+
   meta = with stdenv.lib; {
     homepage = http://www.phontron.com/kytea/;
     description = "General toolkit developed for analyzing text";
 
     longDescription = ''
-      A general toolkit developed for analyzing text, with a focus on Japanese, 
+      A general toolkit developed for analyzing text, with a focus on Japanese,
       Chinese and other languages requiring word or morpheme segmentation.
     '';
 
diff --git a/pkgs/tools/text/kytea/gcc-O3.patch b/pkgs/tools/text/kytea/gcc-O3.patch
new file mode 100644
index 000000000000..71b1d0c3b16e
--- /dev/null
+++ b/pkgs/tools/text/kytea/gcc-O3.patch
@@ -0,0 +1,13 @@
+diff --git a/src/lib/kytea-util.cpp b/src/lib/kytea-util.cpp
+index 7c8c4c6..4492df1 100644
+--- a/src/lib/kytea-util.cpp
++++ b/src/lib/kytea-util.cpp
+@@ -49,5 +49,8 @@ void checkValueVecEqual(const std::vector<T> * a, const std::vector<T> * b) {
+ 
++template void checkValueVecEqual(const std::vector<unsigned int> & a, const std::vector<unsigned int> & b);
+ template void checkValueVecEqual(const std::vector<unsigned int> * a, const std::vector<unsigned int> * b);
++template void checkValueVecEqual(const std::vector<short> & a, const std::vector<short> & b);
+ template void checkValueVecEqual(const std::vector<short> * a, const std::vector<short> * b);
+ template void checkValueVecEqual(const std::vector<vector<KyteaString> > * a, const std::vector<vector<KyteaString> > * b);
++template void checkValueVecEqual(const std::vector<int> & a, const std::vector<int> & b);
+ template void checkValueVecEqual(const std::vector<int> * a, const std::vector<int> * b);

From a12a277e6247a7f43b11f7b16bcf815cd5af2d98 Mon Sep 17 00:00:00 2001
From: tilpner <till@hoeppner.ws>
Date: Tue, 29 May 2018 20:07:41 +0200
Subject: [PATCH 13/30] racket: use proper uname, allow for unix sockets

Racket checks the current platform via uname, then disallows
unix domain socket usage based on the result. Previously, it could not
successfully call uname at all, so it fell back to denying UDS.
---
 pkgs/development/interpreters/racket/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 32d24fa88356..f25d2933ab7f 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -58,7 +58,9 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     unset AR
-    substituteInPlace src/configure --replace /usr/bin/uname ${coreutils}/bin/uname
+    for f in src/configure src/racket/src/string.c; do
+      substituteInPlace "$f" --replace /usr/bin/uname ${coreutils}/bin/uname
+    done
     mkdir src/build
     cd src/build
   '';

From e62b01b78ec2493bb1ff6b793d98a03919160a0f Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent.demeester@docker.com>
Date: Tue, 29 May 2018 21:21:19 +0200
Subject: [PATCH 14/30] drone: 0.5 -> 0.8.5 (#41200)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 .../continuous-integration/drone/default.nix  | 53 +++----------------
 .../continuous-integration/drone/deps.nix     | 38 +++++++++++++
 2 files changed, 44 insertions(+), 47 deletions(-)
 create mode 100644 pkgs/development/tools/continuous-integration/drone/deps.nix

diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix
index 845e3f8a1dc4..d8ba99fbf1a8 100644
--- a/pkgs/development/tools/continuous-integration/drone/default.nix
+++ b/pkgs/development/tools/continuous-integration/drone/default.nix
@@ -2,66 +2,25 @@
 
 buildGoPackage rec {
   name = "drone.io-${version}";
-  version = "0.5-20161104-${stdenv.lib.strings.substring 0 7 revision}";
-  revision = "232df356afeeb4aec5e2959fa54b084dcadb267f";
+  version = "0.8.5-20180329-${stdenv.lib.strings.substring 0 7 revision}";
+  revision = "81103a98208b0bfc76be5b07194f359fbc80183b";
   goPackagePath = "github.com/drone/drone";
 
   # These dependencies pulled (in `drone` buildprocess) via Makefile,
   # so I extracted them here, all revisions pinned by same date, as ${version}
-  extraSrcs = [ 
-    {
-      goPackagePath = "github.com/drone/drone-ui";
-      src = fetchFromGitHub {
-        owner = "drone";
-        repo = "drone-ui";
-        rev = "e66df33b4620917a2e7b59760887cc3eed543664";
-        sha256 = "0d50xdzkh9akpf5c0sqgcgy11v2vz858l36jp5snr94zkrdkv0n1";
-      };
-    }
-    {
-      goPackagePath = "github.com/drone/mq";
-      src = fetchFromGitHub {
-        owner = "drone";
-        repo = "mq";
-        rev = "0f296601feeed952dabd038793864acdbefe6dbe";
-        sha256 = "1k7439c90l4w29g7wyixfmpbkap7bn8yh8zynbjyjf9qjzwsnw97";
-      };
-    }
-    {
-      goPackagePath = "github.com/tidwall/redlog";
-      src = fetchFromGitHub {
-        owner = "tidwall";
-        repo = "redlog";
-        rev = "54086c8553cd23aba652513a87d2b085ea961541";
-        sha256 = "12a7mk6r8figjinzkbisxcaly6sasggy62m8zs4cf35lpq2lhffq";
-      };
-    }
-    {
-      goPackagePath = "golang.org/x/crypto";
-      src = fetchFromGitHub {
-        owner = "golang";
-        repo = "crypto";
-        rev = "9477e0b78b9ac3d0b03822fd95422e2fe07627cd";
-        sha256 = "1qcqai6nf1q50z9ga7r4ljnrh1qz49kwlcqpri4bknx732lqq0v5";
-      };
-    }
-  ];
-  nativeBuildInputs = [ go-bindata go-bindata-assetfs ];
+  goDeps= ./deps.nix;
 
-  preBuild = ''
-    go generate github.com/drone/drone/server/template
-    go generate github.com/drone/drone/store/datastore/ddl
-  '';
+  nativeBuildInputs = [ go-bindata go-bindata-assetfs ];
 
   src = fetchFromGitHub {
     owner = "drone";
     repo = "drone";
     rev = revision;
-    sha256 = "0xrijcrlv3ag9n2kywkrhdkxyhxc8fs6zqn0hyav6a6jpqnsahg3";
+    sha256 = "1890bwhxr62adv261v4kn1azhq7qvcj2zpll68i9nsvjib8a52bq";
   };
 
   meta = with stdenv.lib; {
-    maintainers = with maintainers; [ avnik ];
+    maintainers = with maintainers; [ avnik vdemeester ];
     license = licenses.asl20;
     description = "Continuous Integration platform built on container technology";
   };
diff --git a/pkgs/development/tools/continuous-integration/drone/deps.nix b/pkgs/development/tools/continuous-integration/drone/deps.nix
new file mode 100644
index 000000000000..86059fba28d9
--- /dev/null
+++ b/pkgs/development/tools/continuous-integration/drone/deps.nix
@@ -0,0 +1,38 @@
+[
+  {
+    goPackagePath = "github.com/drone/drone-ui";
+    fetch = {
+      type = "git";
+      url = "https://github.com/drone/drone-ui";
+      rev = "5a497bd6cd5c3c17c53b00d40bcda1bf6f68f475";
+      sha256 = "1666xlz3dg468izfwprg17sgb3f4ppn5sj5klds3wgdfrjjm4v57";
+    };
+  }
+  {
+    goPackagePath = "github.com/drone/mq";
+    fetch = {
+      type = "git";
+      url = "https://github.com/drone/mq";
+      rev = "280af2a3b9c7d9ce90d625150dfff972c6c190b8";
+      sha256 = "10a24yq3ya8mvs7j6m7lqhyws7jd923rnih75ciq1g327qxf743s";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/net";
+      rev = "dfa909b99c79129e1100513e5cd36307665e5723";
+      sha256 = "0nsansy1yqy1kzh5wpv3zi85s0chxfq0ha8knhgnfa0wj0k8q0il";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265";
+      sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq";
+    };
+  }
+]

From 52b3f49797d5c1963eef534074d145b3beb47e75 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Tue, 29 May 2018 19:35:43 +0000
Subject: [PATCH 15/30] hyper: gnome2 cleanup (#41170)

* hyper: gnome2 cleanup

* hyper: use toplevel gtk2
---
 pkgs/applications/misc/hyper/default.nix | 9 ++++-----
 pkgs/top-level/all-packages.nix          | 3 +--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/misc/hyper/default.nix
index 75d18c7a774d..65b85868bc59 100644
--- a/pkgs/applications/misc/hyper/default.nix
+++ b/pkgs/applications/misc/hyper/default.nix
@@ -1,14 +1,13 @@
-{ stdenv, lib, fetchurl, dpkg, gtk2, atk, glib, pango, gdk_pixbuf, cairo
+{ stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk_pixbuf, gnome3, gtk2, cairo
 , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr
 , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
-, libxcb
-, GConf, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }:
+, libxcb, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }:
 
 let
   libPath = stdenv.lib.makeLibraryPath [
-    stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
+    stdenv.cc.cc gtk2 gnome3.gconf atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
     libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
-    libXrender libX11 libXtst libXScrnSaver GConf nss nspr alsaLib cups expat libudev libpulseaudio
+    libXrender libX11 libXtst libXScrnSaver nss nspr alsaLib cups expat libudev libpulseaudio
   ];
 in
 stdenv.mkDerivation rec {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 741b7b55fe2b..f4dcd0314066 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16259,8 +16259,7 @@ with pkgs;
 
   hydrogen = callPackage ../applications/audio/hydrogen { };
 
-  hyper = callPackage ../applications/misc/hyper { inherit (gnome2) GConf; };
-  hyperterm = self.hyper;
+  hyper = callPackage ../applications/misc/hyper { };
 
   hyper-haskell-server-with-packages = callPackage ../development/tools/haskell/hyper-haskell/server.nix {
     inherit (haskellPackages) ghcWithPackages;

From e25e9d619115cfa9bf1529d21ac9a64d17db7cd7 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Tue, 29 May 2018 19:40:59 +0000
Subject: [PATCH 16/30] wire-desktop: gnome2 cleanup (#41155)

* wire-desktop: gnome2 cleanup

* wire-desktop: use toplevel gtk2
---
 .../instant-messengers/wire-desktop/default.nix           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
index f0123024fe2f..87dddff4bd05 100644
--- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, dpkg, makeDesktopItem, gnome2, atk, cairo, gdk_pixbuf, glib
+{ stdenv, lib, fetchurl, dpkg, makeDesktopItem, gnome3, gtk2, atk, cairo, pango, gdk_pixbuf, glib
 , freetype, fontconfig, dbus, libnotify, libX11, xorg, libXi, libXcursor, libXdamage
 , libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver
 , nss, nspr, alsaLib, cups, expat, udev, xdg_utils, hunspell
@@ -15,9 +15,9 @@ let
     freetype
     gdk_pixbuf
     glib
-    gnome2.GConf
-    gnome2.gtk
-    gnome2.pango
+    gnome3.gconf
+    gtk2
+    pango
     hunspell
     libnotify
     libX11

From 1f14408b0e499dcc5faf656c1d7c8b21b520a72c Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Tue, 29 May 2018 19:54:42 +0000
Subject: [PATCH 17/30] skypeforlinux: gnome2 cleanup (#41176)

* skypeforlinux: gnome2 cleanup

* skypeforlinux: use toplevel gdk_pixbuf and gtk2
---
 .../instant-messengers/skypeforlinux/default.nix  | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
index fc8a601f1bea..e305a4927204 100644
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, dpkg, makeWrapper
-, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib, glibc, gnome2
-, libnotify, libpulseaudio, libsecret, libstdcxx5, libv4l, nspr, nss, systemd, xorg }:
+, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, glibc, gnome3
+, gtk2, libnotify, libpulseaudio, libsecret, libstdcxx5, libv4l, nspr, nss, pango, systemd, xorg }:
 
 let
 
@@ -22,17 +22,18 @@ let
     glibc
     libsecret
 
-    gnome2.GConf
-    gnome2.gdk_pixbuf
-    gnome2.gtk
-    gnome2.pango
+    gnome3.gconf
+    gdk_pixbuf
+    gtk2
+    
 
-    gnome2.gnome-keyring
+    gnome3.gnome-keyring
 
     libnotify
     libpulseaudio
     nspr
     nss
+    pango
     stdenv.cc.cc
     systemd
     libstdcxx5

From bab973a28b3d8e565300e798cc43e63fb2bf2a0c Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Tue, 29 May 2018 19:59:05 +0000
Subject: [PATCH 18/30] discord: gnome2 cleanup (#41174)

* discord: gnome2 cleanup

* discord: use top-level gtk2
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 09ead9b3de65..ae0951ba99a1 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, makeDesktopItem, makeWrapper
 , alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk_pixbuf
-, glib, gnome2, gtk2, libnotify, libX11, libXcomposite, libXcursor, libXdamage
+, glib, gnome3, gtk2, libnotify, libX11, libXcomposite, libXcursor, libXdamage
 , libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, libxcb
 , pango, systemd, libXScrnSaver, libcxx, libpulseaudio }:
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     libPath = stdenv.lib.makeLibraryPath [
         libcxx systemd libpulseaudio
         stdenv.cc.cc alsaLib atk cairo cups dbus expat fontconfig freetype
-        gdk_pixbuf glib gnome2.GConf gtk2 libnotify libX11 libXcomposite
+        gdk_pixbuf glib gnome3.gconf gtk2 libnotify libX11 libXcomposite
         libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender
         libXtst nspr nss libxcb pango systemd libXScrnSaver
      ];

From 41bb69fa88c0c9bb86b34f17f36284c92348ca23 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Tue, 29 May 2018 20:04:04 +0000
Subject: [PATCH 19/30] typora: gnome2 cleanup (#41167)

---
 pkgs/applications/editors/typora/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix
index 3513888f74fb..efde7242793d 100644
--- a/pkgs/applications/editors/typora/default.nix
+++ b/pkgs/applications/editors/typora/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, dpkg, lib, glib, dbus, makeWrapper, gnome2, gnome3, gtk3, atk, cairo
-, freetype, fontconfig, nspr, nss, xorg, alsaLib, cups, expat, udev, wrapGAppsHook }:
+{ stdenv, fetchurl, dpkg, lib, glib, dbus, makeWrapper, gnome3, gtk3, atk, cairo, pango
+, gdk_pixbuf, freetype, fontconfig, nspr, nss, xorg, alsaLib, cups, expat, udev, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "typora-${version}";
@@ -20,10 +20,9 @@ stdenv.mkDerivation rec {
 
     rpath = stdenv.lib.makeLibraryPath [
       alsaLib
-      gnome2.GConf
-      gnome2.gtk
-      gnome2.gdk_pixbuf
-      gnome2.pango
+      gnome3.gconf
+      gdk_pixbuf
+      pango
       gnome3.defaultIconTheme
       expat
       gtk3

From 570327b0a35ed39e9dfba1a263d3866e8e382575 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Tue, 29 May 2018 21:25:11 +0000
Subject: [PATCH 20/30] messenger-for-desktop: remove (#41224)

---
 .../messenger-for-desktop/default.nix         | 104 ------------------
 pkgs/top-level/all-packages.nix               |   1 -
 2 files changed, 105 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix b/pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix
deleted file mode 100644
index 37a3746669b1..000000000000
--- a/pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-  stdenv, fetchurl, dpkg, alsaLib, atk, cairo, cups, curl, dbus, expat,
-  fontconfig, freetype, glib, gnome2, libnotify, nspr, nss, systemd, xorg
-}:
-
-with stdenv.lib;
-
-let
-
-  version = "2.0.6";
-
-  rpath = makeLibraryPath [
-    alsaLib
-    atk
-    cairo
-    cups
-    curl
-    dbus
-    expat
-    fontconfig
-    freetype
-    glib
-    gnome2.GConf
-    gnome2.gdk_pixbuf
-    gnome2.gtk
-    gnome2.pango
-    libnotify
-    nspr
-    nss
-    stdenv.cc.cc
-    systemd
-
-    xorg.libxkbfile
-    xorg.libX11
-    xorg.libXcomposite
-    xorg.libXcursor
-    xorg.libXdamage
-    xorg.libXext
-    xorg.libXfixes
-    xorg.libXi
-    xorg.libXrandr
-    xorg.libXrender
-    xorg.libXtst
-    xorg.libXScrnSaver
-  ] + ":${stdenv.cc.cc.lib}/lib64";
-
-  src =
-    if stdenv.system == "x86_64-linux" then
-      fetchurl {
-        url = "https://github.com/aluxian/Messenger-for-Desktop/releases/download/v2.0.6/messengerfordesktop-2.0.6-linux-amd64.deb";
-        sha256 = "bf3f3ed9ac46ceb4b7dffbeb33c7d15bbcbfcdd141c4dbfbb620e8bfefae906b";
-      }
-    else
-      throw "Messenger for Desktop is not supported on ${stdenv.system}";
-
-in stdenv.mkDerivation {
-  name = "messenger-for-desktop-${version}";
-
-  inherit src;
-
-  buildInputs = [ dpkg ];
-  unpackPhase = "true";
-  buildCommand = ''
-    mkdir -p $out
-    dpkg -x $src $out
-
-    mv $out/usr/share $out/share
-    mv $out/opt/messengerfordesktop $out/libexec
-    rmdir $out/usr $out/opt
-
-    chmod -R g-w $out
-
-    # patch the binaries
-    for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do
-      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true
-      patchelf --set-rpath ${rpath}:$out/libexec $file || true
-    done
-
-    # add symlink to bin
-    mkdir -p $out/bin
-    ln -s $out/libexec/messengerfordesktop $out/bin/messengerfordesktop
-
-    # Fix the desktop link
-    substituteInPlace $out/share/applications/messengerfordesktop.desktop                 \
-      --replace /opt/messengerfordesktop/messengerfordesktop $out/bin/messengerfordesktop 
-  '';
-
-  meta = {
-    description = "Bring messenger.com to your Linux desktop.";
-    longDescription = ''
-      A simple & beautiful desktop client for Facebook Messenger. Chat without
-      distractions on macOS, Windows and Linux. Not affiliated with Facebook.
-      This is NOT an official product.
-    '';
-    homepage = https://messengerfordesktop.org;
-    license = licenses.mit;
-    maintainers = [
-      maintainers.shawndellysse
-    ];
-    platforms = [
-      "x86_64-linux"
-    ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f4dcd0314066..3ec08d9cf997 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21404,7 +21404,6 @@ with pkgs;
   ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { inherit (darwin) cctools; };
 
   chrome-gnome-shell = callPackage  ../desktops/gnome-3/extensions/chrome-gnome-shell {};
-  messenger-for-desktop = callPackage ../applications/networking/instant-messengers/messenger-for-desktop {};
 
   NSPlist = callPackage ../development/libraries/NSPlist {};
 

From b02b4648528ee377c717e59af7dfd836bde6c865 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 29 May 2018 22:28:25 +0100
Subject: [PATCH 21/30] neovim-remote: 1.8.6 -> 2.0.5

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

diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix
index c4d2be4c740b..49b08534cd8c 100644
--- a/pkgs/applications/editors/neovim/neovim-remote.nix
+++ b/pkgs/applications/editors/neovim/neovim-remote.nix
@@ -4,14 +4,14 @@ with stdenv.lib;
 
 pythonPackages.buildPythonPackage rec {
   name = "neovim-remote-${version}";
-  version = "1.8.6";
+  version = "2.0.5";
   disabled = !pythonPackages.isPy3k;
 
   src = fetchFromGitHub {
     owner = "mhinz";
     repo = "neovim-remote";
     rev = "v${version}";
-    sha256 = "0x01zpmxi37jr7j2az2bd8902h7zhkpg6kpvc8xmll9f7703zz2l";
+    sha256 = "08qsi61ba5d69ca77layypzvi7nalx4niy97xn4w88jibnbmbrxw";
   };
 
   propagatedBuildInputs = with pythonPackages; [ neovim psutil ];

From 7a23f1accaccdbadfb28da89e00c2489aa96245c Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Tue, 29 May 2018 17:39:21 -0400
Subject: [PATCH 22/30] GHCJS darwin fixes (#41120)

* GHCJS darwin fixes

* Fix ghcjs 80 and 710 packages

* Add socket-io to ghcjs 82 and 84 passthru
---
 pkgs/development/compilers/ghcjs-ng/default.nix | 8 +++++++-
 pkgs/top-level/haskell-packages.nix             | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix
index 035687a64f3a..7f13c373942d 100644
--- a/pkgs/development/compilers/ghcjs-ng/default.nix
+++ b/pkgs/development/compilers/ghcjs-ng/default.nix
@@ -14,7 +14,9 @@
 , xorg
 , gmp
 , pkgconfig
+, gcc
 , lib
+, nodePackages
 , ghcjsDepOverrides ? (_:_:{})
 }:
 
@@ -40,6 +42,8 @@ let
     inherit (bootGhcjs) version;
     isGhcjs = true;
 
+    socket-io = nodePackages."socket.io";
+
     # Relics of the old GHCJS build system
     stage1Packages = [];
     mkStage2 = _: {};
@@ -49,7 +53,7 @@ let
   libexec =
     if builtins.compareVersions bootGhcjs.version "8.3" <= 0
       then "${bootGhcjs}/bin"
-      else "${bootGhcjs}/libexec/${stdenv.system}-${passthru.bootPkgs.ghc.name}/${bootGhcjs.name}";
+      else "${bootGhcjs}/libexec/${builtins.replaceStrings ["darwin"] ["osx"] stdenv.system}-${passthru.bootPkgs.ghc.name}/${bootGhcjs.name}";
 
 in stdenv.mkDerivation {
     name = "ghcjs";
@@ -63,6 +67,8 @@ in stdenv.mkDerivation {
       xorg.lndir
       gmp
       pkgconfig
+    ] ++ lib.optionals stdenv.isDarwin [
+      gcc # https://github.com/ghcjs/ghcjs/issues/663
     ];
     phases = ["unpackPhase" "buildPhase"];
     buildPhase = ''
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 2e6bd5ebb853..fab88ab180b5 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -159,13 +159,13 @@ in rec {
     ghcjs = packages.ghcjs82;
     ghcjs710 = callPackage ../development/haskell-modules rec {
       buildHaskellPackages = ghc.bootPkgs;
-      ghc = bh.compiler.ghcjs;
+      ghc = bh.compiler.ghcjs710;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };
       packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
     };
     ghcjs80 = callPackage ../development/haskell-modules rec {
       buildHaskellPackages = ghc.bootPkgs;
-      ghc = bh.compiler.ghcjsHEAD;
+      ghc = bh.compiler.ghcjs80;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { };
       packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
     };

From 7cadf50be205b664fca0a4a378334095a678df42 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 29 May 2018 23:16:51 +0000
Subject: [PATCH 23/30] virtualbox: fix build after #28029

---
 pkgs/applications/virtualization/virtualbox/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 71c9c8fa6441..3c5d3e6dc1b0 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -65,7 +65,7 @@ in stdenv.mkDerivation {
     ++ optionals (headless) [ libXrandr ]
     ++ optionals (!headless) [ qt5.qtbase qt5.qtx11extras libXinerama SDL ];
 
-  hardeningDisable = [ "fortify" "pic" "stackprotector" ];
+  hardeningDisable = [ "format" "fortify" "pic" "stackprotector" ];
 
   prePatch = ''
     set -x

From 6bb08e881dd41c7cda2569126bec930007c2cc0f Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 30 May 2018 01:13:59 +0200
Subject: [PATCH 24/30] gdk-pixbuf: patch library rpath references on darwin

A bunch of the libraries like libpixbufloader-png link against libgdk_pixbuf,
however the install_name is not correct at this point yet since meson tries to use rpaths.
---
 pkgs/development/libraries/gdk-pixbuf/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index ae84b1a17016..849e72d9a976 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -82,10 +82,14 @@ stdenv.mkDerivation rec {
       $dev/bin/gdk-pixbuf-query-loaders --update-cache
     '';
 
-  # The fixDarwinDylibNames hook doesn't patch binaries.
+  # The fixDarwinDylibNames hook doesn't patch library references or binaries.
   preFixup = stdenv.lib.optionalString stdenv.isDarwin ''
+    for f in $(find $out/lib -name '*.dylib'); do
+        install_name_tool -change @rpath/libgdk_pixbuf-2.0.0.dylib $out/lib/libgdk_pixbuf-2.0.0.dylib $f
+    done
+
     for f in $out/bin/* $dev/bin/*; do
-        install_name_tool -change "@rpath/libgdk_pixbuf-2.0.0.dylib" "$out/lib/libgdk_pixbuf-2.0.0.dylib" $f
+        install_name_tool -change @rpath/libgdk_pixbuf-2.0.0.dylib $out/lib/libgdk_pixbuf-2.0.0.dylib $f
     done
   '';
 

From e4df80a69bf529a322a06391d47b8b7b444d5c4b Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 29 May 2018 23:26:30 +0000
Subject: [PATCH 25/30] haskellPackages.hlibgit2: fix build after #28029

---
 pkgs/development/haskell-modules/configuration-common.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 7d308f5ab722..866079f2e2d3 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -332,6 +332,7 @@ self: super: {
   hgdbmi = dontCheck super.hgdbmi;
   hi = dontCheck super.hi;
   hierarchical-clustering = dontCheck super.hierarchical-clustering;
+  hlibgit2 = disableHardening super.hlibgit2 [ "format" ];
   hmatrix-tests = dontCheck super.hmatrix-tests;
   hquery = dontCheck super.hquery;
   hs2048 = dontCheck super.hs2048;

From 796080f3962276a4da5ee1309e417487d8c7b991 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 29 May 2018 23:31:58 +0000
Subject: [PATCH 26/30] pythonPackages.bsddb3: fix build after 0fd461d5

---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b5849a0bc714..3b0946a0579c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1325,7 +1325,7 @@ in {
     #setupPyBuildFlags = [ "--berkeley-db=${pkgs.db}" ];
     # We can also use a variable
     preConfigure = ''
-      export BERKELEYDB_DIR=${pkgs.db};
+      export BERKELEYDB_DIR=${pkgs.db.dev};
     '';
 
     meta = {

From 9d338974618b7071a3c36844b5aa2b162bb5b34a Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 30 May 2018 00:16:27 +0000
Subject: [PATCH 27/30] zeroc-ice: fix parallel building

---
 pkgs/development/libraries/zeroc-ice/default.nix    | 2 ++
 pkgs/development/libraries/zeroc-ice/makefile.patch | 9 +++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 pkgs/development/libraries/zeroc-ice/makefile.patch

diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix
index 8527832ad9c2..063d64c69058 100644
--- a/pkgs/development/libraries/zeroc-ice/default.nix
+++ b/pkgs/development/libraries/zeroc-ice/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
     sha256 = "05xympbns32aalgcfcpxwfd7bvg343f16xpg6jv5s335ski3cjy2";
   };
 
+  patches = [ ./makefile.patch ];
+
   buildInputs = [ mcpp bzip2 expat openssl db5 ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools libiconv Security ];
 
diff --git a/pkgs/development/libraries/zeroc-ice/makefile.patch b/pkgs/development/libraries/zeroc-ice/makefile.patch
new file mode 100644
index 000000000000..6955bcd0a6d7
--- /dev/null
+++ b/pkgs/development/libraries/zeroc-ice/makefile.patch
@@ -0,0 +1,9 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -77,4 +77,6 @@ FreezeScript: Freeze
+ Glacier2 IceGridLib Glacier2CryptPermissionsVerifier: Glacier2Lib
+ 
++Glacier2: IceSSL
++
+ IcePatch2: IcePatch2Lib
+ 

From 8a0ed10ba729c65cb44aa473327e46a204e3c054 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 29 May 2018 17:31:46 -0700
Subject: [PATCH 28/30] sc-controller: 0.4.2 -> 0.4.3

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/sc-controller/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/sc-controller had a zero exit code or showed the expected version
- /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/scc passed the binary check.
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/scc-daemon had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/scc-osd-dialog had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/scc-osd-keyboard had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/scc-osd-launcher had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/scc-osd-menu had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/scc-osd-message had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/scc-osd-radial-menu had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/scc-osd-show-bindings had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/..sc-controller-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/.sc-controller-wrapped had a zero exit code or showed the expected version
- /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/..scc-wrapped-wrapped passed the binary check.
- /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/.scc-wrapped passed the binary check.
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/..scc-daemon-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/.scc-daemon-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/..scc-osd-dialog-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/.scc-osd-dialog-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/..scc-osd-keyboard-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/.scc-osd-keyboard-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/..scc-osd-launcher-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/.scc-osd-launcher-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/..scc-osd-menu-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/.scc-osd-menu-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/..scc-osd-message-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/.scc-osd-message-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/..scc-osd-radial-menu-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/.scc-osd-radial-menu-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/..scc-osd-show-bindings-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/.scc-osd-show-bindings-wrapped had a zero exit code or showed the expected version
- 3 of 30 passed binary check by having a zero exit code.
- 0 of 30 passed binary check by having the new version present in output.
- found 0.4.3 with grep in /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3
- directory tree listing: https://gist.github.com/28b55137e29bb39ba0741bd1847fe529
- du listing: https://gist.github.com/446c39be30dba3aa0dc166afa85e757a
---
 pkgs/misc/drivers/sc-controller/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix
index d4ed749ca9cc..5583461d3754 100644
--- a/pkgs/misc/drivers/sc-controller/default.nix
+++ b/pkgs/misc/drivers/sc-controller/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonApplication rec {
   pname = "sc-controller";
-  version = "0.4.2";
+  version = "0.4.3";
 
   src = fetchFromGitHub {
     owner  = "kozec";
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "19i9z5cjjgi3a94hrz5g3a6m4vj71p1gs6mhklc6dq8ydwsadwzz";
+    sha256 = "0w4ykl78vdppqr3d4d0h1f31wly6kis57a1gxhnrbpfrgpj0qhvj";
   };
 
   nativeBuildInputs = [ wrapGAppsHook ];

From 9db1f486e15107e417b63119ad5e1917ee126599 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 29 May 2018 21:33:36 -0400
Subject: [PATCH 29/30] git: 2.17.0 -> 2.17.1

---
 .../version-management/git-and-tools/git/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index a3f61f3399db..ceec9f1e75b6 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -18,7 +18,7 @@ assert sendEmailSupport -> perlSupport;
 assert svnSupport -> perlSupport;
 
 let
-  version = "2.17.0";
+  version = "2.17.1";
   svn = subversionClient.override { perlBindings = perlSupport; };
 in
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "1ismz7nsz8dgjmk782xr9s0mr2qh06f72pdcgbxfmnw1bvlya5p9";
+    sha256 = "0pm6bdnrrm165k3krnazxcxadifk2gqi30awlbcf9fism1x6w4vr";
   };
 
   outputs = [ "out" ] ++ stdenv.lib.optional perlSupport "gitweb";

From 798d5f5cdb8a8b8f92f920ffc66cd480c9c661ce Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 30 May 2018 01:09:14 +0000
Subject: [PATCH 30/30] bitlbee: fix build

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

diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
index fa3c66e67b61..0b2a97b53786 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
@@ -15,9 +15,6 @@ stdenv.mkDerivation rec {
   buildInputs = [ gnutls glib libotr python ]
     ++ optional enableLibPurple pidgin;
 
-  preConfigure = optionalString enableLibPurple
-    "export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${pidgin}/lib/pkgconfig";
-
   configureFlags = [
     "--gcov=1"
     "--otr=1"
@@ -26,12 +23,12 @@ stdenv.mkDerivation rec {
   ]
   ++ optional enableLibPurple "--purple=1";
 
-  buildPhase = optionalString (!enableLibPurple) ''
-    make install-dev
-  '';
+  installTargets = [ "install" "install-dev" ];
 
   doCheck = !enableLibPurple; # Checks fail with libpurple for some reason
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "IRC instant messaging gateway";