From bc6cfb47500c56bb1c59462e6b6ccb4fb0ba8486 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Sat, 21 Jul 2018 04:40:20 +0200
Subject: [PATCH 01/14] krb5: Add `staticOnly` flag

---
 pkgs/development/libraries/kerberos/krb5.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index d705aa3388fd..8f9c75c441d1 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -3,6 +3,9 @@
 
 # Extra Arguments
 , type ? ""
+# This is called "staticOnly" because krb5 does not support
+# builting both static and shared, see below.
+, staticOnly ? false
 }:
 
 let
@@ -22,6 +25,9 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   configureFlags = [ "--with-tcl=no" "--localstatedir=/var/lib"]
+    # krb5's ./configure does not allow passing --enable-shared and --enable-static at the same time.
+    # See https://bbs.archlinux.org/viewtopic.php?pid=1576737#p1576737
+    ++ optional staticOnly [ "--enable-static" "--disable-shared" ]
     ++ optional stdenv.isFreeBSD ''WARN_CFLAGS=""''
     ++ optionals (stdenv.buildPlatform != stdenv.hostPlatform)
        [ "krb5_cv_attr_constructor_destructor=yes,yes"

From 479dcc3b549dc7378cdb570bf3cb9fba7b9a4d2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Sat, 21 Jul 2018 04:41:01 +0200
Subject: [PATCH 02/14] openssl: Add `static` flag.

Its effect on `postInstall` is carefully written to not
cause recompilation in the default case.
---
 pkgs/development/libraries/openssl/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 0251de77d03e..746a4445ddbc 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -3,6 +3,7 @@
 , fetchpatch
 , withCryptodev ? false, cryptodevHeaders
 , enableSSL2 ? false
+, static ? false
 }:
 
 with stdenv.lib;
@@ -62,7 +63,7 @@ let
     '';
 
     configureFlags = [
-      "shared"
+      "shared" # "shared" builds both shared and static libraries
       "--libdir=lib"
       "--openssldir=etc/ssl"
     ] ++ stdenv.lib.optionals withCryptodev [
@@ -75,13 +76,16 @@ let
 
     enableParallelBuilding = true;
 
-    postInstall = ''
+    postInstall =
+    stdenv.lib.optionalString (!static) ''
       # If we're building dynamic libraries, then don't install static
       # libraries.
       if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then
           rm "$out/lib/"*.a
       fi
 
+    '' +
+    ''
       mkdir -p $bin
       mv $out/bin $bin/
 

From 2dd664140bc3e8b081f812ee2f170d3af8826664 Mon Sep 17 00:00:00 2001
From: Jack Kelly <jack@jackkelly.name>
Date: Sun, 22 Jul 2018 17:08:43 +1000
Subject: [PATCH 03/14] haskellPackages.doctest-discover: Disable tests

The source package is missing a required file. See:

- https://github.com/karun012/doctest-discover/issues/22
- https://github.com/karun012/doctest-discover/issues/23
---
 pkgs/development/haskell-modules/configuration-nix.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 4e62d4705063..dfaad7a7f6b0 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -504,4 +504,8 @@ self: super: builtins.intersectAttrs super {
   blank-canvas = dontCheck super.blank-canvas;
   blank-canvas_0_6_2 = dontCheck super.blank-canvas_0_6_2;
 
+  # Missing file in source distribution:
+  # - https://github.com/karun012/doctest-discover/issues/22
+  # - https://github.com/karun012/doctest-discover/issues/23
+  doctest-discover = dontCheck super.doctest-discover;
 }

From e017ce083944a05a453db714ba43b2a449b35fd5 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sun, 22 Jul 2018 20:21:47 +0100
Subject: [PATCH 04/14] cloudfoundry-cli: 6.36.1 -> 6.37.0

upstream seems to have added new make build system - adapt to use that
---
 pkgs/development/tools/cloudfoundry-cli/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/cloudfoundry-cli/default.nix b/pkgs/development/tools/cloudfoundry-cli/default.nix
index 22c2f0774182..3ce9e64c0f7a 100644
--- a/pkgs/development/tools/cloudfoundry-cli/default.nix
+++ b/pkgs/development/tools/cloudfoundry-cli/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "cloudfoundry-cli-${version}";
-  version = "6.36.1";
+  version = "6.37.0";
 
   goPackagePath = "code.cloudfoundry.org/cli";
 
@@ -12,17 +12,18 @@ buildGoPackage rec {
     owner = "cloudfoundry";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "19inl7qs2acs59p3gnl5zdsxym0wp2rn05q0zfg7rwf5sjh68amp";
+    sha256 = "1v4f1fyydpzkfir46g4ppbf3zmk3ym6kxswpkdjls8h3dbb2fbnv";
   };
 
   outputs = [ "out" ];
 
-  buildFlagsArray = ''
-    -ldflags= -X ${goPackagePath}/version.binaryVersion=${version}
+  buildPhase = ''
+    cd go/src/${goPackagePath}
+    CF_BUILD_DATE="1970-01-01" make build
   '';
 
   installPhase = ''
-    install -Dm555 go/bin/cli "$out/bin/cf"
+    install -Dm555 out/cf "$out/bin/cf"
     remove-references-to -t ${go} "$out/bin/cf"
     install -Dm444 -t "$out/share/bash-completion/completions/" "$src/ci/installers/completion/cf"
   '';

From 4a629f56b6d05f288269ad0e92bc34bf12eb081b Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Tue, 24 Jul 2018 00:25:05 +0900
Subject: [PATCH 05/14] rubocop: 0.55.0 -> 0.58.1

---
 pkgs/development/tools/rubocop/Gemfile.lock | 14 ++++++-----
 pkgs/development/tools/rubocop/gemset.nix   | 26 ++++++++++++++-------
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/tools/rubocop/Gemfile.lock b/pkgs/development/tools/rubocop/Gemfile.lock
index d6185d79f1d1..6215bed77cf0 100644
--- a/pkgs/development/tools/rubocop/Gemfile.lock
+++ b/pkgs/development/tools/rubocop/Gemfile.lock
@@ -2,21 +2,23 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.0)
+    jaro_winkler (1.5.1)
     parallel (1.12.1)
-    parser (2.5.1.0)
+    parser (2.5.1.2)
       ast (~> 2.4.0)
-    powerpack (0.1.1)
+    powerpack (0.1.2)
     rainbow (3.0.0)
     rake (12.3.1)
-    rubocop (0.55.0)
+    rubocop (0.58.1)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5)
+      parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.9.0)
-    unicode-display_width (1.3.2)
+    unicode-display_width (1.4.0)
 
 PLATFORMS
   ruby
@@ -26,4 +28,4 @@ DEPENDENCIES
   rubocop
 
 BUNDLED WITH
-   1.14.6
+   1.16.1
diff --git a/pkgs/development/tools/rubocop/gemset.nix b/pkgs/development/tools/rubocop/gemset.nix
index a2585a6e4f66..7478cd568bd6 100644
--- a/pkgs/development/tools/rubocop/gemset.nix
+++ b/pkgs/development/tools/rubocop/gemset.nix
@@ -7,6 +7,14 @@
     };
     version = "2.4.0";
   };
+  jaro_winkler = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0rr797nqz081bfk30m2apj5h24bg5d1jr1c8p3xwx4hbwsrbclah";
+      type = "gem";
+    };
+    version = "1.5.1";
+  };
   parallel = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -19,18 +27,18 @@
     dependencies = ["ast"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1af7aa1c2npi8dkshgm3f8qyacabm94ckrdz7b8vd3f8zzswqzp9";
+      sha256 = "1zp89zg7iypncszxsjp8kiccrpbdf728jl449g6cnfkz990fyb5k";
       type = "gem";
     };
-    version = "2.5.1.0";
+    version = "2.5.1.2";
   };
   powerpack = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1fnn3fli5wkzyjl4ryh0k90316shqjfnhydmc7f8lqpi0q21va43";
+      sha256 = "1r51d67wd467rpdfl6x43y84vwm8f5ql9l9m85ak1s2sp3nc5hyv";
       type = "gem";
     };
-    version = "0.1.1";
+    version = "0.1.2";
   };
   rainbow = {
     source = {
@@ -49,13 +57,13 @@
     version = "12.3.1";
   };
   rubocop = {
-    dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
+    dependencies = ["jaro_winkler" "parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "17qnk66q4diny1bvzbwsl1d5a26nj0mjzc2425h6nyp3xqjipz11";
+      sha256 = "0s2qlrdx2f7653kmzwm58c8izyvgyjrzjrz76l2b005f2816kji6";
       type = "gem";
     };
-    version = "0.55.0";
+    version = "0.58.1";
   };
   ruby-progressbar = {
     source = {
@@ -68,9 +76,9 @@
   unicode-display_width = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0x31fgv1acywbb50prp7y4fr677c2d9gsl6wxmfcrlxbwz7nxn5n";
+      sha256 = "0040bsdpcmvp8w31lqi2s9s4p4h031zv52401qidmh25cgyh4a57";
       type = "gem";
     };
-    version = "1.3.2";
+    version = "1.4.0";
   };
 }
\ No newline at end of file

From 272f02415c5c2d92ff5d20c5353cb87e3e03ae32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 23 Jul 2018 16:45:58 +0100
Subject: [PATCH 06/14] python3.pkgs.black: 18.4a0 -> 18.6b4

---
 .../python-modules/black/default.nix          | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix
index f48310ceebc6..b95ed080e66a 100644
--- a/pkgs/development/python-modules/black/default.nix
+++ b/pkgs/development/python-modules/black/default.nix
@@ -1,17 +1,28 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, attrs, click }:
+{ stdenv, buildPythonPackage, fetchPypi, pythonOlder
+, attrs, click, toml, appdirs
+, glibcLocales, pytest }:
 
 buildPythonPackage rec {
   pname = "black";
-  version = "18.4a0";
+  version = "18.6b4";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "04dffr4wmzs4vf2xj0cxp03hv04x0kk06qyzx6jjrp1mq0z3n2rr";
+    sha256 = "0i4sfqgz6w15vd50kbhi7g7rifgqlf8yfr8y78rypd56q64qn592";
   };
 
-  propagatedBuildInputs = [ attrs click ];
+  checkInputs =  [ pytest glibcLocales ];
+
+  checkPhase = ''
+    # no idea, why those fail.
+    LC_ALL="en_US.UTF-8" HOME="$NIX_BUILD_TOP" \
+      pytest \
+        -k "not test_cache_multiple_files and not test_failed_formatting_does_not_get_cached"
+  '';
+
+  propagatedBuildInputs = [ attrs appdirs click toml ];
 
   meta = with stdenv.lib; {
     description = "The uncompromising Python code formatter";

From 928c93ea7bf61b1e9b7456ccfa5ee16f8a48e5d5 Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Thu, 19 Jul 2018 23:28:24 -0700
Subject: [PATCH 07/14] perkeep: 20170505 -> 0.10.1

Also rewrite the derivation to use buildGoPackage
---
 pkgs/applications/misc/perkeep/default.nix | 66 +++++-----------------
 pkgs/top-level/all-packages.nix            |  5 +-
 2 files changed, 14 insertions(+), 57 deletions(-)

diff --git a/pkgs/applications/misc/perkeep/default.nix b/pkgs/applications/misc/perkeep/default.nix
index 9ecf0da58067..8804e438b7e8 100644
--- a/pkgs/applications/misc/perkeep/default.nix
+++ b/pkgs/applications/misc/perkeep/default.nix
@@ -1,72 +1,32 @@
-{ stdenv, go, fetchzip, git, fetchFromGitHub, fetchgit }:
+{ buildGo110Package, fetchzip, lib }:
 
-# When perkeep is updated all deps in the let block should be removed
-let
-  gopherjs = fetchFromGitHub {
-    owner = "gopherjs";
-    repo = "gopherjs";
-    # Rev matching https://github.com/perkeep/perkeep/commit/2e46fca5cc1179dbd90bec49fec3870e6eca6c45
-    rev = "b40cd48c38f9a18eb3db20d163bad78de12cf0b7";
-    sha256 = "0kniz8dg5bymb03qriizza1h3gpymf97vsgq9vd222282pdj0vyc";
-  };
-
-  gotool = fetchFromGitHub {
-    owner = "kisielk";
-    repo = "gotool";
-    rev = "80517062f582ea3340cd4baf70e86d539ae7d84d";
-    sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
-  };
-
-  gcimporter15 = fetchgit {
-    url = "https://go.googlesource.com/tools";
-    rev = "f8f2f88271bf2c23f28a09d288d26507a9503c97";
-    sha256 = "1pchwizx1sdli59g8r0p4djfjkchcvh8msfpp3ibvz3xl250jh0n";
-  };
-
-in
-stdenv.mkDerivation rec {
+buildGo110Package rec {
   name = "perkeep-${version}";
-  version = "20170505";
+  version = "0.10.1";
 
   src = fetchzip {
-    url = "https://perkeep.org/dl/monthly/camlistore-${version}-src.zip";
-    sha256 = "1vliyvkyzmhdi6knbh8rdsswmz3h0rpxdpq037jwbdbkjccxjdwa";
+    url = "https://perkeep.org/dl/perkeep-${version}-src.zip";
+    sha256 = "0rqibc6w4m1r50i2pjcgz1k9dxh18v7jwj4s29y470bc526wv422";
   };
 
-  # When perkeep is updated postPatch should be removed
-  postPatch = ''
-    rm -r ./vendor/github.com/gopherjs/gopherjs/
-    cp -a ${gopherjs} ./vendor/github.com/gopherjs/gopherjs
-    mkdir -p ./vendor/github.com/kisielk/
-    cp -a ${gotool} ./vendor/github.com/kisielk/gotool
-    mkdir -p ./vendor/golang.org/x/tools/go
-    cp -a ${gcimporter15}/go/gcimporter15 ./vendor/golang.org/x/tools/go/gcimporter15
+  goPackagePath = "perkeep.org";
 
-    substituteInPlace vendor/github.com/gopherjs/gopherjs/build/build.go \
-      --replace '"github.com/fsnotify/fsnotify"' 'fsnotify "camlistore.org/pkg/misc/fakefsnotify"'
-
-    substituteInPlace ./make.go \
-      --replace "goVersionMinor  = '8'" "goVersionMinor  = '9'" \
-      --replace "gopherJSGoMinor = '8'" "gopherJSGoMinor = '9'"
-  '';
-
-  buildInputs = [ git go ];
-
-  goPackagePath = "";
   buildPhase = ''
+    cd "$NIX_BUILD_TOP/go/src/$goPackagePath"
     go run make.go
   '';
 
-  installPhase = ''
-    mkdir -p $out/bin
-    cp bin/* $out/bin
+  # devcam is only useful when developing perkeep, we should not install it as
+  # part of this derivation.
+  postInstall = ''
+    rm -f $out/bin/devcam
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A way of storing, syncing, sharing, modelling and backing up content (née Camlistore)";
     homepage = https://perkeep.org;
     license = licenses.asl20;
-    maintainers = with maintainers; [ cstrahan ];
+    maintainers = with maintainers; [ cstrahan kalbasit ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f0264374a94d..78667f7bdbd5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15399,10 +15399,7 @@ with pkgs;
     openjpeg = openjpeg_1;
   };
 
-  perkeep = callPackage ../applications/misc/perkeep {
-    # Perkeep is very particular about which go version to build with.
-    go = go_1_9;
-  };
+  perkeep = callPackage ../applications/misc/perkeep { };
 
   canto-curses = callPackage ../applications/networking/feedreaders/canto-curses { };
 

From f4f8cb5b225f8a4ba303ebbbc89ce70a0f116f9b Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Mon, 23 Jul 2018 22:43:07 +0200
Subject: [PATCH 08/14] networkmanager-vpnc: 1.2.4 -> 1.2.6

fixes CVE-2018-10900
---
 pkgs/tools/networking/network-manager/vpnc.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/vpnc.nix b/pkgs/tools/networking/network-manager/vpnc.nix
index 81d899527e73..577e04f6648d 100644
--- a/pkgs/tools/networking/network-manager/vpnc.nix
+++ b/pkgs/tools/networking/network-manager/vpnc.nix
@@ -1,21 +1,21 @@
 { stdenv, fetchurl, vpnc, intltool, pkgconfig, networkmanager, libsecret
-, withGnome ? true, gnome3, procps, kmod }:
+, withGnome ? true, gnome3, procps, kmod, file }:
 let
   pname   = "NetworkManager-vpnc";
-  version = "1.2.4";
+  version = "1.2.6";
 in stdenv.mkDerivation rec {
   name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
 
   src = fetchurl {
     url    = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "39c7516418e90208cb534c19628ce40fd50eba0a08b2ebaef8da85720b10fb05";
+    sha256 = "1js5lwcsqws4klgypfxl4ikmakv7v7xgddij1fj6b0y0qicx0kyy";
   };
 
   buildInputs = [ vpnc networkmanager libsecret ]
     ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring
                                         gnome3.networkmanagerapplet ];
 
-  nativeBuildInputs = [ intltool pkgconfig ];
+  nativeBuildInputs = [ intltool pkgconfig file ];
 
   configureFlags = [
     "${if withGnome then "--with-gnome --with-gtkver=3" else "--without-gnome"}"

From 149b42d8ee7fe25cd05d24d6d1f915e079f8886e Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sat, 21 Jul 2018 11:32:16 -0400
Subject: [PATCH 09/14] polybar: 3.1.0 -> 3.2.0

Adds support for internal/pulseaudio
---
 pkgs/applications/misc/polybar/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix
index 05ad3e2a9066..651a72bef955 100644
--- a/pkgs/applications/misc/polybar/default.nix
+++ b/pkgs/applications/misc/polybar/default.nix
@@ -8,6 +8,7 @@
 , iwSupport     ? true,  wirelesstools ? null
 , githubSupport ? false, curl          ? null
 , mpdSupport    ? false, mpd_clientlib ? null
+, pulseSupport  ? false, libpulseaudio ? null
 , i3Support ? false, i3GapsSupport ? false, i3 ? null, i3-gaps ? null, jsoncpp ? null
 }:
 
@@ -15,17 +16,18 @@ assert alsaSupport   -> alsaLib       != null;
 assert githubSupport -> curl          != null;
 assert iwSupport     -> wirelesstools != null;
 assert mpdSupport    -> mpd_clientlib != null;
+assert pulseSupport  -> libpulseaudio != null;
 
 assert i3Support     -> ! i3GapsSupport && jsoncpp != null && i3      != null;
 assert i3GapsSupport -> ! i3Support     && jsoncpp != null && i3-gaps != null;
 
 stdenv.mkDerivation rec {
     name = "polybar-${version}";
-    version = "3.1.0";
+    version = "3.2.0";
     src = fetchgit {
       url = "https://github.com/jaagr/polybar";
-      rev = "bf16a4d415ea7d8845f578544de0c71e56ad314e";
-      sha256 = "1jcvqxl0477j0snvh1rzqsm1dkfsybix2lgrlsgiczdxfknwz8iy";
+      rev = version;
+      sha256 = "0p94brndysvmmbidhl4ds4w3qvddb752s4vryp0qckb0hz3knqk8";
     };
 
     meta = with stdenv.lib; {
@@ -48,6 +50,7 @@ stdenv.mkDerivation rec {
       (if githubSupport then curl          else null)
       (if iwSupport     then wirelesstools else null)
       (if mpdSupport    then mpd_clientlib else null)
+      (if pulseSupport  then libpulseaudio else null)
 
       (if i3Support || i3GapsSupport then jsoncpp else null)
       (if i3Support then i3 else null)

From f30bfcd6235a34768aebd3244cb7c175af39a821 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Tue, 24 Jul 2018 01:42:43 +0200
Subject: [PATCH 10/14] doctest-discover: move override out of
 configuration-nix.nix

and move it to configuration-common.nix where it belongs.
configuration-nix.nix is only for fixing build failures
due to Nix.
---
 .../haskell-modules/configuration-common.nix    | 17 +++++++++++++----
 .../haskell-modules/configuration-nix.nix       |  5 -----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index a9f1ac7cb882..942d5fcd27d4 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -506,11 +506,20 @@ self: super: {
   # https://github.com/nushio3/doctest-prop/issues/1
   doctest-prop = dontCheck super.doctest-prop;
 
+  # Missing file in source distribution:
+  # - https://github.com/karun012/doctest-discover/issues/22
+  # - https://github.com/karun012/doctest-discover/issues/23
+  #
+  # When these are fixed the following needs to be enabled again:
+  #
+  # # Depends on itself for testing
+  # doctest-discover = addBuildTool super.doctest-discover
+  #   (if pkgs.buildPlatform != pkgs.hostPlatform
+  #    then self.buildHaskellPackages.doctest-discover
+  #    else dontCheck super.doctest-discover);
+  doctest-discover = dontCheck super.doctest-discover;
+
   # Depends on itself for testing
-  doctest-discover = addBuildTool super.doctest-discover
-    (if pkgs.buildPlatform != pkgs.hostPlatform
-     then self.buildHaskellPackages.doctest-discover
-     else dontCheck super.doctest-discover);
   tasty-discover = addBuildTool super.tasty-discover
     (if pkgs.buildPlatform != pkgs.hostPlatform
      then self.buildHaskellPackages.tasty-discover
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index c7d3f7bc0519..2ae35c0aa688 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -506,9 +506,4 @@ self: super: builtins.intersectAttrs super {
   # Tests require a browser: https://github.com/ku-fpg/blank-canvas/issues/73
   blank-canvas = dontCheck super.blank-canvas;
   blank-canvas_0_6_2 = dontCheck super.blank-canvas_0_6_2;
-
-  # Missing file in source distribution:
-  # - https://github.com/karun012/doctest-discover/issues/22
-  # - https://github.com/karun012/doctest-discover/issues/23
-  doctest-discover = dontCheck super.doctest-discover;
 }

From b2be524e30f58f65595e76cc2cbecc6257c7dfc9 Mon Sep 17 00:00:00 2001
From: Jack Kelly <jack@jackkelly.name>
Date: Tue, 24 Jul 2018 10:32:00 +1000
Subject: [PATCH 11/14] haskellPackages.blank-canvas: Move fixes to
 configuration-common.nix

---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++++
 pkgs/development/haskell-modules/configuration-nix.nix    | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 942d5fcd27d4..dcc2cc467916 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1128,4 +1128,8 @@ self: super: {
     url = "https://github.com/guillaume-nargeot/hpc-coveralls/pull/73/commits/344217f513b7adfb9037f73026f5d928be98d07f.patch";
     sha256 = "056rk58v9h114mjx62f41x971xn9p3nhsazcf9zrcyxh1ymrdm8j";
   });
+
+  # Tests require a browser: https://github.com/ku-fpg/blank-canvas/issues/73
+  blank-canvas = dontCheck super.blank-canvas;
+  blank-canvas_0_6_2 = dontCheck super.blank-canvas_0_6_2;
 }
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 2ae35c0aa688..3e4b18d86b92 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -502,8 +502,4 @@ self: super: builtins.intersectAttrs super {
   LDAP = dontCheck (overrideCabal super.LDAP (drv: {
     librarySystemDepends = drv.librarySystemDepends or [] ++ [ pkgs.cyrus_sasl.dev ];
   }));
-
-  # Tests require a browser: https://github.com/ku-fpg/blank-canvas/issues/73
-  blank-canvas = dontCheck super.blank-canvas;
-  blank-canvas_0_6_2 = dontCheck super.blank-canvas_0_6_2;
 }

From d70c04fc9ebac44eb24f498e6b5b12e11310355b Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 24 Jul 2018 03:00:58 +0200
Subject: [PATCH 12/14] traefik: 1.6.2 -> 1.6.5

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

diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix
index 1ed50a65e91a..58054c34225b 100644
--- a/pkgs/servers/traefik/default.nix
+++ b/pkgs/servers/traefik/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "traefik-${version}";
-  version = "1.6.2";
+  version = "1.6.5";
 
   goPackagePath = "github.com/containous/traefik";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "containous";
     repo = "traefik";
     rev = "v${version}";
-    sha256 = "1gklji9zwdprvv7fvy7rhgazfslwsyjq97w193v9dpsriz1rk5qa";
+    sha256 = "0swiyyw7j7264avfk0a5jqs7h1hv4bq1k1kr92v4830azc9fxrvn";
   };
 
   buildInputs = [ go-bindata bash ];

From 6bf5dfc874728545ac4c874fe880a11dbaa5145a Mon Sep 17 00:00:00 2001
From: Leon Isenberg <ljli@users.noreply.github.com>
Date: Tue, 24 Jul 2018 03:01:19 +0200
Subject: [PATCH 13/14] vscode: fix keymapping.node rpath

---
 pkgs/applications/editors/vscode/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index d79a50855f39..90bb09b9ba0b 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -82,6 +82,11 @@ in
         --set-rpath "${rpath}" \
         $out/lib/vscode/resources/app/node_modules.asar.unpacked/keytar/build/Release/keytar.node
 
+      patchelf \
+        --set-rpath "${rpath}" \
+        "$out/lib/vscode/resources/app/node_modules.asar.unpacked/native-keymap/build/Release/\
+      keymapping.node"
+
       ln -s ${lib.makeLibraryPath [libsecret]}/libsecret-1.so.0 $out/lib/vscode/libsecret-1.so.0
     '';
 

From cc700ad55b3fc4bc257826b3167c3a1247b50a5b Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Tue, 24 Jul 2018 14:28:35 +0300
Subject: [PATCH 14/14] php: libtidy -> html-tidy

https://nix-cache.s3.amazonaws.com/log/i8221imxr8cimkycd7vglyi62an1qirv-nixpkgs-tarball-18.09pre146984.f99f42c4736.drv
---
 pkgs/development/interpreters/php/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 7a96b8abe5a0..6a7b994ee982 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -1,10 +1,10 @@
 # pcre functionality is tested in nixos/tests/php-pcre.nix
 
 { lib, stdenv, fetchurl, composableDerivation, flex, bison
-, mysql, libxml2, readline, zlib, curl, postgresql, gettext
+, mysql, libxml2, readline, zlib, curl, postgresql, gettext, html-tidy
 , openssl, pcre, pkgconfig, sqlite, config, libjpeg, libpng, freetype
 , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds
-, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, libtidy }:
+, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium }:
 
 let
 
@@ -232,8 +232,8 @@ let
         };
 
         tidy = {
-          configureFlags = [ "--with-tidy=${libtidy}" ];
-          buildInputs = [ libtidy ];
+          configureFlags = [ "--with-tidy=${html-tidy}" ];
+          buildInputs = [ html-tidy ];
         };
       };