Merge remote-tracking branch 'upstream/master' into staging

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";

nixos/modules/services/web-servers/uwsgi.nix

@@ -31,9 +31,7 @@ let
         inherit python;
       };
 
-      penv = python.buildEnv.override {
+      pythonEnv = python.withPackages (c.pythonPackages or (self: []));
-        extraLibs = (c.pythonPackages or (self: [])) pythonPackages;
-      };
 
       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 {

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 = [

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 ];

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;
   };
 }

pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch

@@ -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())

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 ];

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;

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;

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 = "";

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

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

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

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

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

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

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 ];

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 = [

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; {

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 " " (

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" ];

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
+    ];
+  };
+}

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";
 

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
+    ];
+  };
+}

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
+    ];
+  };
+}

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"
+ ]

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 = ''
@@ -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;
   };
 }

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/;
+    inherit (wireguard-tools.meta) homepage license maintainers;
-    downloadPage = https://git.zx2c4.com/WireGuard/refs/;
+    description = "Kernel module for the WireGuard secure network tunnel";
-    description  = "Kernel module for the WireGuard secure network tunnel";
+    platforms = platforms.linux;
-    maintainers  = with maintainers; [ ericsagnes mic92 zx2c4 ];
-    license      = licenses.gpl2;
-    platforms    = platforms.linux;
   };
 }

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 = ''

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 = [

pkgs/stdenv/darwin/default.nix

@@ -159,26 +159,27 @@ in rec {
         dyld = bootstrapTools;
       };
 
-      libcxx = stdenv.mkDerivation {
+      llvmPackages_5 = {
-        name = "bootstrap-stage0-libcxx";
+        libcxx = stdenv.mkDerivation {
-        phases = [ "installPhase" "fixupPhase" ];
+          name = "bootstrap-stage0-libcxx";
-        installPhase = ''
+          phases = [ "installPhase" "fixupPhase" ];
-          mkdir -p $out/lib $out/include
+          installPhase = ''
-          ln -s ${bootstrapTools}/lib/libc++.dylib $out/lib/libc++.dylib
+            mkdir -p $out/lib $out/include
-          ln -s ${bootstrapTools}/include/c++      $out/include/c++
+            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;
+          linkCxxAbi = false;
-      };
+          setupHook = ../../development/compilers/llvm/3.9/libc++/setup-hook.sh;
+        };
 
-      libcxxabi = stdenv.mkDerivation {
+        libcxxabi = stdenv.mkDerivation {
-        name = "bootstrap-stage0-libcxxabi";
+          name = "bootstrap-stage0-libcxxabi";
-        buildCommand = ''
+          buildCommand = ''
-          mkdir -p $out/lib
+            mkdir -p $out/lib
-          ln -s ${bootstrapTools}/lib/libc++abi.dylib $out/lib/libc++abi.dylib
+            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
+        findfreetype libssh curl cmake autoconf automake libtool cpio;
-        libcxx libcxxabi;
+
+      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 // {
+      llvmPackages_5 = super.llvmPackages_5 // (let
-         llvm = llvmPackages_5.llvm.override { inherit libcxxabi; };
+        tools = super.llvmPackages_5.tools.extend (_: _: {
-         clang-unwrapped = llvmPackages_5.clang-unwrapped.override { llvm = self.llvmPackages_5.llvm; };
+          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 // {
+      llvmPackages_5 = super.llvmPackages_5 // (let
-        inherit (llvmPackages_5) llvm clang-unwrapped;
+        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;

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; [
+  propagatedBuildInputs = with pythonPackages; [
-    futures
     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 ];

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 ];

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 ];

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 ];

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;

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";

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 = ''

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 { };
 

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 { };
@@ -18202,6 +18204,11 @@ EOF
 
   gast = callPackage ../development/python-modules/gast { };
 
+  IBMQuantumExperience = callPackage ../development/python-modules/ibmquantumexperience { };
+
+  qiskit = callPackage ../development/python-modules/qiskit { };
+
+  qasm2image = callPackage ../development/python-modules/qasm2image { };
 });
 
 in fix' (extends overrides packages)