From 46c1b8479a184bad188b681edcccfaa4439c4024 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 18 Mar 2018 07:45:59 -0700
Subject: [PATCH 01/28] pommed_light: 1.50lw -> 1.51lw

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/yny32js35aqyd4rff303cand5a4w2g90-pommed-light-1.51lw/bin/pommed -v` and found version 1.51lw
- found 1.51lw with grep in /nix/store/yny32js35aqyd4rff303cand5a4w2g90-pommed-light-1.51lw
- directory tree listing: https://gist.github.com/efc712cdbd038d8f65b17ef4670992de
---
 pkgs/os-specific/linux/pommed-light/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/pommed-light/default.nix b/pkgs/os-specific/linux/pommed-light/default.nix
index a039984ff338..e23c06b23fd5 100644
--- a/pkgs/os-specific/linux/pommed-light/default.nix
+++ b/pkgs/os-specific/linux/pommed-light/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pkgname = "pommed-light";
-  version = "1.50lw";
+  version = "1.51lw";
   name = "${pkgname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/bytbox/${pkgname}/archive/v${version}.tar.gz";
 
-    sha256 = "1r2f28zqmyvzgymd0ng53hscbrq8vcqhxdnkq5dppjf9yrzn018b";
+    sha256 = "11wi17bh2br1hp8gmq40b1hm5drm6h969505f7432zam3cm8mc8q";
   };
 
   postPatch = ''

From b3f58d1df12d2173d8f79d90aea332dcbe4d66ab Mon Sep 17 00:00:00 2001
From: pandaman64 <kointosudesuyo@infoseek.jp>
Date: Sat, 12 May 2018 20:16:38 +0900
Subject: [PATCH 02/28] add pandaman as maintainer

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0aa91a31313f..246a6d06cec2 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2928,6 +2928,11 @@
     github = "panaeon";
     name = "Vitalii Voloshyn";
   };
+  pandaman = {
+    email = "kointosudesuyo@infoseek.jp";
+    github = "pandaman64";
+    name = "pandaman";
+  };
   paperdigits = {
     email = "mica@silentumbrella.com";
     github = "paperdigits";

From 972323648346953dfdc5228272f0b6f75756e979 Mon Sep 17 00:00:00 2001
From: pandaman64 <kointosudesuyo@infoseek.jp>
Date: Sat, 12 May 2018 15:48:15 +0900
Subject: [PATCH 03/28] IBMQuantumExperience: init at 1.9.1

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

diff --git a/pkgs/development/python-modules/ibmquantumexperience/default.nix b/pkgs/development/python-modules/ibmquantumexperience/default.nix
new file mode 100644
index 000000000000..22f4ba9301f8
--- /dev/null
+++ b/pkgs/development/python-modules/ibmquantumexperience/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, requests
+, requests_ntlm
+}:
+
+buildPythonPackage rec {
+  pname = "IBMQuantumExperience";
+  version = "1.9.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "480cce2ca285368432b7d00b9cd702a4f8a1c9d69914ba6f65e08099e151e407";
+  };
+
+  propagatedBuildInputs = [
+    requests
+    requests_ntlm
+  ];
+
+  # test requires an API token
+  doCheck = false;
+
+  meta = {
+    description = "A Python library for the Quantum Experience API";
+    homepage    = https://github.com/QISKit/qiskit-api-py;
+    license     = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
+      pandaman
+    ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9f0a0f45b12d..b6e88ca1cc6e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18202,6 +18202,7 @@ EOF
 
   gast = callPackage ../development/python-modules/gast { };
 
+  IBMQuantumExperience = callPackage ../development/python-modules/ibmquantumexperience { };
 });
 
 in fix' (extends overrides packages)

From 1aed57c2225d8177118d236d828f9037965d98de Mon Sep 17 00:00:00 2001
From: pandaman64 <kointosudesuyo@infoseek.jp>
Date: Sat, 12 May 2018 15:49:14 +0900
Subject: [PATCH 04/28] qiskit: init at 0.4.15

---
 .../python-modules/qiskit/default.nix         | 65 +++++++++++++++++++
 .../python-modules/qiskit/setup.py.patch      | 19 ++++++
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 86 insertions(+)
 create mode 100644 pkgs/development/python-modules/qiskit/default.nix
 create mode 100644 pkgs/development/python-modules/qiskit/setup.py.patch

diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix
new file mode 100644
index 000000000000..090358152e79
--- /dev/null
+++ b/pkgs/development/python-modules/qiskit/default.nix
@@ -0,0 +1,65 @@
+{ stdenv
+, isPy3k
+, buildPythonPackage
+, fetchPypi
+, fetchurl
+, python
+, numpy
+, scipy
+, sympy
+, matplotlib
+, networkx
+, ply
+, pillow
+, cffi
+, requests
+, requests_ntlm
+, IBMQuantumExperience
+, cmake
+, llvmPackages 
+}:
+
+buildPythonPackage rec {
+  pname = "qiskit";
+  version = "0.4.15";
+
+  disabled = !isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "bd126a35189f8303df41cb7b7f26b0d06e1fabf61f4fd567b8ec356d31170141";
+  };
+
+  buildInputs = [ cmake ]
+    ++ stdenv.lib.optional stdenv.isDarwin llvmPackages.openmp;
+
+  propagatedBuildInputs = [
+    numpy
+    matplotlib
+    networkx
+    ply
+    scipy
+    sympy
+    pillow
+    cffi
+    requests
+    requests_ntlm
+    IBMQuantumExperience
+  ];
+
+  # Pypi's tarball doesn't contain tests
+  doCheck = false;
+
+  patches = [
+    ./setup.py.patch
+  ];
+
+  meta = {
+    description = "Quantum Software Development Kit for writing quantum computing experiments, programs, and applications";
+    homepage    = https://github.com/QISKit/qiskit-sdk-py;
+    license     = stdenv.lib.licenses.asl20;
+    maintainers = with stdenv.lib.maintainers; [
+      pandaman
+    ];
+  };
+}
diff --git a/pkgs/development/python-modules/qiskit/setup.py.patch b/pkgs/development/python-modules/qiskit/setup.py.patch
new file mode 100644
index 000000000000..bb7cb71ae098
--- /dev/null
+++ b/pkgs/development/python-modules/qiskit/setup.py.patch
@@ -0,0 +1,19 @@
+--- a/setup.py
++++ b/setup.py
+@@ -28,11 +28,11 @@ from setuptools.dist import Distribution
+ 
+ requirements = [
+     "IBMQuantumExperience>=1.8.29",
+-    "matplotlib>=2.1,<2.2",
+-    "networkx>=2.0,<2.1",
+-    "numpy>=1.13,<1.15",
+-    "ply==3.10",
+-    "scipy>=0.19,<1.1",
++    "matplotlib>=2.1",
++    "networkx>=2.0",
++    "numpy>=1.13",
++    "ply>=3.10",
++    "scipy>=0.19",
+     "sympy>=1.0",
+     "pillow>=4.2.1"
+ ]
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b6e88ca1cc6e..17f3b27ebf94 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18203,6 +18203,8 @@ EOF
   gast = callPackage ../development/python-modules/gast { };
 
   IBMQuantumExperience = callPackage ../development/python-modules/ibmquantumexperience { };
+
+  qiskit = callPackage ../development/python-modules/qiskit { };
 });
 
 in fix' (extends overrides packages)

From 1642e85877a5313ac732bae940893e53d56d8301 Mon Sep 17 00:00:00 2001
From: pandaman64 <kointosudesuyo@infoseek.jp>
Date: Sat, 12 May 2018 16:02:57 +0900
Subject: [PATCH 05/28] qasm2image: init at 0.5.0

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

diff --git a/pkgs/development/python-modules/qasm2image/default.nix b/pkgs/development/python-modules/qasm2image/default.nix
new file mode 100644
index 000000000000..174e0871ca2f
--- /dev/null
+++ b/pkgs/development/python-modules/qasm2image/default.nix
@@ -0,0 +1,47 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, cairocffi
+, cairosvg
+, cffi
+, qiskit
+, svgwrite
+, colorama
+, python
+}:
+
+buildPythonPackage rec {
+  pname = "qasm2image";
+  version = "0.5.0";
+
+  src = fetchFromGitHub {
+    owner = "nelimeee";
+    repo = "qasm2image";
+    rev = "7f3c3e4d1701b8b284ef0352aa3a47722ebbbcaa";
+    sha256 = "129xlpwp36h2czzw1wcl8df2864zg3if2gaad1v18ah1cf68b0f3";
+  };
+
+  propagatedBuildInputs = [
+    cairocffi
+    cairosvg
+    cffi
+    qiskit
+    svgwrite
+  ];
+
+  checkInputs = [
+    colorama
+  ];
+  checkPhase = ''
+    ${python.interpreter} tests/launch_tests.py
+  '';
+
+  meta = {
+    description = "A Python module to visualise quantum circuit";
+    homepage    = https://github.com/nelimeee/qasm2image;
+    license     = lib.licenses.cecill-b;
+    maintainers = with lib.maintainers; [
+      pandaman
+    ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 17f3b27ebf94..f4f189f72a21 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18205,6 +18205,8 @@ EOF
   IBMQuantumExperience = callPackage ../development/python-modules/ibmquantumexperience { };
 
   qiskit = callPackage ../development/python-modules/qiskit { };
+
+  qasm2image = callPackage ../development/python-modules/qasm2image { };
 });
 
 in fix' (extends overrides packages)

From 8890e540d91f819b6383249da9515ae3d71000db Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 13 Jun 2018 20:43:39 -0700
Subject: [PATCH 06/28] smenu: 0.9.11 -> 0.9.13

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

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

These checks were done:

- built on NixOS
- /nix/store/d1fp4j713cffpq0kkvi90aqh0bh6pd4d-smenu-0.9.13/bin/smenu passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 1 of 1 passed binary check by having the new version present in output.
- found 0.9.13 with grep in /nix/store/d1fp4j713cffpq0kkvi90aqh0bh6pd4d-smenu-0.9.13
- directory tree listing: https://gist.github.com/26b5e2b7abfe62fcfd01cdbf1c27f655
- du listing: https://gist.github.com/ff013902ab9eca9065e3794daccf7700
---
 pkgs/tools/misc/smenu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/smenu/default.nix b/pkgs/tools/misc/smenu/default.nix
index 77622ce8a1ea..30475047c4f7 100644
--- a/pkgs/tools/misc/smenu/default.nix
+++ b/pkgs/tools/misc/smenu/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, ncurses }:
 
 stdenv.mkDerivation rec {
-  version = "0.9.11";
+  version = "0.9.13";
   name = "smenu-${version}";
 
   src = fetchFromGitHub {
     owner  = "p-gen";
     repo   = "smenu";
     rev    = "v${version}";
-    sha256 = "1va5gsxniin02casgdrqxvpzccm0vwjiql60qrsvncrq6nm6bz0d";
+    sha256 = "0ixfl1dxkvmzb3xy6zs1x94hlf8y7zmd14gmb50rp7gb7ff1ivm5";
   };
 
   buildInputs = [ ncurses ];

From 7dc7a8c8fca7b594770796e8201b9c2c2c06c302 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 13 Jun 2018 21:15:57 -0700
Subject: [PATCH 07/28] stoken: 0.90 -> 0.92

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

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

These checks were done:

- built on NixOS
- /nix/store/hygpmiw7a636bsydqyrkh1rqiw5f36nh-stoken-0.92/bin/stoken passed the binary check.
- Warning: no invocation of /nix/store/hygpmiw7a636bsydqyrkh1rqiw5f36nh-stoken-0.92/bin/stoken-gui had a zero exit code or showed the expected version
- 1 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 0.92 with grep in /nix/store/hygpmiw7a636bsydqyrkh1rqiw5f36nh-stoken-0.92
- directory tree listing: https://gist.github.com/4e9af90c5364e054183e3b51d2ec5d7a
- du listing: https://gist.github.com/7671604980c1e3ec7cb11d47ad4f521d
---
 pkgs/tools/security/stoken/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/stoken/default.nix b/pkgs/tools/security/stoken/default.nix
index a9902fe50422..d28260ffb8b9 100644
--- a/pkgs/tools/security/stoken/default.nix
+++ b/pkgs/tools/security/stoken/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "stoken";
-  version = "0.90";
+  version = "0.92";
   name = "${pname}-${version}";
   src = fetchFromGitHub {
     owner = "cernekee";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1k7wn8pmp7dv646g938dsr99090lsphl7zy4m9x7qbh2zlnnf9af";
+    sha256 = "0q7cv8vy5b2cslm57maqb6jsm7s4rwacjyv6gplwp26yhm38hw7y";
   };
 
   preConfigure = ''

From c2ab820d6aeafeeb02f748e47a5e140170775f77 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Mon, 4 Jun 2018 00:43:23 -0700
Subject: [PATCH 08/28] nixos/uwsgi: use python.withPackages

---
 nixos/modules/services/web-servers/uwsgi.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/web-servers/uwsgi.nix b/nixos/modules/services/web-servers/uwsgi.nix
index 14596bb3add0..356b896a6dc9 100644
--- a/nixos/modules/services/web-servers/uwsgi.nix
+++ b/nixos/modules/services/web-servers/uwsgi.nix
@@ -31,9 +31,7 @@ let
         inherit python;
       };
 
-      penv = python.buildEnv.override {
-        extraLibs = (c.pythonPackages or (self: [])) pythonPackages;
-      };
+      pythonEnv = python.withPackages (c.pythonPackages or (self: []));
 
       uwsgiCfg = {
         uwsgi =
@@ -42,7 +40,7 @@ let
               inherit plugins;
             } // removeAttrs c [ "type" "pythonPackages" ]
               // optionalAttrs (python != null) {
-                pythonpath = "${penv}/${python.sitePackages}";
+                pythonpath = "${pythonEnv}/${python.sitePackages}";
                 env =
                   # Argh, uwsgi expects list of key-values there instead of a dictionary.
                   let env' = c.env or [];
@@ -51,7 +49,7 @@ let
                            then substring (stringLength "PATH=") (stringLength x) x
                            else null;
                       oldPaths = filter (x: x != null) (map getPath env');
-                  in env' ++ [ "PATH=${optionalString (oldPaths != []) "${last oldPaths}:"}${penv}/bin" ];
+                  in env' ++ [ "PATH=${optionalString (oldPaths != []) "${last oldPaths}:"}${pythonEnv}/bin" ];
               }
           else if c.type == "emperor"
             then {

From 4bba2bd98e8a8c5172c45f508df95242b9c6da86 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Sun, 3 Jun 2018 17:57:14 -0700
Subject: [PATCH 09/28] klaus: make available as a python package

This makes it usable via WSGI.
---
 .../web-apps => development/python-modules}/klaus/default.nix   | 2 +-
 pkgs/top-level/all-packages.nix                                 | 2 +-
 pkgs/top-level/python-packages.nix                              | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)
 rename pkgs/{servers/web-apps => development/python-modules}/klaus/default.nix (95%)

diff --git a/pkgs/servers/web-apps/klaus/default.nix b/pkgs/development/python-modules/klaus/default.nix
similarity index 95%
rename from pkgs/servers/web-apps/klaus/default.nix
rename to pkgs/development/python-modules/klaus/default.nix
index 81d1e57e7a04..0740cfa84bb7 100644
--- a/pkgs/servers/web-apps/klaus/default.nix
+++ b/pkgs/development/python-modules/klaus/default.nix
@@ -1,6 +1,6 @@
 { lib, python, fetchFromGitHub }:
 
-python.pkgs.buildPythonApplication rec {
+python.pkgs.buildPythonPackage rec {
   pname = "klaus";
   version = "1.2.2";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dcfc3646bcc6..cf5f480ec3a6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1339,7 +1339,7 @@ with pkgs;
 
   kisslicer = callPackage ../tools/misc/kisslicer { };
 
-  klaus = callPackage ../servers/web-apps/klaus { };
+  klaus = with pythonPackages; toPythonApplication klaus;
 
   lcdproc = callPackage ../servers/monitoring/lcdproc { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9f0a0f45b12d..a3a80f998f7a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6929,6 +6929,8 @@ in {
 
   kiwisolver = callPackage ../development/python-modules/kiwisolver { };
 
+  klaus = callPackage ../development/python-modules/klaus {};
+
   klein = callPackage ../development/python-modules/klein { };
 
   koji = callPackage ../development/python-modules/koji { };

From 753ac6174d8c6ac54b441377d6f8b2890adb937c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 13 Jun 2018 22:53:35 -0700
Subject: [PATCH 10/28] qrencode: 4.0.1 -> 4.0.2

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

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

These checks were done:

- built on NixOS
- /nix/store/cywxaw8h01kh5rvkhx7bh2738icds31s-qrencode-4.0.2/bin/qrencode passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 4.0.2 with grep in /nix/store/cywxaw8h01kh5rvkhx7bh2738icds31s-qrencode-4.0.2
- directory tree listing: https://gist.github.com/93c7bac0fe3aae76a9ef5ebbd9fba7de
- du listing: https://gist.github.com/2b0d6fa748528181bfed9cbb453ed75a
---
 pkgs/tools/graphics/qrencode/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/qrencode/default.nix b/pkgs/tools/graphics/qrencode/default.nix
index 5620f5058a5f..8e186399d638 100644
--- a/pkgs/tools/graphics/qrencode/default.nix
+++ b/pkgs/tools/graphics/qrencode/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libpng, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "qrencode-4.0.1";
+  name = "qrencode-4.0.2";
 
   src = fetchurl {
     url = "${meta.homepage}/${name}.tar.bz2";
-    sha256 = "0j7cqhjc0l6i99lzph51gakmcmfs74x483plna93r4ngz328knph";
+    sha256 = "1d2q5d3v8g3hsi3h5jq4n177bjhf3kawms09immw7p187f6jgjy9";
   };
 
   buildInputs = [ libpng ];

From 96e2be5084738b1daa3425bc20c630deee16d289 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 13 Jun 2018 23:06:40 -0700
Subject: [PATCH 11/28] pony-stable: 0.1.2 -> 0.1.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/pony-stable/versions.

These checks were done:

- built on NixOS
- /nix/store/d6b9yh4mbc6g4ysgzzdj4xbi49cy228m-pony-stable-0.1.3/bin/stable passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 0.1.3 with grep in /nix/store/d6b9yh4mbc6g4ysgzzdj4xbi49cy228m-pony-stable-0.1.3
- directory tree listing: https://gist.github.com/b5577bbf57ef8fa733c1e1aee8ab8908
- du listing: https://gist.github.com/c69c238d1ab5c35fba5ade17f912bed5
---
 pkgs/development/compilers/ponyc/pony-stable.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/pkgs/development/compilers/ponyc/pony-stable.nix
index ce4d44774f69..6a0965360f68 100644
--- a/pkgs/development/compilers/ponyc/pony-stable.nix
+++ b/pkgs/development/compilers/ponyc/pony-stable.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "pony-stable-${version}";
-  version = "0.1.2";
+  version = "0.1.3";
 
   src = fetchFromGitHub {
     owner = "ponylang";
     repo = "pony-stable";
     rev = version;
-    sha256 = "1g0508r66qjx857cb1cycq98b0gw7s1zn1l7bplyj1psk8mqh7kz";
+    sha256 = "0dnj9d35fa0iaka2lsc7cvn9d2qbasknn1c3gbxdyc9drf9vv6kf";
   };
 
   buildInputs = [ ponyc ];

From f6f03202be07b57d0026cf88860cbb111425f3f2 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Tue, 22 May 2018 21:18:37 -0700
Subject: [PATCH 12/28] salt: be Python version agnostic

As of Salt 2017.7 (Salt Nitrogen), Salt supports Python 3.
Release notes: https://docs.saltstack.com/en/develop/topics/releases/2017.7.0.html#python-3
---
 pkgs/tools/admin/salt/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix
index eaae8f40bfab..ef43ba2ba517 100644
--- a/pkgs/tools/admin/salt/default.nix
+++ b/pkgs/tools/admin/salt/default.nix
@@ -1,5 +1,5 @@
 {
-  stdenv, python2Packages, openssl,
+  stdenv, pythonPackages, openssl,
 
   # Many Salt modules require various Python modules to be installed,
   # passing them in this array enables Salt to find them.
@@ -8,7 +8,7 @@
 
 let
   # Use tornado-4.x until https://github.com/saltstack/salt/issues/45790 is resolved
-  tornado = python2Packages.tornado.overridePythonAttrs (oldAttrs: rec {
+  tornado = pythonPackages.tornado.overridePythonAttrs (oldAttrs: rec {
     version = "4.5.3";
     name = "${oldAttrs.pname}-${version}";
     src = oldAttrs.src.override {
@@ -17,17 +17,16 @@ let
     };
   });
 in
-python2Packages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
   pname = "salt";
   version = "2018.3.0";
 
-  src = python2Packages.fetchPypi {
+  src = pythonPackages.fetchPypi {
     inherit pname version;
     sha256 = "0cbbnmaynnpfknmppzlz04mqw4d3d2ay1dqrli11b5pnzli5v950";
   };
 
-  propagatedBuildInputs = with python2Packages; [
-    futures
+  propagatedBuildInputs = with pythonPackages; [
     jinja2
     markupsafe
     msgpack-python
@@ -36,6 +35,8 @@ python2Packages.buildPythonApplication rec {
     pyzmq
     requests
     tornado
+  ] ++ stdenv.lib.optional (!pythonPackages.isPy3k) [
+    futures
   ] ++ extraInputs;
 
   patches = [ ./fix-libcrypto-loading.patch ];

From a8592790280302c510c5518aa8aa7b7d249988e1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 14 Jun 2018 00:31:35 -0700
Subject: [PATCH 13/28] nsd: 4.1.21 -> 4.1.22

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

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

These checks were done:

- built on NixOS
- /nix/store/cv3f36znw2zrckq1082wjf6j7vr5yzyg-nsd-4.1.22/bin/nsd passed the binary check.
- Warning: no invocation of /nix/store/cv3f36znw2zrckq1082wjf6j7vr5yzyg-nsd-4.1.22/bin/nsd-checkconf had a zero exit code or showed the expected version
- /nix/store/cv3f36znw2zrckq1082wjf6j7vr5yzyg-nsd-4.1.22/bin/nsd-checkzone passed the binary check.
- Warning: no invocation of /nix/store/cv3f36znw2zrckq1082wjf6j7vr5yzyg-nsd-4.1.22/bin/nsd-control had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/cv3f36znw2zrckq1082wjf6j7vr5yzyg-nsd-4.1.22/bin/nsd-control-setup had a zero exit code or showed the expected version
- 2 of 5 passed binary check by having a zero exit code.
- 0 of 5 passed binary check by having the new version present in output.
- found 4.1.22 with grep in /nix/store/cv3f36znw2zrckq1082wjf6j7vr5yzyg-nsd-4.1.22
- directory tree listing: https://gist.github.com/ec1aa618f9ae7b813590da95020758aa
- du listing: https://gist.github.com/8277d4bf5e8944c2b6396fb624e08250
---
 pkgs/servers/dns/nsd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix
index c1c0d4e425c2..63e4f3baa8f4 100644
--- a/pkgs/servers/dns/nsd/default.nix
+++ b/pkgs/servers/dns/nsd/default.nix
@@ -15,11 +15,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nsd-4.1.21";
+  name = "nsd-4.1.22";
 
   src = fetchurl {
     url = "http://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz";
-    sha256 = "1gfjdgb5nc0nrbpdm36ngxml302khl2lnwkykl3q45byl0sbjn3q";
+    sha256 = "1704masmx77qcj7b7shzrmgp9hpf9vpd265cnvn3b2kn0mkyi1pi";
   };
 
   prePatch = ''

From 0da8196d1f65187572f3a61a57d543bb0178f5d3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 14 Jun 2018 01:51:33 -0700
Subject: [PATCH 14/28] mopidy-iris: 3.20.0 -> 3.21.1

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

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

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 3.21.1 with grep in /nix/store/ydhbxhldy8a9n64r8if9zy4ricl4in20-Mopidy-Iris-3.21.1
- directory tree listing: https://gist.github.com/3ad4fbaeff603abf3078d8371547dbb4
- du listing: https://gist.github.com/bcb4096a10cef861d8bcf1f384c7ae3e
---
 pkgs/applications/audio/mopidy/iris.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix
index dcd2d6f5f5ae..220ec80834ab 100644
--- a/pkgs/applications/audio/mopidy/iris.nix
+++ b/pkgs/applications/audio/mopidy/iris.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonApplication rec {
   pname = "Mopidy-Iris";
-  version = "3.20.0";
+  version = "3.21.1";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "1fva5ysik3af3x74l6059ngwsxrk9g6ml47wr5ck536k66i025ar";
+    sha256 = "10d97rkqk5qbrninrahn0gr90yd47ivw2zafb24sp7a2g0mm07md";
   };
 
   propagatedBuildInputs = [

From 29d274383e6a8df40f1e7c56dcd30c515908bdfc Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 14 Jun 2018 11:03:15 +0200
Subject: [PATCH 15/28] pommed-light: restrict to x86_64-linux

---
 pkgs/os-specific/linux/pommed-light/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/pommed-light/default.nix b/pkgs/os-specific/linux/pommed-light/default.nix
index e23c06b23fd5..3ee5e312d233 100644
--- a/pkgs/os-specific/linux/pommed-light/default.nix
+++ b/pkgs/os-specific/linux/pommed-light/default.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
       and the like.
     '';
     homepage = https://github.com/bytbox/pommed-light;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = [ "x86_64-linux" ];
     license = stdenv.lib.licenses.gpl2;
   };
 }

From e1a62d443827d2cf137a6604dc0bf1361f9b94e0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 14 Jun 2018 02:37:42 -0700
Subject: [PATCH 16/28] notmuch: 0.26.2 -> 0.27

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

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

These checks were done:

- built on NixOS
- /nix/store/fc0y8jb20kfm3v4yy3zzc6ipidc1ks1c-notmuch-0.27/bin/notmuch passed the binary check.
- Warning: no invocation of /nix/store/fc0y8jb20kfm3v4yy3zzc6ipidc1ks1c-notmuch-0.27/bin/notmuch-emacs-mua had a zero exit code or showed the expected version
- 1 of 2 passed binary check by having a zero exit code.
- 1 of 2 passed binary check by having the new version present in output.
- found 0.27 with grep in /nix/store/fc0y8jb20kfm3v4yy3zzc6ipidc1ks1c-notmuch-0.27
- directory tree listing: https://gist.github.com/2a14e6349ea43a555857f9e30bf328ff
- du listing: https://gist.github.com/d08317825ff4ade027455942eb367fdb
---
 pkgs/applications/networking/mailreaders/notmuch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 13add2690db3..401eb755896f 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -12,7 +12,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "0.26.2";
+  version = "0.27";
   name = "notmuch-${version}";
 
   passthru = {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://notmuchmail.org/releases/${name}.tar.gz";
-    sha256 = "0fqf6wwvqlccq9qdnd0mky7fx0kbkczd28blf045s0vsvdjii70h";
+    sha256 = "0xh8vq2sa7r07xb3n13drc6gdiqhcgl0pj0za5xj43qkiwpikls0";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From b7446bedc83084532cb66fceefbc4088cff8342c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 14 Jun 2018 04:16:05 -0700
Subject: [PATCH 17/28] libfilezilla: 0.12.2 -> 0.12.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/libfilezilla/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 0.12.3 with grep in /nix/store/lnachvvi16drxzbfhcn8qwq5y1b0zz7p-libfilezilla-0.12.3
- directory tree listing: https://gist.github.com/7e151bf94cbf478496df9bee90494f78
- du listing: https://gist.github.com/c3f30a344f3a9f315027869969153779
---
 pkgs/development/libraries/libfilezilla/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix
index f3a6983acae2..a86cf9b935ce 100644
--- a/pkgs/development/libraries/libfilezilla/default.nix
+++ b/pkgs/development/libraries/libfilezilla/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libfilezilla-${version}";
-  version = "0.12.2";
+  version = "0.12.3";
 
   src = fetchurl {
     url = "http://download.filezilla-project.org/libfilezilla/${name}.tar.bz2";
-    sha256 = "1v461hwdk74whp89s490dj1z18gfqf9bz9140m5f11rsvrpid33p";
+    sha256 = "1v606kcz2rdmmlwxrv3xvwh7ia1nh6jfc9bhjw2r4ai3rm16gch5";
   };
 
   meta = with stdenv.lib; {

From d2c016877982053d3f9e4d5b64a028c707d90019 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 14 Jun 2018 13:58:07 +0200
Subject: [PATCH 18/28] maim: 5.5.1 -> 5.5.2

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

diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix
index cd0cff0f3899..0cea8d4011c7 100644
--- a/pkgs/tools/graphics/maim/default.nix
+++ b/pkgs/tools/graphics/maim/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "maim-${version}";
-  version = "5.5.1";
+  version = "5.5.2";
 
   src = fetchFromGitHub {
     owner = "naelstrof";
     repo = "maim";
     rev = "v${version}";
-    sha256 = "106qg85q0aiw4w08vjg9j60brrbln11b8vdycjqkv8fq00pq308i";
+    sha256 = "14mfxdm39kc5jk8wysrzx05ag2g4sk9l24i8m5pzqn8j611150v3";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From a9400e64e717d96aa1a668095eadf38605e451a8 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 14 Jun 2018 11:35:19 -0400
Subject: [PATCH 19/28] ghcjs: add version to haskellCompilerName

This is needed for some cabal2nix stuff in getting the version.
Previously we had left out the version but apparently this can cause
problems in some scenarios.

/cc @elvishjerricco @peti @ericson2314
---
 pkgs/development/compilers/ghcjs-ng/default.nix | 2 +-
 pkgs/development/compilers/ghcjs/base.nix       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix
index dda414620e0b..93257ff7d53d 100644
--- a/pkgs/development/compilers/ghcjs-ng/default.nix
+++ b/pkgs/development/compilers/ghcjs-ng/default.nix
@@ -48,7 +48,7 @@ let
     stage1Packages = [];
     mkStage2 = _: {};
 
-    haskellCompilerName = "ghcjs";
+    haskellCompilerName = "ghcjs-${bootGhcjs.version}";
   };
 
   bootGhcjs = haskellLib.justStaticExecutables passthru.bootPkgs.ghcjs;
diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix
index 07662d32d258..98eb58e6aae7 100644
--- a/pkgs/development/compilers/ghcjs/base.nix
+++ b/pkgs/development/compilers/ghcjs/base.nix
@@ -174,7 +174,7 @@ in mkDerivation (rec {
     isGhcjs = true;
     inherit nodejs ghcjsBoot;
     socket-io = pkgs.nodePackages."socket.io";
-    haskellCompilerName = "ghcjs";
+    haskellCompilerName = "ghcjs-${version}";
 
     # let us assume ghcjs is never actually cross compiled
     targetPrefix = "";

From e921a05febccbafa463be3a95bf2ff98811010e1 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 14 Jun 2018 17:38:06 +0200
Subject: [PATCH 20/28] =?UTF-8?q?syncthing-gtk:=200.9.3.1=20=E2=86=92=200.?=
 =?UTF-8?q?9.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../networking/syncthing-gtk/default.nix      | 17 ++--
 ...sable-syncthing-binary-configuration.patch | 77 -------------------
 2 files changed, 11 insertions(+), 83 deletions(-)
 delete mode 100644 pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch

diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix
index 4db546651dd9..be574acc8c75 100644
--- a/pkgs/applications/networking/syncthing-gtk/default.nix
+++ b/pkgs/applications/networking/syncthing-gtk/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchFromGitHub, libnotify, librsvg, darwin, psmisc, gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3, bcrypt, gobjectIntrospection }:
+{ stdenv, fetchFromGitHub, fetchpatch, libnotify, librsvg, darwin, psmisc, gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3, bcrypt, gobjectIntrospection }:
 
 buildPythonApplication rec {
-  version = "0.9.3.1";
+  version = "0.9.4";
   name = "syncthing-gtk-${version}";
 
   src = fetchFromGitHub {
     owner = "syncthing";
     repo = "syncthing-gtk";
     rev = "v${version}";
-    sha256 = "15bh9i0j0g7hrqsz22px8g2bg0xj4lsn81rziznh9fxxx5b9v9bb";
+    sha256 = "0d3rjd1xjd7zravks9a2ph7gv1cm8wxaxkkvl1fvcx15v7f3hff9";
   };
 
   nativeBuildInputs = [
@@ -29,7 +29,10 @@ buildPythonApplication rec {
   ];
 
   patches = [
-    ./disable-syncthing-binary-configuration.patch
+    (fetchpatch {
+      url = https://github.com/syncthing/syncthing-gtk/commit/b2535e5a9cdb31c4987ab7af37f62d58d38255b7.patch;
+      sha256 = "047v79wz2a9334gbzywlqwpacrk53s26ksvfqaddk06avv8742w7";
+    })
     (substituteAll {
       src = ./paths.patch;
       killall = "${if stdenv.isDarwin then darwin.shell_cmds else psmisc}/bin/killall";
@@ -37,6 +40,8 @@ buildPythonApplication rec {
     })
   ];
 
+  setupPyBuildFlags = [ "build_py" "--nofinddaemon" "--nostdownloader" ];
+
   postPatch = ''
     substituteInPlace setup.py --replace "version = get_version()" "version = '${version}'"
     substituteInPlace scripts/syncthing-gtk --replace "/usr/share" "$out/share"
@@ -48,9 +53,9 @@ buildPythonApplication rec {
 
   meta = with stdenv.lib; {
     description = "GTK3 & python based GUI for Syncthing";
-    maintainers = with maintainers; [ ];
-    platforms = syncthing.meta.platforms;
     homepage = https://github.com/syncthing/syncthing-gtk;
     license = licenses.gpl2;
+    maintainers = with maintainers; [ ];
+    platforms = syncthing.meta.platforms;
   };
 }
diff --git a/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch b/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch
deleted file mode 100644
index 14c2b62e6e38..000000000000
--- a/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- a/glade/find-daemon.glade
-+++ b/glade/find-daemon.glade
-@@ -112,6 +112,7 @@
-                   <object class="GtkEntry" id="vsyncthing_binary">
-                     <property name="visible">True</property>
-                     <property name="can_focus">True</property>
-+                    <property name="sensitive">False</property>
-                     <property name="margin_right">20</property>
-                     <signal name="changed" handler="cb_check_value" swapped="no"/>
-                   </object>
-@@ -126,6 +127,7 @@
-                     <property name="label" translatable="yes">_Browse...</property>
-                     <property name="visible">True</property>
-                     <property name="can_focus">True</property>
-+                    <property name="sensitive">False</property>
-                     <property name="receives_default">True</property>
-                     <property name="use_underline">True</property>
-                     <property name="yalign">0.51999998092651367</property>
---- a/glade/ui-settings.glade
-+++ b/glade/ui-settings.glade
-@@ -943,6 +943,7 @@
-                     <property name="label" translatable="yes">_Browse...</property>
-                     <property name="visible">True</property>
-                     <property name="can_focus">True</property>
-+                    <property name="sensitive">False</property>
-                     <property name="receives_default">True</property>
-                     <property name="use_underline">True</property>
-                     <property name="yalign">0.51999998092651367</property>
-@@ -974,6 +975,7 @@
-                   <object class="GtkEntry" id="vsyncthing_binary">
-                     <property name="visible">True</property>
-                     <property name="can_focus">True</property>
-+                    <property name="sensitive">False</property>
-                     <property name="hexpand">True</property>
-                     <signal name="changed" handler="cb_check_value" swapped="no"/>
-                   </object>
---- a/syncthing_gtk/configuration.py
-+++ b/syncthing_gtk/configuration.py
-@@ -168,6 +168,8 @@
- 			yield k
- 	
- 	def get(self, key):
-+		if key == "syncthing_binary":
-+			return self.REQUIRED_KEYS[key][1]
- 		return self.values[key]
- 	
- 	def set(self, key, value):
---- a/syncthing_gtk/finddaemondialog.py
-+++ b/syncthing_gtk/finddaemondialog.py
-@@ -163,7 +163,7 @@
- 		self["lblDownloadProgress"].set_markup(_("Download failed."))
- 		self["btDownload"].set_visible(True)
- 		self["pbDownload"].set_visible(False)
--		self["vsyncthing_binary"].set_sensitive(True)
-+		self["vsyncthing_binary"].set_sensitive(False)
- 		self["btBrowse"].set_sensitive(True)
- 		self["btSave"].set_sensitive(True)
- 	
-@@ -179,7 +179,7 @@
- 	
- 	def cb_extract_finished(self, downloader, *a):
- 		""" Called after extraction is finished """
--		self["vsyncthing_binary"].set_sensitive(True)
-+		self["vsyncthing_binary"].set_sensitive(False)
- 		self["btBrowse"].set_sensitive(True)
- 		self["vsyncthing_binary"].set_text(downloader.get_target())
- 		self["lblDownloadProgress"].set_markup("<b>" + _("Download finished.") + "</b>")
---- a/syncthing_gtk/wizard.py
-+++ b/syncthing_gtk/wizard.py
-@@ -60,7 +60,6 @@
- 		self.quit_button.connect("clicked", lambda *a : self.emit("cancel"))
- 		# Pages
- 		self.add_page(IntroPage(self))
--		self.add_page(FindDaemonPage())
- 		self.add_page(GenerateKeysPage())
- 		self.add_page(HttpSettingsPage())
- 		self.add_page(SaveSettingsPage())

From 31b4bfe649ce92b1a74dbc464f16c542c32e9043 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 14 Jun 2018 16:17:23 +0200
Subject: [PATCH 21/28] Revert "xmlsec: 1.2.25 -> 1.2.26 (#41655)"

This reverts commit 45eeb247019d6f05626ca06b9ea155fc2d8805a9. This update
broke the build of libreoffice.

See https://github.com/NixOS/nixpkgs/issues/37619.

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

diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix
index e17ac6d15075..32ce856eddd3 100644
--- a/pkgs/development/libraries/xmlsec/default.nix
+++ b/pkgs/development/libraries/xmlsec/default.nix
@@ -2,14 +2,14 @@
 , openssl, nss, makeWrapper }:
 
 let
-  version = "1.2.26";
+  version = "1.2.25";
 in
 stdenv.mkDerivation rec {
   name = "xmlsec-${version}";
 
   src = fetchurl {
     url = "http://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz";
-    sha256 = "0l1dk344rn3j2vnj13daz72xd8j1msvzhg82n2il5ji0qz4pd0ld";
+    sha256 = "1lpwj8dxwhha54sby0v5axjk79h56jnhjjiwiasbbk15vwzahz4n";
   };
 
   outputs = [ "out" "dev" ];

From e2f93046066978dda6deee83ac38a7b6bed6ccba Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 14 Jun 2018 18:14:52 +0200
Subject: [PATCH 22/28] =?UTF-8?q?gnome3.totem-pl-parser:=203.26.0=20?=
 =?UTF-8?q?=E2=86=92=203.26.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix
index 457cee3b3f25..279e7f2e95af 100644
--- a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gmime, libxml2, libsoup, gobjectIntrospection, gnome3 }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gmime, libxml2, gobjectIntrospection, gnome3 }:
 
 stdenv.mkDerivation rec {
   name = "totem-pl-parser-${version}";
-  version = "3.26.0";
+  version = "3.26.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/totem-pl-parser/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "f153a53391e9b42fed5cb6ce62322a58e323fde6ec4a54d8ba4d376cf4c1fbcb";
+    sha256 = "0k5pnka907invgds48d73c1xx1a366v5dcld3gr2l1dgmjwc9qka";
   };
 
   passthru = {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ];
-  buildInputs = [ gmime libxml2 libsoup ];
+  buildInputs = [ gmime libxml2 ];
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Videos;

From e1c1ec901b660aa5c5a5f3e4262a6e602f0c6122 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 14 Jun 2018 18:17:03 +0200
Subject: [PATCH 23/28] =?UTF-8?q?flatpak:=200.11.8.2=20=E2=86=92=200.11.8.?=
 =?UTF-8?q?3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix
index eeaa1e324961..b62d764a2c65 100644
--- a/pkgs/development/libraries/flatpak/default.nix
+++ b/pkgs/development/libraries/flatpak/default.nix
@@ -4,7 +4,7 @@
 , libsoup, lzma, ostree, polkit, python3, systemd, xlibs, valgrind, glib_networking, makeWrapper, gnome3 }:
 
 let
-  version = "0.11.8.2";
+  version = "0.11.8.3";
   desktop_schemas = gnome3.gsettings_desktop_schemas;
 in stdenv.mkDerivation rec {
   name = "flatpak-${version}";
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/flatpak/flatpak/releases/download/${version}/${name}.tar.xz";
-    sha256 = "03c2fx0y7irvws25858x217xmbacn2vfdypf8vc32hkrbh9i6df7";
+    sha256 = "1dgkr1kr00111vsrql2ng2sw2b2j9axmay0fl6p540j952v3yimy";
   };
 
   patches = [

From 6a916d029ee83f218c950f429553b59629ab63c4 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 14 Jun 2018 18:26:40 +0200
Subject: [PATCH 24/28] =?UTF-8?q?gnome3.libgweather:=203.28.1=20=E2=86=92?=
 =?UTF-8?q?=203.28.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/libgweather/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/libgweather/default.nix b/pkgs/desktops/gnome-3/core/libgweather/default.nix
index fbae8fbcfbd4..beab02465272 100644
--- a/pkgs/desktops/gnome-3/core/libgweather/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgweather/default.nix
@@ -3,7 +3,7 @@
 
 let
   pname = "libgweather";
-  version = "3.28.1";
+  version = "3.28.2";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1qqbfgmlfs0g0v92rdl96v2b44yr3sqj9x7zpqv1nx9aaf486yhm";
+    sha256 = "0xfy5ghwvnz2g9074dy6512m4z2pv66pmja14vhi9imgacbfh708";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl gobjectIntrospection ];

From 91ca88b3e6b4d57640c213e755077b2d93d0a8bd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 13 Jun 2018 20:57:10 -0700
Subject: [PATCH 25/28] tbb: 2018_U3 -> 2018_U4

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

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

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 2018_U4 with grep in /nix/store/bi7ml1lf51x1pvf8c9q9sg1vgyr93i10-tbb-2018_U4
- directory tree listing: https://gist.github.com/0b2f954042266f19cb4e819607e57c03
- du listing: https://gist.github.com/f115812285d438e3dc88112762777976
---
 pkgs/development/libraries/tbb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix
index 59765adf7a87..b9fba467457e 100644
--- a/pkgs/development/libraries/tbb/default.nix
+++ b/pkgs/development/libraries/tbb/default.nix
@@ -2,13 +2,13 @@
 
 with stdenv.lib; stdenv.mkDerivation rec {
   name = "tbb-${version}";
-  version = "2018_U3";
+  version = "2018_U4";
 
   src = fetchFromGitHub {
     owner = "01org";
     repo = "tbb";
     rev = version;
-    sha256 = "137hb03ms93v4svjq038z6clfh41y8iq7wcif8n92xz2wzaap006";
+    sha256 = "00y7b4x0blkn0cymnrbh6fw7kp4xcdp4bi14rj33sl1lypawa1j6";
   };
 
   makeFlags = concatStringsSep " " (

From 1e7d53d1130f93541f63901bf9d54ad1cfa33769 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <fadenb@utzutzutz.net>
Date: Thu, 14 Jun 2018 19:05:38 +0200
Subject: [PATCH 26/28] matrix-synapse: 0.31.1 -> 0.31.2

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

diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 3b1b34ac9d57..302aa8d55932 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -26,13 +26,13 @@ let
   };
 in pythonPackages.buildPythonApplication rec {
   name = "matrix-synapse-${version}";
-  version = "0.31.1";
+  version = "0.31.2";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "synapse";
     rev = "v${version}";
-    sha256 = "1lrbjqa9rxn2prbnha9aghnwyi4z1rpfd7bk0bjsjixjl389d6d8";
+    sha256 = "15nfdq5s0d4bv1in6vymhq70hpz48p0nlzx25wxpibbrix630h8q";
   };
 
   patches = [

From 1eacf21bd4cf88fe284bb1687e35a52389e6caac Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 14 Jun 2018 10:22:33 -0400
Subject: [PATCH 27/28] darwin bootstrapping: Avoid overriding aliases for LLVM

Respect the fix points and aliases by overriding originals.
---
 .../compilers/llvm/3.7/default.nix            |  8 +--
 .../compilers/llvm/3.8/default.nix            |  8 +--
 .../compilers/llvm/3.9/default.nix            |  8 +--
 pkgs/development/compilers/llvm/4/default.nix |  8 +--
 pkgs/development/compilers/llvm/5/default.nix |  8 +--
 pkgs/development/compilers/llvm/6/default.nix |  8 +--
 pkgs/stdenv/darwin/default.nix                | 72 +++++++++++--------
 7 files changed, 67 insertions(+), 53 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.7/default.nix b/pkgs/development/compilers/llvm/3.7/default.nix
index 4e1a0ef6409a..1bd4b88c72d4 100644
--- a/pkgs/development/compilers/llvm/3.7/default.nix
+++ b/pkgs/development/compilers/llvm/3.7/default.nix
@@ -16,7 +16,7 @@ let
   compiler-rt_src = fetch "compiler-rt" "10c1mz2q4bdq9bqfgr3dirc6hz1h3sq8573srd5q5lr7m7j6jiwx";
   clang-tools-extra_src = fetch "clang-tools-extra" "0sxw2l3q5msbrwxv1ck72arggdw6n5ysi929gi69ikniranfv4aa";
 
-  tools = let
+  tools = stdenv.lib.makeExtensible (tools: let
     callPackage = newScope (tools // { inherit stdenv isl version fetch; });
   in {
     llvm = callPackage ./llvm.nix {
@@ -41,9 +41,9 @@ let
     };
 
     lldb = callPackage ./lldb.nix {};
-  };
+  });
 
-  libraries = let
+  libraries = stdenv.lib.makeExtensible (libraries: let
     callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv isl version fetch; });
   in {
 
@@ -54,6 +54,6 @@ let
     libcxx = callPackage ./libc++ {};
 
     libcxxabi = callPackage ./libc++abi.nix {};
-  };
+  });
 
 in { inherit tools libraries; } // libraries // tools
diff --git a/pkgs/development/compilers/llvm/3.8/default.nix b/pkgs/development/compilers/llvm/3.8/default.nix
index 3f0cd7d0a763..28f908ee829f 100644
--- a/pkgs/development/compilers/llvm/3.8/default.nix
+++ b/pkgs/development/compilers/llvm/3.8/default.nix
@@ -15,7 +15,7 @@ let
   compiler-rt_src = fetch "compiler-rt" "0p0y85c7izndbpg2l816z7z7558axq11d5pwkm4h11sdw7d13w0d";
   clang-tools-extra_src = fetch "clang-tools-extra" "15n39r4ssphpaq4a0wzyjm7ilwxb0bch6nrapy8c5s8d49h5qjk6";
 
-  tools = let
+  tools = stdenv.lib.makeExtensible (tools: let
     callPackage = newScope (tools // { inherit stdenv isl version fetch; });
  in {
     llvm = callPackage ./llvm.nix {
@@ -41,9 +41,9 @@ let
     };
 
     lldb = callPackage ./lldb.nix {};
-  };
+  });
 
-  libraries = let
+  libraries = stdenv.lib.makeExtensible (libraries: let
     callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv isl version fetch; });
   in {
 
@@ -54,6 +54,6 @@ let
     libcxx = callPackage ./libc++ {};
 
     libcxxabi = callPackage ./libc++abi.nix {};
-  };
+  });
 
 in { inherit tools libraries; } // libraries // tools
diff --git a/pkgs/development/compilers/llvm/3.9/default.nix b/pkgs/development/compilers/llvm/3.9/default.nix
index 3735fb6a02c0..ea3ea36eb6d3 100644
--- a/pkgs/development/compilers/llvm/3.9/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/default.nix
@@ -15,7 +15,7 @@ let
   compiler-rt_src = fetch "compiler-rt" "16gc2gdmp5c800qvydrdhsp0bzb97s8wrakl6i8a4lgslnqnf2fk";
   clang-tools-extra_src = fetch "clang-tools-extra" "0d9nh7j7brbh9avigcn69dlaihsl9p3cf9s45mw6fxzzvrdvd999";
 
-  tools = let
+  tools = stdenv.lib.makeExtensible (tools: let
     callPackage = newScope (tools // { inherit stdenv isl version fetch; });
   in {
     llvm = callPackage ./llvm.nix {
@@ -41,9 +41,9 @@ let
     };
 
     lldb = callPackage ./lldb.nix {};
-  };
+  });
 
-  libraries = let
+  libraries = stdenv.lib.makeExtensible (libraries: let
     callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv isl version fetch; });
   in {
 
@@ -54,6 +54,6 @@ let
     libcxx = callPackage ./libc++ {};
 
     libcxxabi = callPackage ./libc++abi.nix {};
-  };
+  });
 
 in { inherit tools libraries; } // libraries // tools
diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix
index c46e520a33df..ae674d1fa8e8 100644
--- a/pkgs/development/compilers/llvm/4/default.nix
+++ b/pkgs/development/compilers/llvm/4/default.nix
@@ -22,7 +22,7 @@ let
     let drv-manpages = drv.override { enableManpages = true; }; in
     drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ };
 
-  tools = let
+  tools = stdenv.lib.makeExtensible (tools: let
     callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
   in {
 
@@ -52,9 +52,9 @@ let
     lld = callPackage ./lld.nix {};
 
     lldb = callPackage ./lldb.nix {};
-  };
+  });
 
-  libraries = let
+  libraries = stdenv.lib.makeExtensible (libraries: let
     callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
   in {
 
@@ -67,6 +67,6 @@ let
     libcxxabi = callPackage ./libc++abi.nix {};
 
     openmp = callPackage ./openmp.nix {};
-  };
+  });
 
 in { inherit tools libraries; } // libraries // tools
diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix
index feeadf1f1306..c3c1d87f2e4e 100644
--- a/pkgs/development/compilers/llvm/5/default.nix
+++ b/pkgs/development/compilers/llvm/5/default.nix
@@ -22,7 +22,7 @@ let
     let drv-manpages = drv.override { enableManpages = true; }; in
     drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ };
 
-  tools = let
+  tools = stdenv.lib.makeExtensible (tools: let
     callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
   in {
 
@@ -53,9 +53,9 @@ let
     lld = callPackage ./lld.nix {};
 
     lldb = callPackage ./lldb.nix {};
-  };
+  });
 
-  libraries = let
+  libraries = stdenv.lib.makeExtensible (libraries: let
     callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
   in {
 
@@ -68,6 +68,6 @@ let
     libcxxabi = callPackage ./libc++abi.nix {};
 
     openmp = callPackage ./openmp.nix {};
-  };
+  });
 
 in { inherit tools libraries; } // libraries // tools
diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix
index bbac21ef6796..8fe68bad213d 100644
--- a/pkgs/development/compilers/llvm/6/default.nix
+++ b/pkgs/development/compilers/llvm/6/default.nix
@@ -21,7 +21,7 @@ let
     let drv-manpages = drv.override { enableManpages = true; }; in
     drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ };
 
-  tools = let
+  tools = stdenv.lib.makeExtensible (tools: let
     callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
   in {
 
@@ -71,9 +71,9 @@ let
     lld = callPackage ./lld.nix {};
 
     lldb = callPackage ./lldb.nix {};
-  };
+  });
 
-  libraries = let
+  libraries = stdenv.lib.makeExtensible (libraries: let
     callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
   in {
 
@@ -88,6 +88,6 @@ let
     libcxxabi = callPackage ./libc++abi.nix {};
 
     openmp = callPackage ./openmp.nix {};
-  };
+  });
 
 in { inherit tools libraries; } // libraries // tools
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 57b59f26204c..7ef74c5ea7df 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -159,26 +159,27 @@ in rec {
         dyld = bootstrapTools;
       };
 
-      libcxx = stdenv.mkDerivation {
-        name = "bootstrap-stage0-libcxx";
-        phases = [ "installPhase" "fixupPhase" ];
-        installPhase = ''
-          mkdir -p $out/lib $out/include
-          ln -s ${bootstrapTools}/lib/libc++.dylib $out/lib/libc++.dylib
-          ln -s ${bootstrapTools}/include/c++      $out/include/c++
-        '';
-        linkCxxAbi = false;
-        setupHook = ../../development/compilers/llvm/3.9/libc++/setup-hook.sh;
-      };
+      llvmPackages_5 = {
+        libcxx = stdenv.mkDerivation {
+          name = "bootstrap-stage0-libcxx";
+          phases = [ "installPhase" "fixupPhase" ];
+          installPhase = ''
+            mkdir -p $out/lib $out/include
+            ln -s ${bootstrapTools}/lib/libc++.dylib $out/lib/libc++.dylib
+            ln -s ${bootstrapTools}/include/c++      $out/include/c++
+          '';
+          linkCxxAbi = false;
+          setupHook = ../../development/compilers/llvm/3.9/libc++/setup-hook.sh;
+        };
 
-      libcxxabi = stdenv.mkDerivation {
-        name = "bootstrap-stage0-libcxxabi";
-        buildCommand = ''
-          mkdir -p $out/lib
-          ln -s ${bootstrapTools}/lib/libc++abi.dylib $out/lib/libc++abi.dylib
-        '';
+        libcxxabi = stdenv.mkDerivation {
+          name = "bootstrap-stage0-libcxxabi";
+          buildCommand = ''
+            mkdir -p $out/lib
+            ln -s ${bootstrapTools}/lib/libc++abi.dylib $out/lib/libc++abi.dylib
+          '';
+        };
       };
-
     };
 
     extraNativeBuildInputs = [];
@@ -236,8 +237,11 @@ in rec {
         patchutils m4 scons flex perl bison unifdef unzip openssl python
         gettext sharutils libarchive pkg-config groff bash subversion
         openssh sqlite sed serf openldap db cyrus-sasl expat apr-util
-        findfreetype libssh curl cmake autoconf automake libtool cpio
-        libcxx libcxxabi;
+        findfreetype libssh curl cmake autoconf automake libtool cpio;
+
+      llvmPackages_5 = super.llvmPackages_5 // {
+        inherit (llvmPackages_5) libcxx libcxxabi;
+      };
 
       darwin = super.darwin // {
         inherit (darwin)
@@ -272,13 +276,18 @@ in rec {
     persistent = self: super: with prevStage; {
       inherit
         gnumake gzip gnused bzip2 gawk ed xz patch bash
-        libcxxabi libcxx ncurses libffi zlib gmp pcre gnugrep
+        ncurses libffi zlib gmp pcre gnugrep
         coreutils findutils diffutils patchutils;
 
-       llvmPackages_5 = super.llvmPackages_5 // {
-         llvm = llvmPackages_5.llvm.override { inherit libcxxabi; };
-         clang-unwrapped = llvmPackages_5.clang-unwrapped.override { llvm = self.llvmPackages_5.llvm; };
-       };
+      llvmPackages_5 = super.llvmPackages_5 // (let
+        tools = super.llvmPackages_5.tools.extend (_: _: {
+          llvm = llvmPackages_5.llvm.override { inherit libcxxabi; };
+          clang-unwrapped = llvmPackages_5.clang-unwrapped.override { llvm = self.llvmPackages_5.llvm; };
+        });
+        libraries = super.llvmPackages_5.libraries.extend (_: _: {
+          inherit (llvmPackages_5) libcxx libcxxabi;
+        });
+      in { inherit tools libraries; } // tools // libraries);
 
       darwin = super.darwin // {
         inherit (darwin) dyld Libsystem libiconv locale;
@@ -310,12 +319,17 @@ in rec {
     persistent = self: super: with prevStage; {
       inherit
         gnumake gzip gnused bzip2 gawk ed xz patch bash
-        libcxxabi libcxx ncurses libffi zlib llvm gmp pcre gnugrep
+        ncurses libffi zlib llvm gmp pcre gnugrep
         coreutils findutils diffutils patchutils;
 
-      llvmPackages_5 = super.llvmPackages_5 // {
-        inherit (llvmPackages_5) llvm clang-unwrapped;
-      };
+      llvmPackages_5 = super.llvmPackages_5 // (let
+        tools = super.llvmPackages_5.tools.extend (_: _: {
+          inherit (llvmPackages_5) llvm clang-unwrapped;
+        });
+        libraries = super.llvmPackages_5.libraries.extend (_: _: {
+          inherit (llvmPackages_5) libcxx libcxxabi;
+        });
+      in { inherit tools libraries; } // tools // libraries);
 
       darwin = super.darwin // {
         inherit (darwin) dyld ICU Libsystem libiconv;

From 9807281253b7e4f0d7555f6109f011b74e8ea1aa Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Thu, 14 Jun 2018 19:45:15 +0000
Subject: [PATCH 28/28] wireguard{,-go,-tools}: 0.0.20180531 -> 0.0.20180613

---
 pkgs/os-specific/linux/wireguard/default.nix      | 9 +++------
 pkgs/tools/networking/wireguard-go/default.nix    | 4 ++--
 pkgs/tools/networking/wireguard-tools/default.nix | 4 ++--
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index acb159a4acc9..42982d49ce87 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -24,11 +24,8 @@ stdenv.mkDerivation rec {
   buildPhase = "make module";
 
   meta = with stdenv.lib; {
-    homepage     = https://www.wireguard.com/;
-    downloadPage = https://git.zx2c4.com/WireGuard/refs/;
-    description  = "Kernel module for the WireGuard secure network tunnel";
-    maintainers  = with maintainers; [ ericsagnes mic92 zx2c4 ];
-    license      = licenses.gpl2;
-    platforms    = platforms.linux;
+    inherit (wireguard-tools.meta) homepage license maintainers;
+    description = "Kernel module for the WireGuard secure network tunnel";
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix
index cbd28b6954a3..c6b8cb242fdc 100644
--- a/pkgs/tools/networking/wireguard-go/default.nix
+++ b/pkgs/tools/networking/wireguard-go/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   name = "wireguard-go-${version}";
-  version = "0.0.20180531";
+  version = "0.0.20180613";
 
   goPackagePath = "git.zx2c4.com/wireguard-go";
 
   src = fetchzip {
     url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz";
-    sha256 = "1vs11kr5a2s99v0g7079nfrfvmjfh1p2lnkj2icjyn2cb0s1vqiy";
+    sha256 = "0pvg7s1kyn48az54lsnyn1ryhjk0flmpz5dx520rc94g6xn88fic";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix
index 276d7066c561..e8f8b4258721 100644
--- a/pkgs/tools/networking/wireguard-tools/default.nix
+++ b/pkgs/tools/networking/wireguard-tools/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "wireguard-tools-${version}";
-  version = "0.0.20180531";
+  version = "0.0.20180613";
 
   src = fetchzip {
     url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "0944zxmpx2cs71nxl7rcyhpqlwplkzd7jsf1n66vflngw2sjxm03";
+    sha256 = "0xndf5qxc4s0gsidzm0v4ivara6k2shjbr74xfcdpc0apfgyk2fz";
   };
 
   sourceRoot = "source/src/tools";