Merge branch 'master' into staging

doc/languages-frameworks/haskell.section.md

@@ -312,7 +312,7 @@ For example, installing the following environment
 allows one to browse module documentation index [not too dissimilar to
 this](https://downloads.haskell.org/~ghc/latest/docs/html/libraries/index.html)
 for all the specified packages and their dependencies by directing a browser of
-choice to `~/.nix-profiles/share/doc/hoogle/index.html` (or
+choice to `~/.nix-profile/share/doc/hoogle/index.html` (or
 `/run/current-system/sw/share/doc/hoogle/index.html` in case you put it in
 `environment.systemPackages` in NixOS).
 

maintainers/maintainer-list.nix

@@ -33,6 +33,11 @@
     github = "Anton-Latukha";
     name = "Anton Latukha";
   };
+  ariutta = {
+    email = "anders.riutta@gmail.com";
+    github = "ariutta";
+    name = "Anders Riutta";
+  };
   Baughn = {
     email = "sveina@gmail.com";
     github = "Baughn";
@@ -78,6 +83,11 @@
     github = "DmitryTsygankov";
     name = "Dmitry Tsygankov";
   };
+  Dje4321 = {
+    email = "dje4321@gmail.com";
+    github = "dje4321";
+    name = "Dje4321";
+  };
   Esteth = {
     email = "adam.copp@gmail.com";
     name = "Adam Copp";
@@ -2453,6 +2463,11 @@
     github = "meisternu";
     name = "Matt Miemiec";
   };
+  melsigl = {
+    email = "melanie.bianca.sigl@gmail.com";
+    github = "melsigl";
+    name = "Melanie B. Sigl";
+  };
   metabar = {
     email = "softs@metabarcoding.org";
     name = "Celine Mercier";

maintainers/scripts/nixpkgs-lint.pl

@@ -1,4 +1,5 @@
-#! /run/current-system/sw/bin/perl -w
+#! /usr/bin/env nix-shell
+#! nix-shell -i perl -p perl perlPackages.XMLSimple
 
 use strict;
 use List::Util qw(min);

nixos/modules/hardware/brightnessctl.nix

@@ -0,0 +1,30 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let
+  cfg = config.hardware.brightnessctl;
+in
+{
+
+  options = {
+
+    hardware.brightnessctl = {
+
+      enable = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Enable brightnessctl in userspace.
+          This will allow brightness control from users in the video group.
+        '';
+
+      };
+    };
+  };
+
+
+  config = mkIf cfg.enable {
+    services.udev.packages = with pkgs; [ brightnessctl ];
+  };
+
+}

nixos/modules/hardware/video/uvcvideo/default.nix

@@ -0,0 +1,64 @@
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.uvcvideo;
+
+  uvcdynctrl-udev-rules = packages: pkgs.callPackage ./uvcdynctrl-udev-rules.nix {
+    drivers = packages;
+    udevDebug = false;
+  };
+
+in
+
+{
+
+  options = {
+    services.uvcvideo.dynctrl = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable <command>uvcvideo</command> dynamic controls.
+
+          Note that enabling this brings the <command>uvcdynctrl</command> tool
+          into your environement and register all dynamic controls from
+          specified <command>packages</command> to the <command>uvcvideo</command> driver.
+        '';
+      };
+
+      packages = mkOption {
+        type = types.listOf types.path;
+        example = literalExample "[ pkgs.tiscamera ]";
+        description = ''
+          List of packages containing <command>uvcvideo</command> dynamic controls
+          rules. All files found in
+          <filename><replaceable>pkg</replaceable>/share/uvcdynctrl/data</filename>
+          will be included.
+
+          Note that these will serve as input to the <command>libwebcam</command>
+          package which through its own <command>udev</command> rule will register
+          the dynamic controls from specified packages to the <command>uvcvideo</command>
+          driver.
+        '';
+        apply = map getBin;
+      };
+    };
+  };
+
+  config = mkIf cfg.dynctrl.enable {
+
+    services.udev.packages = [
+      (uvcdynctrl-udev-rules cfg.dynctrl.packages)
+    ];
+
+    environment.systemPackages = [
+      pkgs.libwebcam
+    ];
+
+  };
+}

nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix

@@ -0,0 +1,46 @@
+{ lib
+, stdenv
+, buildEnv
+, libwebcam
+, makeWrapper
+, runCommand
+, drivers ? []
+, udevDebug ? false
+}:
+
+let
+  version = "0.0.0";
+
+  dataPath = buildEnv {
+    name = "uvcdynctrl-with-drivers-data-path";
+    paths = drivers ++ [ libwebcam ];
+    pathsToLink = [ "/share/uvcdynctrl/data" ];
+    ignoreCollisions = false;
+  };
+
+  dataDir = "${dataPath}/share/uvcdynctrl/data";
+  udevDebugVarValue = if udevDebug then "1" else "0";
+in
+
+runCommand "uvcdynctrl-udev-rules-${version}"
+{
+  inherit dataPath;
+  buildInputs = [
+    makeWrapper
+    libwebcam
+  ];
+  dontPatchELF = true;
+  dontStrip = true;
+}
+''
+  mkdir -p "$out/lib/udev"
+  makeWrapper "${libwebcam}/lib/udev/uvcdynctrl" "$out/lib/udev/uvcdynctrl" \
+    --set NIX_UVCDYNCTRL_DATA_DIR "${dataDir}" \
+    --set NIX_UVCDYNCTRL_UDEV_DEBUG "${udevDebugVarValue}"
+
+  mkdir -p "$out/lib/udev/rules.d"
+  cat "${libwebcam}/lib/udev/rules.d/80-uvcdynctrl.rules" | \
+    sed -r "s#RUN\+\=\"([^\"]+)\"#RUN\+\=\"$out/lib/udev/uvcdynctrl\"#g" > \
+    "$out/lib/udev/rules.d/80-uvcdynctrl.rules"
+''
+

nixos/modules/installer/scan/not-detected.nix

@@ -1,9 +1,6 @@
-# List all devices which are _not_ detected by nixos-generate-config.
+# Enables non-free firmware on devices not recognized by `nixos-generate-config`.
-# Common devices are enabled by default.
+{ lib, ... }:
-{ config, lib, pkgs, ... }:
-
-with lib;
 
 {
-  hardware.enableRedistributableFirmware = true;
+  hardware.enableRedistributableFirmware = lib.mkDefault true;
 }

nixos/modules/module-list.nix

@@ -29,6 +29,7 @@
   ./config/vpnc.nix
   ./config/zram.nix
   ./hardware/all-firmware.nix
+  ./hardware/brightnessctl.nix
   ./hardware/ckb.nix
   ./hardware/cpu/amd-microcode.nix
   ./hardware/cpu/intel-microcode.nix
@@ -50,6 +51,7 @@
   ./hardware/video/bumblebee.nix
   ./hardware/video/displaylink.nix
   ./hardware/video/nvidia.nix
+  ./hardware/video/uvcvideo/default.nix
   ./hardware/video/webcam/facetimehd.nix
   ./i18n/input-method/default.nix
   ./i18n/input-method/fcitx.nix

nixos/modules/services/databases/postgresql.nix

@@ -24,14 +24,13 @@ let
 
   postgresql = postgresqlAndPlugins cfg.package;
 
-  flags = optional cfg.enableTCPIP "-i";
-
   # The main PostgreSQL configuration file.
   configFile = pkgs.writeText "postgresql.conf"
     ''
       hba_file = '${pkgs.writeText "pg_hba.conf" cfg.authentication}'
       ident_file = '${pkgs.writeText "pg_ident.conf" cfg.identMap}'
       log_destination = 'stderr'
+      listen_addresses = '${if cfg.enableTCPIP then "*" else "localhost"}'
       port = ${toString cfg.port}
       ${cfg.extraConfig}
     '';
@@ -229,7 +228,7 @@ in
                 "${cfg.dataDir}/recovery.conf"
             ''}
 
-             exec postgres ${toString flags}
+             exec postgres
           '';
 
         serviceConfig =

nixos/modules/services/mail/opensmtpd.nix

@@ -10,7 +10,7 @@ let
 
   sendmail = pkgs.runCommand "opensmtpd-sendmail" {} ''
     mkdir -p $out/bin
-    ln -s ${pkgs.opensmtpd}/sbin/smtpctl $out/bin/sendmail
+    ln -s ${cfg.package}/sbin/smtpctl $out/bin/sendmail
   '';
 
 in {
@@ -27,6 +27,13 @@ in {
         description = "Whether to enable the OpenSMTPD server.";
       };
 
+      package = mkOption {
+        type = types.package;
+        default = pkgs.opensmtpd;
+        defaultText = "pkgs.opensmtpd";
+        description = "The OpenSMTPD package to use.";
+      };
+
       addSendmailToSystemPath = mkOption {
         type = types.bool;
         default = true;
@@ -97,7 +104,7 @@ in {
     systemd.services.opensmtpd = let
       procEnv = pkgs.buildEnv {
         name = "opensmtpd-procs";
-        paths = [ pkgs.opensmtpd ] ++ cfg.procPackages;
+        paths = [ cfg.package ] ++ cfg.procPackages;
         pathsToLink = [ "/libexec/opensmtpd" ];
       };
     in {
@@ -115,7 +122,7 @@ in {
         chown smtpq.root /var/spool/smtpd/purge
         chmod 700 /var/spool/smtpd/purge
       '';
-      serviceConfig.ExecStart = "${pkgs.opensmtpd}/sbin/smtpd -d -f ${conf} ${args}";
+      serviceConfig.ExecStart = "${cfg.package}/sbin/smtpd -d -f ${conf} ${args}";
       environment.OPENSMTPD_PROC_PATH = "${procEnv}/libexec/opensmtpd";
     };
 

nixos/modules/services/networking/networkmanager.nix

@@ -38,6 +38,8 @@ let
 
     [device]
     wifi.scan-rand-mac-address=${if cfg.wifi.scanRandMacAddress then "yes" else "no"}
+
+    ${cfg.extraConfig}
   '';
 
   /*
@@ -120,6 +122,14 @@ in {
         '';
       };
 
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Configuration appended to the generated NetworkManager.conf.
+        '';
+      };
+
       unmanaged = mkOption {
         type = types.listOf types.string;
         default = [];

nixos/modules/services/networking/xrdp.nix

@@ -97,6 +97,7 @@ in
     # xrdp can run X11 program even if "services.xserver.enable = false"
     environment.pathsToLink =
       [ "/etc/xdg" "/share/xdg" "/share/applications" "/share/icons" "/share/pixmaps" ];
+    fonts.enableDefaultFonts = mkDefault true;
 
     systemd = {
       services.xrdp = {

nixos/modules/services/security/tor.nix

@@ -360,7 +360,7 @@ in
 
                 <important>
                   <para>
-                    WARNING: THE FOLLOWING PARAGRAPH IS NOT LEGAL ADVISE.
+                    WARNING: THE FOLLOWING PARAGRAPH IS NOT LEGAL ADVICE.
                     Consult with your lawer when in doubt.
                   </para>
 

nixos/modules/services/web-apps/nexus.nix

@@ -13,6 +13,12 @@ in
     services.nexus = {
       enable = mkEnableOption "Sonatype Nexus3 OSS service";
 
+      package = mkOption {
+        type = types.package;
+        default = pkgs.nexus;
+        description = "Package which runs Nexus3";
+      };
+
       user = mkOption {
         type = types.str;
         default = "nexus";
@@ -55,10 +61,10 @@ in
           -XX:LogFile=${cfg.home}/nexus3/log/jvm.log
           -XX:-OmitStackTraceInFastThrow
           -Djava.net.preferIPv4Stack=true
-          -Dkaraf.home=${pkgs.nexus}
+          -Dkaraf.home=${cfg.package}
-          -Dkaraf.base=${pkgs.nexus}
+          -Dkaraf.base=${cfg.package}
-          -Dkaraf.etc=${pkgs.nexus}/etc/karaf
+          -Dkaraf.etc=${cfg.package}/etc/karaf
-          -Djava.util.logging.config.file=${pkgs.nexus}/etc/karaf/java.util.logging.properties
+          -Djava.util.logging.config.file=${cfg.package}/etc/karaf/java.util.logging.properties
           -Dkaraf.data=${cfg.home}/nexus3
           -Djava.io.tmpdir=${cfg.home}/nexus3/tmp
           -Dkaraf.startLocalConsole=false
@@ -112,7 +118,7 @@ in
         fi
       '';
 
-      script = "${pkgs.nexus}/bin/nexus run";
+      script = "${cfg.package}/bin/nexus run";
 
       serviceConfig = {
         User = cfg.user;

nixos/modules/system/boot/stage-1-init.sh

@@ -251,6 +251,9 @@ checkFS() {
     # Skip fsck for bcachefs - not implemented yet.
     if [ "$fsType" = bcachefs ]; then return 0; fi
 
+    # Skip fsck for nilfs2 - not needed by design and no fsck tool for this filesystem.
+    if [ "$fsType" = nilfs2 ]; then return 0; fi
+
     # Skip fsck for inherently readonly filesystems.
     if [ "$fsType" = squashfs ]; then return 0; fi
 

nixos/modules/tasks/filesystems/zfs.nix

@@ -431,6 +431,7 @@ in
           {
             requires = services;
             after = services;
+            wantedBy = [ "zfs.target" ];
           };
 
       systemd.targets."zfs".wantedBy = [ "multi-user.target" ];

pkgs/applications/audio/elisa/default.nix

@@ -7,13 +7,13 @@
 
 mkDerivation rec {
   name = "elisa-${version}";
-  version = "0.1";
+  version = "0.1.80";
 
   src = fetchFromGitHub {
     owner  = "KDE";
     repo   = "elisa";
-    rev    = version;
+    rev    = "v${version}";
-    sha256 = "13i0fkpwrskric3gfalh7mcpp4l2knwnq7jpq391lgh6krq04r4w";
+    sha256 = "1kyvdxbsfi692zazw8vjy6mwyy0sa4r1cim8gsiv9pphfh5bpxb1";
   };
 
   nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];

pkgs/applications/audio/gpodder/default.nix

@@ -5,7 +5,7 @@
 
 python3Packages.buildPythonApplication rec {
   name = "gpodder-${version}";
-  version = "3.10.1";
+  version = "3.10.2";
 
   format = "other";
 
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
     owner = "gpodder";
     repo = "gpodder";
     rev = version;
-    sha256 = "1cqhm5h0kkdb2m691dbj8i3bixl7bw0iww2pl6k1jkz8mgafyd9d";
+    sha256 = "0nbhyh44cympslcf4miwc2n1gccm5ghjf9slg0r8xnpvg921jv04";
   };
 
   postPatch = with stdenv.lib; ''

pkgs/applications/audio/lollypop/default.nix

@@ -0,0 +1,58 @@
+{ stdenv, fetchgit, meson, ninja, pkgconfig, wrapGAppsHook
+, appstream-glib, desktop-file-utils, gobjectIntrospection
+, python36Packages, gnome3, glib, gst_all_1 }:
+
+stdenv.mkDerivation rec  {  
+  version = "0.9.514";
+  name = "lollypop-${version}";
+
+  src = fetchgit {
+    url = "https://gitlab.gnome.org/World/lollypop";
+    rev = "refs/tags/${version}";
+    fetchSubmodules = true;
+    sha256 = "0ny8c5apldhhrcjl3wz01pbyjvf60b7xy39mpvbshvdpnqlnqsca";
+  };
+
+  nativeBuildInputs = with python36Packages; [
+    desktop-file-utils
+    meson
+    ninja
+    pkgconfig
+    wrapGAppsHook
+    wrapPython
+  ];
+
+  buildInputs = [
+    appstream-glib glib gobjectIntrospection
+  ] ++ (with gnome3; [
+    easytag gsettings_desktop_schemas gtk3 libsecret libsoup totem-pl-parser
+  ]) ++ (with gst_all_1; [
+    gst-libav gst-plugins-bad gst-plugins-base gst-plugins-good gst-plugins-ugly
+    gstreamer
+  ]);
+
+  pythonPath = with python36Packages; [
+    beautifulsoup4
+    gst-python
+    pillow
+    pycairo
+    pydbus
+    pygobject3
+    pylast
+  ];
+
+  postFixup = "wrapPythonPrograms";
+
+  postPatch = ''
+    chmod +x ./meson_post_install.py
+    patchShebangs ./meson_post_install.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A modern music player for GNOME";
+    homepage    = https://wiki.gnome.org/Apps/Lollypop;
+    license     = licenses.gpl3Plus;
+    maintainers = with maintainers; [ worldofpeace ];
+    platforms   = platforms.linux;
+  };
+}

pkgs/applications/audio/qjackctl/default.nix

@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }:
 
 stdenv.mkDerivation rec {
-  version = "0.5.1";
+  version = "0.5.2";
   name = "qjackctl-${version}";
 
   # some dependencies such as killall have to be installed additionally
 
   src = fetchurl {
     url = "mirror://sourceforge/qjackctl/${name}.tar.gz";
-    sha256 = "0jw1s4qh4qjxnysddjv3j2lchwlslj9p4iisv9i89d3m7pf1svs4";
+    sha256 = "0nqr5f82lry3i4if8wdmrqsw84m45ijyj4psll30plxx5732zzaz";
   };
 
   buildInputs = [

pkgs/applications/backup/deja-dup/default.nix

@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   name = "deja-dup-${version}";
-  version = "36.3";
+  version = "38.0";
 
   src = fetchurl {
-    url = "https://launchpad.net/deja-dup/36/${version}/+download/deja-dup-${version}.tar.xz";
+    url = "https://launchpad.net/deja-dup/${stdenv.lib.versions.major version}/${version}/+download/deja-dup-${version}.tar.xz";
-    sha256 = "08pwybzp7ynfcf0vqxfc3p8ir4gnzcv4v4cq5bwidbff9crklhrc";
+    sha256 = "1l3sa24v0v6xf312h36jikfi8zyx6z3nmc7pjzgdp7l89gkdm65v";
   };
 
   patches = [

pkgs/applications/display-managers/sddm/default.nix

@@ -16,15 +16,14 @@ in mkDerivation rec {
     sha256 = "1m35ly6miwy8ivsln3j1bfv0nxbc4gyqnj7f847zzp53jsqrm3mq";
   };
 
-  patches = [ ./sddm-ignore-config-mtime.patch ];
+  patches = [
+    ./sddm-ignore-config-mtime.patch
+    ./qt511.patch
+  ];
 
   postPatch =
-    # Module Qt5::Test must be included in `find_package` before it is used.
-    ''
-      sed -i CMakeLists.txt -e '/find_package(Qt5/ s|)| Test)|'
-    ''
     # Fix missing include for gettimeofday()
-    + ''
+    ''
       sed -e '1i#include <sys/time.h>' -i src/helper/HelperApp.cpp
     '';
 

pkgs/applications/display-managers/sddm/qt511.patch

@@ -0,0 +1,28 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 005c9ad..71b46d7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -93,7 +93,7 @@ find_package(XCB REQUIRED)
+ find_package(XKB REQUIRED)
+ 
+ # Qt 5
+-find_package(Qt5 5.6.0 CONFIG REQUIRED Core DBus Gui Qml Quick LinguistTools)
++find_package(Qt5 5.6.0 CONFIG REQUIRED Core DBus Gui Qml Quick LinguistTools Test)
+ 
+ # find qt5 imports dir
+ get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION)
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index c9d935a..bb85ddd 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -2,9 +2,8 @@ set(QT_USE_QTTEST TRUE)
+ 
+ include_directories(../src/common)
+ 
+-
+ set(ConfigurationTest_SRCS ConfigurationTest.cpp ../src/common/ConfigReader.cpp)
+ add_executable(ConfigurationTest ${ConfigurationTest_SRCS})
+ add_test(NAME Configuration COMMAND ConfigurationTest)
+ 
+-qt5_use_modules(ConfigurationTest Test)
++target_link_libraries(ConfigurationTest Qt5::Core Qt5::Test)

pkgs/applications/editors/jetbrains/default.nix

@@ -237,119 +237,119 @@ in
 
   clion = buildClion rec {
     name = "clion-${version}";
-    version = "2018.1.3";
+    version = "2018.1.5"; /* updated by script */
     description  = "C/C++ IDE. New. Intelligent. Cross-platform";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
-      sha256 = "0daj1ha7d9kxgb60mx2yzyj01m6ahw5d6wzs0vvwp5fh5qf4mpw5";
+      sha256 = "0hd58i531schyjlm99vff9bi5gjskdbsljd367k9zafjfh53z91l"; /* updated by script */
     };
     wmClass = "jetbrains-clion";
-    update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
+    update-channel = "CLion Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
   };
 
   datagrip = buildDataGrip rec {
     name = "datagrip-${version}";
-    version = "2018.1.3"; /* updated by script */
+    version = "2018.1.4"; /* updated by script */
     description = "Your Swiss Army Knife for Databases and SQL";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
-      sha256 = "0y959p9jsfqlf6cnj2k5m4bxc85yn5lv549rbacwicx4f0g6zp6r"; /* updated by script */
+      sha256 = "1m0qckq645jw7cj40m5vfgr212b8hji539skavch2j5s5fbqy3ln"; /* updated by script */
     };
     wmClass = "jetbrains-datagrip";
-    update-channel = "datagrip_2018_1";
+    update-channel = "DataGrip 2018.1";
   };
 
   goland = buildGoland rec {
     name = "goland-${version}";
-    version = "2018.1.3"; /* updated by script */
+    version = "2018.1.4"; /* updated by script */
     description = "Up and Coming Go IDE";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/go/${name}.tar.gz";
-      sha256 = "02nl6dssf2r4lk0fy40cvgm1m0nnfvaz2k6yygwzr35qmbsw2xjq"; /* updated by script */
+      sha256 = "1ipib91443sb27snnqik8rm3bm9w6gb5niildbd538lhc9agc9xb"; /* updated by script */
     };
     wmClass = "jetbrains-goland";
-    update-channel = "goland_release";
+    update-channel = "GoLand Release";
   };
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "2018.1.4"; /* updated by script */
+    version = "2018.1.5"; /* updated by script */
     description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
-      sha256 = "1qb425wg4690474g348yizhkcqcgigz2synp4blcfv4p0pg79ri6"; /* updated by script */
+      sha256 = "0bhajghwh5r5mdv3lbnq0xlr6669hid5kyzlsxnsfzc2z737zwc5"; /* updated by script */
     };
     wmClass = "jetbrains-idea-ce";
-    update-channel = "IDEA_Release";
+    update-channel = "IntelliJ IDEA Release";
   };
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "2018.1.4"; /* updated by script */
+    version = "2018.1.5"; /* updated by script */
     description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz";
-      sha256 = "0jn771z09bscnk283kwrki0zyzhh4v4n6mr2swbd0ccs9v12dx71"; /* updated by script */
+      sha256 = "046wyvk2f7vbh4zam1bbri4yxzb34q43rjpk6i6npxrb25jv6clx"; /* updated by script */
     };
     wmClass = "jetbrains-idea";
-    update-channel = "IDEA_Release";
+    update-channel = "IntelliJ IDEA Release";
   };
 
   phpstorm = buildPhpStorm rec {
     name = "phpstorm-${version}";
-    version = "2018.1.4"; /* updated by script */
+    version = "2018.1.6"; /* updated by script */
     description = "Professional IDE for Web and PHP developers";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
-      sha256 = "0rrcsn44va942nrznldjkxymir45q8gq1lf3f8vg1w3k87cfk1zp"; /* updated by script */
+      sha256 = "0v07sfg7ywawk6wb52zhr3753hscpxw3m53ppgw4n50dcdwx0kdn"; /* updated by script */
     };
     wmClass = "jetbrains-phpstorm";
-    update-channel = "PS2018.1";
+    update-channel = "PhpStorm 2018.1";
   };
 
   pycharm-community = buildPycharm rec {
     name = "pycharm-community-${version}";
-    version = "2018.1.3"; /* updated by script */
+    version = "2018.1.4"; /* updated by script */
     description = "PyCharm Community Edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "1cwrqdcp6hwr8wd234g120bblc4bjmhwxwsgj9mmxblj31c7c6an"; /* updated by script */
+      sha256 = "0frzasqh3jx7wcip4dnwdl9ap2g1nkx7anapwd416cxv4jj3r5ch"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm-ce";
-    update-channel = "PyCharm_Release";
+    update-channel = "PyCharm Release";
   };
 
   pycharm-professional = buildPycharm rec {
     name = "pycharm-professional-${version}";
-    version = "2018.1.3"; /* updated by script */
+    version = "2018.1.4"; /* updated by script */
     description = "PyCharm Professional Edition";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "1chri4cknfvvqhxy973dyf7dl5linqdxc97zshrzdqhmwq6y7580"; /* updated by script */
+      sha256 = "1kv1d5y2ph36aq91sq08lbz8hvfp765xi7m0hdwkhqdi2wkrpnkc"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm";
-    update-channel = "PyCharm_Release";
+    update-channel = "PyCharm Release";
   };
 
   rider = buildRider rec {
     name = "rider-${version}";
-    version = "2018.1"; /* updated by script */
+    version = "2018.1.2"; /* updated by script */
     description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz";
-      sha256 = "0jhzfi9r18hy6mig8rrrr2n55lrfn5ysa7h347w5yv2dm7kx09ib"; /* updated by script */
+      sha256 = "1jsj0g4mv7fci3jgwx9skaz2m40g3ray2n17djaln08731rls5cc"; /* updated by script */
     };
     wmClass = "jetbrains-rider";
-    update-channel = "rider_2018_1";
+    update-channel = "Rider 2018.1.2";
   };
 
   ruby-mine = buildRubyMine rec {
@@ -362,20 +362,20 @@ in
       sha256 = "033rjsx6zjrfbl89i513ms14iw53ip56h4bkilrij32hshb7c2c5"; /* updated by script */
     };
     wmClass = "jetbrains-rubymine";
-    update-channel = "rm2018.1";
+    update-channel = "RubyMine 2018.1";
   };
 
   webstorm = buildWebStorm rec {
     name = "webstorm-${version}";
-    version = "2018.1.3"; /* updated by script */
+    version = "2018.1.5"; /* updated by script */
     description = "Professional IDE for Web and JavaScript development";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
-      sha256 = "03nhs4vmqbm5s4ykjz475nvcbwvp2hb0bq5ijfjxwayj3jgv0zbm"; /* updated by script */
+      sha256 = "1mqms8gzmsaqvwzfk821vj1z1cxdgjw5nnwq63mag6rly04h60n6"; /* updated by script */
     };
     wmClass = "jetbrains-webstorm";
-    update-channel = "WS_Release";
+    update-channel = "WebStorm Release";
   };
 
 }

pkgs/applications/editors/jetbrains/update.pl

@@ -17,7 +17,7 @@ sub get_latest_versions {
   my @channels = get("http://www.jetbrains.com/updates/updates.xml") =~ /(<channel .+?<\/channel>)/gs;
   my %h = {};
   for my $ch (@channels) {
-    my ($id) = $ch =~ /^<channel id="([^"]+)"/;
+    my ($id) = $ch =~ /^<channel id="[^"]+" name="([^"]+)"/;
     my @builds = $ch =~ /(<build .+?<\/build>)/gs;
     my $latest_build = reduce {
       my ($aversion) = $a =~ /^<build [^>]*version="([^"]+)"/; die "no version in $a" unless $aversion;

pkgs/applications/graphics/mozjpeg/default.nix

@@ -1,19 +1,17 @@
-{ stdenv, fetchurl, file, pkgconfig, libpng, nasm }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libpng, nasm }:
 
 stdenv.mkDerivation rec {
-  version = "3.2";
+  version = "3.3.1";
   name = "mozjpeg-${version}";
 
-  src = fetchurl {
+  src = fetchFromGitHub {
-    url = "https://github.com/mozilla/mozjpeg/releases/download/v${version}/mozjpeg-${version}-release-source.tar.gz";
+    owner = "mozilla";
-    sha256 = "0wvv5qh1jasz8apq93c3j9d5wd22j7lld9dr06p76yj4mpnc3v4a";
+    repo = "mozjpeg";
+    rev = "v${version}";
+    sha256 = "1na68860asn8b82ny5ilwbhh4nyl9gvx2yxmm4wr2v1v95v51fky";
   };
 
-  postPatch = ''
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
-    sed -i -e "s!/usr/bin/file!${file}/bin/file!g" configure
-  '';
-
-  nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libpng nasm ];
 
   meta = {

pkgs/applications/kde/fetch.sh

@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/applications/18.04.1/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/applications/18.04.2/ -A '*.tar.xz' )

pkgs/applications/misc/calibre/default.nix

@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.25.0";
+  version = "3.26.1";
   name = "calibre-${version}";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "018gxjbj5rak4ys5nyx6749rj9vszlf9k1wdcpl60ap3l83kxdnd";
+    sha256 = "0i53095g6wl3ghhpzfrvizj24b8zxbxs1c7bvcj3fpkf43wd45j0";
   };
 
   patches = [

pkgs/applications/misc/copyq/default.nix

@@ -1,22 +1,23 @@
-{ stdenv, fetchFromGitHub, cmake, qtbase, qtscript, qtwebkit, libXfixes, libXtst, git
+{ stdenv, fetchFromGitHub, cmake, qtbase, qtscript, qtwebkit, libXfixes, libXtst
+, qtx11extras, git
 , webkitSupport ? true
 }:
 
 stdenv.mkDerivation rec {
   name = "CopyQ-${version}";
-  version = "3.3.1";
+  version = "3.5.0";
 
   src  = fetchFromGitHub {
     owner = "hluk";
     repo = "CopyQ";
     rev = "v${version}";
-    sha256 = "1jjb979dwdnkjca95yxzapbjpd6hr97hxz7sn614whvdv4vvpnyc";
+    sha256 = "0hzdv6rhjpq9yrfafnkc6d8m5pzw9qr520vsjf2gn1819gdybmr0";
   };
 
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [
-    git qtbase qtscript libXfixes libXtst
+    git qtbase qtscript libXfixes libXtst qtx11extras
   ] ++ stdenv.lib.optional webkitSupport qtwebkit;
 
   meta = with stdenv.lib; {

pkgs/applications/misc/dbeaver/default.nix

@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
   name = "dbeaver-ce-${version}";
-  version = "5.1.0";
+  version = "5.1.1";
 
   desktopItem = makeDesktopItem {
     name = "dbeaver";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
-    sha256 = "041wqlipkwk4xp3qa4rrwyw6rgsn1ppv25qb4h2mkhrsjcjagqhj";
+    sha256 = "1ll1q585b7yca9jrgg7iw7i6xhyy1wc9q8hjqj1g3gzdagbrf396";
   };
 
   installPhase = ''

pkgs/applications/misc/hugo/default.nix

@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "hugo-${version}";
-  version = "0.40.3";
+  version = "0.42.1";
 
   goPackagePath = "github.com/gohugoio/hugo";
 
@@ -10,11 +10,15 @@ buildGoPackage rec {
     owner  = "gohugoio";
     repo   = "hugo";
     rev    = "v${version}";
-    sha256 = "08d4y6x19cd4qy9pf80zrqarcyarbzxph0yp8mfb1sp2bvq42308";
+    sha256 = "17m8bkldvnd7yyzxi4rc8vv3qfypjzik38bjy4qavb7sjdjmfij9";
   };
 
   goDeps = ./deps.nix;
 
+  postInstall = ''
+    rm $bin/bin/generate
+  '';
+
   meta = with stdenv.lib; {
     description = "A fast and modern static website engine.";
     homepage = https://gohugo.io;

pkgs/applications/misc/hugo/deps.nix

@@ -32,8 +32,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/alecthomas/chroma";
-      rev = "222a1f0fc811afd47471d4a4e32f3aa09b6f9cdf";
+      rev = "d7b2ed20a4989ab604703f61f86523560f8a6a87";
-      sha256 = "090yb9f9gld4l0r6x8y2a6a3ghiqbyh19fgmjcjfq8qlv0vj5n4s";
+      sha256 = "0ni2ncck787sxk9gl14xnyjnw4y27ipypjf4kc00g635fvc64ik6";
     };
   }
   {
@@ -86,8 +86,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/disintegration/imaging";
-      rev = "bbcee2f5c9d5e94ca42c8b50ec847fec64a6c134";
+      rev = "5e63c9a565d0a3260d23d060a795783dab90fefe";
-      sha256 = "0dzwqy1xcm0d481z1fa2r60frdlf5fzjligpiqh5g8lhqskk2lx8";
+      sha256 = "1mmiz439lygi30dj1rbps57iqh762jkinnpb4wfl382v4h136qvp";
     };
   }
   {
@@ -122,8 +122,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/gobuffalo/envy";
-      rev = "ef60bfc50c8f92d1ee64674d8ce7a48f1f67625e";
+      rev = "2d0f467653f3d961ce9ada4d32a230bdcb3bfe11";
-      sha256 = "15qrmw3l2achpd3hz8fkkz7yzpbvldm1pf1vsr250q24nsh6x7iz";
+      sha256 = "0p9raqrsqg2z1hq2kbvbq5qcwqihjqf28xnfh62214p7ak9b9x8n";
     };
   }
   {
@@ -140,8 +140,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/gorilla/websocket";
-      rev = "21ab95fa12b9bdd8fecf5fa3586aad941cc98785";
+      rev = "5ed622c449da6d44c3c8329331ff47a9e5844f71";
-      sha256 = "1ygg6cr84461d6k3nzbja0dxhcgf5zvry2w10f6i7291ghrcwhyy";
+      sha256 = "1yhcwraijdk6lx7f6m9p6i1b3zfh2hq80l1nfpnckfn10gh72aw7";
     };
   }
   {
@@ -203,8 +203,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/magiconair/properties";
-      rev = "2c9e9502788518c97fe44e8955cd069417ee89df";
+      rev = "c2353362d570a7bfa228149c62842019201cfb71";
-      sha256 = "1w0rl9rla61m0qbha75jg48yiq1vs91sfy96rgqa6nags9v9b1rl";
+      sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
     };
   }
   {
@@ -212,8 +212,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/markbates/inflect";
-      rev = "fbc6b23ce49e2578f572d2e72bb72fa03c7145de";
+      rev = "84854b5b4c0dbb0c107480d480a71f7db1fc7dae";
-      sha256 = "10rf7kfqnic8x4z8c29whb76w9v847y63wh5b2kfx6rqhrjfilis";
+      sha256 = "0b7shs0mxhkl7v7mwp799n7jgjsdbgi81f5hbaz2b936gbxksw7d";
     };
   }
   {
@@ -239,8 +239,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/mitchellh/mapstructure";
-      rev = "00c29f56e2386353d58c599509e8dc3801b0d716";
+      rev = "bb74f1db0675b241733089d5a1faa5dd8b0ef57b";
-      sha256 = "1vw8fvhax0d567amgvxr7glcl12lvzg2sbzs007q5k5bbwn1szyb";
+      sha256 = "1aqk9qr46bwgdc5j7n7als61xvssvyjf4qzfsvhacl4izpygqnw7";
     };
   }
   {
@@ -257,8 +257,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/nicksnyder/go-i18n";
-      rev = "8c6996ea1058153460146b16c341a4ae611f7cf7";
+      rev = "f6ac3d9cf0c4b6a32527779e992ebde26bd3d948";
-      sha256 = "1k8ai8mdi5cqbcxihzx727z3gg46lpkw0s1byb3lrdnmp31l7p9r";
+      sha256 = "1vg25khaf7lr90xwf97bsyn873cdi1j7nxh68s80jrg2a86zw0ff";
     };
   }
   {
@@ -275,8 +275,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/pelletier/go-toml";
-      rev = "66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12";
+      rev = "c01d1270ff3e442a8a57cddc1c92dc1138598194";
-      sha256 = "1n8na0yg90gm0rpifmzrby5r385vvd62cdam3ls7ssy02bjvfw15";
+      sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy";
     };
   }
   {
@@ -302,8 +302,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/afero";
-      rev = "63644898a8da0bc22138abf860edaf5277b6102e";
+      rev = "787d034dfe70e44075ccc060d346146ef53270ad";
-      sha256 = "13piahaq4vw1y1sklq5scrsflqx0a8hzmdqfz1fy4871kf2gl8qw";
+      sha256 = "0138rjiacl71h7kvhzinviwvy6qa2m6rflpv9lgqv15hnjvhwvg1";
     };
   }
   {
@@ -320,8 +320,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/cobra";
-      rev = "ef82de70bb3f60c65fb8eebacbb2d122ef517385";
+      rev = "1e58aa3361fd650121dceeedc399e7189c05674a";
-      sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd";
+      sha256 = "1d6dy60dw7i2mcab10yp99wi5w28jzhzzf16w4ys6bna7ymndiin";
     };
   }
   {
@@ -356,8 +356,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/pflag";
-      rev = "583c0c0531f06d5278b7d917446061adc344b5cd";
+      rev = "3ebe029320b2676d667ae88da602a5f854788a8a";
-      sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5";
+      sha256 = "11yxs0wqy70wj106fkz8r923yg4ncnc2mbw33v48zmlg4a1rasgp";
     };
   }
   {
@@ -383,8 +383,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/image";
-      rev = "f315e440302883054d0c2bd85486878cb4f8572c";
+      rev = "af66defab954cb421ca110193eed9477c8541e2a";
-      sha256 = "010pc6qjppqd9c7rramiwz7myvip9vhridfxy7wc2qj1kr92b4dc";
+      sha256 = "0dgi7svwzs37c7m5dz2jig3xr45fyjihhr8cg0x8nc8sc8fsyq4h";
     };
   }
   {
@@ -392,8 +392,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "f73e4c9ed3b7ebdd5f699a16a880c2b1994e50dd";
+      rev = "db08ff08e8622530d9ed3a0e8ac279f6d4c02196";
-      sha256 = "1mvnpln6vm0y1i5bb0ycswds49hyapg3jz643lmlw6d183jdcg0q";
+      sha256 = "1f6q8kbijnrfy6wjqxrzgjf38ippckc5w34lhqsjs7kq045aar9a";
     };
   }
   {
@@ -410,8 +410,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev = "64746a42f36bf0832f86b76004f1699dbeb33e4f";
+      rev = "6c888cc515d3ed83fc103cf1d84468aad274b0a7";
-      sha256 = "1hbk7cnbywiwxdzbx7lqw6iym9dpwvdyacg06gchxpfw7nfa9r27";
+      sha256 = "18anqrdajp4p015v3f5y641k3lmgp2jr0lfyx0pb3ia0qvn93mrp";
     };
   }
   {
@@ -419,8 +419,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/text";
-      rev = "7922cc490dd5a7dbaa7fd5d6196b49db59ac042f";
+      rev = "5c1cf69b5978e5a34c5f9ba09a83e56acc4b7877";
-      sha256 = "06sicjc24hv7v9p1l6psaq87w4lycx3mjixd6gsd1wnd4jhqvlnr";
+      sha256 = "03br8p1sb1ffr02l8hyrgcyib7ms0z06wy3v4r1dj2l6q4ghwzfs";
     };
   }
   {

pkgs/applications/misc/jgmenu/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "jgmenu-${version}";
-  version = "0.9";
+  version = "1.0";
 
   src = fetchFromGitHub {
     owner = "johanmalm";
     repo = "jgmenu";
     rev = "v${version}";
-    sha256 = "17xxz5qyz92sjppsvzjl2v012yb3s5p519cv8xf2hd41j7sh9ym1";
+    sha256 = "068mm0b2npz6qh9j8m9xd8sbznjp5g195vfav8a6016wgm6fhrx7";
   };
 
   nativeBuildInputs = [

pkgs/applications/misc/lyx/default.nix

@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, python, file, bc
+{ fetchurl, stdenv, pkgconfig, python, file, bc, fetchpatch
 , qtbase, qtsvg, hunspell, makeWrapper #, mythes, boost
 }:
 
@@ -35,6 +35,13 @@ stdenv.mkDerivation rec {
       --prefix PATH : '${python}/bin'
   '';
 
+  patches = [
+    (fetchpatch {
+      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-office/lyx/files/lyx-2.3.0-qt-5.11.patch?id=07e82fd1fc07bf055c78b81eaa128f8f837da80d";
+      sha256 = "1bnx0il2iv36lnrnyb370wyvww0rd8bphcy6z8d7zmvd3pwhyfql";
+    })
+  ];
+
   meta = with stdenv.lib; {
     description = "WYSIWYM frontend for LaTeX, DocBook";
     homepage = http://www.lyx.org;

pkgs/applications/misc/mupdf/default.nix

@@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
 
   patches = [
     (fetchpatch {
-      # CVE-2018-10289
+      name = "CVE-2018-10289.patch";
       url = "https://bugs.ghostscript.com/attachment.cgi?id=15230";
       sha256 = "0jmpacxd9930g6k57kda9jrcrbk75whdlv8xwmqg5jwn848qvy4q";
     })

pkgs/applications/misc/slic3r/prusa3d.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, makeWrapper, which, cmake, perl, perlPackages,
   boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, bash, libGLU,
-  glew, eigen }:
+  glew, eigen, curl }:
 let
   AlienWxWidgets = perlPackages.buildPerlPackage rec {
     name = "Alien-wxWidgets-0.69";
@@ -33,12 +33,13 @@ let
 in
 stdenv.mkDerivation rec {
   name = "slic3r-prusa-edition-${version}";
-  version = "1.39.2";
+  version = "1.40.0";
 
   enableParallelBuilding = true;
 
   buildInputs = [
     cmake
+    curl
     perl
     makeWrapper
     eigen
@@ -73,6 +74,8 @@ stdenv.mkDerivation rec {
 
   prePatch = ''
     sed -i 's|"/usr/include/asm-generic/ioctls.h"|<asm-generic/ioctls.h>|g' xs/src/libslic3r/GCodeSender.cpp
+    sed -i "s|\''${PERL_VENDORARCH}|$out/lib/slic3r-prusa3d|g" xs/CMakeLists.txt
+    sed -i "s|\''${PERL_VENDORLIB}|$out/lib/slic3r-prusa3d|g" xs/CMakeLists.txt
   '';
 
   postInstall = ''
@@ -82,14 +85,14 @@ stdenv.mkDerivation rec {
 
     # it seems we need to copy the icons...
     mkdir -p $out/bin/var
-    cp ../resources/icons/* $out/bin/var/
+    cp -r ../resources/icons/* $out/bin/var/
     cp -r ../resources $out/bin/
   '';
 
   src = fetchFromGitHub {
     owner = "prusa3d";
     repo = "Slic3r";
-    sha256 = "0vbqkmd2yqi469ijqm4wyzjmq9w1kwiy8av1kchm4429z5hpmxcd";
+    sha256 = "1cisplrfv6y9ijgl5bs46bxxmid5hl71hjzl73bay2i2bl8hid2f";
     rev = "version_${version}";
   };
 

pkgs/applications/misc/tilix/default.nix

@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "tilix-${version}";
-  version = "1.7.1";
+  version = "1.8.1";
 
   src = fetchFromGitHub {
     owner = "gnunn1";
     repo = "tilix";
     rev = "${version}";
-    sha256 = "0x0bnb26hjvxmvvd7c9k8fw97gcm3z5ssr6r8x90xbyyw6h58hhh";
+    sha256 = "19dx3hlj40cqwph98pcifkm6axfszfr0v9k6sr3caw4ycml84ci1";
   };
 
   nativeBuildInputs = [
@@ -20,7 +20,10 @@ stdenv.mkDerivation rec {
   buildInputs = [ gnome3.dconf gettext gsettings-desktop-schemas gtkd dbus ];
 
   preBuild = ''
-    makeFlagsArray=(PERL5LIB="${perlPackages.Po4a}/lib/perl5")
+    makeFlagsArray=(
+      PERL5LIB="${perlPackages.Po4a}/lib/perl5"
+      DCFLAGS='-O -inline -release -version=StdLoggerDisableTrace'
+    )
   '';
 
   postInstall = with gnome3; ''

pkgs/applications/misc/udiskie/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, asciidoc-full, gettext
-, gobjectIntrospection, gtk3, hicolor-icon-theme, libnotify, librsvg
+, gobjectIntrospection, gtk3, hicolor-icon-theme, libappindicator-gtk3, libnotify, librsvg
 , udisks2, wrapGAppsHook
 , buildPythonApplication
 , docopt
@@ -27,7 +27,7 @@ buildPythonApplication rec {
 
   propagatedBuildInputs = [
     gettext gobjectIntrospection gtk3 libnotify docopt
-    pygobject3 pyyaml udisks2
+    pygobject3 pyyaml udisks2 libappindicator-gtk3
   ];
 
   postBuild = "make -C doc";

pkgs/applications/networking/browsers/firefox/wrapper.nix

@@ -7,7 +7,7 @@
 , trezor-bridge, bluejeans, djview4, adobe-reader
 , google_talk_plugin, fribid, gnome3/*.gnome-shell*/
 , esteidfirefoxplugin
-, browserpass, chrome-gnome-shell, uget-integrator
+, browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration
 , libudev
 , kerberos
 }:
@@ -63,6 +63,7 @@ let
           ++ lib.optional (cfg.enableBrowserpass or false) browserpass
           ++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell
           ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator
+          ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma-browser-integration
           ++ extraNativeMessagingHosts
         );
       libs = lib.optional ffmpegSupport ffmpeg

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

@@ -11,7 +11,7 @@
 , freetype
 , gdk_pixbuf
 , glib
-, gnome2
+, gnome3
 , gtk3
 , libX11
 , libxcb
@@ -32,12 +32,13 @@
 , pango
 , stdenv
 , systemd
+, at-spi2-atk
 }:
 
 let
 
   mirror = https://get.geo.opera.com/pub/opera/desktop;
-  version = "50.0.2762.45";
+  version = "53.0.2907.99";
 
   rpath = stdenv.lib.makeLibraryPath [
 
@@ -54,7 +55,7 @@ let
     freetype.out
     gdk_pixbuf.out
     glib.out
-    gnome2.GConf.out
+    gnome3.gconf
     gtk3.out
     libX11.out
     libXScrnSaver.out
@@ -81,6 +82,8 @@ let
 
     # Works fine without this except there is no sound.
     libpulseaudio.out
+
+    at-spi2-atk
   ];
 
 in stdenv.mkDerivation {
@@ -89,7 +92,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb";
-    sha256 = "1ajdr6yzqc9xkvdcgkps6j5996n60ibjhj518gmminx90da6x5dy";
+    sha256 = "0fih5047xv275rmbcr2drji81wxi6p0kyp172mmn328g3pzddmwx";
   };
 
   unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc .";

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

@@ -29,13 +29,13 @@ let
 in python3Packages.buildPythonApplication rec {
   name = "qutebrowser-${version}${versionPostfix}";
   namePrefix = "";
-  version = "1.3.1";
+  version = "1.3.2";
   versionPostfix = "";
 
   # the release tarballs are different from the git checkout!
   src = fetchurl {
     url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "121fz549vlxdasw0lcx6v394x8g34nadvrfs4svw3b65n0shv1ky";
+    sha256 = "0zy2cm85qq095hk94d8jk6yqpyy0f31vb2pfbdpgg93b9vvzajzz";
   };
 
   # Needs tox

pkgs/applications/networking/cluster/helm/default.nix

@@ -5,10 +5,10 @@ let
          then "linux-amd64"
          else "darwin-amd64";
   checksum = if isLinux
-             then "0bnjpiivhsxhl45ab32vzf6crv4z8nbq5kcjkvlbcbswdbgp0pq6"
+             then "1fk6w6sajdi6iphxrzi9r7xfyaf923nxcqnl01s6x3f611fjvbjn"
-             else "0smwhj4pmd4k7csz82akbkrkb0j2jxnmb33ifhkqw7n33jhl3aqp";
+             else "1jzgy641hm3khj0bakfbr5wd5zl3s7w5jb622fjv2jxwmnv7dxiv";
   pname = "helm";
-  version = "2.9.0";
+  version = "2.9.1";
 in
 stdenv.mkDerivation {
   name = "${pname}-${version}";
@@ -45,6 +45,6 @@ stdenv.mkDerivation {
     description = "A package manager for kubernetes";
     license = licenses.asl20;
     maintainers = [ maintainers.rlupton20 ];
-    platforms = platforms.linux ++ platforms.darwin;
+    platforms = [ "x86_64-linux" ] ++ platforms.darwin;
   };
 }

pkgs/applications/networking/dropbox/default.nix

@@ -7,7 +7,7 @@ assert lib.elem stdenv.system platforms;
 # Dropbox client to bootstrap installation.
 # The client is self-updating, so the actual version may be newer.
 let
-  version = "40.4.46";
+  version = "52.3.56";
 
   arch = {
     "x86_64-linux" = "x86_64";

pkgs/applications/networking/instant-messengers/rambox/bare.nix

@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "rambox-bare-${version}";
-  version = "0.5.13";
+  version = "0.5.17";
 
   src = fetchFromGitHub {
     owner = "saenzramiro";
     repo = "rambox";
     rev = version;
-    sha256 = "0c770a9z017y6gcrpyri7s1gifm8zi5f29bq5nvh3zzg4wgqh326";
+    sha256 = "18adga0symhb825db80l4c7kjl3lzzh54p1qibqsfa087rjxx9ay";
   };
 
   nativeBuildInputs = [ nodejs-8_x ruby sencha ];
@@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
     inherit src;
 
     nodejs = nodejs-8_x;
-    sha256 = "1y3q8ggyvfywxqi5hn9mvr1sjfylspis43iyf4b7snyr1a1br3r4";
+    sha256 = "1v7zwp8vs2pgy04qi92lvnxgfwkyxbid04lab8925wg1pvm2pk3k";
   };
 
-  patches = [ ./hide-check-for-updates.patch ./isDev.patch ]
+  patches = [ ./isDev.patch ]
     ++ stdenv.lib.optionals disableTooltips [ ./disable-tooltips.patch ];
 
   configurePhase = ''

pkgs/applications/networking/instant-messengers/rambox/hide-check-for-updates.patch

@@ -1,35 +0,0 @@
-https://github.com/saenzramiro/rambox/issues/1283
-
-diff -urNZ a/electron/menu.js b/electron/menu.js
---- a/electron/menu.js	2017-11-02 22:02:59.753119865 +0000
-+++ b/electron/menu.js	2017-11-02 22:08:34.419698562 +0000
-@@ -220,14 +220,6 @@
- 					}
- 				},
- 				{
--					label: locale['menu.help[5]'],
--					click(item, win) {
--						const webContents = win.webContents;
--						const send = webContents.send.bind(win.webContents);
--						send('autoUpdater:check-update');
--					}
--				},
--				{
- 					label: locale['menu.help[6]'],
- 					click() {
- 						sendAction('showAbout')
-@@ -290,14 +282,6 @@
- 			type: 'separator'
- 		});
- 		helpSubmenu.push({
--			label: `&`+locale['menu.help[5]'],
--			click(item, win) {
--				const webContents = win.webContents;
--				const send = webContents.send.bind(win.webContents);
--				send('autoUpdater:check-update');
--			}
--		});
--		helpSubmenu.push({
- 			label: `&`+locale['menu.help[6]'],
- 			click() {
- 				sendAction('showAbout')

pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix

@@ -1,15 +1,15 @@
 { stdenv, fetchurl, gzip, which, unzip, jdk }:
 
 let
-  version = "6.5.2";
+  version = "6.5.3";
   srcs = {
     i686-linux = fetchurl {
       url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-i386.sh.zip";
-      sha256 = "18gcqw9434xab97skcb97iw4p4s2pgggvq7jaisblap0ja00kqjr";
+      sha256 = "0g3hk3fdgmkdsr6ck1fgsmaxa9wbj2fpk84rk382ff9ny55bbzv9";
     };
     x86_64-linux = fetchurl {
       url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-amd64.sh.zip";
-      sha256 = "1b8jv99k37q1bi7b29f23lfzxc66v5fqdmr1rxsrqchwcrllc0z7";
+      sha256 = "08j8gak1xsxdjgkv6s24jv97jc49pi5yf906ynjmxb27wqpxn9mz";
     };
   };
 in

pkgs/applications/networking/instant-messengers/signal-desktop/default.nix

@@ -40,11 +40,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "signal-desktop-${version}";
-  version = "1.12.0";
+  version = "1.12.1";
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-    sha256 = "19c9pilx2qkpyqw3p167bfcizrpd4np5jxdcwqmpbcfibmrpmcsk";
+    sha256 = "1p85hpk8kzzgncfm033bzpwm7hk6rrq8zdpwqlk5z2biarwjdqfx";
   };
 
   phases = [ "unpackPhase" "installPhase" ];

pkgs/applications/networking/instant-messengers/slack/default.nix

@@ -5,7 +5,7 @@
 
 let
 
-  version = "3.2.0-beta25a7a50e";
+  version = "3.2.1";
 
   rpath = stdenv.lib.makeLibraryPath [
     alsaLib
@@ -47,7 +47,7 @@ let
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb";
-        sha256 = "0497794a7f0e5ac00a9421e6b1875dcc576ed93efc4a7d8c6465db641c234064";
+        sha256 = "095dpkwvvnwlxsglyg6wi9126wpalzi736b6g6j3bd6d93z9afah";
       }
     else
       throw "Slack is not supported on ${stdenv.system}";

pkgs/applications/networking/irc/konversation/default.nix

@@ -1,6 +1,7 @@
 { mkDerivation
 , lib
 , fetchurl
+, fetchpatch
 , extra-cmake-modules
 , kdoctools
 , kbookmarks
@@ -69,6 +70,13 @@ in mkDerivation rec {
     kdoctools
   ];
 
+  patches = [
+    (fetchpatch {
+      url = "https://cgit.kde.org/konversation.git/patch/?id=20018b3d0798421c9cb8a9d983e5a5b34bd88e8d";
+      sha256 = "0y5m5zimfhc0d1xnkzs05c8ig11lhwdn04fk76vi7966hx8wggnn";
+    })
+  ];
+
   meta = {
     description = "Integrated IRC client for KDE";
     license = with lib.licenses; [ gpl2 ];

pkgs/applications/networking/p2p/ktorrent/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake
+{ stdenv, fetchurl, fetchpatch, cmake
 , extra-cmake-modules, qtbase, qtscript
 , karchive, kcrash, kdnssd, ki18n, kio, knotifications, knotifyconfig
 , kdoctools, kross, kcmutils, kwindowsystem
@@ -22,6 +22,24 @@ stdenv.mkDerivation rec {
     libktorrent taglib libgcrypt kplotting
   ];
 
+  patches = [
+    # Fix build with CMake 3.11
+    (fetchpatch {
+      url = "https://cgit.kde.org/ktorrent.git/patch/?id=672c5076de7e3a526d9bdbb484a69e9386bc49f8";
+      sha256 = "1cn4rnbhadrsxqx50fawpd747azskavbjraygr6s11rh1wbfrxid";
+    })
+
+    # Fix build against Qt 5.11
+    (fetchpatch {
+      url = "https://cgit.kde.org/ktorrent.git/patch/?id=7876857d204188016a135a25938d9f8530fba4e8";
+      sha256 = "1wnmfzkhf6y7fd0z2djwphs6i9lsg7fcrj8fqmbyi0j57dvl9gxl";
+    })
+    (fetchpatch {
+      url = "https://cgit.kde.org/ktorrent.git/patch/?id=36d112e56e56541d439326a267eb906da8b3ee60";
+      sha256 = "1d41pqniljhwqs6awa644s6ks0zwm9sr0hpfygc63wyxnpcrsw2y";
+    })
+  ];
+
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {

pkgs/applications/networking/remote/remmina/default.nix

@@ -1,16 +1,16 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, wrapGAppsHook
+{ stdenv, fetchFromGitLab, cmake, pkgconfig, wrapGAppsHook
 , glib, gtk3, gettext, libxkbfile, libgnome-keyring, libX11
 , freerdp, libssh, libgcrypt, gnutls, makeDesktopItem
 , pcre, webkitgtk, libdbusmenu-gtk3, libappindicator-gtk3
 , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon
 , libsecret, spice-protocol, spice-gtk, epoxy, at-spi2-core
-, openssl, gsettings-desktop-schemas
+, openssl, gsettings-desktop-schemas, json-glib
 # The themes here are soft dependencies; only icons are missing without them.
 , hicolor-icon-theme, adwaita-icon-theme
 }:
 
 let
-  version = "1.2.0-rcgit.24";
+  version = "1.2.30.1";
 
   desktopItem = makeDesktopItem {
     name = "remmina";
@@ -25,11 +25,11 @@ let
 in stdenv.mkDerivation {
   name = "remmina-${version}";
 
-  src = fetchFromGitHub {
+  src = fetchFromGitLab {
-    owner  = "FreeRDP";
+    owner  = "Remmina";
     repo   = "Remmina";
     rev    = "v${version}";
-    sha256 = "1x7kygl9a5nh7rf2gfrk0wwv23mbw7rrjms402l3zp1w53hrhwmg";
+    sha256 = "1jz20yv84a8m9gm9fsz0jii8ag90v1scmbkkx9gk38ax5il7ilvn";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -39,7 +39,7 @@ in stdenv.mkDerivation {
                   pcre webkitgtk libdbusmenu-gtk3 libappindicator-gtk3
                   libvncserver libpthreadstubs libXdmcp libxkbcommon
                   libsecret spice-protocol spice-gtk epoxy at-spi2-core
-                  openssl hicolor-icon-theme adwaita-icon-theme ];
+                  openssl hicolor-icon-theme adwaita-icon-theme json-glib ];
 
   cmakeFlags = [
     "-DWITH_VTE=OFF"
@@ -64,9 +64,9 @@ in stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     license = stdenv.lib.licenses.gpl2;
-    homepage = http://remmina.sourceforge.net/;
+    homepage = https://gitlab.com/Remmina/Remmina;
     description = "Remote desktop client written in GTK+";
-    maintainers = [];
+    maintainers = with maintainers; [ melsigl ryantm ];
     platforms = platforms.linux;
   };
 }

pkgs/applications/networking/sniffers/etherape/default.nix

@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, pkgconfig, libtool, gtk2, libpcap, libglade,
+{ stdenv, fetchurl, pkgconfig, libtool, gtk3, libpcap, goocanvas2,
-libgnomecanvas, popt, itstool }:
+popt, itstool, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "etherape-0.9.17";
+  name = "etherape-0.9.18";
   src = fetchurl {
     url = "mirror://sourceforge/etherape/${name}.tar.gz";
-    sha256 = "1n66dw9nsl7zz0qfkb74ncgch3lzms2ssw8dq2bzbk3q1ilad3p6";
+    sha256 = "0y9cfc5iv5zy82j165i9agf45n1ixka064ykdvpdhb07sr3lzhmv";
   };
 
-  nativeBuildInputs = [ itstool pkgconfig ];
+  nativeBuildInputs = [ itstool pkgconfig (stdenv.lib.getBin libxml2) ];
   buildInputs = [
-    libtool gtk2 libpcap libglade libgnomecanvas popt
+    libtool gtk3 libpcap goocanvas2 popt
   ];
 
   meta = with stdenv.lib; {

pkgs/applications/networking/soapui/default.nix

@@ -0,0 +1,51 @@
+{ fetchurl, stdenv, writeText, jdk, maven, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "soapui-${version}";
+  version = "5.4.0";
+
+  src = fetchurl {
+    url = "https://s3.amazonaws.com/downloads.eviware/soapuios/${version}/SoapUI-${version}-linux-bin.tar.gz";
+    sha256 = "1yqx1fsh8mr5zf36df7pi25dysb28gfscr1667jzd5s0k9jl42xd";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ jdk maven ];
+
+  installPhase = ''
+    mkdir -p $out/share/java
+    cp -R bin lib $out/share/java
+
+    makeWrapper $out/share/java/bin/soapui.sh $out/bin/soapui --set SOAPUI_HOME $out/share/java
+  '';
+
+  patches = [
+    (writeText "soapui-${version}.patch" ''
+      --- a/bin/soapui.sh
+      +++ b/bin/soapui.sh
+      @@ -34,7 +34,7 @@ SOAPUI_CLASSPATH=$SOAPUI_HOME/bin/soapui-${version}.jar:$SOAPUI_HOME/lib/*
+       export SOAPUI_CLASSPATH
+
+       JAVA_OPTS="-Xms128m -Xmx1024m -XX:MinHeapFreeRatio=20 -XX:MaxHeapFreeRatio=40 -Dsoapui.properties=soapui.properties -Dsoapui.home=$SOAPUI_HOME/bin -splash:SoapUI-Spashscreen.png"
+      -JFXRTPATH=`java -cp $SOAPUI_CLASSPATH com.eviware.soapui.tools.JfxrtLocator`
+      +JFXRTPATH=`${jdk}/bin/java -cp $SOAPUI_CLASSPATH com.eviware.soapui.tools.JfxrtLocator`
+       SOAPUI_CLASSPATH=$JFXRTPATH:$SOAPUI_CLASSPATH
+
+       if $darwin
+      @@ -69,4 +69,4 @@ echo = SOAPUI_HOME = $SOAPUI_HOME
+       echo =
+       echo ================================
+
+      -java $JAVA_OPTS -cp $SOAPUI_CLASSPATH com.eviware.soapui.SoapUI "$@"
+      +${jdk}/bin/java $JAVA_OPTS -cp $SOAPUI_CLASSPATH com.eviware.soapui.SoapUI "$@"
+    '')
+  ];
+
+  meta = with stdenv.lib; {
+    description = "The Most Advanced REST & SOAP Testing Tool in the World";
+    homepage = https://www.soapui.org/;
+    license = "SoapUI End User License Agreement";
+    maintainers = with maintainers; [ gerschtli ];
+    platforms = platforms.all;
+  };
+}

pkgs/applications/office/libreoffice/default-primary-src.nix

@@ -3,7 +3,7 @@
 rec {
   major = "6";
   minor = "0";
-  patch = "3";
+  patch = "4";
   tweak = "2";
 
   subdir = "${major}.${minor}.${patch}";
@@ -12,6 +12,6 @@ rec {
 
   src = fetchurl {
     url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "16w5f8jbicby9jgsrpaj7g9c0wzymcmk1qk1fqdxaykrgpss5f0j";
+    sha256 = "1xqh4l1nrvgara4ni9zk8pqywz3gbq4a8sw9v0ggxsch409zp0ch";
   };
 }

pkgs/applications/office/libreoffice/default.nix

@@ -12,7 +12,7 @@
 , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
 , librevenge, libe-book, libmwaw, glm, glew, gst_all_1
 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
-, defaultIconTheme, glib, ncurses, xmlsec, epoxy, gpgme
+, defaultIconTheme, glib, ncurses, epoxy, gpgme
 , langs ? [ "ca" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" ]
 , withHelp ? true
 , kdeIntegration ? false
@@ -42,14 +42,14 @@ let
 
     translations = fetchSrc {
       name = "translations";
-      sha256 = "1cx537akvil4ci4lc9gnz83xmhxyjjrpv9xcibkif6vhdck539la";
+      sha256 = "0bjl3hdckd5bcgskh46xqna1hpxjjx0ycgpnilyk7j8l6407hpw6";
     };
 
     # TODO: dictionaries
 
     help = fetchSrc {
       name = "help";
-      sha256 = "00a7iqknww28z0ifcjrx529p2nxqsa4gjavk75rwykvcfyn9x686";
+      sha256 = "1z21bk5lwd5gxsyjdwh0fmgkys4lhnx7flbjd6dbn9d99paz1w6f";
     };
 
   };
@@ -241,6 +241,7 @@ in stdenv.mkDerivation rec {
     "--without-system-mdds"
     # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f
     "--without-system-orcus"
+    "--without-system-xmlsec"
   ];
 
   checkPhase = ''
@@ -261,7 +262,7 @@ in stdenv.mkDerivation rec {
       python3 sablotron sane-backends unzip vigra which zip zlib
       mdds bluez5 glibc libcmis libwps libabw libzmf libtool
       libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux
-      librevenge libe-book libmwaw glm glew ncurses xmlsec epoxy
+      librevenge libe-book libmwaw glm glew ncurses epoxy
       libodfgen CoinMP librdf_rasqal defaultIconTheme gettext
       gdb
     ]

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

@@ -2,16 +2,16 @@
 
 stdenv.mkDerivation rec {
   name = "geogebra-${version}";
-  version = "5-0-444-0";
+  version = "5-0-472-0";
 
   preferLocalBuild = true;
 
   src = fetchurl {
     urls = [
       "https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
-      "http://web.archive.org/web/20180325075100/http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
+      "http://web.archive.org/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
     ];
-    sha256 = "1x2h40m62zbhmy42hln5gjj3fwk4b6803v3k9agpv5c6j468sq0p";
+    sha256 = "1f56k5r5wf2l27sgp2vjpvx7wl72gizwxs0a6hngk15nzzka87v9";
   };
 
   srcIcon = fetchurl {

pkgs/applications/version-management/gource/default.nix

@@ -3,12 +3,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.48";
+  version = "0.49";
   name = "gource-${version}";
 
   src = fetchurl {
     url = "https://github.com/acaudwell/Gource/releases/download/${name}/${name}.tar.gz";
-    sha256 = "04qxcm05qiyr9rg2kv6abfy7kkzqr8ziw4iyp1d14lniv93m61dp";
+    sha256 = "12hf5ipcsp9dxsqn84n4kr63xaiskrnf5a084wr29qk171lj7pd9";
   };
 
   nativeBuildInputs = [ pkgconfig ];

pkgs/applications/video/mkvtoolnix/default.nix

@@ -12,13 +12,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "mkvtoolnix-${version}";
-  version = "23.0.0";
+  version = "24.0.0";
 
   src = fetchFromGitLab {
     owner  = "mbunkus";
     repo   = "mkvtoolnix";
     rev    = "release-${version}";
-    sha256 = "13n2jvwws87bws483dncvhf9vqsjy3l0lxh7x741g71075299w73";
+    sha256 = "0r6v7n4wq1ivjcfs4br5ywz2f0jbwxrharfcjmycnbjsckz1l7ps";
   };
 
   nativeBuildInputs = [

pkgs/applications/video/obs-studio/linuxbrowser.nix

@@ -10,12 +10,12 @@
 
 stdenv.mkDerivation rec {
   name = "obs-linuxbrowser-${version}";
-  version = "0.3.1";
+  version = "0.4.0";
   src = fetchFromGitHub {
     owner = "bazukas";
     repo = "obs-linuxbrowser";
     rev = version;
-    sha256 = "0dql7wxyhksqa08j1dn5d09v2jwhgywc1p7psifhhvh97rkp4z7j";
+    sha256 = "1nqi04ici9n1xjliy1gaqy2bq8zj1z32dffk890x2hi7ml688y9h";
   };
   nativeBuildInputs = [ cmake ];
   buildInputs = [ obs-studio ];

pkgs/applications/video/xawtv/default.nix

@@ -2,10 +2,10 @@
 , libFS, fontsproto, libXaw, libXpm, libXext, libSM, libICE, perl, xextproto, linux}:
 
 stdenv.mkDerivation rec {
-  name = "xawtv-3.103";
+  name = "xawtv-3.104";
   src = fetchurl {
     url = "http://linuxtv.org/downloads/xawtv/${name}.tar.bz2";
-    sha256 = "0lnxr3xip80g0rz7h6n14n9d1qy0cm56h0g1hsyr982rbldskwrc";
+    sha256 = "0jnvbahxmx9jw8g2519wmc1dq9afnlqcrzc876fcbf2x1iz39qxr";
   };
 
   preConfigure = ''

pkgs/applications/virtualization/looking-glass-client/default.nix

@@ -1,24 +1,24 @@
 { stdenv, fetchFromGitHub
 , pkgconfig, SDL2, SDL, SDL2_ttf, openssl, spice-protocol, fontconfig
-, libX11, freefont_ttf
+, libX11, freefont_ttf, nettle, libconfig
 }:
 
 stdenv.mkDerivation rec {
   name = "looking-glass-client-${version}";
-  version = "a10";
+  version = "a11";
 
   src = fetchFromGitHub {
     owner = "gnif";
     repo = "LookingGlass";
     rev = version;
-    sha256 = "10jxnkrvskjzkg86iz3hnb5v91ykzx6pvcnpy1v4436g5f2d62wn";
+    sha256 = "0q4isn86pl5wddf6h8qd62fw3577ns2sd2myzw969sbl796bwcil";
   };
 
   nativeBuildInputs = [ pkgconfig ];
 
   buildInputs = [
     SDL SDL2 SDL2_ttf openssl spice-protocol fontconfig
-    libX11 freefont_ttf
+    libX11 freefont_ttf nettle libconfig
   ];
 
   enableParallelBuilding = true;

pkgs/applications/virtualization/virtualbox/default.nix

@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext
+{ stdenv, fetchurl, lib, fetchpatch, iasl, dev86, pam, libxslt, libxml2
-, libXcursor, libXmu, qt5, libIDL, SDL, libcap, zlib, libpng, glib, lvm2
+, libX11, xproto, libXext, libXcursor, libXmu, qt5, libIDL, SDL, libcap
-, libXrandr, libXinerama
+, zlib, libpng, glib, lvm2, libXrandr, libXinerama
 , pkgconfig, which, docbook_xsl, docbook_xml_dtd_43
 , alsaLib, curl, libvpx, gawk, nettools, dbus
 , xorriso, makeself, perl
@@ -94,9 +94,14 @@ in stdenv.mkDerivation {
 
   patches =
      optional enableHardening ./hardened.patch
-  ++ [ ./qtx11extras.patch ];
+  ++ [
-
+    ./qtx11extras.patch
-
+    (fetchpatch {
+      name = "010-qt-5.11.patch";
+      url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/010-qt-5.11.patch?h=packages/virtualbox";
+      sha256 = "0hjx99pg40wqyggnrpylrp5zngva4xrnk7r90i0ynrqc7n84g9pn";
+    })
+  ];
 
   postPatch = ''
     sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \

pkgs/applications/window-managers/dwm/dwm-status.nix

@@ -1,29 +1,25 @@
 { stdenv, lib, rustPlatform, fetchFromGitHub, dbus, gdk_pixbuf, libnotify, makeWrapper, pkgconfig, xorg, alsaUtils }:
 
-let
-  runtimeDeps = [ xorg.xsetroot ]
-    ++ lib.optional (alsaUtils != null) alsaUtils;
-in
-
 rustPlatform.buildRustPackage rec {
   name = "dwm-status-${version}";
-  version = "0.4.0";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "Gerschtli";
     repo = "dwm-status";
     rev = version;
-    sha256 = "0nw0iz78mnrmgpc471yjv7yzsaf7346mwjp6hm5kbsdclvrdq9d7";
+    sha256 = "1mppj57h5yr0azypf5d2cgz2wv3k52mg3k4npyfhbmfy1393qbjs";
   };
 
   nativeBuildInputs = [ makeWrapper pkgconfig ];
-  buildInputs = [ dbus gdk_pixbuf libnotify ];
+  buildInputs = [ dbus gdk_pixbuf libnotify xorg.libX11 ];
 
-  cargoSha256 = "0169k91pb7ipvi0m71cmkppp1klgp5ghampa7x0fxkyrvrf0dvqg";
+  cargoSha256 = "0qr999hwrqn7a4n4kvbrpli7shxp9jchj8csxzsw951qmzq32qwv";
 
-  postInstall = ''
+  # needed because alsaUtils is an optional runtime dependency
+  postInstall = lib.optionalString (alsaUtils != null) ''
     wrapProgram $out/bin/dwm-status \
-      --prefix "PATH" : "${stdenv.lib.makeBinPath runtimeDeps}"
+      --prefix "PATH" : "${alsaUtils}/bin"
   '';
 
   meta = with stdenv.lib; {

pkgs/build-support/fetchgit/nix-prefetch-git

@@ -356,7 +356,7 @@ print_results() {
   "rev": "$(json_escape "$fullRev")",
   "date": "$(json_escape "$commitDateStrict8601")",
   "$(json_escape "$hashType")": "$(json_escape "$hash")",
-  "fetchSubmodules": $([[ -n "fetchSubmodules" ]] && echo true || echo false)
+  "fetchSubmodules": $([[ -n "$fetchSubmodules" ]] && echo true || echo false)
 }
 EOF
     fi

pkgs/build-support/vsenv/build-solution.nix

@@ -1,18 +0,0 @@
-{stdenv, vs}:
-{ name
-, src
-, slnFile
-, baseDir ? "."
-, extraBuildInputs ? []
-}:
-
-stdenv.mkDerivation {
-  inherit name src;
-  installPhase = ''
-    cd ${baseDir}
-    vcbuild.exe /rebuild ${slnFile}
-    mkdir -p $out
-    cp Debug/* $out
-  '';
-  buildInputs = [ vs ] ++ extraBuildInputs;
-}

pkgs/build-support/vsenv/default.nix

@@ -1,7 +0,0 @@
-{stdenv, vs}:
-
-{
-  buildSolution = import ./build-solution.nix {
-    inherit stdenv vs;
-  };  
-}

pkgs/data/misc/hackage/default.nix

@@ -1,6 +1,6 @@
 { fetchurl }:
 
 fetchurl {
-  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/6a869307fd58b59579f78e5631b9bc8ae6b9bb92.tar.gz";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/db00b74891fcaae598fdcaf3835e274be8f2c082.tar.gz";
-  sha256 = "1i6gg49gibbqgc0iq87qlf6cqmi67pk8y2zbiz3gynqzrcmqbhfd";
+  sha256 = "0csvwqnvyg2jg76rr4blm4hm6max10a6as4mnwdz76sliw4092sg";
 }

pkgs/desktops/gnome-3/core/grilo/default.nix

@@ -1,5 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, glib
+{ stdenv, fetchurl, pkgconfig, file, intltool, vala, glib, liboauth, gtk3
-, libxml2, gnome3, gobjectIntrospection, libsoup, python3Packages }:
+, gtk-doc, docbook_xsl, docbook_xml_dtd_43
+, libxml2, gnome3, gobjectIntrospection, libsoup }:
 
 let
   pname = "grilo";
@@ -7,6 +8,9 @@ let
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
+  outputs = [ "out" "dev" "man" "devdoc" ];
+  outputBin = "dev";
+
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "0vh67gja6yn7czh77ssmx6ncp99fl2926pbi2hplqms27c2n8sbw";
@@ -14,20 +18,24 @@ in stdenv.mkDerivation rec {
 
   setupHook = ./setup-hook.sh;
 
-  configureFlags = [ "--enable-grl-pls" "--enable-grl-net" ];
+  configureFlags = [
+    "--enable-grl-pls"
+    "--enable-grl-net"
+    "--enable-gtk-doc"
+  ];
 
   preConfigure = ''
     for f in src/Makefile.in libs/pls/Makefile.in libs/net/Makefile.in; do
-       substituteInPlace $f --replace @INTROSPECTION_GIRDIR@ "$out/share/gir-1.0/"
+       substituteInPlace $f --replace @INTROSPECTION_GIRDIR@ "$dev/share/gir-1.0/"
        substituteInPlace $f --replace @INTROSPECTION_TYPELIBDIR@ "$out/lib/girepository-1.0"
     done
   '';
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [
-  buildInputs = [ file intltool glib libxml2 libsoup
+    file intltool pkgconfig gobjectIntrospection vala
-                  gnome3.totem-pl-parser ];
+    gtk-doc docbook_xsl docbook_xml_dtd_43
-
+  ];
-  propagatedBuildInputs = [ python3Packages.pygobject3 gobjectIntrospection ];
+  buildInputs = [ glib liboauth gtk3 libxml2 libsoup gnome3.totem-pl-parser ];
 
   passthru = {
     updateScript = gnome3.updateScript {

pkgs/desktops/gnome-3/core/totem/default.nix

@@ -6,34 +6,25 @@
 
 stdenv.mkDerivation rec {
   name = "totem-${version}";
-  version = "3.26.0";
+  version = "3.26.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/totem/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "e32fb9a68097045e75c87ad1b8177f5c01aea2a13dcb3b2e71a0f9570fe9ee13";
+    sha256 = "10n302fdp3lhkzbij5sbzmsnln738029xil6cnng2d4dxv4n1099";
   };
 
   doCheck = true;
 
   NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
 
-  nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool wrapGAppsHook ];
+  nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool gobjectIntrospection wrapGAppsHook ];
   buildInputs = [
     gtk3 glib gnome3.grilo clutter-gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins
     gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
     gst_all_1.gst-plugins-ugly gst_all_1.gst-libav gnome3.libpeas shared-mime-info
     gdk_pixbuf libxml2 gnome3.defaultIconTheme gnome3.gnome-desktop
     gnome3.gsettings-desktop-schemas tracker nautilus
-  ];
+    python3Packages.pygobject3 python3Packages.dbus-python # for plug-ins
-
-  propagatedBuildInputs = [ gobjectIntrospection python3Packages.pylint python3Packages.pygobject2 ];
-
-  patches = [
-    (fetchurl {
-      name = "remove-pycompile.patch";
-      url = "https://bug787965.bugzilla-attachments.gnome.org/attachment.cgi?id=360204";
-      sha256 = "1iphlazllv42k553jqh3nqrrh5jb63gy3nhj4ipwc9xh4sg2irhi";
-    })
   ];
 
   postPatch = ''
@@ -43,10 +34,6 @@ stdenv.mkDerivation rec {
 
   mesonFlags = [
     "-Dwith-nautilusdir=lib/nautilus/extensions-3.0"
-    # https://bugs.launchpad.net/ubuntu/+source/totem/+bug/1712021
-    # https://bugzilla.gnome.org/show_bug.cgi?id=784236
-    # https://github.com/mesonbuild/meson/issues/1994
-    "-Denable-vala=no"
   ];
 
   wrapPrefixVariables = [ "PYTHONPATH" ];

pkgs/desktops/plasma-5/bluedevil.nix

@@ -11,8 +11,4 @@ mkDerivation {
     bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative kcoreaddons
     kdbusaddons kded kiconthemes knotifications kwidgetsaddons
   ];
-  postInstall = ''
-    # Fix the location of logic.js for the plasmoid
-    ln -s $out/share/plasma/plasmoids/org.kde.plasma.bluetooth/contents/code/logic.js $out/share/plasma/plasmoids/org.kde.plasma.bluetooth/contents/ui/logic.js
-  '';
 }

pkgs/desktops/plasma-5/default.nix

@@ -124,6 +124,7 @@ let
       libksysguard = callPackage ./libksysguard {};
       milou = callPackage ./milou.nix {};
       oxygen = callPackage ./oxygen.nix {};
+      plasma-browser-integration = callPackage ./plasma-browser-integration.nix {};
       plasma-desktop = callPackage ./plasma-desktop {};
       plasma-integration = callPackage ./plasma-integration {};
       plasma-nm = callPackage ./plasma-nm {};

pkgs/desktops/plasma-5/fetch.sh

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

pkgs/desktops/plasma-5/kactivitymanagerd.nix

@@ -2,7 +2,7 @@
   mkDerivation,
   extra-cmake-modules,
   boost, kconfig, kcoreaddons, kdbusaddons, ki18n, kio, kglobalaccel,
-  kwindowsystem, kxmlgui
+  kwindowsystem, kxmlgui, kcrash
 }:
 
 mkDerivation {
@@ -10,6 +10,6 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
     boost kconfig kcoreaddons kdbusaddons kglobalaccel ki18n kio kwindowsystem
-    kxmlgui
+    kxmlgui kcrash
   ];
 }

pkgs/desktops/plasma-5/kde-cli-tools.nix

@@ -1,7 +1,7 @@
 {
   mkDerivation, extra-cmake-modules, kdoctools,
   kcmutils, kconfig, kdesu, ki18n, kiconthemes, kinit, kio, kwindowsystem,
-  qtsvg, qtx11extras, kactivities
+  qtsvg, qtx11extras, kactivities, plasma-workspace
 }:
 
 mkDerivation {
@@ -9,6 +9,6 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     kcmutils kconfig kdesu ki18n kiconthemes kinit kio kwindowsystem qtsvg
-    qtx11extras kactivities
+    qtx11extras kactivities plasma-workspace
   ];
 }

pkgs/desktops/plasma-5/kdecoration.nix

@@ -1,8 +1,8 @@
-{ mkDerivation, extra-cmake-modules, qtbase }:
+{ mkDerivation, extra-cmake-modules, qtbase, ki18n }:
 
 mkDerivation {
   name = "kdecoration";
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtbase ];
+  buildInputs = [ qtbase ki18n ];
   outputs = [ "out" "dev" ];
 }

pkgs/desktops/plasma-5/kdeplasma-addons.nix

@@ -3,7 +3,7 @@
   extra-cmake-modules, kdoctools,
   kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n, kio,
   knewstuff, kross, krunner, kservice, ksysguard, kunitconversion, ibus,
-  plasma-framework, plasma-workspace, qtdeclarative, qtx11extras,
+  plasma-framework, plasma-workspace, qtdeclarative, qtx11extras, kholidays
 }:
 
 mkDerivation {
@@ -12,6 +12,6 @@ mkDerivation {
   buildInputs = [
     kconfig kconfigwidgets kcoreaddons kcmutils kdelibs4support kio knewstuff
     kross krunner kservice ksysguard kunitconversion ibus plasma-framework
-    plasma-workspace qtdeclarative qtx11extras
+    plasma-workspace qtdeclarative qtx11extras kholidays
   ];
 }

pkgs/desktops/plasma-5/kscreen.nix

@@ -2,7 +2,8 @@
   mkDerivation,
   extra-cmake-modules,
   kconfig, kconfigwidgets, kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons,
-  kxmlgui, libkscreen, qtdeclarative, qtgraphicaleffects
+  kxmlgui, libkscreen, qtdeclarative, qtgraphicaleffects, kwindowsystem, 
+  kdeclarative, plasma-framework
 }:
 
 mkDerivation {
@@ -10,6 +11,7 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
     kconfig kconfigwidgets kdbusaddons kglobalaccel ki18n kwidgetsaddons kxmlgui
-    libkscreen qtdeclarative qtgraphicaleffects
+    libkscreen qtdeclarative qtgraphicaleffects kwindowsystem kdeclarative
+    plasma-framework
   ];
 }

pkgs/desktops/plasma-5/kwin/default.nix

@@ -30,13 +30,7 @@ mkDerivation {
     libcap
   ];
   outputs = [ "bin" "dev" "out" ];
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series) ++ [
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-    # This patch should be removed in 5.12.2
-    (fetchpatch {
-      url = "https://github.com/KDE/kwin/commit/6e5f5d92daab4c60f7bf241d90a91b3bea27acfd.patch";
-      sha256 = "1yq9wjvch46z7qx051s0ws0gyqbqhkvx7xl4pymd97vz8v6gnx4x";
-    })
-  ];
   CXXFLAGS = [
     ''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"''
   ];

pkgs/desktops/plasma-5/plasma-browser-integration.nix

@@ -0,0 +1,11 @@
+{ mkDerivation, extra-cmake-modules, qtbase, kio, ki18n, kconfig
+, kdbusaddons, knotifications, krunner, kwindowsystem, kactivities
+}:
+
+mkDerivation {
+  name = "plasma-browser-integration";
+  nativeBuildInputs = [
+    extra-cmake-modules qtbase kio ki18n kconfig kdbusaddons
+    knotifications krunner kwindowsystem kactivities
+  ];
+}

pkgs/desktops/plasma-5/plasma-desktop/qml-import-paths.patch

@@ -1,41 +0,0 @@
-Index: plasma-desktop-5.8.5/containments/desktop/package/contents/ui/FolderView.qml
-===================================================================
---- plasma-desktop-5.8.5.orig/containments/desktop/package/contents/ui/FolderView.qml
-+++ plasma-desktop-5.8.5/containments/desktop/package/contents/ui/FolderView.qml
-@@ -27,7 +27,7 @@ import org.kde.plasma.extras 2.0 as Plas
- import org.kde.kquickcontrolsaddons 2.0
-
- import org.kde.private.desktopcontainment.folder 0.1 as Folder
--import "FolderTools.js" as FolderTools
-+import "../code/FolderTools.js" as FolderTools
-
- Item {
-     id: main
-Index: plasma-desktop-5.8.5/containments/desktop/package/contents/ui/main.qml
-===================================================================
---- plasma-desktop-5.8.5.orig/containments/desktop/package/contents/ui/main.qml
-+++ plasma-desktop-5.8.5/containments/desktop/package/contents/ui/main.qml
-@@ -30,8 +30,8 @@ import org.kde.kquickcontrolsaddons 2.0
-
- import org.kde.private.desktopcontainment.desktop 0.1 as Desktop
-
--import "LayoutManager.js" as LayoutManager
--import "FolderTools.js" as FolderTools
-+import "../code/LayoutManager.js" as LayoutManager
-+import "../code/FolderTools.js" as FolderTools
-
- DragDrop.DropArea {
-     id: root
-Index: plasma-desktop-5.8.5/containments/panel/contents/ui/main.qml
-===================================================================
---- plasma-desktop-5.8.5.orig/containments/panel/contents/ui/main.qml
-+++ plasma-desktop-5.8.5/containments/panel/contents/ui/main.qml
-@@ -25,7 +25,7 @@ import org.kde.plasma.components 2.0 as
- import org.kde.kquickcontrolsaddons 2.0
- import org.kde.draganddrop 2.0 as DragDrop
-
--import "LayoutManager.js" as LayoutManager
-+import "../code/LayoutManager.js" as LayoutManager
-
- DragDrop.DropArea {
-     id: root

pkgs/desktops/plasma-5/plasma-desktop/series

@@ -1,3 +1,2 @@
-qml-import-paths.patch
 hwclock-path.patch
 tzdir.patch

pkgs/desktops/plasma-5/plasma-vault/default.nix

@@ -5,6 +5,7 @@
   kactivities,
   plasma-framework,
   kwindowsystem,
+  networkmanager-qt,
   libksysguard,
 
   encfs,
@@ -24,6 +25,7 @@ mkDerivation {
 
   buildInputs = [
     kactivities plasma-framework kwindowsystem libksysguard
+    networkmanager-qt
   ];
 
   CXXFLAGS = [

pkgs/desktops/plasma-5/plasma-workspace/default.nix

@@ -9,8 +9,9 @@
   baloo, kactivities, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative,
   kdelibs4support, kdesu, kglobalaccel, kidletime, kinit, kjsembed, knewstuff,
   knotifyconfig, kpackage, krunner, kscreenlocker, ktexteditor, ktextwidgets,
-  kwallet, kwayland, kwin, kxmlrpcclient, libkscreen, libksysguard,
+  kwallet, kwayland, kwin, kxmlrpcclient, libkscreen, libksysguard, libqalculate,
-  networkmanager-qt, phonon, plasma-framework, prison, solid,
+  networkmanager-qt, phonon, plasma-framework, prison, solid, kholidays,
+  breeze-qt5,
 
   qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qttools,
   qtwayland, qtx11extras,
@@ -28,8 +29,8 @@ mkDerivation {
     baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative
     kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff
     knotifyconfig kpackage krunner kscreenlocker ktexteditor ktextwidgets
-    kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard
+    kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard libqalculate
-    networkmanager-qt phonon plasma-framework prison solid
+    networkmanager-qt phonon plasma-framework prison solid kholidays
 
     qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland qtx11extras
   ];
@@ -51,6 +52,7 @@ mkDerivation {
     "-DNIXPKGS_GREP=${getBin gnugrep}/bin/grep"
     "-DNIXPKGS_KDEINIT5_SHUTDOWN=${getBin kinit}/bin/kdeinit5_shutdown"
     "-DNIXPKGS_SED=${getBin gnused}/bin/sed"
+    "-DNIXPKGS_WALLPAPER_INSTALL_DIR=${getBin breeze-qt5}/share/wallpapers/"
   ];
 
   # To regenerate ./plasma-workspace.patch,

pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch

@@ -1,76 +1,15 @@
-diff --git a/applets/batterymonitor/package/contents/ui/BatteryItem.qml b/applets/batterymonitor/package/contents/ui/BatteryItem.qml
+diff --git a/sddm-theme/theme.conf.cmake b/sddm-theme/theme.conf.cmake
-index 7e2d975..40a5797 100644
+index 69d30705..52e91028 100644
---- a/applets/batterymonitor/package/contents/ui/BatteryItem.qml
+--- a/sddm-theme/theme.conf.cmake
-+++ b/applets/batterymonitor/package/contents/ui/BatteryItem.qml
++++ b/sddm-theme/theme.conf.cmake
-@@ -26,7 +26,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents
- import org.kde.plasma.extras 2.0 as PlasmaExtras
- import org.kde.plasma.workspace.components 2.0
- import org.kde.kcoreaddons 1.0 as KCoreAddons
--import "logic.js" as Logic
-+import "../code/logic.js" as Logic
- 
- Item {
-     id: batteryItem
-diff --git a/applets/batterymonitor/package/contents/ui/batterymonitor.qml b/applets/batterymonitor/package/contents/ui/batterymonitor.qml
-index 50deee5..45b6b37 100644
---- a/applets/batterymonitor/package/contents/ui/batterymonitor.qml
-+++ b/applets/batterymonitor/package/contents/ui/batterymonitor.qml
-@@ -25,7 +25,7 @@ import org.kde.plasma.plasmoid 2.0
- import org.kde.plasma.core 2.0 as PlasmaCore
- import org.kde.kcoreaddons 1.0 as KCoreAddons
- import org.kde.kquickcontrolsaddons 2.0
--import "logic.js" as Logic
-+import "../code/logic.js" as Logic
- 
- Item {
-     id: batterymonitor
-diff --git a/applets/lock_logout/contents/ui/lockout.qml b/applets/lock_logout/contents/ui/lockout.qml
-index 80e7e53..0083cf0 100644
---- a/applets/lock_logout/contents/ui/lockout.qml
-+++ b/applets/lock_logout/contents/ui/lockout.qml
-@@ -23,7 +23,7 @@ import org.kde.plasma.plasmoid 2.0
- import org.kde.plasma.core 2.0 as PlasmaCore
- import org.kde.plasma.components 2.0
- import org.kde.kquickcontrolsaddons 2.0
--import "data.js" as Data
-+import "../code/data.js" as Data
- 
- Flow {
-     id: lockout
-diff --git a/applets/notifications/package/contents/ui/main.qml b/applets/notifications/package/contents/ui/main.qml
-index cb15cfa..a6976ba 100644
---- a/applets/notifications/package/contents/ui/main.qml
-+++ b/applets/notifications/package/contents/ui/main.qml
-@@ -28,7 +28,7 @@ import org.kde.plasma.extras 2.0 as PlasmaExtras
- 
- import org.kde.plasma.private.notifications 1.0
- 
--import "uiproperties.js" as UiProperties
-+import "../code/uiproperties.js" as UiProperties
- 
- MouseEventListener {
-     id: notificationsApplet
-diff --git a/krunner/dbus/org.kde.krunner.service.in b/krunner/dbus/org.kde.krunner.service.in
-index 8571521..294eab0 100644
---- a/krunner/dbus/org.kde.krunner.service.in
-+++ b/krunner/dbus/org.kde.krunner.service.in
 @@ -1,4 +1,4 @@
- [D-BUS Service]
+ [General]
- Name=org.kde.krunner
+ type=image
--Exec=@CMAKE_INSTALL_PREFIX@/bin/krunner
+ color=#1d99f3
-+Exec=@CMAKE_INSTALL_FULL_BINDIR@/krunner
+-background=${CMAKE_INSTALL_PREFIX}/${WALLPAPER_INSTALL_DIR}/Next/contents/images/3200x2000.png
- 
++background=${NIXPKGS_WALLPAPER_INSTALL_DIR}/Next/contents/images/3200x2000.png
-diff --git a/kuiserver/org.kde.kuiserver.service.in b/kuiserver/org.kde.kuiserver.service.in
-index 7a86d07..5b3030c 100644
---- a/kuiserver/org.kde.kuiserver.service.in
-+++ b/kuiserver/org.kde.kuiserver.service.in
-@@ -1,3 +1,3 @@
- [D-BUS Service]
- Name=org.kde.kuiserver
--Exec=@CMAKE_INSTALL_PREFIX@/bin/kuiserver5
-+Exec=@CMAKE_INSTALL_FULL_BINDIR@/kuiserver5
 diff --git a/startkde/CMakeLists.txt b/startkde/CMakeLists.txt
-index fe29f57..247db95 100644
+index cb75aeca..247db953 100644
 --- a/startkde/CMakeLists.txt
 +++ b/startkde/CMakeLists.txt
 @@ -3,11 +3,6 @@ add_subdirectory(kstartupconfig)
@@ -79,14 +18,14 @@ index fe29f57..247db95 100644
  
 -#FIXME: reconsider, looks fishy
 -if(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr")
--    set(EXPORT_XCURSOR_PATH "XCURSOR_PATH=${CMAKE_INSTALL_PREFIX}/share/icons:$XCURSOR_PATH\":~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons\"; export XCURSOR_PATH")
+-    set(EXPORT_XCURSOR_PATH "XCURSOR_PATH=${KDE_INSTALL_FULL_DATAROOTDIR}/icons:$XCURSOR_PATH\":~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons\"; export XCURSOR_PATH")
 -endif()
 -
  configure_file(startkde.cmake ${CMAKE_CURRENT_BINARY_DIR}/startkde  @ONLY)
  configure_file(startplasmacompositor.cmake ${CMAKE_CURRENT_BINARY_DIR}/startplasmacompositor  @ONLY)
  configure_file(startplasma.cmake ${CMAKE_CURRENT_BINARY_DIR}/startplasma  @ONLY)
 diff --git a/startkde/kstartupconfig/kstartupconfig.cpp b/startkde/kstartupconfig/kstartupconfig.cpp
-index c992785..bd506ce 100644
+index 493218ea..d507aa55 100644
 --- a/startkde/kstartupconfig/kstartupconfig.cpp
 +++ b/startkde/kstartupconfig/kstartupconfig.cpp
 @@ -147,5 +147,5 @@ int main()
@@ -97,7 +36,7 @@ index c992785..bd506ce 100644
 +    return system( NIXPKGS_KDOSTARTUPCONFIG5 );
      }
 diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
-index b3117b4..e70110e 100644
+index f9e2e429..0a4267a9 100644
 --- a/startkde/startkde.cmake
 +++ b/startkde/startkde.cmake
 @@ -1,22 +1,31 @@
@@ -436,37 +375,7 @@ index b3117b4..e70110e 100644
  # Set a left cursor instead of the standard X11 "X" cursor, since I've heard
  # from some users that they're confused and don't know what to do. This is
  # especially necessary on slow machines, where starting KDE takes one or two
-@@ -211,28 +236,10 @@ xset fp rehash
+@@ -257,44 +282,65 @@ export XDG_DATA_DIRS
- # If the user has overwritten fonts, the cursor font may be different now
- # so don't move this up.
- #
--xsetroot -cursor_name left_ptr
--
--# Get Ghostscript to look into user's KDE fonts dir for additional Fontmap
--if test -n "$GS_LIB" ; then
--    GS_LIB=$usr_fdir:$GS_LIB
--    export GS_LIB
--else
--    GS_LIB=$usr_fdir
--    export GS_LIB
--fi
-+@NIXPKGS_XSETROOT@ -cursor_name left_ptr
- 
- echo 'startkde: Starting up...'  1>&2
- 
--# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all.
--# The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend
--# to set it to a list of paths *not* including the KDE prefix if it's not /usr or
--# /usr/local.
--if test -z "$XDG_DATA_DIRS"; then
--    XDG_DATA_DIRS="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@:/usr/share:/usr/local/share"
--fi
--export XDG_DATA_DIRS
--
- # Mark that full KDE session is running (e.g. Konqueror preloading works only
- # with full KDE running). The KDE_FULL_SESSION property can be detected by
- # any X client connected to the same X session, even if not launched
-@@ -257,44 +264,65 @@ export XDG_DATA_DIRS
  #
  KDE_FULL_SESSION=true
  export KDE_FULL_SESSION
@@ -545,7 +454,7 @@ index b3117b4..e70110e 100644
  
  # finally, give the session control to the session manager
  # see kdebase/ksmserver for the description of the rest of the startup sequence
-@@ -306,34 +334,37 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
+@@ -306,34 +352,37 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
  # We only check for 255 which means that the ksmserver process could not be
  # started, any problems thereafter, e.g. ksmserver failing to initialize,
  # will remain undetected.
@@ -594,7 +503,7 @@ index b3117b4..e70110e 100644
              done
              break
          fi
-@@ -342,15 +373,17 @@ fi
+@@ -342,15 +391,17 @@ fi
  
  echo 'startkde: Shutting down...'  1>&2
  # just in case
@@ -617,7 +526,7 @@ index b3117b4..e70110e 100644
  
  echo 'startkde: Done.'  1>&2
 diff --git a/startkde/startplasma.cmake b/startkde/startplasma.cmake
-index a5d09fa..d42c284 100644
+index a5d09fa7..d42c284b 100644
 --- a/startkde/startplasma.cmake
 +++ b/startkde/startplasma.cmake
 @@ -1,6 +1,6 @@
@@ -809,7 +718,7 @@ index a5d09fa..d42c284 100644
  
  echo 'startplasma: Done.'  1>&2
 diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake
-index 8ac47aa..49970ef 100644
+index dd9e304d..49d456e9 100644
 --- a/startkde/startplasmacompositor.cmake
 +++ b/startkde/startplasmacompositor.cmake
 @@ -1,118 +1,165 @@
@@ -1013,27 +922,26 @@ index 8ac47aa..49970ef 100644
  #otherwise apps that manually opt in for high DPI get auto scaled by the developer AND scaled by the wl_output
  export QT_AUTO_SCREEN_SCALE_FACTOR=0
  
+-# XCursor mouse theme needs to be applied here to work even for kded or ksmserver
+-if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
+-    @EXPORT_XCURSOR_PATH@
 +XCURSOR_PATH=~/.icons
 +IFS=":" read -r -a xdgDirs <<< "$XDG_DATA_DIRS"
 +for xdgDir in "${xdgDirs[@]}"; do
 +    XCURSOR_PATH="$XCURSOR_PATH:$xdgDir/icons"
 +done
 +export XCURSOR_PATH
-+
+ 
- # XCursor mouse theme needs to be applied here to work even for kded or ksmserver
--if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
--    @EXPORT_XCURSOR_PATH@
--
 -    # TODO: is kapplymousetheme a core app?
--    #kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
++# XCursor mouse theme needs to be applied here to work even for kded or ksmserver
++if [ -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ]; then
+     #kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
 -    if test $? -eq 10; then
 -        XCURSOR_THEME=breeze_cursors
 -        export XCURSOR_THEME
 -    elif test -n "$kcminputrc_mouse_cursortheme"; then
 -        XCURSOR_THEME="$kcminputrc_mouse_cursortheme"
 -        export XCURSOR_THEME
-+if [ -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ]; then
-+    #kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
 +    if [ $? -eq 10 ]; then
 +        export XCURSOR_THEME=breeze_cursors
 +    elif [ -n "$kcminputrc_mouse_cursortheme" ]; then
@@ -1110,7 +1018,7 @@ index 8ac47aa..49970ef 100644
      : # ok
  else
      echo 'startplasmacompositor: Could not start D-Bus. Can you call qdbus?'  1>&2
-@@ -212,7 +228,7 @@ export KDE_FULL_SESSION
+@@ -212,26 +228,47 @@ export KDE_FULL_SESSION
  KDE_SESSION_VERSION=5
  export KDE_SESSION_VERSION
  
@@ -1119,9 +1027,7 @@ index 8ac47aa..49970ef 100644
  export KDE_SESSION_UID
  
  XDG_CURRENT_DESKTOP=KDE
-@@ -222,20 +238,41 @@ export XDG_CURRENT_DESKTOP
+ export XDG_CURRENT_DESKTOP
- QT_QPA_PLATFORM=wayland
- export QT_QPA_PLATFORM
  
 +# Source scripts found in <config locations>/plasma-workspace/env/*.sh
 +# (where <config locations> correspond to the system and user's configuration
@@ -1171,12 +1077,3 @@ index 8ac47aa..49970ef 100644
  
  echo 'startplasmacompositor: Shutting down...'  1>&2
  
-diff --git a/startkde/waitforname/org.kde.plasma.Notifications.service.in b/startkde/waitforname/org.kde.plasma.Notifications.service.in
-index 0a51b84..f48b5d8 100644
---- a/startkde/waitforname/org.kde.plasma.Notifications.service.in
-+++ b/startkde/waitforname/org.kde.plasma.Notifications.service.in
-@@ -1,3 +1,3 @@
- [D-BUS Service]
- Name=org.freedesktop.Notifications
--Exec=@CMAKE_INSTALL_PREFIX@/bin/plasma_waitforname org.freedesktop.Notifications
-+Exec=@CMAKE_INSTALL_FULL_BINDIR@/plasma_waitforname org.freedesktop.Notifications

pkgs/desktops/plasma-5/srcs.nix

@@ -3,355 +3,363 @@
 
 {
   bluedevil = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/bluedevil-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/bluedevil-5.13.0.tar.xz";
-      sha256 = "0rjxvvg64g4panri4f09fgm571igdijfh92jp616pcqw8v1xqp2a";
+      sha256 = "1aikg2nlhkzasliiyqa0ijk78mpa1lrpgl7gqh3lva3dvq7w9v3m";
-      name = "bluedevil-5.12.5.tar.xz";
+      name = "bluedevil-5.13.0.tar.xz";
     };
   };
   breeze = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/breeze-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/breeze-5.13.0.tar.xz";
-      sha256 = "1xxgyq3lhliv6p54akgpclficbcs2xdv15a92jkl8a2s9wbisk3n";
+      sha256 = "0aaih84h8bh6ljcw6fk7nl4wpvcnk6vqz65s0b1qb8y7q6xr6cd0";
-      name = "breeze-5.12.5.tar.xz";
+      name = "breeze-5.13.0.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/breeze-grub-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/breeze-grub-5.13.0.tar.xz";
-      sha256 = "1w9f2xm4abqcqk2pdb7hi7d4hd1krkhrs9j3zlncxahfvf67ljad";
+      sha256 = "0q0a8ijg7npw5nl20xnna26jvrqdvmil1z7jmc8awdy3bhyi47n6";
-      name = "breeze-grub-5.12.5.tar.xz";
+      name = "breeze-grub-5.13.0.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/breeze-gtk-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/breeze-gtk-5.13.0.tar.xz";
-      sha256 = "0040z43r69kk8l90mvkk8xxzhaw35xm7z2w097sp8xd053y3pdqd";
+      sha256 = "131fknmj1aiixzv2vqk2vza1swxcvm5haj3v9h6j3xp1l9q8rr7l";
-      name = "breeze-gtk-5.12.5.tar.xz";
+      name = "breeze-gtk-5.13.0.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/breeze-plymouth-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/breeze-plymouth-5.13.0.tar.xz";
-      sha256 = "15204zqk81rwmdq07jzaiv2aninbbgqmg76dhzcz43lckjfhczq9";
+      sha256 = "13g4dpx094x4hmhhv5ghbdf59kzlgdxb9b7dpak8bliq3npdh1ri";
-      name = "breeze-plymouth-5.12.5.tar.xz";
+      name = "breeze-plymouth-5.13.0.tar.xz";
     };
   };
   discover = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/discover-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/discover-5.13.0.tar.xz";
-      sha256 = "02fjs016825l35gc173mblii2x9ys5cisqw8niyyvllsls4rp27m";
+      sha256 = "1xg0n1za12ib70iqyxs0kcqrixxfhghi96qqs0l24cmwfca6g4km";
-      name = "discover-5.12.5.tar.xz";
+      name = "discover-5.13.0.tar.xz";
     };
   };
   drkonqi = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/drkonqi-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/drkonqi-5.13.0.tar.xz";
-      sha256 = "0av0rqgc5a9c8lvpdphp3ifw56qc10qkbjhajlslagxswys73cfq";
+      sha256 = "0mm9bssz87camwi7zkgf0ajrnd1pb3gs044k19vgcj85g6knf1bk";
-      name = "drkonqi-5.12.5.tar.xz";
+      name = "drkonqi-5.13.0.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/kactivitymanagerd-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/kactivitymanagerd-5.13.0.tar.xz";
-      sha256 = "1mpldy47fklm9d91wjj734yw3j3pkfrj377b9c5d8l07agwnk2j1";
+      sha256 = "10sqzc4mhbbrzsf9bgmlssk836ylxdqvz8k8wzjsqi7r1iiqmcq6";
-      name = "kactivitymanagerd-5.12.5.tar.xz";
+      name = "kactivitymanagerd-5.13.0.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/kde-cli-tools-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/kde-cli-tools-5.13.0.tar.xz";
-      sha256 = "0gs0d9p2x3q6pvjj6l7f9xq741rfqgzhbxwvz1s3cx385b85lplh";
+      sha256 = "0qjjchdnib28728b0mbkbwq99zr5h9xzljqkskj1npbj723z2bzs";
-      name = "kde-cli-tools-5.12.5.tar.xz";
+      name = "kde-cli-tools-5.13.0.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/kdecoration-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/kdecoration-5.13.0.tar.xz";
-      sha256 = "0qd5pqm3s1wcmy49mry2plzivg6dhmdp521yahx0mmlk2bssxc3d";
+      sha256 = "1fgv73wyahk7q2kvs6vzjnxj0h2g7g137xlczc7wjwxpyrlchavm";
-      name = "kdecoration-5.12.5.tar.xz";
+      name = "kdecoration-5.13.0.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/kde-gtk-config-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/kde-gtk-config-5.13.0.tar.xz";
-      sha256 = "1p5vpk85v50dkm787ljf77xa7f25lamxf5jn2qc31r8dnlc25dnh";
+      sha256 = "1l6zjnjwb8yiy00xnkcaljw0c6mcwd93c2qyc3p23aaxw31jnhyg";
-      name = "kde-gtk-config-5.12.5.tar.xz";
+      name = "kde-gtk-config-5.13.0.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/kdeplasma-addons-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/kdeplasma-addons-5.13.0.tar.xz";
-      sha256 = "1339sapqi0b6pzbsdyhpfssrvfg9sfc3amlfijxsn63swkjvbw2s";
+      sha256 = "034qnphk2biz6jqc494bwzqv3sqr63hvqadiywnhy53n0l9crf3i";
-      name = "kdeplasma-addons-5.12.5.tar.xz";
+      name = "kdeplasma-addons-5.13.0.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/kgamma5-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/kgamma5-5.13.0.tar.xz";
-      sha256 = "0p4x8vzjngw7xxnnviiqw89lzs23nrq007211dprnfzgay9c571c";
+      sha256 = "0yg89p87kx7s2mzhz02rbav07cqb5s3689x3d7r60ppmmf43ylv9";
-      name = "kgamma5-5.12.5.tar.xz";
+      name = "kgamma5-5.13.0.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/khotkeys-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/khotkeys-5.13.0.tar.xz";
-      sha256 = "1yivh10g66h9dmnabnxx1i26rpg8wf9ibpmc7jcmh7j4h5q0lkzg";
+      sha256 = "1x79cn5wi917d3bvy0sfiaqyziziajcgpc9d74var5g9fqg6kali";
-      name = "khotkeys-5.12.5.tar.xz";
+      name = "khotkeys-5.13.0.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/kinfocenter-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/kinfocenter-5.13.0.tar.xz";
-      sha256 = "1g42hk49fjg4rvgvy5phshk8mna3idh55gn4cy1w0q2rl8f0y6b5";
+      sha256 = "15g16455m7csi07llfks58yry7bmv14avs15lb67nadba3clb5mx";
-      name = "kinfocenter-5.12.5.tar.xz";
+      name = "kinfocenter-5.13.0.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/kmenuedit-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/kmenuedit-5.13.0.tar.xz";
-      sha256 = "0vbq2s1ibqna19njw421ai4qwq4apww74qcfgk7gwd6p75k37lkw";
+      sha256 = "12k8y1mw5frg24i6bp39sax9mjv4q9p996rvma9nmwqfxp6br1bf";
-      name = "kmenuedit-5.12.5.tar.xz";
+      name = "kmenuedit-5.13.0.tar.xz";
     };
   };
   kscreen = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/kscreen-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/kscreen-5.13.0.tar.xz";
-      sha256 = "1cscy7vimznwy29qr0x11wqxlxcwxvybdhw703mj44bq1szw8s0l";
+      sha256 = "12hgynpbdj22fg896js9nw9rqddk4j5a8dl6iyr7rwixgv1nw8y5";
-      name = "kscreen-5.12.5.tar.xz";
+      name = "kscreen-5.13.0.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/kscreenlocker-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/kscreenlocker-5.13.0.tar.xz";
-      sha256 = "08l8knfvhrd3h8z70xq1jiq02bg56jdddxx0ml6jbd8ja9r1svdq";
+      sha256 = "12jar9dh0c221v3zlpzcrlpzfrxk39gxqxz3bvb16k6ws5307psh";
-      name = "kscreenlocker-5.12.5.tar.xz";
+      name = "kscreenlocker-5.13.0.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/ksshaskpass-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/ksshaskpass-5.13.0.tar.xz";
-      sha256 = "0vgqp09cfdlf22xxi0pdzdv0i4hrgvbfj3yrxrfqhfh9zlc3q6y4";
+      sha256 = "09id83az5pxn56xqnkilmha0ada86mysxlvvhy6rnm10c340rc0j";
-      name = "ksshaskpass-5.12.5.tar.xz";
+      name = "ksshaskpass-5.13.0.tar.xz";
     };
   };
   ksysguard = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/ksysguard-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/ksysguard-5.13.0.tar.xz";
-      sha256 = "11wh4skx3vjjrdfaa85a8ijdvsw3fnk02s1n9g6yv0c8h74q2nqv";
+      sha256 = "0sz7k0vkpji448pnqpc7q9plsxrf2q5fq3kly2bwh2isd44lxram";
-      name = "ksysguard-5.12.5.tar.xz";
+      name = "ksysguard-5.13.0.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/kwallet-pam-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/kwallet-pam-5.13.0.tar.xz";
-      sha256 = "18pbsmc44pqbdylczqsx6cargzkkp4vcd44yk7mwjhniw8pi6x33";
+      sha256 = "1sbh771z84k9gmy9mkbiwp1mz5rhlb7jb0mbpac6s7gm47axl3za";
-      name = "kwallet-pam-5.12.5.tar.xz";
+      name = "kwallet-pam-5.13.0.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/kwayland-integration-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/kwayland-integration-5.13.0.tar.xz";
-      sha256 = "05qcsqyw2n1hpdsiqjvg98i77kwgcdpsr0096nqr62pzf36bsqz3";
+      sha256 = "0hwyhw9y446ycjzshkdf159awlmkz2sziijabnnblkc75j7qhhzf";
-      name = "kwayland-integration-5.12.5.tar.xz";
+      name = "kwayland-integration-5.13.0.tar.xz";
     };
   };
   kwin = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/kwin-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/kwin-5.13.0.tar.xz";
-      sha256 = "1mkmh90pl4pz1bb3n9zl6x6lxvr8xkj7r795qj70s9jxavl40fj3";
+      sha256 = "12ymycrh6ryrpkz96mhha38bgpfaxchf9ilwpiafmms5h6s8d3zh";
-      name = "kwin-5.12.5.tar.xz";
+      name = "kwin-5.13.0.tar.xz";
     };
   };
   kwrited = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/kwrited-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/kwrited-5.13.0.tar.xz";
-      sha256 = "0vvlkr4w4vwgkl9sili63cwlp0lsxlnzwfwmhpa5nrwcjgbyfbmz";
+      sha256 = "0vpmcd9l4jl440wqh691rjk1zxbs7vaknfrbar8n5fj41w8bri24";
-      name = "kwrited-5.12.5.tar.xz";
+      name = "kwrited-5.13.0.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/libkscreen-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/libkscreen-5.13.0.tar.xz";
-      sha256 = "0hzdchkxlv5l3zx7lxzj0x44kn3086gxnhmas9w1n9b6qrf0sjb4";
+      sha256 = "1fmffdw9hg4wcr78nmdryaam1dc890fcpwiq5v5n6plp78v99hv9";
-      name = "libkscreen-5.12.5.tar.xz";
+      name = "libkscreen-5.13.0.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/libksysguard-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/libksysguard-5.13.0.tar.xz";
-      sha256 = "0dbf3xx52xqyzaxvybmjra0z1lc3qcbb0aqmsga8rjj77bmj3kx9";
+      sha256 = "11b82rma2mqrjnzjpdij6316xbynr7ca9vizp3zqps7xvgq2hva1";
-      name = "libksysguard-5.12.5.tar.xz";
+      name = "libksysguard-5.13.0.tar.xz";
     };
   };
   milou = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/milou-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/milou-5.13.0.tar.xz";
-      sha256 = "0v0zkwmh7rzqbgw1ypqz18bd3gn3x8iag0q9lrk6zzpd66j2r1fc";
+      sha256 = "12azqm4ck4mlz5cnglp6b99lj229dk25c2r9dy1v2k1c0sa9wqk5";
-      name = "milou-5.12.5.tar.xz";
+      name = "milou-5.13.0.tar.xz";
     };
   };
   oxygen = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/oxygen-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/oxygen-5.13.0.tar.xz";
-      sha256 = "0336bkvn8mqrbswnhg87ah7k3w7i99c8rfpfvhw5qq3mm6jvbi4l";
+      sha256 = "15zxldc828vppswrqfkgmzpxx6fpx8i20qm0smljkx08yd280zry";
-      name = "oxygen-5.12.5.tar.xz";
+      name = "oxygen-5.13.0.tar.xz";
+    };
+  };
+  plasma-browser-integration = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.13.0/plasma-browser-integration-5.13.0.tar.xz";
+      sha256 = "1pnzi02lfm33c47l3znzj9p2ksrc4mn9wvglj6ffnxfhcsdv1xqc";
+      name = "plasma-browser-integration-5.13.0.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/plasma-desktop-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/plasma-desktop-5.13.0.tar.xz";
-      sha256 = "0rm7j8n3yflzl6wpivmjsgrhc5arrnmzfg81arfs06gjdnvwnmd6";
+      sha256 = "0bj6zkgqjc83yp0q3srpdvvppi2jh9gajr65bli370n52z86rmnn";
-      name = "plasma-desktop-5.12.5.tar.xz";
+      name = "plasma-desktop-5.13.0.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/plasma-integration-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/plasma-integration-5.13.0.tar.xz";
-      sha256 = "14iciz6zjxrvig58hpqa51cj5r949xq9xgqvs8glzldzg34928sm";
+      sha256 = "1xl9zlc9z747zy2lzj3azbypljxv3gn03ssn5703dg8ab32kr0p4";
-      name = "plasma-integration-5.12.5.tar.xz";
+      name = "plasma-integration-5.13.0.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/plasma-nm-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/plasma-nm-5.13.0.tar.xz";
-      sha256 = "1awnd9gdciwrwyl2xs9h778fizhnbw8wm8ddbqr8050v7fkc7fs6";
+      sha256 = "02680npqafrqq2yvc96x03i3kiq6kwybvg6378718bwpdmrwfv1k";
-      name = "plasma-nm-5.12.5.tar.xz";
+      name = "plasma-nm-5.13.0.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/plasma-pa-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/plasma-pa-5.13.0.tar.xz";
-      sha256 = "13z9shlnprbjgqy1w8lf3brjcvmh76fpl0xv3q2r7kvcgm1ndjdd";
+      sha256 = "0m2gss12rqzv4ba554mijqm9qf25c5ghjb8v785si5amm012dkfr";
-      name = "plasma-pa-5.12.5.tar.xz";
+      name = "plasma-pa-5.13.0.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/plasma-sdk-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/plasma-sdk-5.13.0.tar.xz";
-      sha256 = "0rrwis63khq1b6shxrp5cj6dgz9lhrccs7752f7j73pi5fpmbz0g";
+      sha256 = "1zaxr8c9nybbap27jsgdb95sn22z0vfyxai969mkmdajxijcy8md";
-      name = "plasma-sdk-5.12.5.tar.xz";
+      name = "plasma-sdk-5.13.0.tar.xz";
     };
   };
   plasma-tests = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/plasma-tests-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/plasma-tests-5.13.0.tar.xz";
-      sha256 = "1rq8li7y3qf1ipyhy869lw3znmssf5grbh522qla4sn08d1lhxij";
+      sha256 = "1cclf6cp19y4ylsgqlrq7rjvgpy59dxz91cq14d2fi93h1dcyrra";
-      name = "plasma-tests-5.12.5.tar.xz";
+      name = "plasma-tests-5.13.0.tar.xz";
     };
   };
   plasma-vault = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/plasma-vault-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/plasma-vault-5.13.0.tar.xz";
-      sha256 = "0zrwsqcpkssrfhy2xgg4y2k2w6l7vyn7mqani9lw18i13vp2fh1d";
+      sha256 = "1wx0jibn5fmp2ddy28azls9wb23mhpnwkvg8gihq16im62pb499i";
-      name = "plasma-vault-5.12.5.tar.xz";
+      name = "plasma-vault-5.13.0.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/plasma-workspace-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/plasma-workspace-5.13.0.tar.xz";
-      sha256 = "1vy5p22y6jckhm09171pjacdrndl7vak6grwvzg8bmhqk1ahzdwk";
+      sha256 = "071za67v4d6kn4qn68r88lgwp9mchb2wh26p2mf0rmqxz3c56ihf";
-      name = "plasma-workspace-5.12.5.tar.xz";
+      name = "plasma-workspace-5.13.0.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/plasma-workspace-wallpapers-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/plasma-workspace-wallpapers-5.13.0.tar.xz";
-      sha256 = "1p6kcakdw020pjwdfdhh1v8bha8r6j9934nid7vv7ldp388mq6a7";
+      sha256 = "1xnssczasr855fl5yaffs6a5dlvivrh7dvzhinfws1pk960vndyb";
-      name = "plasma-workspace-wallpapers-5.12.5.tar.xz";
+      name = "plasma-workspace-wallpapers-5.13.0.tar.xz";
     };
   };
   plymouth-kcm = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/plymouth-kcm-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/plymouth-kcm-5.13.0.tar.xz";
-      sha256 = "1fv2b792d7bg5vdix823fks8capgbnda94fc8z91nsffa894p0i9";
+      sha256 = "1j7gaqypd5ijrvp4s4ry57q1lix8gfff8pxbwb7n6bnfka6hk8i6";
-      name = "plymouth-kcm-5.12.5.tar.xz";
+      name = "plymouth-kcm-5.13.0.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.12.5";
+    version = "1-5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/polkit-kde-agent-1-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/polkit-kde-agent-1-5.13.0.tar.xz";
-      sha256 = "01plpzhj2fc2i3hjqb75skmyiy9dg3mw2h1sxsl7hxmbvm9fv9if";
+      sha256 = "0sab09glz9b8i1ricww8lrvp9ivnfzh4g1nijks7f1wg8nk1vpcm";
-      name = "polkit-kde-agent-1-5.12.5.tar.xz";
+      name = "polkit-kde-agent-1-5.13.0.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/powerdevil-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/powerdevil-5.13.0.tar.xz";
-      sha256 = "07f3kqvfqgqpz50fk8dwyr5z1hylli0k4ndlcp5mkybiraz1rdjk";
+      sha256 = "0w0x0lgi8xdifz811j749xbgkvqixvrpzamwv0iqn3zgg1m5b5vy";
-      name = "powerdevil-5.12.5.tar.xz";
+      name = "powerdevil-5.13.0.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/sddm-kcm-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/sddm-kcm-5.13.0.tar.xz";
-      sha256 = "13qqyvq7rk7h65krjaqgil2rxjj7073arxp4bij5g534ckpwkz3h";
+      sha256 = "13mkd1b4c7ihp0s3n80snq70v76vs2gzvfx7f0s2pjq44q07bv5f";
-      name = "sddm-kcm-5.12.5.tar.xz";
+      name = "sddm-kcm-5.13.0.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/systemsettings-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/systemsettings-5.13.0.tar.xz";
-      sha256 = "0ackzdyfmssq6lh9dranc8nv6bhk633zq1mixibqhswl3pz8n4h8";
+      sha256 = "1imnry86jz2rwwgz470h7pji2hajnj337hvxmrrlr0giijf1amlc";
-      name = "systemsettings-5.12.5.tar.xz";
+      name = "systemsettings-5.13.0.tar.xz";
     };
   };
   user-manager = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/user-manager-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/user-manager-5.13.0.tar.xz";
-      sha256 = "1566scbw6f02gskwdc2kk6xcbbf7hq6jkz3ka1avkwmyi3xhh010";
+      sha256 = "10w5wr3pxlybqx192xiljni9nbqai33v5j2nvcs032i0ms7fbxpf";
-      name = "user-manager-5.12.5.tar.xz";
+      name = "user-manager-5.13.0.tar.xz";
     };
   };
   xdg-desktop-portal-kde = {
-    version = "5.12.5";
+    version = "5.13.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/xdg-desktop-portal-kde-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.0/xdg-desktop-portal-kde-5.13.0.tar.xz";
-      sha256 = "1rmjwjx7x481607vp0pjxsabbjhm7qfqa0ax4ciqqlv676hcr5cv";
+      sha256 = "13pnj7mpnv30fqwzpnjrfwmjx4isbkhlznpr6hpvsh0f178zhfz4";
-      name = "xdg-desktop-portal-kde-5.12.5.tar.xz";
+      name = "xdg-desktop-portal-kde-5.13.0.tar.xz";
     };
   };
 }

pkgs/desktops/plasma-5/systemsettings.nix

@@ -2,7 +2,7 @@
   mkDerivation, extra-cmake-modules, kdoctools,
   kcmutils, kconfig, kdbusaddons, khtml, ki18n, kiconthemes, kio, kitemviews,
   kservice, kwindowsystem, kxmlgui, qtquickcontrols, qtquickcontrols2,
-  kactivities, kactivities-stats, kirigami2, kcrash
+  kactivities, kactivities-stats, kirigami2, kcrash, plasma-workspace
 }:
 
 mkDerivation {
@@ -11,7 +11,7 @@ mkDerivation {
   buildInputs = [
     kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice
     kwindowsystem kxmlgui qtquickcontrols qtquickcontrols2
-    kactivities kactivities-stats kirigami2 kcrash
+    kactivities kactivities-stats kirigami2 kcrash plasma-workspace
   ];
   outputs = [ "bin" "dev" "out" ];
 }

pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix

@@ -1,13 +1,13 @@
 {
   mkDerivation,
   extra-cmake-modules, gettext, kdoctools, python,
-  kcoreaddons, knotifications
+  kcoreaddons, knotifications, kwayland, kwidgetsaddons
 }:
 
 mkDerivation {
   name = "xdg-desktop-portal-kde";
   nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ];
   buildInputs = [
-    kcoreaddons knotifications
+    kcoreaddons knotifications kwayland kwidgetsaddons
   ];
 }

pkgs/development/compilers/closure/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "closure-compiler-${version}";
-  version = "20180506";
+  version = "20180610";
 
   src = fetchurl {
     url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
-    sha256 = "10w9vs61fs14k8g3wlng0ifj0knfm0xfc4rsnd2c75464hkdxvr9";
+    sha256 = "1qg9a1whmrkrifqrsb9m541cgr3rf1nnkqlv4q7rq30m8bdilvk5";
   };
 
   sourceRoot = ".";

pkgs/development/compilers/crystal/default.nix

@@ -1,26 +1,27 @@
-{ stdenv, fetchurl, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, makeWrapper }:
+{ stdenv, fetchurl, makeWrapper
+, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang }:
 
 stdenv.mkDerivation rec {
   name = "crystal-${version}";
-  version = "0.24.2";
+  version = "0.25.0";
 
   src = fetchurl {
     url = "https://github.com/crystal-lang/crystal/archive/${version}.tar.gz";
-    sha256 = "1l7nrrfgz1yxxjphypwzlxj6dbari20p71zb4l0gix09lmas8l6y";
+    sha256 = "1pnx21ky6cqfyv6df4mmjnyd1yh1bvcqkdzq6f0mk0yrkcl57k3q";
   };
 
-  prebuiltName = "crystal-0.24.2-1";
+  prebuiltName = "crystal-0.25.0-1";
   prebuiltSrc = let arch = {
     "x86_64-linux" = "linux-x86_64";
     "i686-linux" = "linux-i686";
     "x86_64-darwin" = "darwin-x86_64";
   }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
   in fetchurl {
-    url = "https://github.com/crystal-lang/crystal/releases/download/0.24.2/${prebuiltName}-${arch}.tar.gz";
+    url = "https://github.com/crystal-lang/crystal/releases/download/0.25.0/${prebuiltName}-${arch}.tar.gz";
     sha256 = {
-      "x86_64-linux" = "1xf6riwd5k5f95988m1hsppsfii5v96svgmy12ncy7mgmm7k4dh3";
+      "x86_64-linux" = "1q006086pbbvhmscbjzzgbdq1jkppd4p4kl9z9fn9j6np8fhi8ms";
-      "i686-linux" = "0ar05kj89pm3zxfnxwhf0mz9vrd9q5p47y4969sh0r6knccri0kp";
+      "i686-linux" = "074ndm9n0mzsa7dkl3chhf234l85msm99yjksa5980lyqynyrw1d";
-      "x86_64-darwin" = "1vz8bi5rfgggiic4ayxbcf6pfmdjvqcg4lsivnk2fyshr1m8l0h5";
+      "x86_64-darwin" = "006f2j5984dkp5lsq8kns5mkxbhj50syjvzqk9z931pxl92wc7iy";
     }."${stdenv.system}";
   };
 
@@ -60,6 +61,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     install -Dm755 .build/crystal $out/bin/crystal
     wrapProgram $out/bin/crystal \
+        --suffix PATH : ${clang}/bin \
         --suffix CRYSTAL_PATH : lib:$out/lib/crystal \
         --suffix LIBRARY_PATH : $libPath
     install -dm755 $out/lib/crystal
@@ -79,7 +81,7 @@ stdenv.mkDerivation rec {
 
   dontStrip = true;
 
-  enableParallelBuilding = true;
+  enableParallelBuilding = false;
 
   meta = {
     description = "A compiled language with Ruby like syntax and type inference";

pkgs/development/compilers/mint/crystal2nix.cr

@@ -8,7 +8,7 @@ end
 File.open "shards.nix", "w+" do |file|
   file.puts %({)
   yaml = YAML.parse(File.read("shard.lock"))
-  yaml["shards"].each do |key, value|
+  yaml["shards"].as_h.each do |key, value|
     owner, repo = value["github"].as_s.split("/")
     url = "https://github.com/#{value["github"]}"
     rev = if value["version"]?

pkgs/development/compilers/mint/default.nix

@@ -28,13 +28,13 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  version = "0.0.3";
+  version = "0.0.4";
   name = "mint-${version}";
   src = fetchFromGitHub {
     owner = "mint-lang";
     repo = "mint";
-    rev = "0.0.3";
+    rev = "0.0.4";
-    sha256 = "15aawhpagpaqrs64jnz3g6iw3dhq0rlqm92cvfd5a3hbwvxg7lm0";
+    sha256 = "04zq6qqh2dbqgnywsy6qfpimsr2zg19gs3xls1bphbaygnb2yi3l";
   };
 
   buildInputs = [ crystal zlib openssl duktape ];

pkgs/development/compilers/mint/shards.nix

@@ -8,26 +8,26 @@
   ameba = {
     owner = "veelenga";
     repo = "ameba";
-    rev = "v0.6.0";
+    rev = "v0.7.0";
-    sha256 = "16jfyrkfc909h16si513lw944qp3dyapymczcqc2ic0jaal0af5b";
+    sha256 = "01h0a1ba5l254r04mgkqhjdfn21cs0q7fmvk4gj35cj5lpr2bp17";
   };
   baked_file_system = {
     owner = "schovi";
     repo = "baked_file_system";
-    rev = "v0.9.6";
+    rev = "e1447549d5ac0560720fae62179b2f2c62c9bfd1";
-    sha256 = "06cpriaizp5pcqwdq3jl2lm4sz9b2gcxg3a9q3lh0fqk2acajzmx";
+    sha256 = "1fi6zag1a6h4xwrfizy01dls3hhraqw0cmpwj7rjv1qcddjgig5z";
   };
   duktape = {
     owner = "jessedoyle";
     repo = "duktape.cr";
-    rev = "v0.13.0";
+    rev = "v0.14.1";
-    sha256 = "0v0nckprgr7idmsx97g98as1a7z4hmlmwl924dbbaqvyslv5ls6w";
+    sha256 = "0fkay3qspzych050xl8xjkrphmxpzaj0dcf9jl22xwz8cx1l89f1";
   };
   kemal = {
     owner = "kemalcr";
     repo = "kemal";
-    rev = "v0.22.0";
+    rev = "a5870e7d24e5ec75c956bcf3e4423f55a2c4ff78";
-    sha256 = "0gq3c27grgh90fykbj9fdsz507lwd41gk686qfnig6npndqv1v10";
+    sha256 = "1f2bm4xmfg6zqs3a8744pbk1vx964flf17g1mj01yslfcnzxywal";
   };
   kilt = {
     owner = "jeromegn";
@@ -50,8 +50,8 @@
   time_format = {
     owner = "vladfaust";
     repo = "time_format.cr";
-    rev = "v0.1.0";
+    rev = "v0.1.1";
-    sha256 = "1f3rssdlcw2a5f74qa8bzlf1rh5dzvyg1d32w9qlisf2cc4lkh9g";
+    sha256 = "0mmssnabf476i07sajm7s3rlvfcav4lkh0n8g12rybxr6c9f683v";
   };
   tree_template = {
     owner = "anykeyh";

pkgs/development/compilers/vs90wrapper/default.nix

@@ -1,9 +0,0 @@
-{stdenv}:
-
-stdenv.mkDerivation {
-  name = "visual-studio-9.0";
-  buildCommand = ''
-    mkdir -p $out/bin
-    ln -s "/cygdrive/c/Program Files/Microsoft Visual Studio 9.0/VC/vcpackages/vcbuild.exe" $out/bin/vcbuild.exe
-  '';
-}

pkgs/development/haskell-modules/configuration-common.nix

@@ -1044,6 +1044,12 @@ self: super: {
   # Work around overspecified constraint on github ==0.18.
   github-backup = doJailbreak super.github-backup;
 
+  # Work around large number of repeated arguments
+  # https://github.com/NixOS/nixpkgs/issues/40013
+  taffybar = super.taffybar.overrideDerivation (drv: {
+    strictDeps = true;
+  });
+
 }
 
 //

pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix

@@ -418,7 +418,7 @@ self: super: {
   hspec-smallcheck = self.hspec-smallcheck_0_5_2;
   matrix = self.matrix_0_3_6_1;
   pandoc = self.pandoc_2_2_1;
-  pandoc-types = self.pandoc-types_1_17_4_2;
+  pandoc-types = self.pandoc-types_1_17_5_1;
   wl-pprint-text = self.wl-pprint-text_1_2_0_0;
 
   # https://github.com/xmonad/xmonad/issues/155
@@ -444,4 +444,10 @@ self: super: {
 
   lambdabot-core = appendPatch super.lambdabot-core ./patches/lambdabot-core-ghc-8.4.x-fix.patch;
 
+  # Version 1.9.1 excludes base-compat 0.10.x for the benefit of older
+  # compilers, but ghc 8.4.x works fine with the new version.
+  hledger-lib = doJailbreak super.hledger-lib;
+  hledger = doJailbreak super.hledger;
+  hledger-ui = doJailbreak super.hledger-ui;
+
 }

pkgs/development/haskell-modules/configuration-hackage2nix.yaml

@@ -38,7 +38,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 11.12
+  # LTS Haskell 11.13
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -216,11 +216,9 @@ default-package-overrides:
   - attoparsec ==0.13.2.2
   - attoparsec-binary ==0.2
   - attoparsec-expr ==0.1.1.2
-  - attoparsec-ip ==0.0.1
   - attoparsec-iso8601 ==1.0.0.0
   - attoparsec-path ==0.0.0.1
   - attoparsec-time ==1
-  - attoparsec-uri ==0.0.4
   - audacity ==0.0.2
   - authenticate ==1.3.4
   - authenticate-oauth ==1.6
@@ -345,7 +343,7 @@ default-package-overrides:
   - bytestring-trie ==0.2.4.1
   - bzlib ==0.5.0.5
   - bzlib-conduit ==0.3.0.1
-  - c2hs ==0.28.3
+  - c2hs ==0.28.5
   - Cabal ==2.0.1.1
   - cabal-doctest ==1.0.6
   - cabal-file-th ==0.2.4
@@ -626,7 +624,7 @@ default-package-overrides:
   - dsp ==0.2.4
   - dublincore-xml-conduit ==0.1.0.2
   - dvorak ==0.1.0.0
-  - dynamic-state ==0.3
+  - dynamic-state ==0.3.1
   - dyre ==0.8.12
   - Earley ==0.12.1.0
   - easy-file ==0.2.2
@@ -771,7 +769,7 @@ default-package-overrides:
   - from-sum ==0.2.1.0
   - frontmatter ==0.1.0.2
   - fsnotify ==0.2.1.1
-  - fsnotify-conduit ==0.1.1.0
+  - fsnotify-conduit ==0.1.1.1
   - funcmp ==1.9
   - functor-classes-compat ==1
   - fuzzcheck ==0.1.1
@@ -945,7 +943,7 @@ default-package-overrides:
   - hdaemonize ==0.5.5
   - HDBC ==2.4.0.2
   - HDBC-mysql ==0.7.1.0
-  - HDBC-session ==0.1.1.1
+  - HDBC-session ==0.1.2.0
   - hdevtools ==0.1.6.1
   - heap ==1.0.4
   - heaps ==0.3.6
@@ -1008,7 +1006,7 @@ default-package-overrides:
   - HPDF ==1.4.10
   - hpio ==0.9.0.6
   - hpp ==0.5.2
-  - hpqtypes ==1.5.2.0
+  - hpqtypes ==1.5.3.0
   - hquantlib ==0.0.4.0
   - hreader ==1.1.0
   - hreader-lens ==0.1.3.0
@@ -1169,7 +1167,6 @@ default-package-overrides:
   - io-storage ==0.3
   - io-streams ==1.5.0.1
   - io-streams-haproxy ==1.0.0.2
-  - ip ==1.1.2
   - ip6addr ==0.5.3
   - iproute ==1.7.5
   - IPv6Addr ==1.0.3
@@ -1200,7 +1197,6 @@ default-package-overrides:
   - js-flot ==0.8.3
   - js-jquery ==3.3.1
   - json ==0.9.2
-  - json-autotype ==1.0.18
   - json-builder ==0.3
   - json-rpc-generic ==0.2.1.4
   - json-schema ==0.7.4.1
@@ -1265,7 +1261,7 @@ default-package-overrides:
   - lens-simple ==0.1.0.9
   - lentil ==1.0.11.3
   - leveldb-haskell ==0.6.5
-  - lexer-applicative ==2.1.0.1
+  - lexer-applicative ==2.1.0.2
   - libffi ==0.1
   - libgit ==0.3.1
   - libgraph ==1.14
@@ -1331,10 +1327,9 @@ default-package-overrides:
   - markdown ==0.1.17.1
   - markdown-unlit ==0.5.0
   - markov-chain ==0.0.3.4
-  - markup ==4.0.4
   - marvin-interpolate ==1.1.2
   - massiv ==0.1.6.1
-  - massiv-io ==0.1.3.0
+  - massiv-io ==0.1.4.0
   - mathexpr ==0.3.0.0
   - math-functions ==0.2.1.0
   - matplotlib ==0.6.0
@@ -1682,9 +1677,8 @@ default-package-overrides:
   - pretty-show ==1.6.16
   - pretty-simple ==2.1.0.0
   - pretty-types ==0.2.3.1
-  - prim-array ==0.2.2
   - primes ==0.2.1.0
-  - primitive ==0.6.3.0
+  - primitive ==0.6.4.0
   - prim-uniq ==0.1.0.1
   - probability ==0.2.5.1
   - process-extras ==0.7.4
@@ -1728,12 +1722,11 @@ default-package-overrides:
   - QuickCheck ==2.10.1
   - quickcheck-arbitrary-adt ==0.3.1.0
   - quickcheck-assertions ==0.3.0
-  - quickcheck-classes ==0.3.3
   - quickcheck-combinators ==0.0.2
   - quickcheck-instances ==0.3.18
   - quickcheck-io ==0.2.0
   - quickcheck-properties ==0.1
-  - quickcheck-simple ==0.1.0.3
+  - quickcheck-simple ==0.1.0.4
   - quickcheck-special ==0.1.0.6
   - quickcheck-state-machine ==0.3.1
   - quickcheck-text ==0.1.2.1
@@ -1795,7 +1788,7 @@ default-package-overrides:
   - regex-tdfa-text ==1.0.0.3
   - reinterpret-cast ==0.1.0
   - relational-query ==0.11.1.0
-  - relational-query-HDBC ==0.6.6.1
+  - relational-query-HDBC ==0.6.7.0
   - relational-record ==0.2.1.2
   - relational-schemas ==0.1.6.1
   - rematch ==0.2.0.0
@@ -2069,7 +2062,7 @@ default-package-overrides:
   - tasty-ant-xml ==1.1.4
   - tasty-auto ==0.2.0.0
   - tasty-dejafu ==1.1.0.2
-  - tasty-discover ==4.2.0
+  - tasty-discover ==4.2.1
   - tasty-expected-failure ==0.11.1.1
   - tasty-golden ==2.3.1.3
   - tasty-hedgehog ==0.1.0.2
@@ -2250,13 +2243,11 @@ default-package-overrides:
   - unliftio-core ==0.1.1.0
   - unlit ==0.4.0.0
   - unordered-containers ==0.2.9.0
-  - unordered-intmap ==0.1.0.0
   - unsafe ==0.0
   - uri-bytestring ==0.3.2.0
   - uri-bytestring-aeson ==0.1.0.6
   - uri-encode ==1.5.0.5
   - uri-templater ==0.3.1.0
-  - urlpath ==8.0.1
   - userid ==0.1.3.2
   - users ==0.5.0.0
   - users-postgresql-simple ==0.5.0.2
@@ -2337,6 +2328,7 @@ default-package-overrides:
   - warp-tls ==3.2.4.3
   - wave ==0.1.5
   - wavefront ==0.7.1.2
+  - web3 ==0.7.3.0
   - webdriver ==0.8.5
   - webdriver-angular ==0.1.11
   - webpage ==0.0.5

pkgs/development/haskell-modules/configuration-nix.nix

@@ -269,6 +269,10 @@ self: super: builtins.intersectAttrs super {
     );
 
   llvm-hs = super.llvm-hs.override { llvm-config = pkgs.llvm; };
+  llvm-hs_6_2_0 = super.llvm-hs_6_2_0.override {
+    llvm-config = pkgs.llvm_6;
+    llvm-hs-pure = super.llvm-hs-pure_6_2_0;
+  };
 
   # Needs help finding LLVM.
   spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm;