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

doc/submitting-changes.xml

@@ -476,7 +476,7 @@ Additional information.
      <para>
       It's only for non-breaking mass-rebuild commits. That means it's not to
       be used for testing, and changes must have been well tested already.
-      <link xlink:href="http://comments.gmane.org/gmane.linux.distributions.nixos/13447">Read
+      <link xlink:href="https://web.archive.org/web/20160528180406/http://comments.gmane.org/gmane.linux.distributions.nixos/13447">Read
       policy here</link>.
      </para>
     </listitem>

nixos/modules/services/misc/mesos-slave.nix

@@ -187,7 +187,7 @@ in {
     systemd.services.mesos-slave = {
       description = "Mesos Slave";
       wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" ];
+      after = [ "network.target" ] ++ optionals cfg.withDocker [ "docker.service" ] ;
       path = [ pkgs.runtimeShellPackage ];
       serviceConfig = {
         ExecStart = ''

nixos/modules/services/x11/desktop-managers/xterm.nix

@@ -12,6 +12,7 @@ in
   options = {
 
     services.xserver.desktopManager.xterm.enable = mkOption {
+      type = types.bool;
       default = true;
       description = "Enable a xterm terminal as a desktop manager.";
     };

nixos/modules/system/boot/systemd-unit-options.nix

@@ -217,7 +217,7 @@ in rec {
 
     environment = mkOption {
       default = {};
-      type = with types; attrsOf (nullOr (either str package));
+      type = with types; attrsOf (nullOr (either str (either path package)));
       example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; };
       description = "Environment variables passed to the service's processes.";
     };

nixos/modules/testing/test-instrumentation.nix

@@ -129,6 +129,9 @@ in
     users.extraUsers.root.initialHashedPassword = mkOverride 150 "";
 
     services.xserver.displayManager.job.logToJournal = true;
+
+    # set default stateVersion to avoid warnings during eval
+    system.nixos.stateVersion = mkDefault "18.03";
   };
 
 }

nixos/tests/acme.nix

@@ -54,9 +54,11 @@ in import ./make-test.nix {
   };
 
   testScript = ''
+    $letsencrypt->waitForUnit("default.target");
     $letsencrypt->waitForUnit("boulder.service");
-    startAll;
+    $webserver->waitForUnit("default.target");
     $webserver->waitForUnit("acme-certificates.target");
+    $client->waitForUnit("default.target");
     $client->succeed('curl https://example.com/ | grep -qF "hello world"');
   '';
 }

nixos/tests/common/letsencrypt.nix

@@ -386,6 +386,10 @@ in {
 
     services.nginx.enable = true;
     services.nginx.recommendedProxySettings = true;
+    # This fixes the test on i686
+    services.nginx.commonHttpConfig = ''
+      server_names_hash_bucket_size 64;
+    '';
     services.nginx.virtualHosts.${wfeDomain} = {
       onlySSL = true;
       enableACME = false;

nixos/tests/mesos.nix

@@ -66,9 +66,11 @@ import ./make-test.nix ({ pkgs, ...} : rec {
   testScript =
     ''
       startAll;
+      $master->waitForUnit("zookeeper.service");
       $master->waitForUnit("mesos-master.service");
+      $slave->waitForUnit("docker.service");
       $slave->waitForUnit("mesos-slave.service");
-
+      $master->waitForOpenPort(2181);
       $master->waitForOpenPort(5050);
       $slave->waitForOpenPort(5051);
 

pkgs/applications/graphics/avocode/default.nix

@@ -0,0 +1,99 @@
+{ stdenv, lib, makeDesktopItem, fetchurl, unzip
+, gdk_pixbuf, glib, gtk2, atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome2
+, xorg, mozjpeg
+}:
+
+stdenv.mkDerivation rec {
+  name = "avocode-${version}";
+  version = "2.26.0";
+
+  src = fetchurl {
+    url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
+    sha256 = "11d3nlshyzh5aqf5vsvnjwhr9qn8a2kd848x0ylv91y9p9njgsl5";
+  };
+
+  libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome2; [
+    stdenv.cc.cc.lib
+    gdk_pixbuf
+    glib
+    gtk2
+    atk
+    pango
+    cairo
+    freetype
+    fontconfig
+    dbus
+    nss
+    nspr
+    alsaLib
+    cups
+    expat
+    udev
+    GConf
+    libX11
+    libxcb
+    libXi
+    libXcursor
+    libXdamage
+    libXrandr
+    libXcomposite
+    libXext
+    libXfixes
+    libXrender
+    libXtst
+    libXScrnSaver
+  ]);
+
+  desktopItem = makeDesktopItem {
+    name = "Avocode";
+    exec = "avocode";
+    icon = "avocode";
+    desktopName = "Avocode";
+    genericName = "Design Inspector";
+    categories = "Application;Development;";
+    comment = "The bridge between designers and developers";
+  };
+
+  buildInputs = [ unzip ];
+
+  # src is producing multiple folder on unzip so we must
+  # override unpackCmd to extract it into newly created folder
+  unpackCmd = ''
+    mkdir out
+    unzip $curSrc -d out
+  '';
+
+  installPhase = ''
+    substituteInPlace avocode.desktop.in \
+      --replace /path/to/avocode-dir/Avocode $out/bin/avocode \
+      --replace /path/to/avocode-dir/avocode.png avocode
+
+    mkdir -p share/applications share/pixmaps
+    mv avocode.desktop.in share/applications/avocode.desktop
+    mv avocode.png share/pixmaps/
+
+    rm resources/cjpeg
+    cp -av . $out
+
+    mkdir $out/bin
+    ln -s $out/avocode $out/bin/avocode
+    ln -s ${mozjpeg}/bin/cjpeg $out/resources/cjpeg
+  '';
+
+  postFixup = ''
+    for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do
+      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/avocode
+        patchelf --set-rpath ${libPath}:$out/ $file
+    done
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://avocode.com/;
+    description = "The bridge between designers and developers";
+    license = licenses.unfree;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ megheaiulian ];
+  };
+}

pkgs/applications/graphics/feh/default.nix

@@ -6,11 +6,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "feh-${version}";
-  version = "2.26";
+  version = "2.26.1";
 
   src = fetchurl {
     url = "https://feh.finalrewind.org/${name}.tar.bz2";
-    sha256 = "11kckzwk3b734l0n4j41k40liq1v2lbbj1gzir5qc386g7fvzmmi";
+    sha256 = "155clzkrzs7fh5nx924851di30hilcg16g192ldqqc12p5z5gikd";
   };
 
   outputs = [ "out" "man" "doc" ];

pkgs/applications/misc/dbeaver/default.nix

@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
   name = "dbeaver-ce-${version}";
-  version = "5.0.4";
+  version = "5.0.5";
 
   desktopItem = makeDesktopItem {
     name = "dbeaver";
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "https://dbeaver.jkiss.org/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
+    url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
-    sha256 = "0dfs2xa490dypp4qz8v0wj6d2bjnfqhjmlskpzrf8ih416lz1bd3";
+    sha256 = "1rcskrv8d3rjcfcn1sxzcaxnvmzgdsbjc9m11li8i4rln712ysza";
   };
 
   installPhase = ''
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://dbeaver.jkiss.org;
+    homepage = https://dbeaver.io/;
     description = "Universal SQL Client for developers, DBA and analysts. Supports MySQL, PostgreSQL, MariaDB, SQLite, and more";
     longDescription = ''
       Free multi-platform database tool for developers, SQL programmers, database

pkgs/applications/misc/keepass/default.nix

@@ -3,11 +3,11 @@
 
 with builtins; buildDotnetPackage rec {
   baseName = "keepass";
-  version = "2.39";
+  version = "2.39.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip";
-    sha256 = "05mrbzlkr2h42cls6xhas76dg8kyic4fijwckrh0b0qv5pp71c11";
+    sha256 = "0y69w9zzxqj7xrn632bw6bibrknjbx1k3qcvi9axn67sqmzaka00";
   };
 
   sourceRoot = ".";

pkgs/applications/misc/taskwarrior/default.nix

@@ -4,10 +4,8 @@ stdenv.mkDerivation rec {
   name = "taskwarrior-${version}";
   version = "2.5.1";
 
-  enableParallelBuilding = true;
-
   src = fetchurl {
-    url = "http://www.taskwarrior.org/download/task-${version}.tar.gz";
+    url = "https://taskwarrior.org/download/task-${version}.tar.gz";
     sha256 = "059a9yc58wcicc6xxsjh1ph7k2yrag0spsahp1wqmsq6h7jwwyyq";
   };
 
@@ -20,11 +18,13 @@ stdenv.mkDerivation rec {
     ln -s "../../doc/task/scripts/bash/task.sh" "$out/share/bash-completion/completions/task.bash"
     mkdir -p "$out/share/fish/vendor_completions.d"
     ln -s "../../../share/doc/task/scripts/fish/task.fish" "$out/share/fish/vendor_completions.d/"
+    mkdir -p "$out/share/zsh/site-functions"
+    ln -s "../../../share/doc/task/scripts/zsh/_task" "$out/share/zsh/site-functions/"
   '';
 
   meta = with stdenv.lib; {
     description = "Highly flexible command-line tool to manage TODO lists";
-    homepage = http://taskwarrior.org;
+    homepage = https://taskwarrior.org;
     license = licenses.mit;
     maintainers = with maintainers; [ marcweber jgeerds ];
     platforms = platforms.linux ++ platforms.darwin;

pkgs/applications/networking/browsers/links2/default.nix

@@ -8,12 +8,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.15";
+  version = "2.16";
   name = "links2-${version}";
 
   src = fetchurl {
     url = "${meta.homepage}/download/links-${version}.tar.bz2";
-    sha256 = "1jp3xyvp87a188b4kg5ycqahrazj7928zncgsznzn54w8d5iqahy";
+    sha256 = "0gsa2gpb1grhssl5jzpc5pa0zi21mxi8g25rh5bacl70slw31w42";
   };
 
   buildInputs = with stdenv.lib;

pkgs/applications/science/logic/elan/default.nix

@@ -2,7 +2,7 @@
 
 rustPlatform.buildRustPackage rec {
   name = "elan-${version}";
-  version = "0.3.2";
+  version = "0.5.0";
 
   cargoSha256 = "01d3s47fjszxx8s5gr3haxq3kz3hswkrkr8x97wx8l4nfhm8ndd2";
 
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
     owner = "kha";
     repo = "elan";
     rev = "v${version}";
-    sha256 = "13r110382dh7848lpn3mrhc5bgmj373sbpx1326ryx3wl5kfp8rs";
+    sha256 = "13zcqlyz0nwvd574llndrs7kvkznj6njljkq3v5j7kb3vndkj6i9";
   };
 
   nativeBuildInputs = [ pkgconfig ];

pkgs/applications/science/math/giac/default.nix

@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, fetchpatch, texlive, bison, flex
+{ stdenv, fetchurl, fetchpatch, texlive, bison, flex, liblapackWithoutAtlas
-, gmp, mpfr, pari, ntl, gsl, blas, mpfi, liblapackWithAtlas
+, gmp, mpfr, pari, ntl, gsl, blas, mpfi
 , readline, gettext, libpng, libao, gfortran, perl
 , enableGUI ? false, libGLU_combined ? null, xorg ? null, fltk ? null
 }:
@@ -37,11 +37,12 @@ stdenv.mkDerivation rec {
 
   # perl is only needed for patchShebangs fixup.
   buildInputs = [
-    gmp mpfr pari ntl gsl blas mpfi liblapackWithAtlas
+    gmp mpfr pari ntl gsl blas mpfi
     readline gettext libpng libao perl
     # gfortran.cc default output contains static libraries compiled without -fPIC
     # we want libgfortran.so.3 instead
     (stdenv.lib.getLib gfortran.cc)
+    liblapackWithoutAtlas
   ] ++ stdenv.lib.optionals enableGUI [
     libGLU_combined fltk xorg.libX11
   ];

pkgs/applications/science/misc/sasview/default.nix

@@ -1,7 +1,8 @@
-{lib, fetchgit, gcc, python}:
+{ lib, fetchFromGitHub, gcc, python }:
 
 let
-  xhtml2pdf = import ./xhtml2pdf.nix { inherit lib;
+  xhtml2pdf = import ./xhtml2pdf.nix {
+    inherit lib;
     fetchPypi = python.pkgs.fetchPypi;
     buildPythonPackage = python.pkgs.buildPythonPackage;
     html5lib = python.pkgs.html5lib;
@@ -10,17 +11,29 @@ let
     pillow = python.pkgs.pillow;
     pypdf2 = python.pkgs.pypdf2;
     reportlab = python.pkgs.reportlab;
-};
+  };
 
 in
 
 python.pkgs.buildPythonApplication rec {
   pname = "sasview";
-  version = "4.1.2";
+  version = "unstable-2018-05-05";
 
-  buildInputs = with python.pkgs; [
+  checkInputs = with python.pkgs; [
     pytest
-    unittest-xml-reporting];
+    unittest-xml-reporting
+  ];
+
+  checkPhase = ''
+    # fix the following error:
+    # imported module 'sas.sascalc.data_util.uncertainty' has this __file__ attribute:
+    #   /build/source/build/lib.linux-x86_64-2.7/sas/sascalc/data_util/uncertainty.py
+    # which is not the same as the test file we want to collect:
+    #   /build/source/dist/tmpbuild/sasview/sas/sascalc/data_util/uncertainty.py
+    rm -r dist/tmpbuild
+
+    HOME=$(mktemp -d) py.test
+  '';
 
   propagatedBuildInputs = with python.pkgs; [
     bumps
@@ -41,20 +54,22 @@ python.pkgs.buildPythonApplication rec {
     six
     sphinx
     wxPython
-    xhtml2pdf];
+    xhtml2pdf
+  ];
 
-  src = fetchgit {
+  src = fetchFromGitHub {
-    url = "https://github.com/SasView/sasview.git";
+    owner = "SasView";
-    rev = "v${version}";
+    repo = "sasview";
-    sha256 ="05la54wwzzlkhmj8vkr0bvzagyib6z6mgwqbddzjs5y1wd48vpcx";
+    rev = "de431924d0ddf73cfb952df88bd6661181947019";
+    sha256 = "01bk0i0g65yzyq16n1a61rgjna8rrc2i51x2ndf1z7khb1fl16vg";
   };
 
-  patches = [./pyparsing-fix.patch ./local_config.patch];
+  patches = [ ./pyparsing-fix.patch ./local_config.patch ];
 
-  meta = {
+  meta = with lib; {
     homepage = https://www.sasview.org;
     description = "Fitting and data analysis for small angle scattering data";
-    maintainers = with lib.maintainers; [ rprospero ];
+    maintainers = with maintainers; [ rprospero ];
-    license = lib.licenses.bsd3;
+    license = licenses.bsd3;
   };
 }

pkgs/applications/science/misc/sasview/local_config.patch

@@ -1,10 +1,22 @@
+diff --git a/src/sas/_config.py b/src/sas/_config.py
+index ece08fd4c..926768593 100644
 --- a/src/sas/_config.py
 +++ b/src/sas/_config.py
-@@ -70,2 +70,2 @@
+@@ -67,8 +67,8 @@ def load_local_config(app_dir):
+         logger.info("GuiManager loaded %s", path)
+         return module
+     except Exception as exc:
 -        logger.critical("Error loading %s: %s", path, exc)
 -        sys.exit()
 +        import sas.sasview.local_config
 +        return sas.sasview.local_config
--- 
+ 
-2.15.0
+ def make_custom_config_path(user_dir):
-
+     """
+@@ -116,4 +116,4 @@ def load_custom_config(path):
+ 
+     from sas.sasview import custom_config
+     logger.info("GuiManager custom_config defaults to sas.sasview.custom_config")
+-    return custom_config
+\ No newline at end of file
++    return custom_config

pkgs/applications/science/misc/sasview/pyparsing-fix.patch

@@ -1,8 +1,13 @@
+diff --git a/setup.py b/setup.py
+index 866ab7e36..78727b276 100755
 --- a/setup.py
 +++ b/setup.py
-@@ -5,1 +5,1 @@
+@@ -401,7 +401,7 @@ package_data['sas.sasview'] = ['images/*',
--    'bumps>=0.7.5.9', 'periodictable>=1.5.0', 'pyparsing<2.0.0',
+ packages.append("sas.sasview")
+ 
+ required = [
+-    'bumps>=0.7.5.9', 'periodictable>=1.5.0', 'pyparsing>=2.0.0',
 +    'bumps>=0.7.5.9', 'periodictable>=1.5.0',
--- 
+ 
-2.15.0
+     # 'lxml>=2.2.2',
-
+     'lxml', 'h5py',

pkgs/applications/virtualization/virt-manager/default.nix

@@ -3,6 +3,7 @@
 , gobjectIntrospection, libvirt-glib, system-libvirt
 , gsettings-desktop-schemas, glib, libosinfo, gnome3, gtk3
 , spiceSupport ? true, spice-gtk ? null
+, cpio, e2fsprogs, findutils, gzip
 }:
 
 with stdenv.lib;
@@ -47,6 +48,8 @@ python2Packages.buildPythonApplication rec {
 
   preFixup = ''
     gappsWrapperArgs+=(--set PYTHONPATH "$PYTHONPATH")
+    # these are called from virt-install in initrdinject.py
+    gappsWrapperArgs+=(--prefix PATH : "${makeBinPath [ cpio e2fsprogs file findutils gzip ]}")
   '';
 
   # Failed tests

pkgs/desktops/plasma-5/fetch.sh

@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma/5.12.4/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.12.5/ -A '*.tar.xz' )

pkgs/desktops/plasma-5/kde-gtk-config/default.nix

@@ -1,21 +1,25 @@
 {
   mkDerivation,
-  extra-cmake-modules,
+  extra-cmake-modules, wrapGAppsHook,
   glib, gtk2, gtk3, karchive, kcmutils, kconfigwidgets, ki18n, kiconthemes, kio,
   knewstuff, gsettings-desktop-schemas
 }:
 
 mkDerivation {
   name = "kde-gtk-config";
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook ];
+  dontWrapGApps = true;  # There is nothing to wrap
   buildInputs = [
     ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes
     knewstuff gsettings-desktop-schemas
   ];
-  patches = [ ./0001-follow-symlinks.patch ];
+  patches = [ ./patches/follow-symlinks.patch ./patches/gsettings.patch ];
   cmakeFlags = [
     "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
     "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
     "-DGLIB_SCHEMAS_DIR=${gsettings-desktop-schemas.out}/"
   ];
+  preConfigure = ''
+    NIX_CFLAGS_COMPILE+=" -DGSETTINGS_SCHEMAS_PATH=\"$GSETTINGS_SCHEMAS_PATH\""
+  '';
 }

pkgs/desktops/plasma-5/kde-gtk-config/patches/follow-symlinks.patch

@@ -8,11 +8,11 @@ Subject: [PATCH] follow symlinks
  src/iconthemesmodel.cpp | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/src/appearancegtk2.cpp b/src/appearancegtk2.cpp
+Index: kde-gtk-config-5.12.4/src/appearancegtk2.cpp
-index b1e0b52..095cddc 100644
+===================================================================
---- a/src/appearancegtk2.cpp
+--- kde-gtk-config-5.12.4.orig/src/appearancegtk2.cpp
-+++ b/src/appearancegtk2.cpp
++++ kde-gtk-config-5.12.4/src/appearancegtk2.cpp
-@@ -73,7 +73,7 @@ QString AppearanceGTK2::themesGtkrcFile(const QString& themeName) const
+@@ -69,7 +69,7 @@ QString AppearanceGTK2::themesGtkrcFile(
      QStringList themes=installedThemes();
      themes=themes.filter(QRegExp("/"+themeName+"/?$"));
      if(themes.size()==1) {
@@ -21,27 +21,24 @@ index b1e0b52..095cddc 100644
          while(it.hasNext()) {
              it.next();
              if(it.fileName()=="gtkrc") {
-diff --git a/src/iconthemesmodel.cpp b/src/iconthemesmodel.cpp
+Index: kde-gtk-config-5.12.4/src/iconthemesmodel.cpp
-index 07c7ad7..b04d978 100644
+===================================================================
---- a/src/iconthemesmodel.cpp
+--- kde-gtk-config-5.12.4.orig/src/iconthemesmodel.cpp
-+++ b/src/iconthemesmodel.cpp
++++ kde-gtk-config-5.12.4/src/iconthemesmodel.cpp
-@@ -46,7 +46,7 @@ QList<QDir> IconThemesModel::installedThemesPaths()
+@@ -47,7 +47,7 @@ QList<QDir> IconThemesModel::installedTh
-     
+ 
-     foreach(const QString& dir, dirs) {
+     foreach(const QString& dir, dirs) {
-         QDir userIconsDir(dir);
+         QDir userIconsDir(dir);
--        QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs|QDir::NoSymLinks);
+-        QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs|QDir::NoSymLinks);
-+        QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs);
++        QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs);
-         while(it.hasNext()) {
+         while(it.hasNext()) {
-             QString currentPath = it.next();
+             QString currentPath = it.next();
-             QDir dir(currentPath);
+             QDir dir(currentPath);
--- 
+Index: kde-gtk-config-5.12.4/src/cursorthemesmodel.cpp
-2.6.2
+===================================================================
-
+--- kde-gtk-config-5.12.4.orig/src/cursorthemesmodel.cpp
-diff --git a/src/cursorthemesmodel.cpp b/src/cursorthemesmodel.cpp
++++ kde-gtk-config-5.12.4/src/cursorthemesmodel.cpp
-index 926a666..85b10f8 100644
+@@ -47,7 +47,7 @@ QList<QDir> CursorThemesModel::installed
---- a/src/cursorthemesmodel.cpp
-+++ b/src/cursorthemesmodel.cpp
-@@ -47,7 +47,7 @@ QList<QDir> CursorThemesModel::installedThemesPaths()
  
      foreach(const QString& dir, dirs) {
          QDir userIconsDir(dir);

pkgs/desktops/plasma-5/kde-gtk-config/patches/gsettings.patch

@@ -0,0 +1,21 @@
+Index: kde-gtk-config-5.12.4/src/gtkconfigkcmodule.cpp
+===================================================================
+--- kde-gtk-config-5.12.4.orig/src/gtkconfigkcmodule.cpp
++++ kde-gtk-config-5.12.4/src/gtkconfigkcmodule.cpp
+@@ -78,6 +78,16 @@ GTKConfigKCModule::GTKConfigKCModule(QWi
+     m_iconsModel = new IconThemesModel(false, this);
+     ui->cb_icon->setModel(m_iconsModel);
+     ui->cb_icon_fallback->setModel(m_iconsModel);
++
++    // Add GSETTINGS_SCHEMAS_PATH to the front of XDG_DATA_DIRS.
++    // Normally this would be done by wrapGAppsHook, but this plugin
++    // (shared object) cannot be wrapped.
++    QByteArray xdgdata = qgetenv("XDG_DATA_DIRS");
++    if (!xdgdata.isEmpty()) {
++        xdgdata.push_front(":");
++    }
++    xdgdata.push_front(QByteArray(GSETTINGS_SCHEMAS_PATH));
++    qputenv("XDG_DATA_DIRS", xdgdata);
+     
+     m_tempGtk2Preview = QStandardPaths::writableLocation(QStandardPaths::TempLocation)+ "/gtkrc-2.0";
+     m_tempGtk3Preview = QStandardPaths::writableLocation(QStandardPaths::TempLocation)+ "/.config/gtk-3.0/settings.ini";

pkgs/desktops/plasma-5/kde-gtk-config/patches/series

@@ -0,0 +1,2 @@
+follow-symlinks.patch
+gsettings.patch

pkgs/desktops/plasma-5/srcs.nix

@@ -3,355 +3,355 @@
 
 {
   bluedevil = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/bluedevil-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/bluedevil-5.12.5.tar.xz";
-      sha256 = "1gr7zrs2h3xk6rc16wqh2fx40q6q2vm5nwk2fy9r6z639wyxhk2x";
+      sha256 = "0rjxvvg64g4panri4f09fgm571igdijfh92jp616pcqw8v1xqp2a";
-      name = "bluedevil-5.12.4.tar.xz";
+      name = "bluedevil-5.12.5.tar.xz";
     };
   };
   breeze = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/breeze-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/breeze-5.12.5.tar.xz";
-      sha256 = "12baji960mfkb9ynkhz6c2a76m8fwx4kvzwifwn40sxqv5m857w7";
+      sha256 = "1xxgyq3lhliv6p54akgpclficbcs2xdv15a92jkl8a2s9wbisk3n";
-      name = "breeze-5.12.4.tar.xz";
+      name = "breeze-5.12.5.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/breeze-grub-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/breeze-grub-5.12.5.tar.xz";
-      sha256 = "0jnpwznhfml9mshx9zl9wsi8s6ygfplfw4bycq1r9gyxzlcm9zvs";
+      sha256 = "1w9f2xm4abqcqk2pdb7hi7d4hd1krkhrs9j3zlncxahfvf67ljad";
-      name = "breeze-grub-5.12.4.tar.xz";
+      name = "breeze-grub-5.12.5.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/breeze-gtk-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/breeze-gtk-5.12.5.tar.xz";
-      sha256 = "183pj18ldhql845xd2lvd4klp6m2xiiaszprw83n7048s9b0bk4c";
+      sha256 = "0040z43r69kk8l90mvkk8xxzhaw35xm7z2w097sp8xd053y3pdqd";
-      name = "breeze-gtk-5.12.4.tar.xz";
+      name = "breeze-gtk-5.12.5.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/breeze-plymouth-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/breeze-plymouth-5.12.5.tar.xz";
-      sha256 = "1apv2jqcjmsfvj4xi736vqsly57wwzxv088hsqcryv3l4v4qkyfr";
+      sha256 = "15204zqk81rwmdq07jzaiv2aninbbgqmg76dhzcz43lckjfhczq9";
-      name = "breeze-plymouth-5.12.4.tar.xz";
+      name = "breeze-plymouth-5.12.5.tar.xz";
     };
   };
   discover = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/discover-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/discover-5.12.5.tar.xz";
-      sha256 = "1gyddpafis1yfhh1dz0zvjca8pxnq5z0xvwfbmyh062xmhfy66wq";
+      sha256 = "02fjs016825l35gc173mblii2x9ys5cisqw8niyyvllsls4rp27m";
-      name = "discover-5.12.4.tar.xz";
+      name = "discover-5.12.5.tar.xz";
     };
   };
   drkonqi = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/drkonqi-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/drkonqi-5.12.5.tar.xz";
-      sha256 = "0ijrhd689w6pg4biikfv7w6h5hwfjmsp7wcbpd2dq0xwjp3vnyb6";
+      sha256 = "0av0rqgc5a9c8lvpdphp3ifw56qc10qkbjhajlslagxswys73cfq";
-      name = "drkonqi-5.12.4.tar.xz";
+      name = "drkonqi-5.12.5.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kactivitymanagerd-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kactivitymanagerd-5.12.5.tar.xz";
-      sha256 = "1llni6dz8014r8gaihnaxg0nn6ihjvqy7bfyigfda6iz5gwfbpcg";
+      sha256 = "1mpldy47fklm9d91wjj734yw3j3pkfrj377b9c5d8l07agwnk2j1";
-      name = "kactivitymanagerd-5.12.4.tar.xz";
+      name = "kactivitymanagerd-5.12.5.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kde-cli-tools-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kde-cli-tools-5.12.5.tar.xz";
-      sha256 = "0w6iz9rqi9b6vy18jxksah5lr44211dhfgaxccm0gmggqpiqm5wb";
+      sha256 = "0gs0d9p2x3q6pvjj6l7f9xq741rfqgzhbxwvz1s3cx385b85lplh";
-      name = "kde-cli-tools-5.12.4.tar.xz";
+      name = "kde-cli-tools-5.12.5.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kdecoration-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kdecoration-5.12.5.tar.xz";
-      sha256 = "0njs3b05hvm5s04cfn56dc98yc8sw52hwlclx0qf1hqcsjmm8bnj";
+      sha256 = "0qd5pqm3s1wcmy49mry2plzivg6dhmdp521yahx0mmlk2bssxc3d";
-      name = "kdecoration-5.12.4.tar.xz";
+      name = "kdecoration-5.12.5.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kde-gtk-config-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kde-gtk-config-5.12.5.tar.xz";
-      sha256 = "00j2279z4b9qknip4rpaliwpwv25g3d6j9s0ajs151x94cl18wd6";
+      sha256 = "1p5vpk85v50dkm787ljf77xa7f25lamxf5jn2qc31r8dnlc25dnh";
-      name = "kde-gtk-config-5.12.4.tar.xz";
+      name = "kde-gtk-config-5.12.5.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kdeplasma-addons-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kdeplasma-addons-5.12.5.tar.xz";
-      sha256 = "0ggvxmsj4r25sjaap377i6ap2qkdhjqwslcjym9bcyys1lldbcg5";
+      sha256 = "1339sapqi0b6pzbsdyhpfssrvfg9sfc3amlfijxsn63swkjvbw2s";
-      name = "kdeplasma-addons-5.12.4.tar.xz";
+      name = "kdeplasma-addons-5.12.5.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kgamma5-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kgamma5-5.12.5.tar.xz";
-      sha256 = "1v19ay77vv8y37pxqainkrlh0lpajwxgx4xxra84gzd8g7l4zs0h";
+      sha256 = "0p4x8vzjngw7xxnnviiqw89lzs23nrq007211dprnfzgay9c571c";
-      name = "kgamma5-5.12.4.tar.xz";
+      name = "kgamma5-5.12.5.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/khotkeys-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/khotkeys-5.12.5.tar.xz";
-      sha256 = "1lj8axpimh34vbpgwnfhkh3f7njmqy7jihqk51vkq7ngcy1bmd6f";
+      sha256 = "1yivh10g66h9dmnabnxx1i26rpg8wf9ibpmc7jcmh7j4h5q0lkzg";
-      name = "khotkeys-5.12.4.tar.xz";
+      name = "khotkeys-5.12.5.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kinfocenter-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kinfocenter-5.12.5.tar.xz";
-      sha256 = "0dgybc8xa5lxgmw3nxfh5y085921qm5x6aw0233mwx3zj4v6nsj3";
+      sha256 = "1g42hk49fjg4rvgvy5phshk8mna3idh55gn4cy1w0q2rl8f0y6b5";
-      name = "kinfocenter-5.12.4.tar.xz";
+      name = "kinfocenter-5.12.5.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kmenuedit-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kmenuedit-5.12.5.tar.xz";
-      sha256 = "063509xbvpk2n86anpl2kcsb1v4zvx6ycwl1ppyjhgg4jim9p099";
+      sha256 = "0vbq2s1ibqna19njw421ai4qwq4apww74qcfgk7gwd6p75k37lkw";
-      name = "kmenuedit-5.12.4.tar.xz";
+      name = "kmenuedit-5.12.5.tar.xz";
     };
   };
   kscreen = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kscreen-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kscreen-5.12.5.tar.xz";
-      sha256 = "1pix8gfvgig5phvcqjc7yqvn1pgmdn6l8g56n06pijicrpksq315";
+      sha256 = "1cscy7vimznwy29qr0x11wqxlxcwxvybdhw703mj44bq1szw8s0l";
-      name = "kscreen-5.12.4.tar.xz";
+      name = "kscreen-5.12.5.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kscreenlocker-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kscreenlocker-5.12.5.tar.xz";
-      sha256 = "187c6azmbcfs5w18f450f75hikpvh3lhz7qn8zb93kfm65yvjz1m";
+      sha256 = "08l8knfvhrd3h8z70xq1jiq02bg56jdddxx0ml6jbd8ja9r1svdq";
-      name = "kscreenlocker-5.12.4.tar.xz";
+      name = "kscreenlocker-5.12.5.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/ksshaskpass-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/ksshaskpass-5.12.5.tar.xz";
-      sha256 = "0k405qp8ji84gd7h3lsyfhsya7z55kw2klj9a0ld9z5r7jpr95z5";
+      sha256 = "0vgqp09cfdlf22xxi0pdzdv0i4hrgvbfj3yrxrfqhfh9zlc3q6y4";
-      name = "ksshaskpass-5.12.4.tar.xz";
+      name = "ksshaskpass-5.12.5.tar.xz";
     };
   };
   ksysguard = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/ksysguard-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/ksysguard-5.12.5.tar.xz";
-      sha256 = "0svk5ggdbjqq9lg4ggwijy7nbwmn3mdkmvm1jqbd174myyd6hmwk";
+      sha256 = "11wh4skx3vjjrdfaa85a8ijdvsw3fnk02s1n9g6yv0c8h74q2nqv";
-      name = "ksysguard-5.12.4.tar.xz";
+      name = "ksysguard-5.12.5.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kwallet-pam-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kwallet-pam-5.12.5.tar.xz";
-      sha256 = "058xxqkyyiwn34iwbmapk6bk6fi3l1g4vwbf125vc9pcbx6nqn2q";
+      sha256 = "18pbsmc44pqbdylczqsx6cargzkkp4vcd44yk7mwjhniw8pi6x33";
-      name = "kwallet-pam-5.12.4.tar.xz";
+      name = "kwallet-pam-5.12.5.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kwayland-integration-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kwayland-integration-5.12.5.tar.xz";
-      sha256 = "1lcz12iqisls2icv4jmgjndlamz2zlfyd9lbn6j2hizz7riybsla";
+      sha256 = "05qcsqyw2n1hpdsiqjvg98i77kwgcdpsr0096nqr62pzf36bsqz3";
-      name = "kwayland-integration-5.12.4.tar.xz";
+      name = "kwayland-integration-5.12.5.tar.xz";
     };
   };
   kwin = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kwin-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kwin-5.12.5.tar.xz";
-      sha256 = "0br27craalz6vqcv2g7jkskk0ia91hrir1wf1phm2lrnn4yadgf8";
+      sha256 = "1mkmh90pl4pz1bb3n9zl6x6lxvr8xkj7r795qj70s9jxavl40fj3";
-      name = "kwin-5.12.4.tar.xz";
+      name = "kwin-5.12.5.tar.xz";
     };
   };
   kwrited = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kwrited-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kwrited-5.12.5.tar.xz";
-      sha256 = "0m2snmvyxfnmlhfpvghp3w6apmba7rna9xsp5szdzrxgrd92ibgy";
+      sha256 = "0vvlkr4w4vwgkl9sili63cwlp0lsxlnzwfwmhpa5nrwcjgbyfbmz";
-      name = "kwrited-5.12.4.tar.xz";
+      name = "kwrited-5.12.5.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/libkscreen-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/libkscreen-5.12.5.tar.xz";
-      sha256 = "1dq5mbz7vqz4dzgnpsxgmygnz00d7ziqs98qcdgfcbvkh0j4sqsr";
+      sha256 = "0hzdchkxlv5l3zx7lxzj0x44kn3086gxnhmas9w1n9b6qrf0sjb4";
-      name = "libkscreen-5.12.4.tar.xz";
+      name = "libkscreen-5.12.5.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/libksysguard-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/libksysguard-5.12.5.tar.xz";
-      sha256 = "09mqfr4dxiq4xs4ihrxvsa9wf8azmilpnl5jbi06pfw5bd1q6fpd";
+      sha256 = "0dbf3xx52xqyzaxvybmjra0z1lc3qcbb0aqmsga8rjj77bmj3kx9";
-      name = "libksysguard-5.12.4.tar.xz";
+      name = "libksysguard-5.12.5.tar.xz";
     };
   };
   milou = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/milou-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/milou-5.12.5.tar.xz";
-      sha256 = "0v0m4a0idah99dvsmgng6kmlcqwpwh1rbd2j9ih7ka1xmlshdml7";
+      sha256 = "0v0zkwmh7rzqbgw1ypqz18bd3gn3x8iag0q9lrk6zzpd66j2r1fc";
-      name = "milou-5.12.4.tar.xz";
+      name = "milou-5.12.5.tar.xz";
     };
   };
   oxygen = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/oxygen-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/oxygen-5.12.5.tar.xz";
-      sha256 = "1k9kls7xzwb49gwjlhyxhg2jn9zh034csbdlz0pnq9h1yzwph4wa";
+      sha256 = "0336bkvn8mqrbswnhg87ah7k3w7i99c8rfpfvhw5qq3mm6jvbi4l";
-      name = "oxygen-5.12.4.tar.xz";
+      name = "oxygen-5.12.5.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/plasma-desktop-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/plasma-desktop-5.12.5.tar.xz";
-      sha256 = "16g2vnbfd7nl61hfx7i6b3m0hms2aw4v85nbj8mf2i6csc1vzhmy";
+      sha256 = "0rm7j8n3yflzl6wpivmjsgrhc5arrnmzfg81arfs06gjdnvwnmd6";
-      name = "plasma-desktop-5.12.4.tar.xz";
+      name = "plasma-desktop-5.12.5.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/plasma-integration-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/plasma-integration-5.12.5.tar.xz";
-      sha256 = "0qdyckmm52d0bf0062v103hy5szqqgfbh4z6h9bbjcz5l372aklb";
+      sha256 = "14iciz6zjxrvig58hpqa51cj5r949xq9xgqvs8glzldzg34928sm";
-      name = "plasma-integration-5.12.4.tar.xz";
+      name = "plasma-integration-5.12.5.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/plasma-nm-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/plasma-nm-5.12.5.tar.xz";
-      sha256 = "1mvj41hxd42wk8ja186vxv080igrdza6sqbgcajk48r2klybpfzj";
+      sha256 = "1awnd9gdciwrwyl2xs9h778fizhnbw8wm8ddbqr8050v7fkc7fs6";
-      name = "plasma-nm-5.12.4.tar.xz";
+      name = "plasma-nm-5.12.5.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/plasma-pa-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/plasma-pa-5.12.5.tar.xz";
-      sha256 = "1mngqa9957m45ij73xp3lzp19hmwwq9h40ig39mwh20gm5jrdw56";
+      sha256 = "13z9shlnprbjgqy1w8lf3brjcvmh76fpl0xv3q2r7kvcgm1ndjdd";
-      name = "plasma-pa-5.12.4.tar.xz";
+      name = "plasma-pa-5.12.5.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/plasma-sdk-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/plasma-sdk-5.12.5.tar.xz";
-      sha256 = "1mw477p1z396gsbdx3m9cp0b2ljhqjw39grklg7l4cgrhiwrnjk2";
+      sha256 = "0rrwis63khq1b6shxrp5cj6dgz9lhrccs7752f7j73pi5fpmbz0g";
-      name = "plasma-sdk-5.12.4.tar.xz";
+      name = "plasma-sdk-5.12.5.tar.xz";
     };
   };
   plasma-tests = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/plasma-tests-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/plasma-tests-5.12.5.tar.xz";
-      sha256 = "13gq7mfimh4xd4f2vqaqri3f1v8nh7yixqppjip8s9mq3amf6xd9";
+      sha256 = "1rq8li7y3qf1ipyhy869lw3znmssf5grbh522qla4sn08d1lhxij";
-      name = "plasma-tests-5.12.4.tar.xz";
+      name = "plasma-tests-5.12.5.tar.xz";
     };
   };
   plasma-vault = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/plasma-vault-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/plasma-vault-5.12.5.tar.xz";
-      sha256 = "022vqjra25v9bw9j14j0a5jl9r08iqvzd5zn0dhz6l4bj0amcd8n";
+      sha256 = "0zrwsqcpkssrfhy2xgg4y2k2w6l7vyn7mqani9lw18i13vp2fh1d";
-      name = "plasma-vault-5.12.4.tar.xz";
+      name = "plasma-vault-5.12.5.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/plasma-workspace-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/plasma-workspace-5.12.5.tar.xz";
-      sha256 = "00n2i6hj0fqss69gmmdhf32sfybak3l1iw379ljc3l4k6b3kzmh7";
+      sha256 = "1vy5p22y6jckhm09171pjacdrndl7vak6grwvzg8bmhqk1ahzdwk";
-      name = "plasma-workspace-5.12.4.tar.xz";
+      name = "plasma-workspace-5.12.5.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/plasma-workspace-wallpapers-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/plasma-workspace-wallpapers-5.12.5.tar.xz";
-      sha256 = "1y2mqkql2nadq3npxjp5hr2vzq3i45b4xp7gzcjl9bb2wppmhv4j";
+      sha256 = "1p6kcakdw020pjwdfdhh1v8bha8r6j9934nid7vv7ldp388mq6a7";
-      name = "plasma-workspace-wallpapers-5.12.4.tar.xz";
+      name = "plasma-workspace-wallpapers-5.12.5.tar.xz";
     };
   };
   plymouth-kcm = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/plymouth-kcm-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/plymouth-kcm-5.12.5.tar.xz";
-      sha256 = "1aakf2qrbnnv2n2rp57jql6nvl9i5mxpy0f4f5bjlqjxhzjlwwkn";
+      sha256 = "1fv2b792d7bg5vdix823fks8capgbnda94fc8z91nsffa894p0i9";
-      name = "plymouth-kcm-5.12.4.tar.xz";
+      name = "plymouth-kcm-5.12.5.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.12.4";
+    version = "1-5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/polkit-kde-agent-1-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/polkit-kde-agent-1-5.12.5.tar.xz";
-      sha256 = "0wwk1cr4mh2csjv0xrahzwyxyg8znd839zz518hfxdcv9a1rba2q";
+      sha256 = "01plpzhj2fc2i3hjqb75skmyiy9dg3mw2h1sxsl7hxmbvm9fv9if";
-      name = "polkit-kde-agent-1-5.12.4.tar.xz";
+      name = "polkit-kde-agent-1-5.12.5.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/powerdevil-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/powerdevil-5.12.5.tar.xz";
-      sha256 = "043k0zhab6nqa1kc09d9d8jg7j1sd7jy0zhrwb66lf29yc6iyahx";
+      sha256 = "07f3kqvfqgqpz50fk8dwyr5z1hylli0k4ndlcp5mkybiraz1rdjk";
-      name = "powerdevil-5.12.4.tar.xz";
+      name = "powerdevil-5.12.5.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/sddm-kcm-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/sddm-kcm-5.12.5.tar.xz";
-      sha256 = "0bm8h5r4nin0hx1nfqya1lxcp93745shk6ifqrizgzw1ldqqyah7";
+      sha256 = "13qqyvq7rk7h65krjaqgil2rxjj7073arxp4bij5g534ckpwkz3h";
-      name = "sddm-kcm-5.12.4.tar.xz";
+      name = "sddm-kcm-5.12.5.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/systemsettings-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/systemsettings-5.12.5.tar.xz";
-      sha256 = "0af2vqnlwxa7ldra78y0gwq1cra227q49ww7w1cnvgq0il7cav4a";
+      sha256 = "0ackzdyfmssq6lh9dranc8nv6bhk633zq1mixibqhswl3pz8n4h8";
-      name = "systemsettings-5.12.4.tar.xz";
+      name = "systemsettings-5.12.5.tar.xz";
     };
   };
   user-manager = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/user-manager-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/user-manager-5.12.5.tar.xz";
-      sha256 = "1y144lw1a4q4pp9hw31lr806fpm1p397ibpbagcdr3xaka2z36lm";
+      sha256 = "1566scbw6f02gskwdc2kk6xcbbf7hq6jkz3ka1avkwmyi3xhh010";
-      name = "user-manager-5.12.4.tar.xz";
+      name = "user-manager-5.12.5.tar.xz";
     };
   };
   xdg-desktop-portal-kde = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/xdg-desktop-portal-kde-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/xdg-desktop-portal-kde-5.12.5.tar.xz";
-      sha256 = "18b97mbyfqvf2ygwrggi5zvkv8a9givqjlyaqi184h8mgndn044c";
+      sha256 = "1rmjwjx7x481607vp0pjxsabbjhm7qfqa0ax4ciqqlv676hcr5cv";
-      name = "xdg-desktop-portal-kde-5.12.4.tar.xz";
+      name = "xdg-desktop-portal-kde-5.12.5.tar.xz";
     };
   };
 }

pkgs/development/interpreters/clojure/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "clojure-${version}";
-  version = "1.9.0.375";
+  version = "1.9.0.381";
 
   src = fetchurl {
     url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
-    sha256 = "17a82dw5akhzlz4az9bh6s8rnz6nfgq50d8si0lwg212niq3c599";
+    sha256 = "18aqfjm6vbhlflxdnpcr9gib00zg2ys5hck4kfxr9rc4aylnn9pi";
   };
 
   buildInputs = [ makeWrapper ];

pkgs/development/libraries/accountsservice/default.nix

@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "accountsservice-${version}";
-  version = "0.6.47";
+  version = "0.6.49";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz";
-    sha256 = "038k7p2fqqcycwbh1ik4rjlnzddkf9j9wf0risjabccqj33znkp3";
+    sha256 = "032ndvs18gla49dvc9vg35cwczg0wpv2wscp1m3yjfdqdpams7i5";
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];

pkgs/development/libraries/libb2/default.nix

@@ -1,17 +1,26 @@
-{stdenv, fetchurl}:
+{ stdenv, hostPlatform, fetchurl, autoconf, automake, libtool }:
-with stdenv; with lib;
+
-mkDerivation rec {
+stdenv.mkDerivation rec {
-  name = "libb2-${meta.version}";
+  name = "libb2-${version}";
+  version = "0.98";
 
   src = fetchurl {
     url = "https://blake2.net/${name}.tar.gz";
-    sha256 = "7829c7309347650239c76af7f15d9391af2587b38f0a65c250104a2efef99051";
+    sha256 = "1852gh8wwnsghdb9zhxdhw0173plpqzk684npxbl4bzk1hhzisal";
   };
 
-  configureFlags = [ "--enable-fat=yes" ];
+  preConfigure = ''
+    patchShebangs autogen.sh
+    ./autogen.sh
+  '';
 
-  meta = {
+  configureFlags = stdenv.lib.optional hostPlatform.isx86 "--enable-fat=yes";
-    version = "0.97";
+
+  nativeBuildInputs = [ autoconf automake libtool ];
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
     description = "The BLAKE2 family of cryptographic hash functions";
     platforms = platforms.all;
     maintainers = with maintainers; [ dfoxfranke ];

pkgs/development/libraries/libressl/default.nix

@@ -26,7 +26,7 @@ let
 
     meta = with lib; {
       description = "Free TLS/SSL implementation";
-      homepage    = "http://www.libressl.org";
+      homepage    = "https://www.libressl.org";
       platforms   = platforms.all;
       maintainers = with maintainers; [ thoughtpolice wkennington fpletz globin ];
     };
@@ -43,4 +43,9 @@ in {
     version = "2.6.4";
     sha256 = "07yi37a2ghsgj2b4w30q1s4d2inqnix7ika1m21y57p9z71212k3";
   };
+
+  libressl_2_7 = generic {
+    version = "2.7.3";
+    sha256 = "1597kj9jy3jyw52ys19sd4blg2gkam5q0rqdxbnrnvnyw67hviqn";
+  };
 }

pkgs/development/ocaml-modules/bitstring/camlp4-git.patch

@@ -1,44 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index d040f4c..cc1a8f5 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -40,7 +40,7 @@ pkg_extlib	= @OCAML_PKG_extlib@
- enable_coverage = @enable_coverage@
- 
- OCAMLCFLAGS	= -g
--OCAMLCPACKAGES	=
-+OCAMLCPACKAGES	= -package camlp4
- OCAMLCLIBS	= -linkpkg
- OCAMLOPTFLAGS	= $(OCAMLCFLAGS)
- OCAMLOPTPACKAGES = $(OCAMLCPACKAGES)
-@@ -110,12 +110,13 @@ bitstring_persistent.cmi: bitstring_persistent.mli
- 	  -I +camlp4 -pp camlp4of -c $<
- 
- pa_bitstring.cmo: pa_bitstring.ml bitstring.cma bitstring_persistent.cma
--	$(OCAMLFIND) ocamlc bitstring.cma -I +camlp4 dynlink.cma camlp4lib.cma \
-+	$(OCAMLFIND) ocamlc $(OCAMLCPACKAGES) \
-+          bitstring.cma -I +camlp4 dynlink.cma camlp4lib.cma \
- 	  -pp camlp4of -c $< -o $@
- 
- bitstring-objinfo: bitstring_objinfo.cmo bitstring.cma bitstring_persistent.cma
- 	$(OCAMLFIND) ocamlc -I +camlp4 unix.cma dynlink.cma camlp4lib.cma \
--	  $(OCAMLCFLAGS) $(OCAMLCLIBS) \
-+	  $(OCAMLCFLAGS) $(OCAMLCLIBS) $(OCAMLCPACKAGES) \
- 	  bitstring.cma bitstring_persistent.cma \
- 	  $< -o $@
- 
-@@ -158,12 +159,13 @@ tests/test.bmpp: create_test_pattern
- 
- create_test_pattern: create_test_pattern.cmo
- 	$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -pp camlp4of \
--	  unix.cma -I +camlp4 dynlink.cma camlp4lib.cma \
-+	  unix.cma -I `ocamlfind query camlp4` dynlink.cma camlp4lib.cma \
- 	  $(OCAMLCLIBS) \
- 	  -I . bitstring.cma bitstring_persistent.cma $< -o $@
- 
- create_test_pattern.cmo: create_test_pattern.ml
- 	$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -pp camlp4of \
-+	  $(OCAMLCPACKAGES) \
- 	  unix.cma -I +camlp4 \
- 	  -I . -c $< -o $@
- 

pkgs/development/ocaml-modules/bitstring/default.nix

@@ -1,26 +1,31 @@
-{ stdenv, fetchurl, buildOcaml, time, autoconf, automake }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder
+, ppx_tools_versioned
+, ounit
+}:
 
-buildOcaml rec {
+stdenv.mkDerivation rec {
-  name = "bitstring";
+  name = "ocaml${ocaml.version}-bitstring-${version}";
-  version = "2.1.1";
+  version = "3.0.0";
-  src = fetchurl {
+  src = fetchFromGitHub {
-    url = http://github.com/xguerin/bitstring/archive/v2.1.1.tar.gz;
+    owner = "xguerin";
-    sha256 = "0vy8ibrxccii1jbsk5q6yh1kxjigqvi7lhhcmizvd5gfhf7mfyc8";
+    repo = "bitstring";
+    rev = "v${version}";
+    sha256 = "0r49qax7as48jgknzaq6p9rbpmrvnmlic713wzz5bj60j5h0396f";
   };
 
-  patches = [ ./camlp4-git.patch ./srcdir.patch ];
+  buildInputs = [ ocaml findlib jbuilder ppx_tools_versioned ounit ];
+
+  buildPhase = "jbuilder build";
 
-  buildInputs = [time autoconf automake];
   doCheck = true;
+  checkPhase = "jbuilder runtest";
 
-  createFindlibDestdir = true;
+  inherit (jbuilder) installPhase;
-  hasSharedObjects = true;
-
-  preConfigure = "./bootstrap";
 
   meta = with stdenv.lib; {
     description = "This library adds Erlang-style bitstrings and matching over bitstrings as a syntax extension and library for OCaml";
     homepage = https://github.com/xguerin/bitstring;
+    inherit (ocaml.meta) platforms;
     license = licenses.lgpl21Plus;
     maintainers = [ maintainers.maurer ];
   };

pkgs/development/ocaml-modules/bitstring/srcdir.patch

@@ -1,11 +0,0 @@
---- a/Makefile.in	2015-09-01 06:32:15.111441188 +0200
-+++ b/Makefile.in	2015-09-01 06:32:56.001084480 +0200
-@@ -125,7 +125,7 @@
- 
- byteswap.h: byteswap.in.h
- 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
--	  cat $(srcdir)/byteswap.in.h; \
-+	  cat $(top_srcdir)/byteswap.in.h; \
- 	} > $@-t
- 	mv -f $@-t $@
- 

pkgs/development/python-modules/Theano/default.nix

@@ -15,17 +15,24 @@
 , libgpuarray
 , cudaSupport ? false, cudatoolkit
 , cudnnSupport ? false, cudnn
+, nvidia_x11
 }:
 
 assert cudnnSupport -> cudaSupport;
 
+assert cudaSupport -> nvidia_x11 != null
+                   && cudatoolkit != null
+                   && cudnn != null;
+
 let
   extraFlags =
     lib.optionals cudaSupport [ "-I ${cudatoolkit}/include" "-L ${cudatoolkit}/lib" ]
-    ++ lib.optionals cudnnSupport [ "-I ${cudnn}/include" "-L ${cudnn}/lib" ];
+    ++ lib.optionals cudnnSupport [ "-I ${cudnn}/include" "-L ${cudnn}/lib" ]
+    ++ lib.optionals cudaSupport [ "-I ${libgpuarray}/include" "-L ${libgpuarray}/lib" ];
 
   gcc_ = writeScriptBin "g++" ''
     #!${stdenv.shell}
+    export NIX_CC_WRAPPER_${stdenv.cc.infixSalt}_TARGET_HOST=1
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE ${toString extraFlags}"
     exec ${gcc}/bin/g++ "$@"
   '';

pkgs/development/python-modules/libgpuarray/default.nix

@@ -9,10 +9,13 @@
 , nose
 , Mako
 , python
-, cudaSupport ? false, cudatoolkit
+, cudaSupport ? false, cudatoolkit , nvidia_x11
 , openclSupport ? true, ocl-icd, clblas
 }:
 
+assert cudaSupport -> nvidia_x11 != null
+                   && cudatoolkit != null;
+
 buildPythonPackage rec {
   pname = "libgpuarray";
   version = "0.7.5";
@@ -32,7 +35,7 @@ buildPythonPackage rec {
 
   libraryPath = lib.makeLibraryPath (
     []
-    ++ lib.optionals cudaSupport [ cudatoolkit.lib cudatoolkit.out ]
+    ++ lib.optionals cudaSupport [ cudatoolkit.lib cudatoolkit.out nvidia_x11 ]
     ++ lib.optionals openclSupport ([ clblas ] ++ lib.optional (!stdenv.isDarwin) ocl-icd)
   );
 

pkgs/servers/home-assistant/component-packages.nix

@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "0.69.0";
+  version = "0.69.1";
   components = {
     "abode" = ps: with ps; [  ];
     "ads" = ps: with ps; [  ];

pkgs/servers/home-assistant/default.nix

@@ -74,7 +74,7 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.69.0";
+  hassVersion = "0.69.1";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
@@ -89,7 +89,7 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "home-assistant";
     rev = version;
-    sha256 = "05hagifi1338law2mwwik2gjjw1ckjdjh0lg9l8ldsz999dkc2zz";
+    sha256 = "1y74zq1nah9k6rif8k384ri11h1f23ggr613f7qnn0107b23asr4";
   };
 
   propagatedBuildInputs = [

pkgs/servers/plex/default.nix

@@ -6,9 +6,9 @@
 let
   plexPass = throw "Plex pass has been removed at upstream's request; please unset nixpkgs.config.plex.pass";
   plexpkg = if enablePlexPass then plexPass else {
-    version = "1.9.6.4429";
+    version = "1.13.0.5023";
-    vsnHash = "23901a099";
+    vsnHash = "31d3c0c65";
-    sha256 = "0bmqf8b2d9h2h5q3n4ahs8y6a9aihj63rch7wd82rcr1l9xnqk9d";
+    sha256 = "b94d571bcd47bc3201fd7f54b910f5693cabd1b543d5d0b4705668b7b7c24602";
   };
 
 in stdenv.mkDerivation rec {

pkgs/servers/web-apps/matomo/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "matomo-${version}";
-  version = "3.4.0";
+  version = "3.5.0";
 
   src = fetchurl {
     # TODO: As soon as the tarballs are renamed as well on future releases, this should be enabled again
     # url = "https://builds.matomo.org/${name}.tar.gz";
     url = "https://builds.matomo.org/piwik-${version}.tar.gz";
-    sha256 = "1hnja8mvjvlbqgw7maa76lxd5hxxg7d5ggq9wyrff25mapj398wc";
+    sha256 = "1l656b194h7z3k52ywl7sfa2h6sxa5gf22wcfrp0pp07v9p6pc5f";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
   #   unix socket authentication only works with localhost,
   #   but password-based SQL authentication works with both.
   # TODO: is upstream interested in this?
+  # -> discussion at https://github.com/matomo-org/matomo/issues/12646
   patches = [ ./make-localhost-default-database-host.patch ];
 
   # this bootstrap.php adds support for getting PIWIK_USER_PATH

pkgs/servers/x11/xorg/overrides.nix

@@ -476,8 +476,6 @@ in
         dri2proto dri3proto kbproto xineramaproto resourceproto scrnsaverproto videoproto
         libXfont2
       ];
-      # fix_segfault: https://bugs.freedesktop.org/show_bug.cgi?id=91316
-      commonPatches = [ ];
       # XQuartz requires two compilations: the first to get X / XQuartz,
       # and the second to get Xvfb, Xnest, etc.
       darwinOtherX = overrideDerivation xorgserver (oldAttrs: {
@@ -494,11 +492,10 @@ in
       if (!isDarwin)
       then {
         outputs = [ "out" "dev" ];
-        buildInputs = [ makeWrapper args.libdrm ] ++ commonBuildInputs;
+        buildInputs = commonBuildInputs ++ [ args.libdrm args.mesa_noglu ];
         propagatedBuildInputs = [ libpciaccess args.epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [
           args.udev
         ];
-        patches = commonPatches;
         prePatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
           export CFLAGS+=" -D__uid_t=uid_t -D__gid_t=gid_t"
         '';
@@ -515,6 +512,7 @@ in
         ] ++ lib.optionals stdenv.hostPlatform.isMusl [
           "--disable-tls"
         ];
+
         postInstall = ''
           rm -fr $out/share/X11/xkb/compiled # otherwise X will try to write in it
           ( # assert() keeps runtime reference xorgserver-dev in xf86-video-intel and others
@@ -538,7 +536,7 @@ in
         ];
 
         # XQuartz patchset
-        patches = commonPatches ++ [
+        patches = [
           (args.fetchpatch {
             url = "https://github.com/XQuartz/xorg-server/commit/e88fd6d785d5be477d5598e70d105ffb804771aa.patch";
             sha256 = "1q0a30m1qj6ai924afz490xhack7rg4q3iig2gxsjjh98snikr1k";

pkgs/shells/xonsh/default.nix

@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "xonsh-${version}";
-  version = "0.6.1";
+  version = "0.6.3";
 
   src = fetchFromGitHub {
     owner = "scopatz";
     repo = "xonsh";
     rev = version;
-    sha256= "0lxjklwj267q0ikqab8p743sjvm44gq1w7mp80c7hgrn2ndvrypg";
+    sha256= "1893kkxvalx8ycjl27gixkh979kkp4ra00zb7m6a8cdllx6yhsgi";
   };
 
   LC_ALL = "en_US.UTF-8";

pkgs/tools/audio/beets/default.nix

@@ -174,6 +174,11 @@ in pythonPackages.buildPythonApplication rec {
       test/test_replaygain.py
   '';
 
+  postInstall = ''
+    mkdir -p $out/share/zsh/site-functions
+    cp extra/_beet $out/share/zsh/site-functions/
+  '';
+
   doCheck = true;
 
   preCheck = ''
@@ -222,7 +227,7 @@ in pythonPackages.buildPythonApplication rec {
 
   meta = {
     description = "Music tagger and library organizer";
-    homepage = http://beets.radbox.org;
+    homepage = http://beets.io;
     license = licenses.mit;
     maintainers = with maintainers; [ aszlig domenkozar pjones ];
     platforms = platforms.linux;

pkgs/tools/backup/borg/default.nix

@@ -44,11 +44,20 @@ python3Packages.buildPythonApplication rec {
     make -C docs man
     mkdir -p $out/share/man
     cp -R docs/_build/man $out/share/man/man1
+
+    mkdir -p $out/share/bash-completion/completions
+    cp scripts/shell_completions/bash/borg $out/share/bash-completion/completions/
+
+    mkdir -p $out/share/fish/vendor_completions.d
+    cp scripts/shell_completions/fish/borg.fish $out/share/fish/vendor_completions.d/
+
+    mkdir -p $out/share/zsh/site-functions
+    cp scripts/shell_completions/zsh/_borg $out/share/zsh/site-functions/
   '';
 
   meta = with stdenv.lib; {
     description = "A deduplicating backup program (attic fork)";
-    homepage = https://borgbackup.github.io/;
+    homepage = https://www.borgbackup.org;
     license = licenses.bsd3;
     platforms = platforms.unix; # Darwin and FreeBSD mentioned on homepage
     maintainers = with maintainers; [ flokli ];

pkgs/tools/misc/exa/default.nix

@@ -23,6 +23,20 @@ buildRustPackage rec {
     libiconv darwin.apple_sdk.frameworks.Security ]
   ;
 
+  postInstall = ''
+    mkdir -p $out/share/man/man1
+    cp contrib/man/exa.1 $out/share/man/man1/
+
+    mkdir -p $out/share/bash-completion/completions
+    cp contrib/completions.bash $out/share/bash-completion/completions/exa
+
+    mkdir -p $out/share/fish/vendor_completions.d
+    cp contrib/completions.fish $out/share/fish/vendor_completions.d/exa.fish
+
+    mkdir -p $out/share/zsh/site-functions
+    cp contrib/completions.zsh $out/share/zsh/site-functions/_exa
+  '';
+
   # Some tests fail, but Travis ensures a proper build
   doCheck = false;
 

pkgs/tools/misc/youtube-dl/default.nix

@@ -38,11 +38,16 @@ buildPythonApplication rec {
         ++ optional phantomjsSupport phantomjs2;
     in [ ''--prefix PATH : "${makeBinPath packagesToBinPath}"'' ];
 
+  postInstall = ''
+    mkdir -p $out/share/zsh/site-functions
+    cp youtube-dl.zsh $out/share/zsh/site-functions/_youtube-dl
+  '';
+
   # Requires network
   doCheck = false;
 
   meta = {
-    homepage = http://rg3.github.io/youtube-dl/;
+    homepage = https://rg3.github.io/youtube-dl/;
     repositories.git = https://github.com/rg3/youtube-dl.git;
     description = "Command-line tool to download videos from YouTube.com and other sites";
     longDescription = ''

pkgs/top-level/all-packages.nix

@@ -10895,9 +10895,10 @@ with pkgs;
 
   inherit (callPackages ../development/libraries/libressl { })
     libressl_2_5
-    libressl_2_6;
+    libressl_2_6
+    libressl_2_7;
 
-  libressl = libressl_2_5;
+  libressl = libressl_2_7;
 
   boringssl = callPackage ../development/libraries/boringssl { };
 
@@ -14773,6 +14774,8 @@ with pkgs;
 
   autotrace = callPackage ../applications/graphics/autotrace {};
 
+  avocode = callPackage ../applications/graphics/avocode {};
+
   milkytracker = callPackage ../applications/audio/milkytracker { };
 
   schismtracker = callPackage ../applications/audio/schismtracker { };

pkgs/top-level/python-packages.nix

@@ -7116,6 +7116,7 @@ in {
   libgpuarray = callPackage ../development/python-modules/libgpuarray {
     clblas = pkgs.clblas.override { boost = self.boost; };
     cudaSupport = pkgs.config.cudaSupport or false;
+    inherit (pkgs.linuxPackages) nvidia_x11;
   };
 
   librepo = toPythonModule (pkgs.librepo.override {
@@ -12987,6 +12988,7 @@ in {
   Theano = callPackage ../development/python-modules/Theano rec {
     cudaSupport = pkgs.config.cudaSupport or false;
     cudnnSupport = cudaSupport;
+    inherit (pkgs.linuxPackages) nvidia_x11;
   };
 
   TheanoWithoutCuda = self.Theano.override {