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

nixos/doc/manual/release-notes/rl-1803.xml

@@ -39,6 +39,12 @@ has the following highlights: </para>
     </para>
   </listitem>
 
+  <listitem>
+    <para>
+      The GNOME version is now 3.26.
+    </para>
+  </listitem>
+
   <listitem>
     <para>PHP now defaults to PHP 7.2</para>
   </listitem>
@@ -217,6 +223,14 @@ following incompatible changes:</para>
       overhead of a go package having non-versioned dependencies.
     </para>
   </listitem>
+  <listitem>
+    <para>
+      When using <option>services.xserver.libinput</option> (enabled by default in GNOME),
+      it now handles all input devices, not just touchpads. As a result, you might need to
+      re-evaluate any custom Xorg configuration. In particular,
+      <literal>Option "XkbRules" "base"</literal> may result in broken keyboard layout.
+    </para>
+  </listitem>
 </itemizedlist>
 
 </section>

nixos/modules/module-list.nix

@@ -114,6 +114,7 @@
   ./programs/yabar.nix
   ./programs/zsh/oh-my-zsh.nix
   ./programs/zsh/zsh.nix
+  ./programs/zsh/zsh-autoenv.nix
   ./programs/zsh/zsh-syntax-highlighting.nix
   ./rename.nix
   ./security/acme.nix
@@ -201,6 +202,7 @@
   ./services/desktops/dleyna-renderer.nix
   ./services/desktops/dleyna-server.nix
   ./services/desktops/geoclue2.nix
+  ./services/desktops/pipewire.nix
   ./services/desktops/gnome3/at-spi2-core.nix
   ./services/desktops/gnome3/chrome-gnome-shell.nix
   ./services/desktops/gnome3/evolution-data-server.nix

nixos/modules/programs/zsh/zsh-autoenv.nix

@@ -0,0 +1,28 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.programs.zsh.zsh-autoenv;
+in {
+  options = {
+    programs.zsh.zsh-autoenv = {
+      enable = mkEnableOption "zsh-autoenv";
+      package = mkOption {
+        default = pkgs.zsh-autoenv;
+        defaultText = "pkgs.zsh-autoenv";
+        description = ''
+          Package to install for `zsh-autoenv` usage.
+        '';
+
+        type = types.package;
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    programs.zsh.interactiveShellInit = ''
+      source ${cfg.package}/share/zsh-autoenv/autoenv.zsh
+    '';
+  };
+}

nixos/modules/services/desktops/pipewire.nix

@@ -0,0 +1,23 @@
+# pipewire service.
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  ###### interface
+  options = {
+    services.pipewire = {
+      enable = mkEnableOption "pipewire service";
+    };
+  };
+
+
+  ###### implementation
+  config = mkIf config.services.pipewire.enable {
+    environment.systemPackages = [ pkgs.pipewire ];
+
+    systemd.packages = [ pkgs.pipewire ];
+  };
+
+  meta.maintainers = with lib.maintainers; [ jtojnar ];
+}

nixos/modules/services/networking/gnunet.nix

@@ -137,6 +137,8 @@ in
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
       path = [ pkgs.gnunet pkgs.miniupnpc ];
+      environment.TMPDIR = "/tmp";
+      serviceConfig.PrivateTemp = true;
       serviceConfig.ExecStart = "${pkgs.gnunet}/lib/gnunet/libexec/gnunet-service-arm -c ${configFile}";
       serviceConfig.User = "gnunet";
       serviceConfig.UMask = "0007";

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

@@ -66,6 +66,10 @@ in
       security.wrappers = {
         kcheckpass.source = "${lib.getBin plasma5.plasma-workspace}/lib/libexec/kcheckpass";
         "start_kdeinit".source = "${lib.getBin pkgs.kinit}/lib/libexec/kf5/start_kdeinit";
+        kwin_wayland = {
+          source = "${lib.getBin plasma5.kwin}/bin/kwin_wayland";
+          capabilities = "cap_sys_nice+ep";
+        };
       };
 
       environment.systemPackages = with pkgs; with qt5; with libsForQt5; with plasma5; with kdeApplications;

nixos/release.nix

@@ -244,6 +244,7 @@ in rec {
   tests.containers-macvlans = callTest tests/containers-macvlans.nix {};
   tests.couchdb = callTest tests/couchdb.nix {};
   tests.docker = callTestOnTheseSystems ["x86_64-linux"] tests/docker.nix {};
+  tests.docker-tools = callTestOnTheseSystems ["x86_64-linux"] tests/docker-tools.nix {};
   tests.docker-edge = callTestOnTheseSystems ["x86_64-linux"] tests/docker-edge.nix {};
   tests.dovecot = callTest tests/dovecot.nix {};
   tests.dnscrypt-proxy = callTestOnTheseSystems ["x86_64-linux"] tests/dnscrypt-proxy.nix {};

nixos/tests/docker-tools.nix

@@ -0,0 +1,36 @@
+# this test creates a simple GNU image with docker tools and sees if it executes
+
+import ./make-test.nix ({ pkgs, ... }: {
+  name = "docker-tools";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ ];
+  };
+
+  nodes = {
+    docker =
+      { config, pkgs, ... }: {
+        virtualisation.docker.enable = true;
+      };
+  };
+
+  testScript =
+    let
+      dockerImage = pkgs.dockerTools.buildImage {
+        name = "hello-docker";
+        contents = [ pkgs.hello ];
+        tag = "sometag";
+
+        # TODO: create another test checking whether runAsRoot works as intended.
+
+        config = {
+          Cmd = [ "hello" ];
+        };
+      };
+
+    in ''
+      $docker->waitForUnit("sockets.target");
+      $docker->succeed("docker load --input='${dockerImage}'");
+      $docker->succeed("docker run hello-docker:sometag");
+    '';
+
+})

pkgs/applications/editors/emacs-modes/elpa-generated.nix

@@ -1040,10 +1040,10 @@
       }) {};
     hook-helpers = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
         pname = "hook-helpers";
-        version = "1.1";
+        version = "1.1.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/hook-helpers-1.1.tar";
+          url = "https://elpa.gnu.org/packages/hook-helpers-1.1.1.tar";
-          sha256 = "0xvabl0lfc0ijr98clsyh0bqk2fdi1ncl0knn58j2p30gn9958i5";
+          sha256 = "05nqlshdqh32smav58hzqg8wp04h7w9sxr239qrz4wqxwlxlv9im";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2014,10 +2014,10 @@
       }) {};
     sql-indent = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "sql-indent";
-        version = "1.0";
+        version = "1.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/sql-indent-1.0.tar";
+          url = "https://elpa.gnu.org/packages/sql-indent-1.1.tar";
-          sha256 = "02cmi96mqk3bfmdh0xv5s0qx310cirs6kq0jqwk1ga41rpp596vl";
+          sha256 = "06q41msfir178f50nk8fnyc1rwgyq5iyy17pv8mq0zqbacjbp88z";
         };
         packageRequires = [];
         meta = {

pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix

@@ -548,12 +548,12 @@
     ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "ac-php";
-        version = "2.0.2";
+        version = "2.0.3";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "b9f455d863d3e92fcf32eaa722447c6d62ee1297";
+          rev = "cf9db85af2db9150e9d9b4fecad874e16ce43f0d";
-          sha256 = "1mwx61yxsxzd9d6jas61rsc68vc7mrlzkxxyyzcq21qvikadigrk";
+          sha256 = "0gm15f5l91sh7syf60lnvlfnf3vivbk36gddsf3yndiwfsqh7xd0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -569,12 +569,12 @@
     ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }:
     melpaBuild {
         pname = "ac-php-core";
-        version = "2.0.2";
+        version = "2.0.3";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "b9f455d863d3e92fcf32eaa722447c6d62ee1297";
+          rev = "cf9db85af2db9150e9d9b4fecad874e16ce43f0d";
-          sha256 = "1mwx61yxsxzd9d6jas61rsc68vc7mrlzkxxyyzcq21qvikadigrk";
+          sha256 = "0gm15f5l91sh7syf60lnvlfnf3vivbk36gddsf3yndiwfsqh7xd0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -905,12 +905,12 @@
     adafruit-wisdom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "adafruit-wisdom";
-        version = "0.2.0";
+        version = "0.2.1";
         src = fetchFromGitHub {
           owner = "gonewest818";
           repo = "adafruit-wisdom.el";
-          rev = "67e1fb17964c09514e7635dba85fb14b0926e49c";
+          rev = "2b353f9029f359eb4eb4f0364bd2fbbedf081e42";
-          sha256 = "097r31l4fpj4yd2ajv6zwgwn35fwn3c83qg9yzm2rjz1rdcwxlrw";
+          sha256 = "0zyqnwmrj7yigk1z9baqxmzxnwhpxfjz9r1gl090harl69hdp67d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/18483af52c26f719fbfde626db84a67750bf4754/recipes/adafruit-wisdom";
@@ -2557,12 +2557,12 @@
     base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "base16-theme";
-        version = "2.1";
+        version = "2.2";
         src = fetchFromGitHub {
           owner = "belak";
           repo = "base16-emacs";
-          rev = "f6d3d45a88d8fa2d70eaa26d8ebcef741b370dd1";
+          rev = "10180e88d6d9434cec367b6c91222dd2fc3bd8ae";
-          sha256 = "19jbvz07qc325mqdzk0q1ycvpibndw0mb7s7bpr0f0nblla0l0sv";
+          sha256 = "01w89g413s1da6rf94y1xnhw79cjy2bqb01yfjs58cy492cm0vr6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
@@ -2830,12 +2830,12 @@
     better-shell = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "better-shell";
-        version = "1.1";
+        version = "1.2";
         src = fetchFromGitHub {
           owner = "killdash9";
           repo = "better-shell";
-          rev = "6ae157da700a4473734dca75925f6bf60e6b3ba7";
+          rev = "f231404b6f8efce33b48e31e5b1566108d0ba000";
-          sha256 = "14ym7gp57yflf86hxpsjnagxnc0z1jrdc4mbq7wcbh5z8kjkbfpd";
+          sha256 = "1g5bljvigga856ksyvgix9hk0pp9nzic088kp0bqx0zqvcl82v0b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/better-shell";
@@ -5486,12 +5486,12 @@
     company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-php";
-        version = "2.0.2";
+        version = "2.0.3";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "b9f455d863d3e92fcf32eaa722447c6d62ee1297";
+          rev = "cf9db85af2db9150e9d9b4fecad874e16ce43f0d";
-          sha256 = "1mwx61yxsxzd9d6jas61rsc68vc7mrlzkxxyyzcq21qvikadigrk";
+          sha256 = "0gm15f5l91sh7syf60lnvlfnf3vivbk36gddsf3yndiwfsqh7xd0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -7935,12 +7935,12 @@
     dotenv-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dotenv-mode";
-        version = "0.2.3";
+        version = "0.2.4";
         src = fetchFromGitHub {
           owner = "preetpalS";
           repo = "emacs-dotenv-mode";
-          rev = "574bf1e3dfa79aa836c67759d9eec904a6878c77";
+          rev = "f4c52bcd5313379b9f2460db7f7a33119dfa96ea";
-          sha256 = "0rx0f9vs68lbrjmzsajcxxhv6dm3wjiil12xzqg924d7fx3b1w52";
+          sha256 = "1fplkhxnsgdrg10iqsmw162zny2idz4vvv35spsb9j0hsk8imclc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9fc022c54b90933e70dcedb6a85167c2d9d7ba79/recipes/dotenv-mode";
@@ -8103,12 +8103,12 @@
     dtrt-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dtrt-indent";
-        version = "0.4";
+        version = "0.5";
         src = fetchFromGitHub {
           owner = "jscheid";
           repo = "dtrt-indent";
-          rev = "1cca0834800e8f775a558e84fc6d4fdcb6a235d0";
+          rev = "a87d3d9cf8d4d8cb6f108004e425f9a557683b75";
-          sha256 = "0vq1qz12kbphl9hfsnq1v2yzsy0p6v6wi4h9b3a0iwvbya4f110l";
+          sha256 = "0dia1xc8mng9bg987cpnhr2lciw4qbqsvzs4ayakrqfl2g3ny2qn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/61bcbcfa6c0f38a1d87f5b6913b8be6c50ef2994/recipes/dtrt-indent";
@@ -9178,27 +9178,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    elcord = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "elcord";
-        version = "1.0.0";
-        src = fetchFromGitHub {
-          owner = "Zulu-Inuoe";
-          repo = "elcord";
-          rev = "91c665fd832ef3b79c3eb810b7a6b08979a352cd";
-          sha256 = "04nxyj94rmi22wfasi4lavn3lzkcpxpr5ksfqc8dfq9bllz4c9pa";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/36b64d0fead049df5ebd6606943a8f769324539e/recipes/elcord";
-          sha256 = "044mwil9alh2v7bjj8yvx8azym2b7a5xb0c7y0r0k2vj72wiirjb";
-          name = "elcord";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://melpa.org/#/elcord";
-          license = lib.licenses.free;
-        };
-      }) {};
     eldoc-eval = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eldoc-eval";
@@ -9923,12 +9902,12 @@
     emms-player-mpv = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "emms-player-mpv";
-        version = "0.0.12";
+        version = "0.0.13";
         src = fetchFromGitHub {
           owner = "dochang";
           repo = "emms-player-mpv";
-          rev = "8c72282c98f9b10601e9a6901277040cda4b33aa";
+          rev = "6d526fe618c3cebf7fbc5f0d3f0a225de16a76c7";
-          sha256 = "1h37kqhsi1x5xgxfp1i72vfdx5c2klblzmphf6mih3fvw3pcyxi6";
+          sha256 = "0jq67lngpz7iqwqfsl95r5p26cnnq7ldcj534nm86hwm6jfij564";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9679cb8d4b3b9dce1e0bff16647ea3f3e02c4189/recipes/emms-player-mpv";
@@ -12318,8 +12297,8 @@
           sha256 = "16p7qmljjki4svci3mxzydmvpxaprbnfq6794b3adyyixkmgr6k7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d7a6fc9f99241ff8e3a9c1fb12418d4d69d9e203/recipes/faustine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf/recipes/faustine";
-          sha256 = "1hyvkd4y28smdp30bkky6bwmqwlxjrq136wp7112371w963iwjsb";
+          sha256 = "1blmz993xrwkyr7snj7rm07s07imgpdlfqi6wxkm4ns6iwa2q60s";
           name = "faustine";
         };
         packageRequires = [ emacs faust-mode ];
@@ -12965,22 +12944,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-dmd-dub = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    flycheck-dmd-dub = callPackage ({ f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-dmd-dub";
-        version = "0.9";
+        version = "0.12";
         src = fetchFromGitHub {
           owner = "atilaneves";
           repo = "flycheck-dmd-dub";
-          rev = "e8744adaba010415055ac15c702f780dd6e13e14";
+          rev = "41a839e18eb7159175c59a2f8b2f5f283191e33f";
-          sha256 = "1ap5hgvaccmf2xkfvyp7rqcfjwmiy6mhr6ccgahxm2z0vm51kpyh";
+          sha256 = "0a78np6nb9ciz440n9ks6kybwggkq99knzv7swbmvngvhg96khbx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a812594901c1099283bdf51fbea1aa077cfc588d/recipes/flycheck-dmd-dub";
           sha256 = "0pg3sf7h6xqv65yqclhlb7fx1mp2w0m3qk4vji6m438kxy6fhzqm";
           name = "flycheck-dmd-dub";
         };
-        packageRequires = [ flycheck ];
+        packageRequires = [ f flycheck ];
         meta = {
           homepage = "https://melpa.org/#/flycheck-dmd-dub";
           license = lib.licenses.free;
@@ -18525,6 +18504,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-rg = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-rg";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "cosmicexplorer";
+          repo = "helm-rg";
+          rev = "96dcbeb366caa0b158668384113458ee5f7c4dfd";
+          sha256 = "1k9yv9iw694alf5w7555ygk2i1b26i90rqq7ny63a4nd3y5cbs5f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/958fbafdcb214f1ec89fd0d84c6600c89890e0cf/recipes/helm-rg";
+          sha256 = "0gfq59540q9s6mr04q7dz638zqmqbqmbl1qaczddgmjn4vyjmf7v";
+          name = "helm-rg";
+        };
+        packageRequires = [ cl-lib dash emacs helm ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-rg";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-robe = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-robe";
@@ -18819,22 +18819,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    helpful = callPackage ({ dash, dash-functional, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
+    helpful = callPackage ({ dash, dash-functional, elisp-refs, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
     melpaBuild {
         pname = "helpful";
-        version = "0.6";
+        version = "0.7";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "helpful";
-          rev = "e1b660e2a48b39b0a81119c2593362dd60076757";
+          rev = "3ae20551fb0ce199deff47534a475cab50f19237";
-          sha256 = "031hglxwlq8fryi8vs11hyflcrk09qc9qja28nqby0adn20z47mc";
+          sha256 = "1zb2zfyflabhar8smvpxcdmkla7camaq2srq6dk2xc66226vj9rn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful";
           sha256 = "17w9j5v1r2c8ka1fpzbr295cgnsbiw8fxlslh4zbjqzaazamchn2";
           name = "helpful";
         };
-        packageRequires = [ dash dash-functional elisp-refs emacs s shut-up ];
+        packageRequires = [ dash dash-functional elisp-refs emacs f s shut-up ];
         meta = {
           homepage = "https://melpa.org/#/helpful";
           license = lib.licenses.free;
@@ -20690,12 +20690,12 @@
     intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "intero";
-        version = "0.1.23";
+        version = "0.1.26";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "3865aad923559bee140eaede20c3510890979930";
+          rev = "f85e1b47df3bb328be0de34120950cecb3465055";
-          sha256 = "1q6q2hnqf78kxd61nic4zjx7crbv8p25p4aq0h4vihamm8r0v7vm";
+          sha256 = "1zng4sliygg1l0jamprx9pfs85jiy19gwxpcy2hs3s4hc7yxjdds";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -25787,13 +25787,13 @@
         pname = "notmuch";
         version = "0.26";
         src = fetchgit {
-          url = "git://git.notmuchmail.org/git/notmuch";
+          url = "https://git.notmuchmail.org/git/notmuch";
           rev = "3c4e64d976eb561ac5157df1bbe5882e3e65b583";
           sha256 = "00a9ggrc63n88g7vp57c09r859pl2dbxnqgf543ks94lm0jzyz3f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d05fbde3aabfec4efdd19a33fd2b1297905acb5a/recipes/notmuch";
-          sha256 = "173d1gf5rd4nbjwg91486ibg54n3qlpwgyvkcy4d30jm4vqwqrqv";
+          sha256 = "0pznpl0aqybdg4b2qypq6k4jac64sssqhgz6rvk9g2nkqhkds1x7";
           name = "notmuch";
         };
         packageRequires = [];
@@ -26180,27 +26180,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-spice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, spice-mode }:
-    melpaBuild {
-        pname = "ob-spice";
-        version = "0.4.2";
-        src = fetchFromGitHub {
-          owner = "stardiviner";
-          repo = "ob-spice";
-          rev = "790faa67b0c57ca76e8814a1fa60b4dd774412c0";
-          sha256 = "0rn3j88ry38500vfaj0myx148nd5kh1jwja6j221ydd6v5wqws6d";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-spice";
-          sha256 = "0nhdcvq7yvprz4323836k507w0g1lh3rdfr6dqrbj29yvsqfw0x2";
-          name = "ob-spice";
-        };
-        packageRequires = [ org spice-mode ];
-        meta = {
-          homepage = "https://melpa.org/#/ob-spice";
-          license = lib.licenses.free;
-        };
-      }) {};
     ob-translate = callPackage ({ fetchFromGitHub, fetchurl, google-translate, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ob-translate";
@@ -26481,8 +26460,8 @@
         src = fetchFromGitHub {
           owner = "OmniSharp";
           repo = "omnisharp-emacs";
-          rev = "588b8482685adedbc56933cb13c58d9cc6a82456";
+          rev = "7a6fe00e841106b17e7554f8a21f8457d12c5197";
-          sha256 = "1iqwxc19jvcb2gsm2aq59zblg1qjmbxgb2yl3h3aybqp968j3i00";
+          sha256 = "1vrgj2irm87pykfjyx27a46g5xam7rxwjdfqh4jl6p8cgzgprrrg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@@ -36566,22 +36545,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pfuture, s }:
+    treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, ht, hydra, lib, melpaBuild, pfuture, s }:
     melpaBuild {
         pname = "treemacs";
-        version = "1.16.1";
+        version = "1.18";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "ef7597d5e99d50efd014bfa9f01046956d0da95f";
+          rev = "2bab3bfb6e75d44d42e1055c4e9bb44400a46475";
-          sha256 = "15379w0frxwl9p1xraqapn9r2wra75g8mjybj41jd1y65acjg9wg";
+          sha256 = "0zzm17cv1j25b2hj6vlqwi7iglqckijqbsvap0lkijimaipzpq52";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs";
           sha256 = "0zbnw48wrbq9g7vlwxapxpq9xz8cqyr63814w0pqnh6j40ia7r2a";
           name = "treemacs";
         };
-        packageRequires = [ ace-window cl-lib dash emacs f hydra pfuture s ];
+        packageRequires = [ ace-window cl-lib dash emacs f ht hydra pfuture s ];
         meta = {
           homepage = "https://melpa.org/#/treemacs";
           license = lib.licenses.free;
@@ -36590,12 +36569,12 @@
     treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }:
     melpaBuild {
         pname = "treemacs-evil";
-        version = "1.16.1";
+        version = "1.18";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "ef7597d5e99d50efd014bfa9f01046956d0da95f";
+          rev = "2bab3bfb6e75d44d42e1055c4e9bb44400a46475";
-          sha256 = "15379w0frxwl9p1xraqapn9r2wra75g8mjybj41jd1y65acjg9wg";
+          sha256 = "0zzm17cv1j25b2hj6vlqwi7iglqckijqbsvap0lkijimaipzpq52";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-evil";
@@ -36611,12 +36590,12 @@
     treemacs-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, treemacs }:
     melpaBuild {
         pname = "treemacs-projectile";
-        version = "1.16.1";
+        version = "1.18";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "ef7597d5e99d50efd014bfa9f01046956d0da95f";
+          rev = "2bab3bfb6e75d44d42e1055c4e9bb44400a46475";
-          sha256 = "15379w0frxwl9p1xraqapn9r2wra75g8mjybj41jd1y65acjg9wg";
+          sha256 = "0zzm17cv1j25b2hj6vlqwi7iglqckijqbsvap0lkijimaipzpq52";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-projectile";
@@ -39305,13 +39284,13 @@
         pname = "yatex";
         version = "1.80";
         src = fetchhg {
-          url = "https://www.yatex.org/hgrepos/yatex/";
+          url = "https://www.yatex.org/hgrepos/yatex";
           rev = "b1896ef49747";
           sha256 = "1a8qc1krskl5qdy4fikilrrzrwmrghs4h1yaj5lclzywpc67zi8b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e28710244a1bef8f56156fe1c271520896a9c694/recipes/yatex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9854c39fc1889891fe460d0d5ac9224de3f6c635/recipes/yatex";
-          sha256 = "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6";
+          sha256 = "1qbqdsqf5s61hyyzx84csnby242n5sdcmcw55pa8r16j8kyzgrc0";
           name = "yatex";
         };
         packageRequires = [];

pkgs/applications/editors/emacs-modes/org-generated.nix

@@ -1,10 +1,10 @@
 { callPackage }: {
     org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org";
-        version = "20180205";
+        version = "20180212";
         src = fetchurl {
-          url = "https://orgmode.org/elpa/org-20180205.tar";
+          url = "https://orgmode.org/elpa/org-20180212.tar";
-          sha256 = "03045w9pr45byrj7wqzkb6i56d4r7xykfr066qmywspk764wmfyh";
+          sha256 = "09wgmiavby009mkc5v2d0znrrs40fnmhzq252hni4zjy8kbgwfzk";
         };
         packageRequires = [];
         meta = {
@@ -14,10 +14,10 @@
       }) {};
     org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org-plus-contrib";
-        version = "20180205";
+        version = "20180212";
         src = fetchurl {
-          url = "https://orgmode.org/elpa/org-plus-contrib-20180205.tar";
+          url = "https://orgmode.org/elpa/org-plus-contrib-20180212.tar";
-          sha256 = "0pbs3b0miqmpjw3d6mcw61dqyy6gnpdq6m18xmkbfvk5nn9lv7i6";
+          sha256 = "0wy9j2iagjzzjkqfsz1askxg4jmaxc0p0f42jbzx2ja7h4qkm9nj";
         };
         packageRequires = [];
         meta = {

pkgs/applications/editors/ghostwriter/default.nix

@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, qmake, pkgconfig, qtwebkit, hunspell }:
+
+stdenv.mkDerivation rec {
+  pname = "ghostwriter";
+  version = "1.5.0";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "wereturtle";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0ixw2w2526836lwj4pc0vp7prp1gls7iq37v8m9ql1508b33b9pq";
+  };
+
+  nativeBuildInputs = [ qmake pkgconfig ];
+
+  buildInputs = [ qtwebkit hunspell ];
+
+  meta = with stdenv.lib; {
+    description = "A cross-platform, aesthetic, distraction-free Markdown editor";
+    homepage = src.meta.homepage;
+    license = licenses.gpl3Plus;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ dotlambda ];
+  };
+}

pkgs/applications/editors/texstudio/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt4, qmake4Hook, poppler_qt4, zlib, pkgconfig}:
+{ stdenv, fetchurl, qt5, poppler_qt5, zlib, pkgconfig}:
 
 stdenv.mkDerivation rec {
   pname = "texstudio";
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "18rxd7ra5k2f7s4c296b3v3pqhxjmfix9xpy9i1g4jm87ygqrbnd";
   };
 
-  nativeBuildInputs = [ qmake4Hook pkgconfig ];
+  nativeBuildInputs = [ qt5.qmake pkgconfig ];
-  buildInputs = [ qt4 poppler_qt4 zlib ];
+  buildInputs = [ qt5.qtbase qt5.qtscript qt5.qtsvg poppler_qt5 zlib ];
 
   qmakeFlags = [ "NO_APPDATA=True" ];
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 	'';
     homepage = http://texstudio.sourceforge.net;
     license = licenses.gpl2Plus;
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" ];
     maintainers = with maintainers; [ cfouche ];
   };
 }

pkgs/applications/editors/vim/macvim.nix

@@ -103,6 +103,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
+    broken = true; # needs ruby 2.2
     description = "Vim - the text editor - for macOS";
     homepage    = https://github.com/b4winckler/macvim;
     license = licenses.vim;

pkgs/applications/misc/taskjuggler/default.nix

@@ -7,6 +7,7 @@ bundlerEnv {
   gemdir = ./.;
 
   meta = {
+    broken = true; # needs ruby 2.0
     description = "A modern and powerful project management tool";
     homepage    = http://taskjuggler.org/;
     license     = lib.licenses.gpl2;

pkgs/applications/misc/xca/default.nix

@@ -1,15 +1,13 @@
 { mkDerivation, lib, fetchurl, pkgconfig, which
 , libtool, openssl, qtbase, qttools }:
 
-with lib;
-
 mkDerivation rec {
   name = "xca-${version}";
-  version = "1.3.2";
+  version = "1.4.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/xca/${name}.tar.gz";
-    sha256 = "1r2w9gpahjv221j963bd4vn0gj4cxmb9j42f3cd9qdn890hizw84";
+    sha256 = "1gygj6kljj3r1y0pg67mks36vfcz4vizjsqnqdvrk6zlgqjbzm7z";
   };
 
   enableParallelBuilding = true;
@@ -23,9 +21,8 @@ mkDerivation rec {
   meta = with lib; {
     description = "Interface for managing asymetric keys like RSA or DSA";
     homepage    = http://xca.sourceforge.net/;
-    platforms = platforms.all;
     license     = licenses.bsd3;
     maintainers = with maintainers; [ offline peterhoeg ];
-    broken = builtins.compareVersions qtbase.version "5.7.0" == 0;
+    platforms   = platforms.all;
   };
 }

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

@@ -4,7 +4,7 @@
 , freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp
 , libuuid, xz
 , gstreamer, gst-plugins-base, libxml2
-, glib, gtk3, pango, gdk_pixbuf, cairo, atk, gnome3
+, glib, gtk3, pango, gdk_pixbuf, cairo, atk, at_spi2_atk, gnome3
 , nss, nspr
 , patchelf, makeWrapper
 , proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null
@@ -13,11 +13,11 @@
 stdenv.mkDerivation rec {
   name = "${product}-${version}";
   product = "vivaldi";
-  version = "1.13.1008.34-1";
+  version = "1.14.1077.45-1";
 
   src = fetchurl {
     url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb";
-    sha256 = "18p5n87n5rkd6dhdsf2lvcyhg6ipn0k4p6a79dy93vsgjmk4bvw2";
+    sha256 = "0b4iviar927jx6xqyrzgzb3p4p617zm4an1np8jnldadq2a0p56d";
   };
 
   unpackPhase = ''
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb
     libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr
-    atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd
+    atk at_spi2_atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd
     freetype fontconfig libXrender libuuid expat glib nss nspr
     gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf
   ] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs;

pkgs/applications/networking/cluster/panamax/api/default.nix

@@ -64,6 +64,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
+    broken = true; # needs ruby 2.1
     homepage = https://github.com/CenturyLinkLabs/panamax-api;
     description = "The API behind The Panamax UI";
     license = licenses.asl20;

pkgs/applications/networking/cluster/panamax/ui/default.nix

@@ -62,6 +62,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
+    broken = true; # needs ruby 2.1
     homepage = https://github.com/CenturyLinkLabs/panamax-ui;
     description = "The Web GUI for Panamax";
     license = licenses.asl20;

pkgs/applications/networking/instant-messengers/ring-daemon/default.nix

@@ -145,5 +145,7 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ taeer olynch ];
     platforms = platforms.linux;
+    # pjsip' fails to compile with the supplied patch set, see: https://hydra.nixos.org/build/68667921/nixlog/4
+    broken = true;
   };
 }

pkgs/applications/networking/mailreaders/mailpile/default.nix

@@ -1,27 +1,39 @@
-{ stdenv, fetchgit, python2Packages, gnupg1orig, makeWrapper, openssl }:
+{ stdenv, fetchFromGitHub, python2Packages, gnupg1orig, makeWrapper, openssl, git }:
 
 python2Packages.buildPythonApplication rec {
   name = "mailpile-${version}";
-  version = "0.4.1";
+  version = "1.0.0rc2";
 
-  src = fetchgit {
+  src = fetchFromGitHub {
-    url = "git://github.com/pagekite/Mailpile";
+    owner = "mailpile";
-    rev = "refs/tags/${version}";
+    repo = "Mailpile";
-    sha256 = "118b5zwfwmzj38p0mkj3r1s09jxg8x38y0a42b21imzpmli5vpb5";
+    rev = "${version}";
+    sha256 = "1z5psh00fjr8gnl4yjcl4m9ywfj24y1ffa2rfb5q8hq4ksjblbdj";
   };
 
-  patchPhase = ''
+  postPatch = ''
-    substituteInPlace setup.py --replace "data_files.append((dir" "data_files.append(('lib/${python2Packages.python.libPrefix}/site-packages/' + dir"
+    patchShebangs scripts
   '';
 
+  nativeBuildInputs = with python2Packages; [ pbr git ];
+  PBR_VERSION=version;
+
   propagatedBuildInputs = with python2Packages; [
-    makeWrapper pillow jinja2 spambayes python2Packages.lxml
+    appdirs
-    pgpdump gnupg1orig
+    cryptography
+    fasteners
+    gnupg1orig
+    jinja2
+    pgpdump
+    pillow
+    python2Packages.lxml
+    spambayes
   ];
 
   postInstall = ''
     wrapProgram $out/bin/mailpile \
-      --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1orig openssl ]}"
+      --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1orig openssl ]}" \
+      --set-default MAILPILE_SHARED "$out/share/mailpile"
   '';
 
   # No tests were found

pkgs/applications/networking/offrss/default.nix

@@ -8,18 +8,14 @@ stdenv.mkDerivation {
     cp offrss $out/bin
   '';
 
-  crossAttrs = {
+  buildInputs = [ curl libmrss ]
-    propagatedBuildInputs = [ curl.crossDrv libmrss.crossDrv ];
+    ++ stdenv.lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) podofo
-    preConfigure = ''
-      sed 's/^PDF/#PDF/' -i Makefile
-    '';
-  };
-
-  buildInputs = [ curl libmrss podofo ]
     ++ stdenv.lib.optional (!stdenv.isLinux) libiconv;
 
   configurePhase = stdenv.lib.optionalString (!stdenv.isLinux) ''
     sed 's/#EXTRA/EXTRA/' -i Makefile
+  '' + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+    sed 's/^PDF/#PDF/' -i Makefile
   '';
 
   src = fetchurl {

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

@@ -1,8 +1,6 @@
-{ stdenv, fetchFromGitHub, python2, fixDarwinDylibNames }:
+{ stdenv, fetchFromGitHub, python, fixDarwinDylibNames }:
 
-let
+stdenv.mkDerivation rec {
-  python = python2;
-in stdenv.mkDerivation rec {
   name = "z3-${version}";
   version = "4.6.0";
 
@@ -14,6 +12,7 @@ in stdenv.mkDerivation rec {
   };
 
   buildInputs = [ python fixDarwinDylibNames ];
+  propagatedBuildInputs = [ python.pkgs.setuptools ];
   enableParallelBuilding = true;
 
   configurePhase = ''

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

@@ -29,6 +29,7 @@
 , texlive
 , texinfo
 , hevea
+, buildDocs ? false
 }:
 
 stdenv.mkDerivation rec {
@@ -87,7 +88,7 @@ stdenv.mkDerivation rec {
     # Sage installs during first `make`, `make install` is no-op and just takes time.
   '';
 
-  outputs = [ "out" "doc" ];
+  outputs = [ "out" ] ++ stdenv.lib.optionals (buildDocs) [ "doc" ];
 
   buildInputs = [
     bash # needed for the build
@@ -135,13 +136,16 @@ stdenv.mkDerivation rec {
     # TODO could be patched with `sed s|printf(ctime(\(.*\)))|%s... or fixed upstream
   ];
 
+  configureFlags = stdenv.lib.optionals(buildDocs) [ "--docdir=$(doc)" ];
   preConfigure = ''
-    export SAGE_NUM_THREADS=$NIX_BUILD_CORES
+    export SAGE_NUM_THREADS="$NIX_BUILD_CORES"
     export SAGE_ATLAS_ARCH=fast
 
-    export HOME=$out/sage-home
+    export HOME=/tmp/sage-home
-    mkdir -p $out/sage-home
+    export SAGE_ROOT="$PWD"
+    export SAGE_SRC="$PWD"
 
+    mkdir -p "$HOME"
     mkdir -p "$out"
 
     # we need to keep the source around
@@ -150,12 +154,18 @@ stdenv.mkDerivation rec {
     mv "$dir" "$out/sage-root"
 
     cd "$out/sage-root" # build in target dir, since `make` is also `make install`
+  ''
+  + stdenv.lib.optionalString (buildDocs) ''
+    mkdir -p "$doc"
+    export SAGE_DOC="$doc"
+    export SAGE_DOCBUILD_OPTS="--no-pdf-links -k"
+    export SAGE_SPKG_INSTALL_DOCS='no'
   '';
 
+  buildFlags = if (buildDocs) then "doc" else "build";
+
   # for reference: http://doc.sagemath.org/html/en/installation/source.html
   preBuild = ''
-    # TODO do this conditionally
-    export SAGE_SPKG_INSTALL_DOCS='no'
     # symlink python to make sure the shebangs are patched to the sage path
     # while still being able to use python before building it
     # (this is important because otherwise sage will try to install python
@@ -167,10 +177,15 @@ stdenv.mkDerivation rec {
   '';
 
   postBuild = ''
+    # Clean up
     rm -r "$out/sage-root/upstream" # don't keep the sources of all the spkgs
-    rm -r "$out/sage-root/src/build"
+    rm -rf "$out/sage-root/src/build"
-    rm -rf "$out/sage-root/src/.git"
+    rm -rf "$out/sage-root/src/autom4te.cache"
+    rm -rf "$out/sage-root/src/config"
+    rm -rf "$out/sage-root/src/m4"
+    rm -rf "$out/sage-root/.git"
     rm -r "$out/sage-root/logs"
+    rm -r "$out"/lib/python*/test
     # Fix dependency cycle between out and doc
     rm -f "$out/sage-root/config.log"
     rm -f "$out/sage-root/config.status"

pkgs/applications/search/catfish/default.nix

@@ -1,15 +1,17 @@
-{ stdenv, fetchurl, file, which, intltool, findutils, xdg_utils,
+{ stdenv, fetchurl, file, which, intltool, gobjectIntrospection,
-  gnome3, pythonPackages, wrapGAppsHook }:
+  findutils, xdg_utils, gnome3, pythonPackages, hicolor_icon_theme,
+  wrapGAppsHook
+}:
 
 pythonPackages.buildPythonApplication rec {
   majorver = "1.4";
-  minorver = "2";
+  minorver = "4";
   version = "${majorver}.${minorver}";
-  name = "catfish-${version}";
+  pname = "catfish";
 
   src = fetchurl {
-    url = "https://launchpad.net/catfish-search/${majorver}/${version}/+download/${name}.tar.bz2";
+    url = "https://launchpad.net/catfish-search/${majorver}/${version}/+download/${pname}-${version}.tar.gz";
-    sha256 = "0j3by9yfs4j9za3s5qdxrsm7idmps69pimc9d0mjyakvviy0izm3";
+    sha256 = "1mw7py6si6y88jblmzm04hf049bpww7h87k2wypq07zm1dw55m52";
   };
 
   nativeBuildInputs = [
@@ -17,6 +19,7 @@ pythonPackages.buildPythonApplication rec {
     file
     which
     intltool
+    gobjectIntrospection
     wrapGAppsHook
   ];
 
@@ -26,6 +29,7 @@ pythonPackages.buildPythonApplication rec {
     pythonPackages.pyxdg
     pythonPackages.ptyprocess
     pythonPackages.pycairo
+    hicolor_icon_theme
   ];
 
   propagatedBuildInputs = [
@@ -35,17 +39,20 @@ pythonPackages.buildPythonApplication rec {
     findutils
   ];
 
-  preFixup = ''
+  # Explicitly set the prefix dir in "setup.py" because setuptools is
-    rm "$out/${pythonPackages.python.sitePackages}/catfish_lib/catfishconfig.pyc"
+  # not using "$out" as the prefix when installing catfish data. In
-    for f in \
+  # particular the variable "__catfish_data_directory__" in
-      "$out/${pythonPackages.python.sitePackages}/catfish_lib/catfishconfig.py" \
+  # "catfishconfig.py" is being set to a subdirectory in the python
-      "$out/share/applications/catfish.desktop"
+  # path in the store.
-    do
+  postPatch = ''
-      substituteInPlace $f --replace "${pythonPackages.python}" "$out"
+    sed -i "/^        if self.root/i\\        self.prefix = \"$out\"" setup.py
-    done
   '';
 
+  # Disable check because there is no test in the source distribution
+  doCheck = false;
+
   meta = with stdenv.lib; {
+    homepage = https://launchpad.net/catfish-search;
     description = "A handy file search tool";
     longDescription = ''
       Catfish is a handy file searching tool. The interface is
@@ -53,7 +60,6 @@ pythonPackages.buildPythonApplication rec {
       You can configure it to your needs by using several command line
       options.
     '';
-    homepage = https://launchpad.net/catfish-search;
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
     maintainers = [ maintainers.romildo ];

pkgs/build-support/docker/default.nix

@@ -476,8 +476,6 @@ rec {
         cp ${layer}/* temp/
         chmod ug+w temp/*
 
-        echo "$(dirname ${storeDir})" >> layerFiles
-        echo '${storeDir}' >> layerFiles
         for dep in $(cat $layerClosure); do
           find $dep >> layerFiles
         done

pkgs/build-support/rust/build-rust-crate.nix

@@ -291,6 +291,7 @@ let buildCrate = { crateName, crateVersion, crateAuthors, buildDependencies,
         mkdir -p $out/bin
         cp -P target/bin/* $out/bin # */
       fi
+      runHook postInstall
     '';
 in
 

pkgs/data/fonts/iosevka/bin.nix

@@ -1,7 +1,7 @@
 { stdenv, fetchzip }:
 
 let
-  version = "1.13.3";
+  version = "1.14.0";
 in fetchzip rec {
   name = "iosevka-bin-${version}";
 
@@ -12,7 +12,7 @@ in fetchzip rec {
     unzip -j $downloadedFile \*.ttc -d $out/share/fonts/iosevka
   '';
 
-  sha256 = "0103rjxcp2sis42xp7fh7g8i03h5snvs8n78lgsf79g8ssw0p9d4";
+  sha256 = "03zgh5dfx58sxrprhqi8cyc18sh05k84yc262bn81vavl6lm14ns";
 
   meta = with stdenv.lib; {
     homepage = https://be5invis.github.io/Iosevka/;

pkgs/data/fonts/iosevka/default.nix

@@ -7,6 +7,7 @@
   # Custom font set options.
   # See https://github.com/be5invis/Iosevka#build-your-own-style
   design ? [], upright ? [], italic ? [], oblique ? [],
+  family ? null, weights ? [],
   # Custom font set name. Required if any custom settings above.
   set ? null
 }:
@@ -15,6 +16,8 @@ assert (design != []) -> set != null;
 assert (upright != []) -> set != null;
 assert (italic != []) -> set != null;
 assert (oblique != []) -> set != null;
+assert (family != null) -> set != null;
+assert (weights != []) -> set != null;
 
 let
   installPackageLock = import ./package-lock.nix { inherit fetchurl lib; };
@@ -23,13 +26,13 @@ in
 let pname = if set != null then "iosevka-${set}" else "iosevka"; in
 
 let
-  version = "1.13.3";
+  version = "1.14.0";
   name = "${pname}-${version}";
   src = fetchFromGitHub {
     owner = "be5invis";
     repo ="Iosevka";
     rev = "v${version}";
-    sha256 = "0wfhfiahllq8ngn0mybvp29cfcm7b8ndk3fyhizd620wrj50bazf";
+    sha256 = "0mmdlrd9a0rhmmdqwkk6v7cdvbi23djr5kkiyv38llk11j3w0clp";
   };
 in
 
@@ -44,8 +47,11 @@ let
     (param "upright" upright)
     (param "italic" italic)
     (param "oblique" oblique)
+    (if family != null then "family='${family}'" else null)
+    (param "weights" weights)
   ]);
-  custom = design != [] || upright != [] || italic != [] || oblique != [];
+  custom = design != [] || upright != [] || italic != [] || oblique != []
+    || family != null || weights != [];
 in
 
 stdenv.mkDerivation {

pkgs/data/fonts/iosevka/package-lock.json

@@ -1,13 +1,13 @@
 {
   "name": "iosevka",
-  "version": "1.13.3",
+  "version": "1.14.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
     "JSONStream": {
-      "version": "1.3.1",
+      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz",
+      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz",
-      "integrity": "sha1-cH92HgHa6eFvG8+TcDt4xwlmV5o=",
+      "integrity": "sha1-wQI3G27Dp887hHygDCC7D85Mbeo=",
       "requires": {
         "jsonparse": "1.3.1",
         "through": "2.3.8"
@@ -24,9 +24,9 @@
       "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
     },
     "bezier-js": {
-      "version": "2.2.3",
+      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/bezier-js/-/bezier-js-2.2.3.tgz",
+      "resolved": "https://registry.npmjs.org/bezier-js/-/bezier-js-2.2.5.tgz",
-      "integrity": "sha1-xVdBFqSjVkpxU41z4LDVFdqN3sU="
+      "integrity": "sha512-HGh+GevPguxrAmnWF2/A+8c8FEatnKcE6WttpYWA5fn1CfpJz4reFbr11DuyFs2gwaIo9vF7aVXW2xg1iaqvyg=="
     },
     "builtin-modules": {
       "version": "1.1.1",
@@ -39,11 +39,11 @@
       "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
     },
     "caryll-shapeops": {
-      "version": "0.2.1",
+      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/caryll-shapeops/-/caryll-shapeops-0.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/caryll-shapeops/-/caryll-shapeops-0.3.1.tgz",
-      "integrity": "sha1-uEBMpQ5pAMB6vJNXubsAhbQEa8s=",
+      "integrity": "sha512-3TdH6DZGL08S6qEvCZLNaOHyFvmzQts8m+TyYEvc6/PiI+XgX5mIag1/CKczIM8e2QtDr8JKW8foo4VNOM8/Og==",
       "requires": {
-        "bezier-js": "2.2.3",
+        "bezier-js": "2.2.5",
         "clipper-lib": "1.0.0"
       }
     },
@@ -54,7 +54,7 @@
       "requires": {
         "cross-spawn": "4.0.2",
         "node-version": "1.1.0",
-        "promise-polyfill": "6.0.2"
+        "promise-polyfill": "6.1.0"
       }
     },
     "clipper-lib": {
@@ -457,7 +457,7 @@
       "resolved": "https://registry.npmjs.org/megaminx/-/megaminx-0.3.3.tgz",
       "integrity": "sha512-lZBSLMro+XYJIix9zCZ8N6nZgixpjUPkX6CKuh+Y9Wl9bir/2Fp27NWapA0cNQCPrzOOI9sAwxc4BI14aIdumw==",
       "requires": {
-        "JSONStream": "1.3.1",
+        "JSONStream": "1.3.2",
         "child-process-promise": "2.2.1",
         "cubic2quad": "1.1.1",
         "fs-extra": "3.0.1",
@@ -469,13 +469,13 @@
       "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
       "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
       "requires": {
-        "mimic-fn": "1.1.0"
+        "mimic-fn": "1.2.0"
       }
     },
     "mimic-fn": {
-      "version": "1.1.0",
+      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-      "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg="
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
     },
     "node-version": {
       "version": "1.1.0",
@@ -489,7 +489,7 @@
       "requires": {
         "hosted-git-info": "2.5.0",
         "is-builtin-module": "1.0.0",
-        "semver": "5.4.1",
+        "semver": "5.5.0",
         "validate-npm-package-license": "3.0.1"
       }
     },
@@ -538,18 +538,26 @@
       "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
     },
     "p-limit": {
-      "version": "1.1.0",
+      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz",
-      "integrity": "sha1-sH/y2aXYi+yAYDWJWiurZqJ5iLw="
+      "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==",
+      "requires": {
+        "p-try": "1.0.0"
+      }
     },
     "p-locate": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
       "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
       "requires": {
-        "p-limit": "1.1.0"
+        "p-limit": "1.2.0"
       }
     },
+    "p-try": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
+    },
     "pad": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/pad/-/pad-1.2.1.tgz",
@@ -661,9 +669,9 @@
       "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
     },
     "promise-polyfill": {
-      "version": "6.0.2",
+      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.1.0.tgz",
-      "integrity": "sha1-2chtPcTcLfkBboiUbe/Wm0m0EWI="
+      "integrity": "sha1-36lpQ+qcEh/KTem1hoyznTRy4Fc="
     },
     "pseudomap": {
       "version": "1.0.2",
@@ -708,9 +716,9 @@
       }
     },
     "semver": {
-      "version": "5.4.1",
+      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
-      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg=="
+      "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="
     },
     "set-blocking": {
       "version": "2.0.0",

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

@@ -1,7 +1,7 @@
 { fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
 , pango, cogl, clutter, libstartup_notification, zenity, libcanberra_gtk3
 , libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput
-, libgudev, libwacom, xwayland, autoreconfHook }:
+, pipewire, libgudev, libwacom, xwayland, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
@@ -9,6 +9,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--with-x"
     "--disable-static"
+    "--enable-remote-desktop"
     "--enable-shape"
     "--enable-sm"
     "--enable-startup-notification"
@@ -18,6 +19,15 @@ stdenv.mkDerivation rec {
     "--with-xwayland-path=${xwayland}/bin/Xwayland"
   ];
 
+  patches = [
+    # Pipewire 0.1.8 compatibility
+    (fetchurl {
+      name = "mutter-pipewire-0.1.8-compat.patch";
+      url = https://bugzilla.gnome.org/attachment.cgi?id=367356;
+      sha256 = "10bx5zf11wwhhy686w11ggikk56pbxydpbk9fbd947ir385x92cz";
+    })
+  ];
+
   propagatedBuildInputs = [
     # required for pkgconfig to detect mutter-clutter
     libXtst
@@ -30,7 +40,7 @@ stdenv.mkDerivation rec {
     gnome_desktop cairo pango cogl clutter zenity libstartup_notification
     gnome3.geocode_glib libinput libgudev libwacom
     libcanberra_gtk3 zenity xkeyboard_config libxkbfile
-    libxkbcommon
+    libxkbcommon pipewire
   ];
 
   preFixup = ''

pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix

@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-shell-extension-remove-dropdown-arrows-${version}";
+  version = "9";
+
+  src = fetchFromGitHub {
+    owner = "mpdeimos";
+    repo = "gnome-shell-remove-dropdown-arrows";
+    rev = "version/${version}";
+    sha256 = "1z9icxr75rd3cas28xjlmsbbd3j3sm1qvj6mp95jhfaqj821q665";
+  };
+
+  # This package has a Makefile, but it's used for publishing and linting, not
+  # for building. Disable the build phase so installing doesn't attempt to
+  # publish the extension.
+  dontBuild = true;
+
+  uuid = "remove-dropdown-arrows@mpdeimos.com";
+  installPhase = ''
+    mkdir -p $out/share/gnome-shell/extensions/${uuid}
+    cp extension.js $out/share/gnome-shell/extensions/${uuid}
+    cp metadata.json $out/share/gnome-shell/extensions/${uuid}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Remove dropdown arrows from GNOME Shell Menus";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ jonafato ];
+    homepage = https://github.com/mpdeimos/gnome-shell-remove-dropdown-arrows;
+  };
+}

pkgs/desktops/mate/atril/default.nix

@@ -1,14 +1,12 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxml2, libsecret, poppler, itstool, caja, mate-desktop, hicolor_icon_theme, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxml2, libsecret, poppler, itstool, hicolor_icon_theme, mate, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "atril-${version}";
-  version = "${major-ver}.${minor-ver}";
+  version = "1.20.0";
-  major-ver = "1.19";
-  minor-ver = "0";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "https://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "0v829yvr738y5s2knyvimcgqv351qzb0rpw5il19qc27rbzyri1r";
+    sha256 = "1639jxcdhcn5wvb4gj9xncdj5d5c3rnyydwwsgqj66cmfmb53l1n";
   };
 
   nativeBuildInputs = [
@@ -23,8 +21,8 @@ stdenv.mkDerivation rec {
     libsecret
     libxml2
     poppler
-    caja
+    mate.caja
-    mate-desktop
+    mate.mate-desktop
     hicolor_icon_theme
   ];
   

pkgs/desktops/mate/caja-dropbox/default.nix

@@ -1,14 +1,12 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, caja, pythonPackages }:
+{ stdenv, fetchurl, pkgconfig, gtk3, mate, pythonPackages }:
 
 stdenv.mkDerivation rec {
   name = "caja-dropbox-${version}";
-  version = "${major-ver}.${minor-ver}";
+  version = "1.20.0";
-  major-ver = "1.18";
-  minor-ver = "0";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "18wd8abjaxa68n1yjmvh9az1m8lqa2wing73xdymz0d5gmxmk25g";
+    sha256 = "0xjqcfi5n6hsfyw77blplkn30as0slkfzngxid1n6z7jz5yjq7vj";
   };
 
   nativeBuildInputs = [
@@ -17,7 +15,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     gtk3
-    caja
+    mate.caja
     pythonPackages.python
     pythonPackages.pygtk
     pythonPackages.docutils

pkgs/desktops/mate/caja-extensions/default.nix

@@ -1,14 +1,12 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus_glib, gupnp, caja, mate-desktop, imagemagick, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus_glib, gupnp, mate, imagemagick, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "caja-extensions-${version}";
-  version = "${major-ver}.${minor-ver}";
+  version = "1.20.0";
-  major-ver = "1.18";
-  minor-ver = "2";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "065j3dyk7zp35rfvxxsdglx30i3xrma4d4saf7mn1rn1akdfgaba";
+    sha256 = "1abi7s31mx7v8x0f747bmb3s8hrv8fv007pflv2n545yvn0m1dpj";
   };
 
   nativeBuildInputs = [
@@ -21,8 +19,8 @@ stdenv.mkDerivation rec {
     gtk3
     dbus_glib
     gupnp
-    caja
+    mate.caja
-    mate-desktop
+    mate.mate-desktop
     imagemagick
   ];
 

pkgs/desktops/mate/caja/default.nix

@@ -2,13 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "caja-${version}";
-  version = "${major-ver}.${minor-ver}";
+  version = "1.20.0";
-  major-ver = "1.18";
-  minor-ver = "5";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1ild2bslvnvxvl5q2xc1sa8bz1lyr4q4ksw3bwxrj0ymc16h7p50";
+    sha256 = "05shyqqapqbz4w0gbhx0i3kj6xg7rcj80hkaq7wf5pyj91wmkxqg";
   };
 
   nativeBuildInputs = [

pkgs/desktops/mate/default.nix

@@ -5,6 +5,9 @@ let
 
   self = rec {
 
+    getRelease = version:
+      pkgs.stdenv.lib.concatStringsSep "." (pkgs.stdenv.lib.take 2 (pkgs.stdenv.lib.splitString "." version));
+  
     atril = callPackage ./atril { };
     caja = callPackage ./caja { };
     caja-dropbox = callPackage ./caja-dropbox { };

pkgs/desktops/mate/engrampa/default.nix

@@ -2,13 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "engrampa-${version}";
-  version = "${major-ver}.${minor-ver}";
+  version = "1.20.0";
-  major-ver = "1.18";
-  minor-ver = "3";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1ms6kz8k86hsj9zk5w3087l749022y0j5ba2s9hz8ah6gfx0mvn5";
+    sha256 = "1pk053i14a0r5s9qkipwnp4qjg76b763203z64ymnpkslrrarnnm";
   };
 
   nativeBuildInputs = [

pkgs/desktops/mate/eom/default.nix

@@ -2,13 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "eom-${version}";
-  version = "${major-ver}.${minor-ver}";
+  version = "1.20.0";
-  major-ver = "1.18";
-  minor-ver = "3";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1zr85ilv0f4x8iky002qvh00qhsq1vsfm5z1954gf31hi57z2j25";
+    sha256 = "0320ph6cyh0m4cfyvky10j9prk2hry6rpm4jzgcn7ig03dnj4y0s";
   };
 
   nativeBuildInputs = [

pkgs/desktops/mate/libmatekbd/default.nix

@@ -1,14 +1,12 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxklavier }:
+{ stdenv, fetchurl, pkgconfig, intltool, gtk3, mate, libxklavier }:
 
 stdenv.mkDerivation rec {
   name = "libmatekbd-${version}";
-  version = "${major-ver}.${minor-ver}";
+  version = "1.20.0";
-  major-ver = "1.18";
-  minor-ver = "2";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "030bl18qbjm7l92bp1bhs7v82bp8j3mv7c1j1a4gd89iz4611pq3";
+    sha256 = "1n2zphb3g6ai54nfr0r9s06vn3bmm361xpjga88hmq947fvbpx19";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];

pkgs/desktops/mate/libmatemixer/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib
+{ stdenv, fetchurl, pkgconfig, intltool, glib, mate
 , alsaSupport ? stdenv.isLinux, alsaLib
 , pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio
 , ossSupport ? false
@@ -6,13 +6,11 @@
 
 stdenv.mkDerivation rec {
   name = "libmatemixer-${version}";
-  version = "${major-ver}.${minor-ver}";
+  version = "1.20.0";
-  major-ver = "1.18";
-  minor-ver = "0";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "09vyxnlnalws318gsafdfi5c6jwpp92pbafn1ddlqqds23ihk4mr";
+    sha256 = "0jpfaqbspn2mjv6ysgzdmzhb07gx61yiiiwmrw94qymld2igrzb5";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];

pkgs/desktops/mate/libmateweather/default.nix

@@ -1,14 +1,12 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libsoup, tzdata }:
+{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libsoup, tzdata, mate }:
 
 stdenv.mkDerivation rec {
   name = "libmateweather-${version}";
-  version = "${major-ver}.${minor-ver}";
+  version = "1.20.0";
-  major-ver = "1.18";
-  minor-ver = "2";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1q3rvmm533cgiif9hbdp6a92dm727g5i2dv5d8krfa0nl36i468y";
+    sha256 = "1c8mvydb0h7z3zn0qahwlp15z5wl6nrv24q4z7ldhm340jnxsvh7";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];

pkgs/desktops/mate/marco/default.nix

@@ -1,14 +1,12 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra_gtk3, libgtop, gnome2, gnome3, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra_gtk3, libgtop, gnome2, gnome3, mate, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "marco-${version}";
-  version = "${major-ver}.${minor-ver}";
+  version = "1.20.0";
-  major-ver = "1.18";
-  minor-ver = "2";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "173g9mrnkcgjc6a1maln13iqdl0cqcnca8ydr8767xrn9dlkx9f5";
+    sha256 = "07asf8i15ih6ajkp5yapk720qyssi2cinxwg2z5q5j9m6mxax6lr";
   };
 
   nativeBuildInputs = [

pkgs/desktops/mate/mate-applets/default.nix

@@ -1,14 +1,12 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, libwnck3, libgtop, libxml2, libnotify, dbus_glib, polkit, upower, wirelesstools, libmateweather, mate-panel, pythonPackages, hicolor_icon_theme, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, libwnck3, libgtop, libxml2, libnotify, dbus_glib, polkit, upower, wirelesstools, mate, hicolor_icon_theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "mate-applets-${version}";
-  version = "${major-ver}.${minor-ver}";
+  version = "1.20.0";
-  major-ver = "1.18";
-  minor-ver = "2";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "045cl62nnfsl14vnfydwqjssdakgdrahh5h0xiz5afmdcbq6cqgw";
+    sha256 = "1jmhswfcbawp9ax5p5h2dj8pyajadjdyxa0ac7ldvh7viv8qy52s";
   };
 
   nativeBuildInputs = [
@@ -26,14 +24,11 @@ stdenv.mkDerivation rec {
     libgtop
     libxml2
     libnotify
-    dbus_glib
     polkit
     upower
     wirelesstools
-    libmateweather
+    mate.libmateweather
-    mate-panel
+    mate.mate-panel
-    pythonPackages.python
-    pythonPackages.pygobject3
     hicolor_icon_theme
   ];
 

pkgs/desktops/mate/mate-backgrounds/default.nix

@@ -1,14 +1,12 @@
-{ stdenv, fetchurl, intltool }:
+{ stdenv, fetchurl, intltool, mate }:
 
 stdenv.mkDerivation rec {
   name = "mate-backgrounds-${version}";
-  version = "${major-ver}.${minor-ver}";
+  version = "1.20.0";
-  major-ver = "1.18";
-  minor-ver = "0";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "06q8ksjisijps2wn959arywsimhzd3j35mqkr048c26ck24d60zi";
+    sha256 = "0pcnjcw00y8hf2bwfrb5sbk2511cbg4fr8vgvgqswcwjp9y15cjp";
   };
 
   nativeBuildInputs = [ intltool ];

pkgs/desktops/mate/mate-calc/default.nix

@@ -1,14 +1,12 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, mate, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "mate-calc-${version}";
-  version = "${major-ver}.${minor-ver}";
+  version = "1.20.0";
-  major-ver = "1.18";
-  minor-ver = "1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1h6kr9qb1kaw8jvfm7xmqm1wqnxsw2iwha5vl38b986x4zm2b712";
+    sha256 = "03cma6b00chd4026pbnh5i0ckpl8b1l7i1ppvcmbfbx0s3vpbc73";
   };
 
   nativeBuildInputs = [

pkgs/desktops/mate/mate-common/default.nix

@@ -1,14 +1,12 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, mate }:
 
 stdenv.mkDerivation rec {
   name = "mate-common-${version}";
-  version = "${major-ver}.${minor-ver}";
+  version = "1.20.0";
-  major-ver = "1.18";
-  minor-ver = "0";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1005laf3z1h8qczm7pmwr40r842665cv6ykhjg7r93vldra48z6p";
+    sha256 = "0h8s2qhc6f5flslx05cd3xxg243c67vv03spjiag14p8kqqrqvb1";
   };
 
   meta = {

pkgs/desktops/mate/mate-control-center/default.nix

@@ -5,13 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-control-center-${version}";
-  version = "${major-ver}.${minor-ver}";
+  version = "1.20.0";
-  major-ver = "1.18";
-  minor-ver = "2";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "0flnn0h8f5aqyccwrlv7qxchvr3kqmlfdga6wq28d55zkpv5m7dl";
+    sha256 = "0qq3ln40w7lxa7qvbvbsgdq1c5ybzqw3bw2x4z6y6brl4c77sbh7";
   };
 
   nativeBuildInputs = [

pkgs/desktops/mate/mate-desktop/default.nix

@@ -1,14 +1,12 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gnome3, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, gnome3, mate, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "mate-desktop-${version}";
-  version = "${major-ver}.${minor-ver}";
+  version = "1.20.0";
-  major-ver = "1.18";
-  minor-ver = "0";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "12iv2y4dan962fs7vkkxbjkp77pbvjnwfa43ggr0zkdsc3ydjbbg";
+    sha256 = "0y5172sbj6f4dvimf4pmz74b9cfidbpmnwwb9f6vlc6fa0kp5l1n";
   };
 
   nativeBuildInputs = [

pkgs/desktops/mate/mate-icon-theme-faenza/default.nix

@@ -2,13 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-icon-theme-faenza-${version}";
-  version = "${major-ver}.${minor-ver}";
+  version = "1.20.0";
-  major-ver = "1.18";
-  minor-ver = "1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "0vc3wg9l5yrxm0xmligz4lw2g3nqj1dz8fwv90xvym8pbjds2849";
+    sha256 = "000vr9cnbl2qlysf2gyg1lsjirqdzmwrnh6d3hyrsfc0r2vh4wna";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

pkgs/desktops/mate/mate-icon-theme/default.nix

@@ -1,14 +1,12 @@
-{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, librsvg, hicolor_icon_theme, gtk3 }:
+{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, librsvg, hicolor_icon_theme, gtk3, mate }:
 
 stdenv.mkDerivation rec {
   name = "mate-icon-theme-${version}";
-  version = "${major-ver}.${minor-ver}";
+  version = "1.20.0";
-  major-ver = "1.18";
-  minor-ver = "2";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "0si3li3kza7s45zhasjvqn5f85zpkn0x8i4kq1dlnqvjjqzkg4ch";
+    sha256 = "0lmsmsamgg1s6qrk19qwa76ld7x1k3pwhy4vs1ixn1as4iaaddk5";
   };
 
   nativeBuildInputs = [ pkgconfig intltool iconnamingutils ];

pkgs/desktops/mate/mate-indicator-applet/default.nix

@@ -1,14 +1,12 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libindicator-gtk3, mate-panel, hicolor_icon_theme, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libindicator-gtk3, mate, hicolor_icon_theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "mate-indicator-applet-${version}";
-  version = "${major-ver}.${minor-ver}";
+  version = "1.20.0";
-  major-ver = "1.18";
-  minor-ver = "1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1h77f1gbz1a8l9xyq5fk75bs58mcwx6pbk6db33v0v1mwq6cidiv";
+    sha256 = "1fc6j5dnxghpgz8xbf5p8j2jprk97q4q3ajkh6sg5l71gqlnampg";
   };
 
   nativeBuildInputs = [
@@ -20,7 +18,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     gtk3
     libindicator-gtk3
-    mate-panel
+    mate.mate-panel
     hicolor_icon_theme
   ];
 

pkgs/desktops/mate/mate-media/default.nix

@@ -2,13 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-media-${version}";
-  version = "${major-ver}.${minor-ver}";
+  version = "1.20.0";
-  major-ver = "1.18";
-  minor-ver = "2";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "07v37jvrl8m5rhlasrdziwy15gcpn561d7zn5q1yfla2d5ddy0b1";
+    sha256 = "09vbw7nc91ljnxm5sbrch0w7zzn2i6qjb1b50q402niwr5b0zicr";
   };
 
   buildInputs = [

pkgs/desktops/mate/mate-menus/default.nix

@@ -1,14 +1,12 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection, python }:
+{ stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection, python, mate }:
 
 stdenv.mkDerivation rec {
   name = "mate-menus-${version}";
-  version = "${major-ver}.${minor-ver}";
+  version = "1.20.0";
-  major-ver = "1.18";
-  minor-ver = "1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "03fwv0fvg073dmdbrcbpwjhxpj98aqna804m9nqybhvj3cfyhaz6";
+    sha256 = "1w1k6kdabmabhpqvkizk1si6ri4rmspsbj0252ki834ml0dxpnhg";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];

pkgs/desktops/mate/mate-netbook/default.nix

@@ -1,14 +1,12 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libwnck3, libfakekey, libXtst, mate-panel, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "mate-netbook-${version}";
-  version = "${major-ver}.${minor-ver}";
+  version = "1.20.0";
-  major-ver = "1.18";
-  minor-ver = "2";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "0xy5mhkg0xfgyr7gnnjrfzqhmdnhyqscrl2h496p06cflknm17vb";
+    sha256 = "1w92kny1fnlwbq4b8y50n5s1vsvvl4xrvspsp9lqfxyz3jxiwbrz";
   };
 
   nativeBuildInputs = [
@@ -22,7 +20,7 @@ stdenv.mkDerivation rec {
     libwnck3
     libfakekey
     libXtst
-    mate-panel
+    mate.mate-panel
   ];
 
   meta = with stdenv.lib; {

pkgs/desktops/mate/mate-notification-daemon/default.nix

@@ -1,15 +1,13 @@
 { stdenv, fetchurl, pkgconfig, intltool, dbus_glib, libcanberra_gtk3,
-  libnotify, libwnck3, gnome3, wrapGAppsHook }:
+  libnotify, libwnck3, gnome3, mate, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "mate-notification-daemon-${version}";
-  version = "${major-ver}.${minor-ver}";
+  version = "1.20.0";
-  major-ver = "1.18";
-  minor-ver = "1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "102nmd6mnf1fwvw11ggdlgcblq612nd4aar3gdjzqn1fw37591i5";
+    sha256 = "0dq457npzid20yfwigdh8gfqgf5wv8p6jhbxfnzybam9xidlqc5f";
   };
 
   nativeBuildInputs = [

pkgs/desktops/mate/mate-panel/default.nix

@@ -2,13 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-panel-${version}";
-  version = "${major-ver}.${minor-ver}";
+  version = "1.20.0";
-  major-ver = "1.18";
-  minor-ver = "7";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1m0fxyzbvg239dddmz3ksd8871lhkd7n3fxvdgdf4hv9rlvm1klv";
+    sha256 = "0cz1pfwvsmrjcd0wa83cid9yjcygla6rhigyr7f75d75kiknlcm7";
   };
 
   nativeBuildInputs = [

pkgs/desktops/mate/mate-polkit/default.nix

@@ -1,14 +1,12 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk3, gobjectIntrospection, libappindicator-gtk3, libindicator-gtk3, polkit }:
+{ stdenv, fetchurl, pkgconfig, intltool, gtk3, gobjectIntrospection, libappindicator-gtk3, libindicator-gtk3, polkit, mate }:
 
 stdenv.mkDerivation rec {
   name = "mate-polkit-${version}";
-  version = "${major-ver}.${minor-ver}";
+  version = "1.20.0";
-  major-ver = "1.18";
-  minor-ver = "2";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "01mxl7wj1501d3clrwlwa54970vpkahp5968xpaxwfb2zbnqgjbd";
+    sha256 = "00c1rmi31gv1a3lk7smjp489kd3wrj0d6npagnb8p1rz0g88ha94";
   };
 
   nativeBuildInputs = [

pkgs/desktops/mate/mate-power-manager/default.nix

@@ -2,13 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-power-manager-${version}";
-  version = "${major-ver}.${minor-ver}";
+  version = "1.20.0";
-  major-ver = "1.18";
-  minor-ver = "1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1sybc4j9bdnb2axmvpbbm85ixhdfa1k1yh769gns56ix0ryd9nr5";
+    sha256 = "038c2q5kqvqmkp1i93p4pp9x8p6a9i7lyn3nv522mq06qsbynbww";
   };
 
   buildInputs = [
@@ -21,7 +19,6 @@ stdenv.mkDerivation rec {
      libnotify
      dbus_glib
      upower
-
      mate.mate-panel
   ];
 

pkgs/desktops/mate/mate-screensaver/default.nix

@@ -1,14 +1,12 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus_glib, libXScrnSaver, libnotify, pam, systemd, mate-desktop, mate-menus, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus_glib, libXScrnSaver, libnotify, pam, systemd, mate, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "mate-screensaver-${version}";
-  version = "${major-ver}.${minor-ver}";
+  version = "1.20.0";
-  major-ver = "1.18";
-  minor-ver = "2";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "03za7ssww095i49braaq0di5ir9g6wxh1n5hfgy6b3w9nb0j1y2p";
+    sha256 = "1698608m6kf4dn91xdwy7l809yagz02h1k594smj75wvnhr7x4k9";
   };
 
   nativeBuildInputs = [
@@ -24,8 +22,8 @@ stdenv.mkDerivation rec {
     libnotify
     pam
     systemd
-    mate-desktop
+    mate.mate-desktop
-    mate-menus
+    mate.mate-menus
   ];
 
   configureFlags = "--without-console-kit";

pkgs/desktops/mate/mate-sensors-applet/default.nix

@@ -1,14 +1,12 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, dbus_glib, lm_sensors, mate-panel, hicolor_icon_theme, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, dbus_glib, lm_sensors, mate, hicolor_icon_theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "mate-sensors-applet-${version}";
-  version = "${major-ver}.${minor-ver}";
+  version = "1.20.0";
-  major-ver = "1.18";
-  minor-ver = "3";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1nm68rhp73kgvs7wwsgs5zbvq3lzaanl5s5nnn28saiknjbz1mcx";
+    sha256 = "1yj8zr9w0a1h4bpd27w7ssg97vnrz7yr10jqhx67yyb900ccr3ik";
   };
 
   nativeBuildInputs = [
@@ -27,7 +25,7 @@ stdenv.mkDerivation rec {
     libnotify
     dbus_glib
     lm_sensors
-    mate-panel
+    mate.mate-panel
     hicolor_icon_theme
   ];
 

pkgs/desktops/mate/mate-session-manager/default.nix

@@ -1,17 +1,15 @@
 { stdenv, fetchurl, pkgconfig, intltool, xtrans, dbus_glib, systemd,
-  libSM, libXtst, gtk3, mate-desktop, hicolor_icon_theme,
+  libSM, libXtst, gtk3, hicolor_icon_theme, mate,
   wrapGAppsHook
 }:
 
 stdenv.mkDerivation rec {
   name = "mate-session-manager-${version}";
-  version = "${major-ver}.${minor-ver}";
+  version = "1.20.0";
-  major-ver = "1.18";
-  minor-ver = "2";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "11ii7azl8rn9mfymcmcbpysyd12vrxp4s8l3l6yk4mwlr3gvzxj0";
+    sha256 = "0vzr6y9shw4zb3ddfrj0nn7yqggpq9sv6h33p0xxdx71ydl40p2g";
   };
 
   nativeBuildInputs = [
@@ -27,7 +25,7 @@ stdenv.mkDerivation rec {
     libSM
     libXtst
     gtk3
-    mate-desktop
+    mate.mate-desktop
     hicolor_icon_theme
   ];
 

pkgs/desktops/mate/mate-settings-daemon/default.nix

@@ -4,13 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-settings-daemon-${version}";
-  version = "${major-ver}.${minor-ver}";
+  version = "1.20.0";
-  major-ver = "1.18";
-  minor-ver = "2";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "0v2kdzfmfqq0avlrxnxysmkawy83g7sanmyhivisi5vg4rzsr0a4";
+    sha256 = "0p4fr2sgkjcjsrmkdy579xmk20dl0sa6az40rzvm6fb2w6693sf5";
   };
 
   nativeBuildInputs = [

pkgs/desktops/mate/mate-system-monitor/default.nix

@@ -1,14 +1,12 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, systemd, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, systemd, mate, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "mate-system-monitor-${version}";
-  version = "${major-ver}.${minor-ver}";
+  version = "1.20.0";
-  major-ver = "1.18";
-  minor-ver = "1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1xhz7d9045xfh431rn27kh1sd1clbzkfrw1zkjgfnpad6v3aaaks";
+    sha256 = "059aryj0gz4sic719nsmckhkjl4yhqxmyplvh78clf5khh4apwn5";
   };
 
   nativeBuildInputs = [

pkgs/desktops/mate/mate-terminal/default.nix

@@ -2,13 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-terminal-${version}";
-  version = "${major-ver}.${minor-ver}";
+  version = "1.20.0";
-  major-ver = "1.18";
-  minor-ver = "2";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "053jdcjalywcq4fvqlb145sfp5hmnd6yyk9ckzvkh6fl3gyp54gc";
+    sha256 = "03366hs7mxazn6m6y53ppkb1din4jywljg0lx8zw101qg6car0az";
   };
 
   buildInputs = [

pkgs/desktops/mate/mate-themes/default.nix

@@ -3,20 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-themes-${version}";
-  version = "${major-ver}.${minor-ver}";
+  version = "3.22.15";
-  # There is no 3.24 release.
-  major-ver = if stdenv.lib.versionOlder gnome3.version "3.23" then gnome3.version else "3.22";
-  minor-ver = {
-    "3.20" = "23";
-    "3.22" = "14";
-  }."${major-ver}";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/themes/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/themes/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = {
+    sha256 = "0cmlbj6vlkavdirc5xnsgwmy0m11bj9yrbv1dkq46n1s23rvv6wg";
-      "3.20" = "0xmcm1kmkhbakhwy5vvx3gll5v2gvihwnbf0gyjf75fys6h3818g";
-      "3.22" = "09fqvlnmrvc73arl7jv9ygkxi46lw7c1q8qra6w3ap7x83f9zdak";
-    }."${major-ver}";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];

pkgs/desktops/mate/mate-user-guide/default.nix

@@ -1,14 +1,12 @@
-{ stdenv, fetchurl, intltool, itstool, libxml2, yelp }:
+{ stdenv, fetchurl, intltool, itstool, libxml2, yelp, mate }:
 
 stdenv.mkDerivation rec {
   name = "mate-user-guide-${version}";
-  version = "${major-ver}.${minor-ver}";
+  version = "1.20.0";
-  major-ver = "1.18";
-  minor-ver = "0";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "0f3b46r9a3cywm7rpj08xlkfnlfr9db58xfcpix8i33qp50fxqmb";
+    sha256 = "1n1rlvymz8k7vvjmd9qkv26wz3770w1ywsa41kbisbfp9x7mr0w2";
   };
 
   nativeBuildInputs = [ itstool intltool libxml2 ];

pkgs/desktops/mate/mate-user-share/default.nix

@@ -1,14 +1,12 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, dbus_glib, libnotify, libxml2, libcanberra_gtk3, caja, mod_dnssd, apacheHttpd, hicolor_icon_theme, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, dbus_glib, libnotify, libxml2, libcanberra_gtk3, mod_dnssd, apacheHttpd, hicolor_icon_theme, mate, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "mate-user-share-${version}";
-  version = "${major-ver}.${minor-ver}";
+  version = "1.20.0";
-  major-ver = "1.18";
-  minor-ver = "0";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "0w7r7jmm12n41hcxj1pfk3f0xy69cddx7ga490x191rdpcb3ry1n";
+    sha256 = "0lv5ndjk2br4w7cw8gsgj7aa2iadxv7m4wii4c49pajmd950iff2";
   };
 
   nativeBuildInputs = [
@@ -24,7 +22,7 @@ stdenv.mkDerivation rec {
     libnotify
     libcanberra_gtk3
     libxml2
-    caja
+    mate.caja
     hicolor_icon_theme
     # Should mod_dnssd and apacheHttpd be runtime dependencies?
     # In gnome-user-share they are not.

pkgs/desktops/mate/mate-utils/default.nix

@@ -1,14 +1,12 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libgtop, libcanberra_gtk3, mate-panel, hicolor_icon_theme, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libgtop, libcanberra_gtk3, mate, hicolor_icon_theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "mate-utils-${version}";
-  version = "${major-ver}.${minor-ver}";
+  version = "1.20.0";
-  major-ver = "1.18";
-  minor-ver = "3";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1nw8rcq3x67v73cmy44zz6r2ikz46wsx834qzkbq4i2ac96kdkfz";
+    sha256 = "10a6k8gi7cajlkbj1jbvk3s633hw58lan3rc85v8jlrkwm7wmhpl";
   };
 
   nativeBuildInputs = [
@@ -23,7 +21,7 @@ stdenv.mkDerivation rec {
     libgtop
     libcanberra_gtk3
     libxml2
-    mate-panel
+    mate.mate-panel
     hicolor_icon_theme
   ];
 

pkgs/desktops/mate/mozo/default.nix

@@ -1,17 +1,15 @@
-{ stdenv, fetchurl, pkgconfig, intltool, mate-menus, pythonPackages }:
+{ stdenv, fetchurl, pkgconfig, intltool, mate, pythonPackages }:
 
 stdenv.mkDerivation rec {
   name = "mozo-${version}";
-  version = "${major-ver}.${minor-ver}";
+  version = "1.20.0";
-  major-ver = "1.18";
-  minor-ver = "0";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "04yn9bw64q5a5kvpmkb7rb3mlp11pmnvkbphficsgb0368fj895b";
+    sha256 = "1108avdappfjadd46ld7clhh5m9f4b5khl5y33l377m8ky9dy87g";
   };
   
-  pythonPath = [ mate-menus pythonPackages.pygobject3 ];
+  pythonPath = [ mate.mate-menus pythonPackages.pygobject3 ];
 
   nativeBuildInputs = [ pkgconfig intltool pythonPackages.wrapPython ];
 

pkgs/desktops/mate/pluma/default.nix

@@ -2,13 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "pluma-${version}";
-  version = "${major-ver}.${minor-ver}";
+  version = "1.20.0";
-  major-ver = "1.18";
-  minor-ver = "3";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1bz2jvjfz761hcvhcbkz8sc4xf0iyixh5w0k7bx69qkwwdc0gxi0";
+    sha256 = "0w2x270n11rfa321cdlycfhcgncwxqpikjyl3lwmn4vkx8nhgq5f";
   };
 
   nativeBuildInputs = [

pkgs/desktops/mate/python-caja/default.nix

@@ -1,14 +1,12 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk3, caja, pythonPackages }:
+{ stdenv, fetchurl, pkgconfig, intltool, gtk3, mate, pythonPackages }:
 
 stdenv.mkDerivation rec {
   name = "python-caja-${version}";
-  version = "${major-ver}.${minor-ver}";
+  version = "1.20.0";
-  major-ver = "1.18";
-  minor-ver = "1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "0n43cvvv29gq31hgrsf9al184cr87c3hzskrh2593rid52kwyz44";
+    sha256 = "0bcgg3p01zik53l5ns48575yw0k88fyc044yvp9fvwy5jqqg1ykk";
   };
 
   nativeBuildInputs = [
@@ -19,7 +17,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     gtk3
-    caja
+    mate.caja
     pythonPackages.python
     pythonPackages.pygobject3
   ];

pkgs/desktops/mate/update.sh

@@ -0,0 +1,54 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p libarchive curl common-updater-scripts
+
+set -eu -o pipefail
+
+cd "$(dirname "${BASH_SOURCE[0]}")"
+root=../../..
+export NIXPKGS_ALLOW_UNFREE=1
+
+mate_version=1.20
+theme_version=3.22
+materepo=https://pub.mate-desktop.org/releases/${mate_version}
+themerepo=https://pub.mate-desktop.org/releases/themes/${theme_version}
+
+version() {
+    (cd "$root" && nix-instantiate --eval --strict -A "$1.version" | tr -d '"')
+}
+
+update_package() {
+    local p=$1
+    echo $p
+
+    local repo
+    if [ "$p" = "mate-themes" ]; then
+        repo=$themerepo
+    else
+        repo=$materepo
+    fi
+  
+    local p_version_old=$(version mate.$p)
+    local p_versions=$(curl -sS ${repo}/ | sed -rne "s/.*\"$p-([0-9]+\\.[0-9]+\\.[0-9]+)\\.tar\\.xz.*/\\1/p")
+    local p_version=$(echo $p_versions | sed -e 's/ /\n/g' | sort -t. -k 1,1n -k 2,2n -k 3,3n | tail -n1)
+  
+    if [[ "$p_version" = "$p_version_old" ]]; then
+        echo "nothing to do, $p $p_version is current"
+        echo
+        return
+    fi
+
+    # Download package and save hash and file path.
+    local url="$repo/$p-${p_version}.tar.xz"
+    mapfile -t prefetch < <(nix-prefetch-url --print-path "$url")
+    local hash=${prefetch[0]}
+    local path=${prefetch[1]}
+    echo "$p: $p_version_old -> $p_version"
+    (cd "$root" && update-source-version mate.$p "$p_version" "$hash")
+    echo
+}
+
+for d in $(ls -A --indicator-style=none); do
+    if [ -d $d ]; then
+        update_package $d
+    fi
+done

pkgs/desktops/plasma-5/default.nix

@@ -26,7 +26,7 @@ existing packages here and modify it as necessary.
 
 {
   libsForQt5, lib, fetchurl,
-  gconf,
+  gconf, gsettings_desktop_schemas,
   debug ? false,
 }:
 
@@ -105,7 +105,7 @@ let
       breeze-plymouth = callPackage ./breeze-plymouth {};
       kactivitymanagerd = callPackage ./kactivitymanagerd.nix {};
       kde-cli-tools = callPackage ./kde-cli-tools.nix {};
-      kde-gtk-config = callPackage ./kde-gtk-config {};
+      kde-gtk-config = callPackage ./kde-gtk-config { inherit gsettings_desktop_schemas; };
       kdecoration = callPackage ./kdecoration.nix {};
       kdeplasma-addons = callPackage ./kdeplasma-addons.nix {};
       kgamma5 = callPackage ./kgamma5.nix {};

pkgs/desktops/plasma-5/fetch.sh

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

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

@@ -2,7 +2,7 @@
   mkDerivation,
   extra-cmake-modules,
   glib, gtk2, gtk3, karchive, kcmutils, kconfigwidgets, ki18n, kiconthemes, kio,
-  knewstuff
+  knewstuff, gsettings_desktop_schemas
 }:
 
 mkDerivation {
@@ -10,11 +10,12 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
     ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes
-    knewstuff
+    knewstuff gsettings_desktop_schemas
   ];
   patches = [ ./0001-follow-symlinks.patch ];
   cmakeFlags = [
     "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
     "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
+    "-DGLIB_SCHEMAS_DIR=${gsettings_desktop_schemas.out}/"
   ];
 }

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

@@ -11,7 +11,7 @@
   kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n,
   kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage,
   kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem, kxmlgui,
-  plasma-framework,
+  plasma-framework, qtsensors, libcap
 }:
 
 mkDerivation {
@@ -21,22 +21,22 @@ mkDerivation {
     epoxy libICE libSM libinput libxkbcommon udev wayland xcb-util-cursor
     xwayland
 
-    qtdeclarative qtmultimedia qtscript qtx11extras
+    qtdeclarative qtmultimedia qtscript qtx11extras qtsensors
 
     breeze-qt5 kactivities kcmutils kcompletion kconfig kconfigwidgets
     kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes
     kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice
     kwayland kwidgetsaddons kwindowsystem kxmlgui plasma-framework
+    libcap
   ];
   outputs = [ "bin" "dev" "out" ];
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series)
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series) ++ [
-    ++ [(fetchpatch {
+    # This patch should be removed in 5.12.2
-        name = "cmake-3.10.diff";
+    (fetchpatch {
-        # included upstream for kwin >= 5.11.95
+      url = "https://github.com/KDE/kwin/commit/6e5f5d92daab4c60f7bf241d90a91b3bea27acfd.patch";
-        url = "https://github.com/KDE/kwin/commit/cd544890ced4192.diff";
+      sha256 = "1yq9wjvch46z7qx051s0ws0gyqbqhkvx7xl4pymd97vz8v6gnx4x";
-        sha256 = "0z5nbcg712v10mskb7r9v0jcx5h8q4ixb7fjbb0kicmzsc266yd5";
+    })
-    })]
+  ];
-    ;
   CXXFLAGS = [
     ''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"''
   ];

pkgs/desktops/plasma-5/kwin/no-setcap-install.patch

@@ -0,0 +1,24 @@
+Dont set capabilities on kwin_wayland executable at build time
+
+This is handled by security.wrappers on NixOS
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 48cbcdbfe..93b410ed8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -674,15 +674,6 @@ if (HAVE_LIBCAP)
+ endif()
+
+ install(TARGETS kwin_wayland         ${INSTALL_TARGETS_DEFAULT_ARGS} )
+-if (HAVE_LIBCAP)
+-    install(
+-    CODE "execute_process(
+-            COMMAND
+-                ${SETCAP_EXECUTABLE}
+-                CAP_SYS_NICE=+ep
+-                \$ENV{DESTDIR}${CMAKE_INSTALL_FULL_BINDIR}/kwin_wayland)"
+-    )
+-endif()
+
+ add_subdirectory(platformsupport)
+ add_subdirectory(plugins)

pkgs/desktops/plasma-5/kwin/series

@@ -1,2 +1,3 @@
 follow-symlinks.patch
 xwayland.patch
+no-setcap-install.patch

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

@@ -12,7 +12,7 @@
   kdeclarative, kded, kdelibs4support, kemoticons, kglobalaccel, ki18n,
   kitemmodels, knewstuff, knotifications, knotifyconfig, kpeople, krunner,
   kscreenlocker, ksysguard, kwallet, kwin, phonon, plasma-framework,
-  plasma-workspace,
+  plasma-workspace, xf86inputlibinput
 }:
 
 mkDerivation rec {
@@ -41,6 +41,7 @@ mkDerivation rec {
   cmakeFlags = [
     "-DEvdev_INCLUDE_DIRS=${lib.getDev xf86inputevdev}/include/xorg"
     "-DSynaptics_INCLUDE_DIRS=${lib.getDev xf86inputsynaptics}/include/xorg"
+    "-DXORGLIBINPUT_INCLUDE_DIRS=${lib.getDev xf86inputlibinput}/include/xorg"
   ];
   postInstall = ''
     # Display ~/Desktop contents on the desktop by default.

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

@@ -1,5 +1,5 @@
 diff --git a/applets/batterymonitor/package/contents/ui/BatteryItem.qml b/applets/batterymonitor/package/contents/ui/BatteryItem.qml
-index 7e2d9758..40a5797b 100644
+index 7e2d975..40a5797 100644
 --- a/applets/batterymonitor/package/contents/ui/BatteryItem.qml
 +++ b/applets/batterymonitor/package/contents/ui/BatteryItem.qml
 @@ -26,7 +26,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents
@@ -12,7 +12,7 @@ index 7e2d9758..40a5797b 100644
  Item {
      id: batteryItem
 diff --git a/applets/batterymonitor/package/contents/ui/batterymonitor.qml b/applets/batterymonitor/package/contents/ui/batterymonitor.qml
-index ae6d5919..c2f99c86 100644
+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
@@ -25,7 +25,7 @@ index ae6d5919..c2f99c86 100644
  Item {
      id: batterymonitor
 diff --git a/applets/lock_logout/contents/ui/lockout.qml b/applets/lock_logout/contents/ui/lockout.qml
-index 80e7e53b..0083cf01 100644
+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
@@ -38,7 +38,7 @@ index 80e7e53b..0083cf01 100644
  Flow {
      id: lockout
 diff --git a/applets/notifications/package/contents/ui/main.qml b/applets/notifications/package/contents/ui/main.qml
-index acdda88f..989de8ab 100644
+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
@@ -51,7 +51,7 @@ index acdda88f..989de8ab 100644
  MouseEventListener {
      id: notificationsApplet
 diff --git a/krunner/dbus/org.kde.krunner.service.in b/krunner/dbus/org.kde.krunner.service.in
-index 85715214..294eab08 100644
+index 8571521..294eab0 100644
 --- a/krunner/dbus/org.kde.krunner.service.in
 +++ b/krunner/dbus/org.kde.krunner.service.in
 @@ -1,4 +1,4 @@
@@ -61,7 +61,7 @@ index 85715214..294eab08 100644
 +Exec=@CMAKE_INSTALL_FULL_BINDIR@/krunner
  
 diff --git a/kuiserver/org.kde.kuiserver.service.in b/kuiserver/org.kde.kuiserver.service.in
-index 7a86d07f..5b3030cc 100644
+index 7a86d07..5b3030c 100644
 --- a/kuiserver/org.kde.kuiserver.service.in
 +++ b/kuiserver/org.kde.kuiserver.service.in
 @@ -1,3 +1,3 @@
@@ -70,7 +70,7 @@ index 7a86d07f..5b3030cc 100644
 -Exec=@CMAKE_INSTALL_PREFIX@/bin/kuiserver5
 +Exec=@CMAKE_INSTALL_FULL_BINDIR@/kuiserver5
 diff --git a/startkde/CMakeLists.txt b/startkde/CMakeLists.txt
-index fe29f57a..247db953 100644
+index fe29f57..247db95 100644
 --- a/startkde/CMakeLists.txt
 +++ b/startkde/CMakeLists.txt
 @@ -3,11 +3,6 @@ add_subdirectory(kstartupconfig)
@@ -86,7 +86,7 @@ index fe29f57a..247db953 100644
  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 c9927855..bd506ce2 100644
+index c992785..bd506ce 100644
 --- a/startkde/kstartupconfig/kstartupconfig.cpp
 +++ b/startkde/kstartupconfig/kstartupconfig.cpp
 @@ -147,5 +147,5 @@ int main()
@@ -97,7 +97,7 @@ index c9927855..bd506ce2 100644
 +    return system( NIXPKGS_KDOSTARTUPCONFIG5 );
      }
 diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
-index e9fa0bee..79e50a96 100644
+index b3117b4..e70110e 100644
 --- a/startkde/startkde.cmake
 +++ b/startkde/startkde.cmake
 @@ -1,22 +1,31 @@
@@ -142,11 +142,10 @@ index e9fa0bee..79e50a96 100644
  fi
  
  # Boot sequence:
-@@ -33,59 +42,132 @@ fi
+@@ -33,61 +42,133 @@ fi
  #
  # * Then ksmserver is started which takes control of the rest of the startup sequence
  
--# We need to create config folder so we can write startupconfigkeys
 -if [  ${XDG_CONFIG_HOME} ]; then
 -  configDir=$XDG_CONFIG_HOME;
 -else
@@ -174,7 +173,9 @@ index e9fa0bee..79e50a96 100644
 +if [ -e $XDG_CONFIG_HOME/Trolltech.conf ]; then
 +    @NIXPKGS_SED@ -e '/nix\\store\|nix\/store/ d' -i $XDG_CONFIG_HOME/Trolltech.conf
  fi
+ sysConfigDirs=${XDG_CONFIG_DIRS:-/etc/xdg}
  
+-# We need to create config folder so we can write startupconfigkeys
 -mkdir -p $configDir
 +@NIXPKGS_KBUILDSYCOCA5@
 +
@@ -297,13 +298,14 @@ index e9fa0bee..79e50a96 100644
      exit 1
  fi
 -[ -r $configDir/startupconfig ] && . $configDir/startupconfig
+-
 +if [ -r "$XDG_CONFIG_HOME/startupconfig" ]; then
 +    . "$XDG_CONFIG_HOME/startupconfig"
 +fi
  
- if [ "$kdeglobals_kscreen_screenscalefactors" ]; then
+ #Do not sync any of this section with the wayland versions as there scale factors are
-     export QT_SCREEN_SCALE_FACTORS="$kdeglobals_kscreen_screenscalefactors"
+ #sent properly over wl_output
-@@ -94,26 +176,33 @@ fi
+@@ -99,26 +180,33 @@ fi
  #otherwise apps that manually opt in for high DPI get auto scaled by the developer AND manually scaled by us
  export QT_AUTO_SCREEN_SCALE_FACTOR=0
  
@@ -350,7 +352,7 @@ index e9fa0bee..79e50a96 100644
  Xft.dpi: $kcmfonts_general_forcefontdpi
  EOF
  fi
-@@ -122,11 +211,11 @@ dl=$DESKTOP_LOCKED
+@@ -127,11 +215,11 @@ dl=$DESKTOP_LOCKED
  unset DESKTOP_LOCKED # Don't want it in the environment
  
  ksplash_pid=
@@ -364,14 +366,13 @@ index e9fa0bee..79e50a96 100644
        ;;
      None)
        ;;
-@@ -135,71 +224,6 @@ if test -z "$dl"; then
+@@ -140,69 +228,6 @@ if test -z "$dl"; then
    esac
  fi
  
 -# Source scripts found in <config locations>/plasma-workspace/env/*.sh
 -# (where <config locations> correspond to the system and user's configuration
--# directories, as identified by Qt's qtpaths,  e.g.  $HOME/.config
+-# directory.
--# and /etc/xdg/ on Linux)
 -#
 -# This is where you can define environment variables that will be available to
 -# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent`
@@ -382,11 +383,10 @@ index e9fa0bee..79e50a96 100644
 -# For anything else (that doesn't set env vars, or that needs a window manager),
 -# better use the Autostart folder.
 -
--scriptpath=`qtpaths --locate-dirs GenericConfigLocation plasma-workspace | tr ':' '\n'`
+-scriptpath=`echo "$configDir:$sysConfigDirs" | tr ':' '\n'`
 -
--# Add /env/ to the directory to locate the scripts to be sourced
 -for prefix in `echo $scriptpath`; do
--  for file in "$prefix"/env/*.sh; do
+-  for file in "$prefix"/plasma-workspace/env/*.sh; do
 -    test -r "$file" && . "$file" || true
 -  done
 -done
@@ -436,7 +436,7 @@ index e9fa0bee..79e50a96 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
-@@ -208,28 +232,10 @@ xset fp rehash
+@@ -211,28 +236,10 @@ xset fp rehash
  # If the user has overwritten fonts, the cursor font may be different now
  # so don't move this up.
  #
@@ -466,7 +466,7 @@ index e9fa0bee..79e50a96 100644
  # 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
-@@ -254,44 +260,65 @@ export XDG_DATA_DIRS
+@@ -257,44 +264,65 @@ export XDG_DATA_DIRS
  #
  KDE_FULL_SESSION=true
  export KDE_FULL_SESSION
@@ -545,7 +545,7 @@ index e9fa0bee..79e50a96 100644
  
  # finally, give the session control to the session manager
  # see kdebase/ksmserver for the description of the rest of the startup sequence
-@@ -303,34 +330,37 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
+@@ -306,34 +334,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 +594,7 @@ index e9fa0bee..79e50a96 100644
              done
              break
          fi
-@@ -339,15 +369,17 @@ fi
+@@ -342,15 +373,17 @@ fi
  
  echo 'startkde: Shutting down...'  1>&2
  # just in case
@@ -617,7 +617,7 @@ index e9fa0bee..79e50a96 100644
  
  echo 'startkde: Done.'  1>&2
 diff --git a/startkde/startplasma.cmake b/startkde/startplasma.cmake
-index 9f875110..2a7a2a70 100644
+index a5d09fa..d42c284 100644
 --- a/startkde/startplasma.cmake
 +++ b/startkde/startplasma.cmake
 @@ -1,6 +1,6 @@
@@ -714,7 +714,7 @@ index 9f875110..2a7a2a70 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
-@@ -100,35 +56,25 @@ xset fp rehash
+@@ -100,22 +56,13 @@ xset fp rehash
  # If the user has overwritten fonts, the cursor font may be different now
  # so don't move this up.
  #
@@ -738,6 +738,10 @@ index 9f875110..2a7a2a70 100644
 +@NIXPKGS_XPROP@ -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
 +@NIXPKGS_XPROP@ -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
  
+ # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
+ if which dbus-update-activation-environment >/dev/null 2>/dev/null ; then
+@@ -131,16 +78,15 @@ fi
+ 
  # We set LD_BIND_NOW to increase the efficiency of kdeinit.
  # kdeinit unsets this variable before loading applications.
 -LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup
@@ -755,17 +759,8 @@ index 9f875110..2a7a2a70 100644
  
  # finally, give the session control to the session manager
  # see kdebase/ksmserver for the description of the rest of the startup sequence
-@@ -143,27 +89,26 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit
+@@ -163,19 +109,19 @@ if test $? -eq 255; then
- # If the session should be locked from the start (locked autologin),
+   xmessage -geometry 500x100 "Could not start ksmserver. Check your installation."
- # lock now and do the rest of the KDE startup underneath the locker.
- KSMSERVEROPTIONS=" --no-lockscreen"
--kwrapper5 @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS
-+@NIXPKGS_KWRAPPER5@ @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS
- if test $? -eq 255; then
-   # Startup error
-   echo 'startplasma: Could not start ksmserver. Check your installation.'  1>&2
-   test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
--  xmessage -geometry 500x100 "Could not start ksmserver. Check your installation."
  fi
  
 -wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`
@@ -791,13 +786,13 @@ index 9f875110..2a7a2a70 100644
              done
              break
          fi
-@@ -172,15 +117,17 @@ fi
+@@ -184,15 +130,17 @@ fi
  
  echo 'startplasma: Shutting down...'  1>&2
  # just in case
 -test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
 +if [ -n "$ksplash_pid" ]; then
-+    kill "$ksplash_pid" 2>/dev/null
++ "$ksplash_pid" 2>/dev/null
 +fi
  
  # Clean up
@@ -814,27 +809,21 @@ index 9f875110..2a7a2a70 100644
  
  echo 'startplasma: Done.'  1>&2
 diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake
-index 417a87d4..3f62745a 100644
+index 8ac47aa..49970ef 100644
 --- a/startkde/startplasmacompositor.cmake
 +++ b/startkde/startplasmacompositor.cmake
-@@ -1,173 +1,171 @@
+@@ -1,118 +1,165 @@
  #!/bin/sh
  #
 -#  DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ )
 +#  NIXPKGS Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ )
  #
  
--# in case we have been started with full pathname spec without being in PATH
+-# We need to create config folder so we can write startupconfigkeys
--bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
+-if [  ${XDG_CONFIG_HOME} ]; then
--if [ -n "$bindir" ]; then
+-  configDir=$XDG_CONFIG_HOME;
--  qbindir=`qtpaths --binaries-dir`
--  qdbus=$qbindir/qdbus
--  case $PATH in
--    $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
--    *) PATH=$bindir:$PATH; export PATH;;
--  esac
 -else
--  qdbus=qdbus
+-  configDir=${HOME}/.config; #this is the default, http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
 +# we have to unset this for Darwin since it will screw up KDE's dynamic-loading
 +unset DYLD_FORCE_FLAT_NAMESPACE
 +
@@ -860,13 +849,8 @@ index 417a87d4..3f62745a 100644
 +# Qt from doing this wackiness in the first place.
 +if [ -e $XDG_CONFIG_HOME/Trolltech.conf ]; then
 +    @NIXPKGS_SED@ -e '/nix\\store\|nix\/store/ d' -i $XDG_CONFIG_HOME/Trolltech.conf
- fi
++fi
- 
++
--# We need to create config folder so we can write startupconfigkeys
--if [  ${XDG_CONFIG_HOME} ]; then
--  configDir=$XDG_CONFIG_HOME;
--else
--  configDir=${HOME}/.config; #this is the default, http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
 +@NIXPKGS_KBUILDSYCOCA5@
 +
 +# Set the default GTK 2 theme
@@ -891,7 +875,9 @@ index 417a87d4..3f62745a 100644
 +gtk-button-images=1
 +EOF
  fi
+ sysConfigDirs=${XDG_CONFIG_DIRS:-/etc/xdg}
  
+-# We need to create config folder so we can write startupconfigkeys
 -mkdir -p $configDir
 +# Set the default GTK 3 theme
 +gtk3_settings="$XDG_CONFIG_HOME/gtk-3.0/settings.ini"
@@ -1012,8 +998,8 @@ index 417a87d4..3f62745a 100644
 -    }
  fi
  
--kstartupconfig5
+ kstartupconfig5
--returncode=$?
+ returncode=$?
 -if test $returncode -ne 0; then
 +if ! @CMAKE_INSTALL_FULL_BINDIR@/kstartupconfig5; then
      exit 1
@@ -1047,7 +1033,7 @@ index 417a87d4..3f62745a 100644
 -        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"
++    #kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
 +    if [ $? -eq 10 ]; then
 +        export XCURSOR_THEME=breeze_cursors
 +    elif [ -n "$kcminputrc_mouse_cursortheme" ]; then
@@ -1066,6 +1052,23 @@ index 417a87d4..3f62745a 100644
      export QT_WAYLAND_FORCE_DPI=$kcmfonts_general_forcefontdpiwayland
  else
      export QT_WAYLAND_FORCE_DPI=96
+@@ -120,12 +167,12 @@ fi
+ 
+ # Get a property value from org.freedesktop.locale1
+ queryLocale1() {
+-    qdbus --system org.freedesktop.locale1 /org/freedesktop/locale1 "$1"
++    @NIXPKGS_QDBUS@ --system org.freedesktop.locale1 /org/freedesktop/locale1 "$1"
+ }
+ 
+ # Query whether org.freedesktop.locale1 is available. If it is, try to
+ # set XKB_DEFAULT_{MODEL,LAYOUT,VARIANT,OPTIONS} accordingly.
+-if qdbus --system org.freedesktop.locale1 >/dev/null 2>/dev/null; then
++if @NIXPKGS_QDBUS@ --system org.freedesktop.locale1 >/dev/null 2>/dev/null; then
+     # Do not overwrite existing values. There is no point in setting only some
+     # of them as then they would not match anymore.
+     if [ -z "${XKB_DEFAULT_MODEL}" -a -z "${XKB_DEFAULT_LAYOUT}" -a \
+@@ -141,41 +188,10 @@ if qdbus --system org.freedesktop.locale1 >/dev/null 2>/dev/null; then
+     fi
  fi
  
 -# Source scripts found in <config locations>/plasma-workspace/env/*.sh
@@ -1082,13 +1085,11 @@ index 417a87d4..3f62745a 100644
 -# For anything else (that doesn't set env vars, or that needs a window manager),
 -# better use the Autostart folder.
 -
--# TODO: Use GenericConfigLocation once we depend on Qt 5.4
+-scriptpath=`echo "$configDir:$sysConfigDirs" | tr ':' '\n'`
--scriptpath=`qtpaths --paths ConfigLocation | tr ':' '\n' | sed 's,$,/plasma-workspace,g'`
 -
--# Add /env/ to the directory to locate the scripts to be sourced
 -for prefix in `echo $scriptpath`; do
--  for file in "$prefix"/env/*.sh; do
+-  for file in "$prefix"/plasma-workspace/env/*.sh; do
--    test -r "$file" && . "$file"
+-    test -r "$file" && . "$file" || true
 -  done
 -done
 -
@@ -1104,14 +1105,12 @@ index 417a87d4..3f62745a 100644
 -export XDG_DATA_DIRS
 -
  # Make sure that D-Bus is running
--if $qdbus >/dev/null 2>/dev/null; then
+-if qdbus >/dev/null 2>/dev/null; then
--    : # ok
++if @NIXPKGS_QDBUS@ >/dev/null 2>/dev/null; then
--else
+     : # ok
-+if ! @NIXPKGS_QDBUS@ >/dev/null 2>/dev/null; then
+ else
      echo 'startplasmacompositor: Could not start D-Bus. Can you call qdbus?'  1>&2
-     test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+@@ -212,7 +228,7 @@ export KDE_FULL_SESSION
-     exit 1
-@@ -202,7 +200,7 @@ export KDE_FULL_SESSION
  KDE_SESSION_VERSION=5
  export KDE_SESSION_VERSION
  
@@ -1120,7 +1119,7 @@ index 417a87d4..3f62745a 100644
  export KDE_SESSION_UID
  
  XDG_CURRENT_DESKTOP=KDE
-@@ -212,26 +210,47 @@ export XDG_CURRENT_DESKTOP
+@@ -222,20 +238,41 @@ export XDG_CURRENT_DESKTOP
  QT_QPA_PLATFORM=wayland
  export QT_QPA_PLATFORM
  
@@ -1148,7 +1147,8 @@ index 417a87d4..3f62745a 100644
 +    done
 +done
 +
- # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
+ # kwin_wayland can possibly also start dbus-activated services which need env variables.
+ # In that case, the update in startplasma might be too late.
 -if which dbus-update-activation-environment >/dev/null 2>/dev/null ; then
 -    dbus-update-activation-environment --systemd --all
 -else
@@ -1171,17 +1171,8 @@ index 417a87d4..3f62745a 100644
  
  echo 'startplasmacompositor: Shutting down...'  1>&2
  
- unset KDE_FULL_SESSION
--xprop -root -remove KDE_FULL_SESSION
-+@NIXPKGS_XPROP@ -root -remove KDE_FULL_SESSION
- unset KDE_SESSION_VERSION
--xprop -root -remove KDE_SESSION_VERSION
-+@NIXPKGS_XPROP@ -root -remove KDE_SESSION_VERSION
- unset KDE_SESSION_UID
- 
- echo 'startplasmacompositor: Done.'  1>&2
 diff --git a/startkde/waitforname/org.kde.plasma.Notifications.service.in b/startkde/waitforname/org.kde.plasma.Notifications.service.in
-index 0a51b84b..f48b5d8a 100644
+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 @@

pkgs/desktops/plasma-5/srcs.nix

@@ -3,355 +3,355 @@
 
 {
   bluedevil = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/bluedevil-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/bluedevil-5.12.1.tar.xz";
-      sha256 = "0xzdf1qrf2nlpvn2hr9zk72hw027i318s9pnzgmqg1lwhdr276h5";
+      sha256 = "0qdqbykphala7np333l3a0r94nrd8zg2dh7iqw6k7mc1mxkh92b7";
-      name = "bluedevil-5.11.5.tar.xz";
+      name = "bluedevil-5.12.1.tar.xz";
     };
   };
   breeze = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/breeze-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/breeze-5.12.1.tar.xz";
-      sha256 = "0xxwnhxpkdf4nyc1rvsjrnqsv1cgzs3a88mwfwpvci4snfva8jp1";
+      sha256 = "0hi3z4jrs6a0sm58726v6v0hvb0v313qihi06mm6fayiijh0s5zs";
-      name = "breeze-5.11.5.tar.xz";
+      name = "breeze-5.12.1.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/breeze-grub-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/breeze-grub-5.12.1.tar.xz";
-      sha256 = "1l3dv1acgs6ssydg985d90136p9n4h0xry3xlx12g5wg07i8s89g";
+      sha256 = "0i7w9i2m9sxywag46dhr22ksw9zb2cjm6vk2019m3kpg9pq8yx68";
-      name = "breeze-grub-5.11.5.tar.xz";
+      name = "breeze-grub-5.12.1.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/breeze-gtk-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/breeze-gtk-5.12.1.tar.xz";
-      sha256 = "0mkd1gqih5irmabxly2y744sr1iwxy7r7hx68jrd452nbvqvyrqq";
+      sha256 = "0bal2zf2xg32hxbabf4kzlm2lhir9sn67nfzrf9zb0hb0b7ya01d";
-      name = "breeze-gtk-5.11.5.tar.xz";
+      name = "breeze-gtk-5.12.1.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/breeze-plymouth-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/breeze-plymouth-5.12.1.tar.xz";
-      sha256 = "0ydfrrsqvzn71j9x1f26771x99yiq59h745k476dcqajj2m0ari3";
+      sha256 = "0535igi9ms4dyz25sygkrmg310s90vy3srx5qdrdzfinah5m8qz7";
-      name = "breeze-plymouth-5.11.5.tar.xz";
+      name = "breeze-plymouth-5.12.1.tar.xz";
     };
   };
   discover = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/discover-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/discover-5.12.1.tar.xz";
-      sha256 = "0yxsp4jimyrsxf72hinqa51ycg4hmfxrxdicm9n8qfz47srcgkml";
+      sha256 = "07jdx01qz9339w652ixk0hjb25s1bf4rc5gs872i0hv77vxy161b";
-      name = "discover-5.11.5.tar.xz";
+      name = "discover-5.12.1.tar.xz";
     };
   };
   drkonqi = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/drkonqi-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/drkonqi-5.12.1.tar.xz";
-      sha256 = "1kngafr1hdq6r02mpd4bj5lgbgzk2cd10f5zqsvdfgsirz91vfsf";
+      sha256 = "056qqhp8jh2v9jrghdb2n2ljq3s4vyrfdfligkvxvviwrd1r3wyk";
-      name = "drkonqi-5.11.5.tar.xz";
+      name = "drkonqi-5.12.1.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/kactivitymanagerd-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/kactivitymanagerd-5.12.1.tar.xz";
-      sha256 = "11nnmqpw4kq96912rys2a539yzgncc5vp7b52wgc4is9i5czsr50";
+      sha256 = "0hfkcy27mpick1sfwvw4x6323bsq9ks2ac066560wm5xy6svhmid";
-      name = "kactivitymanagerd-5.11.5.tar.xz";
+      name = "kactivitymanagerd-5.12.1.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/kde-cli-tools-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/kde-cli-tools-5.12.1.tar.xz";
-      sha256 = "0d4d360pq6winykjp6lgq77k9yc435d5g71dj7bivkyilqc4cp8c";
+      sha256 = "0l6bky92j1hpgn4ikfxwrpsrcvx673g8vk2n3lff1cyy4j0ayg6v";
-      name = "kde-cli-tools-5.11.5.tar.xz";
+      name = "kde-cli-tools-5.12.1.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/kdecoration-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/kdecoration-5.12.1.tar.xz";
-      sha256 = "0hl9mqwyfkh1r5nbl46g5axi446fdf7fw09b7v6l3jg9c5xbx89d";
+      sha256 = "08x87kcgphb1jknyp3fsimgb2al919s039kkhimijmm0n1z16fiy";
-      name = "kdecoration-5.11.5.tar.xz";
+      name = "kdecoration-5.12.1.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/kde-gtk-config-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/kde-gtk-config-5.12.1.tar.xz";
-      sha256 = "1y9ji82qlvp2z00xw0l32zj8asbg85n6azw8ringg2l6376r01l6";
+      sha256 = "1a10nxivnfnm9634z98r6jgp887vf1zynyp9hi75pw9jbm4zf1kw";
-      name = "kde-gtk-config-5.11.5.tar.xz";
+      name = "kde-gtk-config-5.12.1.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/kdeplasma-addons-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/kdeplasma-addons-5.12.1.tar.xz";
-      sha256 = "1vp9r7ia5wriw5srpyq89nqdp82akz3jnh7dcbh2h0gdagw7hb94";
+      sha256 = "123daj7q8jgw6zsq9c0mdd28qf9r20hlbzs71zz48r7736njaw98";
-      name = "kdeplasma-addons-5.11.5.tar.xz";
+      name = "kdeplasma-addons-5.12.1.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/kgamma5-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/kgamma5-5.12.1.tar.xz";
-      sha256 = "16vlx51n52j5q1nfsz4ji6bz4x6sfagxzn6q3r6ckj41rkwmp9gg";
+      sha256 = "0cgkrc4b0x50ih4x0zfvcydnhqryd37d5sqj3p0k3b6p2r9mnqkb";
-      name = "kgamma5-5.11.5.tar.xz";
+      name = "kgamma5-5.12.1.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/khotkeys-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/khotkeys-5.12.1.tar.xz";
-      sha256 = "051yjqkf5bigz6cz2qbq0lggw9i6ydfaxrvy4xh40mw2c6x3xmvh";
+      sha256 = "1acjg51ikp9gdabdjbg6i9znxrfs11md9zhi7rls9b5p06l38ckj";
-      name = "khotkeys-5.11.5.tar.xz";
+      name = "khotkeys-5.12.1.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/kinfocenter-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/kinfocenter-5.12.1.tar.xz";
-      sha256 = "0ym7i64k48x8dcln0lajj0379blp3c3a0axfcjibp3ya2xcaqdif";
+      sha256 = "1wb7gag22ssaril3rl5r3y62rszvihrr4y1ph7nmhrg14sifg16k";
-      name = "kinfocenter-5.11.5.tar.xz";
+      name = "kinfocenter-5.12.1.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/kmenuedit-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/kmenuedit-5.12.1.tar.xz";
-      sha256 = "0wh4hk51k2mz1gqm9brvdy16gp2ap2iz5b6yjiqbkpz6giy88kwc";
+      sha256 = "13liv9qj8h4b17h8864bhxqahjwaz7bbh1gx53mhkbn59g5kh39d";
-      name = "kmenuedit-5.11.5.tar.xz";
+      name = "kmenuedit-5.12.1.tar.xz";
     };
   };
   kscreen = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/kscreen-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/kscreen-5.12.1.tar.xz";
-      sha256 = "0qa23qs8v8hm91190ssdnlg7dyljra7csgykb7d8la30yxa9vzc7";
+      sha256 = "18v0gzv4j9w0jyf05ibi5iwmw1wp231q7hi098sps614hz38zmh2";
-      name = "kscreen-5.11.5.tar.xz";
+      name = "kscreen-5.12.1.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/kscreenlocker-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/kscreenlocker-5.12.1.tar.xz";
-      sha256 = "0qrby8jxmvmnr1abkry8h5xapdswabj27n35s9l71d9lp9p96naz";
+      sha256 = "1s3k51k05g3nhq1c32631ryr754zk40fnrw4zi2x69bvx3mj40hq";
-      name = "kscreenlocker-5.11.5.tar.xz";
+      name = "kscreenlocker-5.12.1.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/ksshaskpass-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/ksshaskpass-5.12.1.tar.xz";
-      sha256 = "08jf6f1i9xn0zsz2j2czgdzcr203wrlj1nlam26dakrphhaj8vm2";
+      sha256 = "1zj7ka6wfisjbx7lbpw7acjdgr590596zgy4al7if4rznva1zsh7";
-      name = "ksshaskpass-5.11.5.tar.xz";
+      name = "ksshaskpass-5.12.1.tar.xz";
     };
   };
   ksysguard = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/ksysguard-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/ksysguard-5.12.1.tar.xz";
-      sha256 = "161bcmsw4bjlsgkr3izfsqbiwambmm3za8mln3m96nf70gpqpa6i";
+      sha256 = "1dh84wzn1iyc59yvzqjah16rp05wl6cf3lgiiycza09d9k4m0j5m";
-      name = "ksysguard-5.11.5.tar.xz";
+      name = "ksysguard-5.12.1.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/kwallet-pam-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/kwallet-pam-5.12.1.tar.xz";
-      sha256 = "0wqnaszvwclz2gn74nmhqmci39525hwvpc3igxzjhdccnkfb5ac4";
+      sha256 = "0x7w945ifmdczynyr45xid8ymq7m0djapacb815bgy7xzr3y3glm";
-      name = "kwallet-pam-5.11.5.tar.xz";
+      name = "kwallet-pam-5.12.1.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/kwayland-integration-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/kwayland-integration-5.12.1.tar.xz";
-      sha256 = "0xisgzymlhmbngvmv3dkh6a51dqnhcwrjj2480f0yxsmhvknxrps";
+      sha256 = "00fncsp9ihg9f9n9a63rnx6n7jfld6bya3wymppwxnzxp1awx8s0";
-      name = "kwayland-integration-5.11.5.tar.xz";
+      name = "kwayland-integration-5.12.1.tar.xz";
     };
   };
   kwin = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/kwin-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/kwin-5.12.1.tar.xz";
-      sha256 = "06bz2vm78i1x0i0ljdqd2a0bnnrfwz9zvlg7r86qlmhkzn2dpc4z";
+      sha256 = "13wdqhyhnnk64bd1vyxk7rm6bkn7z2cpcxigqdyy3iqkkpz16mfy";
-      name = "kwin-5.11.5.tar.xz";
+      name = "kwin-5.12.1.tar.xz";
     };
   };
   kwrited = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/kwrited-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/kwrited-5.12.1.tar.xz";
-      sha256 = "0sx5v1apambb8w6mndkkp2lvwlqwzbpxxp5d5zsz96lxndjx6sbv";
+      sha256 = "1blbv41mm74bhp1fkdc0f24pk990xr8ppmwnif9g5ygsisw6mwbl";
-      name = "kwrited-5.11.5.tar.xz";
+      name = "kwrited-5.12.1.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/libkscreen-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/libkscreen-5.12.1.tar.xz";
-      sha256 = "03cnr7z74j2kjwbg1ddavmj0l8hpxg7bg2ipglirnzvp2ihv1wzg";
+      sha256 = "01j9rvhsgn57jqqhznqwpmq6x2jrfrkv9svhch3akp9qz580wzjf";
-      name = "libkscreen-5.11.5.tar.xz";
+      name = "libkscreen-5.12.1.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/libksysguard-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/libksysguard-5.12.1.tar.xz";
-      sha256 = "0f2py4zkqzpxxf3mqaij0q8ka0v3nschj17dv6rbzzmr5mjv825f";
+      sha256 = "0xfbh0fndld6ab12770fj3szfc66zgfzh0al36lif8rvdgyqymfl";
-      name = "libksysguard-5.11.5.tar.xz";
+      name = "libksysguard-5.12.1.tar.xz";
     };
   };
   milou = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/milou-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/milou-5.12.1.tar.xz";
-      sha256 = "0ja7a668wv67vb3mgsd2nbjdcp0lm7aix5dpc496wr1jy47pxv8a";
+      sha256 = "1k6v0lbadvmclw6mpq2xdh3w4scjjhzj6jsgq7v3g27mjf4pdjc2";
-      name = "milou-5.11.5.tar.xz";
+      name = "milou-5.12.1.tar.xz";
     };
   };
   oxygen = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/oxygen-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/oxygen-5.12.1.tar.xz";
-      sha256 = "1n2xr3a0002xfiy99gjqlny76nxjlss1d3sgcj8adpza44j91228";
+      sha256 = "1pmw26aihk63zscxzwacp6yfqg1siamvjcgc4b81xafcby5w1xyz";
-      name = "oxygen-5.11.5.tar.xz";
+      name = "oxygen-5.12.1.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/plasma-desktop-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/plasma-desktop-5.12.1.tar.xz";
-      sha256 = "0djzs80mr0radmhai3k7jnlwlp76maf7vvrgkfckzs63n1jhdhb3";
+      sha256 = "1mjwjvv0dmvvpghckqw56s2khdxbgqvs0n68c06v56hcnsvxpadw";
-      name = "plasma-desktop-5.11.5.tar.xz";
+      name = "plasma-desktop-5.12.1.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/plasma-integration-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/plasma-integration-5.12.1.tar.xz";
-      sha256 = "1rmq8i0flrvqcl21fnn94d58zyw55scagrzbjw92p34i1mllhif1";
+      sha256 = "0ljdwfw2b8nk5nsxhhhx4vh9mrdvchrzr39y6wx7yq0hk8ldspkf";
-      name = "plasma-integration-5.11.5.tar.xz";
+      name = "plasma-integration-5.12.1.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/plasma-nm-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/plasma-nm-5.12.1.tar.xz";
-      sha256 = "11lw26nd1rp2wbmqlf37wgk8qzv4fcc5x04g1i1h7c6hmjf5svqv";
+      sha256 = "023v1v8c6zqddnms82xyym99x7faxf3g304q8zd5hk1xmwxfydmq";
-      name = "plasma-nm-5.11.5.tar.xz";
+      name = "plasma-nm-5.12.1.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/plasma-pa-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/plasma-pa-5.12.1.tar.xz";
-      sha256 = "1gdkz9yx21skg3c95nwh1mwacvrklgpfl0cspsmyyfnbnv93cz94";
+      sha256 = "19qfmrqsxf4h59ayy2cr8qixk04wlh9gg5f6aqlrbd81611pnmss";
-      name = "plasma-pa-5.11.5.tar.xz";
+      name = "plasma-pa-5.12.1.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/plasma-sdk-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/plasma-sdk-5.12.1.tar.xz";
-      sha256 = "013dc8dg0nhgdjlflgpqi28jsyparnwrj5am8lzvc0kkd9f69yhk";
+      sha256 = "11irkik3ppvcxfv4cd4jyim0qrr0i8y1911vw9h8gppg4bihiibr";
-      name = "plasma-sdk-5.11.5.tar.xz";
+      name = "plasma-sdk-5.12.1.tar.xz";
     };
   };
   plasma-tests = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/plasma-tests-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/plasma-tests-5.12.1.tar.xz";
-      sha256 = "00n1i6s1811w5h37i2iyy924495d2w24vfsl348cxplfxpxhcqf0";
+      sha256 = "1vk4c61839ggwdjxnmv6f5l5rcml4q6sjhrxykw9sx2fk43b7aqc";
-      name = "plasma-tests-5.11.5.tar.xz";
+      name = "plasma-tests-5.12.1.tar.xz";
     };
   };
   plasma-vault = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/plasma-vault-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/plasma-vault-5.12.1.tar.xz";
-      sha256 = "1pg891fahslnjn5jdsjjlw8i2l71ddznxjg96l9wycvh6nn7k0v6";
+      sha256 = "13ph0npgjc8mx1jn1pszj0hv3332lyamiq4wrpc7qgj6cx81qygz";
-      name = "plasma-vault-5.11.5.tar.xz";
+      name = "plasma-vault-5.12.1.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/plasma-workspace-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/plasma-workspace-5.12.1.tar.xz";
-      sha256 = "1ipklc6v2ml095sy80rgq4123vkk3famjwf8s3rgkk172s76qm98";
+      sha256 = "1ijnafbsyrv9n0mldf77mipq03k29db2ad57iwvr310xpr0sckfq";
-      name = "plasma-workspace-5.11.5.tar.xz";
+      name = "plasma-workspace-5.12.1.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/plasma-workspace-wallpapers-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/plasma-workspace-wallpapers-5.12.1.tar.xz";
-      sha256 = "0zhcpbb74phnmr24kxcp0k6gr7gjzdfbrrv4xjjb2qpg2d00l3pm";
+      sha256 = "0lsczs68w9ygzc9m7q2r6fziddzgraavyf2vf49d7543lym21k8n";
-      name = "plasma-workspace-wallpapers-5.11.5.tar.xz";
+      name = "plasma-workspace-wallpapers-5.12.1.tar.xz";
     };
   };
   plymouth-kcm = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/plymouth-kcm-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/plymouth-kcm-5.12.1.tar.xz";
-      sha256 = "152fyg5hc3rzvqw0z88pgapnhc64jx34vcqgsslsfja8mwk9h0ql";
+      sha256 = "1wqqxxmcn49gryr7pyn5hq3jyl92r0m8dxns2wn2mgy2cz0xz5yk";
-      name = "plymouth-kcm-5.11.5.tar.xz";
+      name = "plymouth-kcm-5.12.1.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.11.5";
+    version = "1-5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/polkit-kde-agent-1-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/polkit-kde-agent-1-5.12.1.tar.xz";
-      sha256 = "0bwv567czi9h3rxgn19aw10nq5c674zd8wgk9nj006km1yyxrgy6";
+      sha256 = "1hsy14xprgpfh0zgn1z9c8j8qs41wfizm38wr7nbnhk81k25kr96";
-      name = "polkit-kde-agent-1-5.11.5.tar.xz";
+      name = "polkit-kde-agent-1-5.12.1.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/powerdevil-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/powerdevil-5.12.1.tar.xz";
-      sha256 = "0jqf85bain8vj5plxvvbdwiwc2jyb1r6idajhr6igcpjryfa75hj";
+      sha256 = "09c8snaf236cbxp8ifv8zwy1zifld3gsszvvzyvwdhbpz3gr41hm";
-      name = "powerdevil-5.11.5.tar.xz";
+      name = "powerdevil-5.12.1.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/sddm-kcm-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/sddm-kcm-5.12.1.tar.xz";
-      sha256 = "1ln1h4r614rg4w6b7g5l7yqqijkaaj04s4g4m41d8rg8z5ywq4v0";
+      sha256 = "1ij90cjjnb8318v6s4m56xfhs6cvi9p09mwmgqsh5463ya74x7dy";
-      name = "sddm-kcm-5.11.5.tar.xz";
+      name = "sddm-kcm-5.12.1.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/systemsettings-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/systemsettings-5.12.1.tar.xz";
-      sha256 = "0ycdfl585853481bjix63nnj7qvg767qpbyr015k32c1v3vllx8y";
+      sha256 = "1nzscbs8v22wa8adlxcvhr2qhibpq3dm584774ma3rmzvagjl6hv";
-      name = "systemsettings-5.11.5.tar.xz";
+      name = "systemsettings-5.12.1.tar.xz";
     };
   };
   user-manager = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/user-manager-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/user-manager-5.12.1.tar.xz";
-      sha256 = "1r4q411g2r6cz4z6bm5jwygfbvrfrl8dawdd69s6h93ixs7697s4";
+      sha256 = "0db8lgh6sxfbc9v68yqq0g68rznkk8ml88h8zxrw5khicazg2n62";
-      name = "user-manager-5.11.5.tar.xz";
+      name = "user-manager-5.12.1.tar.xz";
     };
   };
   xdg-desktop-portal-kde = {
-    version = "5.11.5";
+    version = "5.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.5/xdg-desktop-portal-kde-5.11.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.1/xdg-desktop-portal-kde-5.12.1.tar.xz";
-      sha256 = "07xwb4zbf0cp4a672vs631dh9cqyvn0j9wwlknc21jzr619mnkap";
+      sha256 = "0xnryki83vmm1jmzkwfkxga0s1qfrl939rg6bb5h44j6665sv2bl";
-      name = "xdg-desktop-portal-kde-5.11.5.tar.xz";
+      name = "xdg-desktop-portal-kde-5.12.1.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
+  kactivities, kactivities-stats, kirigami2, kcrash
 }:
 
 mkDerivation {
@@ -11,7 +11,7 @@ mkDerivation {
   buildInputs = [
     kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice
     kwindowsystem kxmlgui qtquickcontrols qtquickcontrols2
-    kactivities kactivities-stats kirigami2
+    kactivities kactivities-stats kirigami2 kcrash
   ];
   outputs = [ "bin" "dev" "out" ];
 }

pkgs/development/compilers/arachne-pnr/default.nix

@@ -1,21 +1,29 @@
 { stdenv, fetchFromGitHub, icestorm }:
 
+with builtins;
+
 stdenv.mkDerivation rec {
   name = "arachne-pnr-${version}";
-  version = "2018.02.04";
+  version = "2018.02.14";
 
   src = fetchFromGitHub {
     owner  = "cseed";
     repo   = "arachne-pnr";
-    rev    = "c21df0062c6ee13e8c8280cefbb7c017823336c0";
+    rev    = "b54675413f9aac1d9a1fb0a8e9354bec2a2a8f3c";
-    sha256 = "1ah1gn07av3ff5lnay4p7dahaacbyj0mfakbx7g5fs3p1m1m8p1k";
+    sha256 = "06slsb239qk1r2g96n1g37yp8314cy7yi4g1yf86fr87fr11ml8l";
   };
 
   enableParallelBuilding = true;
   makeFlags =
-    [ "PREFIX=$(out)" "ICEBOX=${icestorm}/share/icebox"
+    [ "PREFIX=$(out)"
+      "ICEBOX=${icestorm}/share/icebox"
     ];
 
+  patchPhase = ''
+    substituteInPlace ./Makefile \
+      --replace 'echo UNKNOWN' 'echo ${substring 0 10 src.rev}'
+  '';
+
   meta = {
     description = "Place and route tool for FPGAs";
     longDescription = ''

pkgs/development/compilers/compcert/default.nix

@@ -7,11 +7,11 @@ assert lib.versionAtLeast ocamlPackages.ocaml.version "4.02";
 
 stdenv.mkDerivation rec {
   name    = "compcert-${version}";
-  version = "3.1";
+  version = "3.2";
 
   src = fetchurl {
     url    = "http://compcert.inria.fr/release/${name}.tgz";
-    sha256 = "0irfwlw2chalp0g2gw0makc699hn3z37sha1a239p9d90mzx03cx";
+    sha256 = "11q4121s0rxva63njjwya7syfx9w0p4hzr6avh8s57vfbrcakc93";
   };
 
   buildInputs = [ coq ]
@@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   configurePhase = ''
-    substituteInPlace VERSION --replace '3.0.1' '3.1'
     substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc'
     ./configure -clightgen -prefix $out -toolprefix ${tools}/bin/ '' +
     (if stdenv.isDarwin then "x86_64-macosx" else "x86_64-linux");

pkgs/development/compilers/yosys/default.nix

@@ -2,18 +2,24 @@
 , pkgconfig, tcl, readline, libffi, python3, bison, flex
 }:
 
+with builtins;
+
 stdenv.mkDerivation rec {
   name = "yosys-${version}";
-  version = "2018.02.04";
+  version = "2018.02.14";
 
   srcs = [
     (fetchFromGitHub {
       owner  = "yosyshq";
       repo   = "yosys";
-      rev    = "0659d9eac7b546ee6f5acab46dbc83c91d556a34";
+      rev    = "c1abd3b02cab235334342f3520e2535eb74c5792";
-      sha256 = "1hy21gxcp3q3hlbh5sh46h2340r11fwalkb9if9sbpc9y3279njj";
+      sha256 = "0pzrplv4p0qzy115rg19lxv4w274iby337zfd7hhlinnpx3gzqvw";
       name   = "yosys";
     })
+
+    # NOTE: the version of abc used here is synchronized with
+    # the one in the yosys Makefile of the version above;
+    # keep them the same for quality purposes.
     (fetchFromBitbucket {
       owner  = "alanmi";
       repo   = "abc";
@@ -27,6 +33,12 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ tcl readline libffi python3 bison flex ];
+
+  patchPhase = ''
+    substituteInPlace ./Makefile \
+      --replace 'echo UNKNOWN' 'echo ${substring 0 10 (elemAt srcs 0).rev}'
+  '';
+
   preBuild = ''
     chmod -R u+w ../yosys-abc
     ln -s ../yosys-abc abc

pkgs/development/interpreters/ruby/default.nix

@@ -99,8 +99,6 @@ let
 
         enableParallelBuilding = true;
 
-        hardeningDisable = lib.optional isRuby20 "format";
-
         patches =
           (import ./patchsets.nix {
             inherit patchSet useRailsExpress ops;
@@ -112,16 +110,9 @@ let
           pushd ${sourceRoot}/rubygems
           patch -p1 < ${rubygemsPatch}
           popd
-        '' + opString isRuby21 ''
-          rm "$sourceRoot/enc/unicode/name2ctype.h"
         '';
 
-        postPatch = if isRuby21 then ''
+        postPatch = if isRuby25 then ''
-          rm tool/config_files.rb
-          cp ${config}/config.guess tool/
-          cp ${config}/config.sub tool/
-        ''
-        else if isRuby25 then ''
           sed -i configure.ac -e '/config.guess/d'
           cp ${config}/config.guess tool/
           cp ${config}/config.sub tool/
@@ -203,31 +194,7 @@ let
     ) args; in self;
 
 in {
-  ruby_2_0_0 = generic {
+  ruby_2_3 = generic {
-    version = rubyVersion "2" "0" "0" "p648";
-    sha256 = {
-      src = "1y3n4c6xw2wki7pyjpq5zpbgxnw5i3jc8mcpj6rk7hs995mvv446";
-      git = "0ncjfq4hfqj9kcr8pbll6kypwnmcgs8w7l4466qqfyv7jj3yjd76";
-    };
-  };
-
-  ruby_2_1_10 = generic {
-    version = rubyVersion "2" "1" "10" "";
-    sha256 = {
-      src = "086x66w51lg41abjn79xb7f6xsryymkcc3nvakmkjnjyg96labpv";
-      git = "133phd5r5y0np5lc9nqif93l7yb13yd52aspyl6c46z5jhvhyvfi";
-    };
-  };
-
-  ruby_2_2_9 = generic {
-    version = rubyVersion "2" "2" "9" "";
-    sha256 = {
-      src = "19m1ximl7vcrsvq595dgrjh4yb6kar944095wbywqh7waiqcfirg";
-      git = "03qrjh55098wcqh2khxryzkzfqkznjrcdgwf27r2bgcycbg5ca5q";
-    };
-  };
-
-  ruby_2_3_6 = generic {
     version = rubyVersion "2" "3" "6" "";
     sha256 = {
       src = "07jpa7fw1gyf069m7alf2b0zm53qm08w2ns45mhzmvgrg4r528l3";
@@ -235,7 +202,7 @@ in {
     };
   };
 
-  ruby_2_4_3 = generic {
+  ruby_2_4 = generic {
     version = rubyVersion "2" "4" "3" "";
     sha256 = {
       src = "161smb52q19r9lrzy22b3bhnkd0z8wjffm0qsfkml14j5ic7a0zx";
@@ -243,7 +210,7 @@ in {
     };
   };
 
-  ruby_2_5_0 = generic {
+  ruby_2_5 = generic {
     version = rubyVersion "2" "5" "0" "";
     sha256 = {
       src = "1azj0d2lzziw6iml7bx3sxpxzcdmfwfq3yhm7djyp20q1xiz7rj6";

pkgs/development/interpreters/ruby/patchsets.nix

@@ -1,29 +1,6 @@
 { patchSet, useRailsExpress, ops, patchLevel }:
 
 rec {
-  "2.0.0" = [
-    ./ssl_v3.patch
-    ./rand-egd.patch
-  ] ++ ops useRailsExpress [
-    "${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/01-zero-broken-tests.patch"
-    "${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/02-railsexpress-gc.patch"
-    "${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/03-display-more-detailed-stack-trace.patch"
-    "${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/04-show-full-backtrace-on-stack-overflow.patch"
-  ];
-  "2.1.10" = [
-    ./rand-egd.patch
-  ] ++ ops useRailsExpress [
-    # 2.1.10 patchsets are not available, but 2.1.8 patchsets apply
-    "${patchSet}/patches/ruby/2.1.8/railsexpress/01-zero-broken-tests.patch"
-    "${patchSet}/patches/ruby/2.1.8/railsexpress/02-improve-gc-stats.patch"
-    "${patchSet}/patches/ruby/2.1.8/railsexpress/03-display-more-detailed-stack-trace.patch"
-    "${patchSet}/patches/ruby/2.1.8/railsexpress/04-show-full-backtrace-on-stack-overflow.patch"
-    "${patchSet}/patches/ruby/2.1.8/railsexpress/05-funny-falcon-stc-density.patch"
-    "${patchSet}/patches/ruby/2.1.8/railsexpress/06-funny-falcon-stc-pool-allocation.patch"
-    "${patchSet}/patches/ruby/2.1.8/railsexpress/07-aman-opt-aset-aref-str.patch"
-    "${patchSet}/patches/ruby/2.1.8/railsexpress/08-funny-falcon-method-cache.patch"
-    "${patchSet}/patches/ruby/2.1.8/railsexpress/09-heap-dump-support.patch"
-  ];
   "2.2.9" = ops useRailsExpress [
     "${patchSet}/patches/ruby/2.2/head/railsexpress/01-zero-broken-tests.patch"
     "${patchSet}/patches/ruby/2.2/head/railsexpress/02-improve-gc-stats.patch"

pkgs/development/interpreters/ruby/rand-egd.patch

@@ -1,42 +0,0 @@
-diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb
-index e272cba..3a1fa71 100644
---- a/ext/openssl/extconf.rb
-+++ b/ext/openssl/extconf.rb
-@@ -87,6 +87,7 @@
- have_func("PEM_def_callback")
- have_func("PKCS5_PBKDF2_HMAC")
- have_func("PKCS5_PBKDF2_HMAC_SHA1")
-+have_func("RAND_egd")
- have_func("X509V3_set_nconf")
- have_func("X509V3_EXT_nconf_nid")
- have_func("X509_CRL_add0_revoked")
-diff --git a/ext/openssl/ossl_rand.c b/ext/openssl/ossl_rand.c
-index 29cbf8c..27466fe 100644
---- a/ext/openssl/ossl_rand.c
-+++ b/ext/openssl/ossl_rand.c
-@@ -148,6 +148,7 @@ ossl_rand_pseudo_bytes(VALUE self, VALUE len)
-     return str;
- }
- 
-+#ifdef HAVE_RAND_EGD
- /*
-  *  call-seq:
-  *     egd(filename) -> true
-@@ -186,6 +187,7 @@ ossl_rand_egd_bytes(VALUE self, VALUE filename, VALUE len)
-     }
-     return Qtrue;
- }
-+#endif /* HAVE_RAND_EGD */
- 
- /*
-  *  call-seq:
-@@ -219,7 +221,9 @@ Init_ossl_rand(void)
-     DEFMETH(mRandom, "write_random_file", ossl_rand_write_file, 1);
-     DEFMETH(mRandom, "random_bytes", ossl_rand_bytes, 1);
-     DEFMETH(mRandom, "pseudo_bytes", ossl_rand_pseudo_bytes, 1);
-+#ifdef HAVE_RAND_EGD
-     DEFMETH(mRandom, "egd", ossl_rand_egd, 1);
-     DEFMETH(mRandom, "egd_bytes", ossl_rand_egd_bytes, 2);
-+#endif /* HAVE_RAND_EGD */
-     DEFMETH(mRandom, "status?", ossl_rand_status, 0)
- }

pkgs/development/interpreters/ruby/ssl_v3.patch

@@ -1,16 +0,0 @@
---- a/ext/openssl/ossl_ssl.c  2015-11-26 16:41:03.775058140 +0000
-+++ b/ext/openssl/ossl_ssl.c  2015-11-26 16:40:56.191907346 +0000
-@@ -138,9 +138,12 @@
-     OSSL_SSL_METHOD_ENTRY(SSLv2_server),
-     OSSL_SSL_METHOD_ENTRY(SSLv2_client),
- #endif
-+#if defined(HAVE_SSLV3_METHOD) && defined(HAVE_SSLV3_SERVER_METHOD) && \
-+        defined(HAVE_SSLV3_CLIENT_METHOD)
-     OSSL_SSL_METHOD_ENTRY(SSLv3),
-     OSSL_SSL_METHOD_ENTRY(SSLv3_server),
-     OSSL_SSL_METHOD_ENTRY(SSLv3_client),
-+#endif
-     OSSL_SSL_METHOD_ENTRY(SSLv23),
-     OSSL_SSL_METHOD_ENTRY(SSLv23_server),
-     OSSL_SSL_METHOD_ENTRY(SSLv23_client),
-

pkgs/development/libraries/cutee/default.nix

@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "C++ Unit Testing Easy Environment";
-    homepage    = http://codesink.org/cutee_unit_testing.html;
+    homepage    = http://www.codesink.org/cutee_unit_testing.html;
     license     = licenses.gpl2Plus;
     maintainers = with maintainers; [ leenaars];
     platforms = platforms.linux;

pkgs/development/libraries/getdns/default.nix

@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, libtool, unbound, libidn, m4, file
+, openssl, doxygen, autoreconfHook, automake }:
+
+stdenv.mkDerivation rec {
+  pname = "getdns";
+  name = "${pname}-${version}";
+  version = "1.3.0";
+
+  src = fetchurl {
+    url = "https://getdnsapi.net/releases/${pname}-1-3-0/${pname}-${version}.tar.gz";
+    sha256 = "920fa2e07c72fd0e5854db1820fa777108009fc5cb702f9aa5155ef58b12adb1";
+  };
+
+  nativeBuildInputs = [ libtool m4 autoreconfHook automake file ];
+
+  buildInputs = [ unbound libidn openssl doxygen ];
+
+  patchPhase = ''
+    substituteInPlace m4/acx_openssl.m4 \
+      --replace /usr/local/ssl ${openssl.dev}
+    '';
+
+  meta = with stdenv.lib; {
+    description = "A modern asynchronous DNS API";
+    longDescription = ''
+      getdns is an implementation of a modern asynchronous DNS API; the
+      specification was originally edited by Paul Hoffman. It is intended to make all
+      types of DNS information easily available to application developers and non-DNS
+      experts. DNSSEC offers a unique global infrastructure for establishing and
+      enhancing cryptographic trust relations. With the development of this API the
+      developers intend to offer application developers a modern and flexible
+      interface that enables end-to-end trust in the DNS architecture, and which will
+      inspire application developers to implement innovative security solutions in
+      their applications.
+'';
+    homepage = https://getdnsapi.net;
+    maintainers = with maintainers; [ leenaars ];
+    license = licenses.bsd3;
+    platforms = platforms.all;
+  };
+}

pkgs/development/libraries/gnutls-kdh/generic.nix

@@ -84,7 +84,7 @@ stdenv.mkDerivation {
        layer. It adds TLS-KDH ciphers: Kerberos + Diffie-Hellman.
     '';
 
-    homepage = http://www.gnu.org/software/gnutls://github.com/arpa2/gnutls-kdh;
+    homepage = https://github.com/arpa2/gnutls-kdh;
     license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ leenaars ];
     platforms = platforms.all;

pkgs/development/libraries/libyaml-cpp/default.nix

@@ -2,28 +2,26 @@
 
 stdenv.mkDerivation rec {
   name = "libyaml-cpp-${version}";
-  version = "0.5.3";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "jbeder";
     repo = "yaml-cpp";
-    rev = "release-${version}";
+    rev = "yaml-cpp-${version}";
-    sha256 = "0qr286q8mwbr4cxz0y0rf045zc071qh3cb804by6w1ydlqciih8a";
+    sha256 = "16x53p9gfch7gpyg865j7m1zhqsixx2hbbd206ffjv0ip8cjipjf";
   };
 
   outputs = [ "out" "dev" ];
 
-  buildInputs = [ cmake boost ];
+  nativeBuildInputs = [ cmake ];
 
   cmakeFlags = "-DBUILD_SHARED_LIBS=ON";
 
-  enableParallelBuilding = true;
-
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;
     description = "A YAML parser and emitter for C++";
     license = licenses.mit;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ wkennington ];
+    maintainers = with maintainers; [ andir ];
   };
 }

pkgs/development/libraries/mimetic/default.nix

@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "MIME handling library";
-    homepage    = http://codesink.org/mimetic_mime_library.html;
+    homepage    = http://www.codesink.org/mimetic_mime_library.html;
     license     = licenses.mit;
     maintainers = with maintainers; [ leenaars];
     platforms = platforms.linux;

pkgs/development/libraries/nix-plugins/default.nix

@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, nix, boehmgc }:
+{ stdenv, fetchFromGitHub, nix, cmake, pkgconfig }:
-let version = "2.0.7"; in
+let version = "3.0.1"; in
 stdenv.mkDerivation {
   name = "nix-plugins-${version}";
 
@@ -7,12 +7,12 @@ stdenv.mkDerivation {
     owner = "shlevy";
     repo = "nix-plugins";
     rev = version;
-    sha256 = "1q4ydp2w114wbfm41m4qgrabha7ifa17xyz5dr137vvnj6njp4vs";
+    sha256 = "1pmk2m0kc6a3jqygm5cy1fl5gbcy0ghc2xs4ww0gh20walrys82r";
   };
 
-  buildFlags = [ "NIX_INCLUDE=${nix.dev}/include" "GC_INCLUDE=${boehmgc.dev}/include" ];
+  nativeBuildInputs = [ cmake pkgconfig ];
 
-  installFlags = [ "PREFIX=$(out)" ];
+  buildInputs = [ nix ];
 
   meta = {
     description = "Collection of miscellaneous plugins for the nix expression language";

pkgs/development/libraries/pipewire/default.nix

@@ -0,0 +1,47 @@
+{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind
+, glib, dbus, gst_all_1, v4l_utils, alsaLib, ffmpeg, libjack2, libudev, libva, xlibs
+, sbc, SDL2
+}:
+
+let
+  version = "0.1.8";
+in stdenv.mkDerivation rec {
+  name = "pipewire-${version}";
+
+  src = fetchFromGitHub {
+    owner = "PipeWire";
+    repo = "pipewire";
+    rev = version;
+    sha256 = "1nim8d1lsf6yxk97piwmsz686w84b09lk6cagbyjr9m3k2hwybqn";
+  };
+
+  outputs = [ "out" "dev" "doc" ];
+
+  nativeBuildInputs = [
+    meson ninja pkgconfig doxygen graphviz valgrind
+  ];
+  buildInputs = [
+    glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer v4l_utils
+    alsaLib ffmpeg libjack2 libudev libva xlibs.libX11 sbc SDL2
+  ];
+
+  patches = [
+    ./fix-paths.patch
+  ];
+
+  mesonFlags = [
+    "-Denable_docs=true"
+    "-Denable_gstreamer=true"
+  ];
+
+  doCheck = true;
+  checkPhase = "meson test";
+
+  meta = with stdenv.lib; {
+    description = "Server and user space API to deal with multimedia pipelines";
+    homepage = http://pipewire.org/;
+    license = licenses.lgpl21;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ jtojnar ];
+  };
+}