From baef643232f7f9f916e89ac11ff1b2008e534941 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 17 Jun 2018 19:48:51 +0200
Subject: [PATCH 01/40] nixos/pgbackup: Fix the postgres backup modules

---
 .../services/backup/postgresql-backup.nix     | 60 ++++++++++++++-----
 1 file changed, 44 insertions(+), 16 deletions(-)

diff --git a/nixos/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix
index 4a5ebebc682e1..93dcd2f964797 100644
--- a/nixos/modules/services/backup/postgresql-backup.nix
+++ b/nixos/modules/services/backup/postgresql-backup.nix
@@ -3,18 +3,41 @@
 with lib;
 
 let
-  inherit (pkgs) gzip;
 
-  location = config.services.postgresqlBackup.location;
+  cfg = config.services.postgresqlBackup;
 
-  postgresqlBackupCron = db:
-    ''
-      ${config.services.postgresqlBackup.period} root ${config.services.postgresql.package}/bin/pg_dump ${db} | ${gzip}/bin/gzip -c > ${location}/${db}.gz
-    '';
+  postgresqlBackupService = db :
+    {
+      enable = true;
 
-in
+      description = "Backup of database ${db}";
 
-{
+      requires = [ "postgresql.service" ];
+
+      preStart = ''
+        mkdir -m 0700 -p ${cfg.location}
+        chown postgres ${cfg.location}
+      '';
+
+      script = ''
+        if [ -e ${cfg.location}/${db}.sql.gz ]; then
+          ${pkgs.coreutils}/bin/mv ${cfg.location}/${db}.sql.gz ${cfg.location}/${db}.prev.sql.gz
+        fi
+
+        ${config.services.postgresql.package}/bin/pg_dump ${cfg.pgdumpOptions} ${db} | \
+          ${pkgs.gzip}/bin/gzip -c > ${cfg.location}/${db}.sql.gz
+      '';
+
+      serviceConfig = {
+        Type = "oneshot";
+        PermissionsStartOnly = "true";
+        User = "postgres";
+      };
+
+      startAt = cfg.period;
+    };
+
+in {
 
   options = {
 
@@ -28,9 +51,9 @@ in
       };
 
       period = mkOption {
-        default = "15 01 * * *";
+        default = "*-*-* 01:15:00";
         description = ''
-          This option defines (in the format used by cron) when the
+          This option defines (in the format used by <literal>systemd.time</literal>) when the
           databases should be dumped.
           The default is to update at 01:15 (at night) every day.
         '';
@@ -49,18 +72,23 @@ in
           Location to put the gzipped PostgreSQL database dumps.
         '';
       };
+
+      pgdumpOptions = mkOption {
+        type = types.string;
+        default = "-Cbo";
+        description = ''
+          Command line options for pg_dump.
+        '';
+      };
     };
 
   };
 
   config = mkIf config.services.postgresqlBackup.enable {
-    services.cron.systemCronJobs = map postgresqlBackupCron config.services.postgresqlBackup.databases;
 
-    system.activationScripts.postgresqlBackup = stringAfter [ "stdio" "users" ]
-      ''
-        mkdir -m 0700 -p ${config.services.postgresqlBackup.location}
-        chown root ${config.services.postgresqlBackup.location}
-      '';
+    systemd.services = listToAttrs (map (db : {
+          name = "postgresqlBackup-${db}";
+          value = postgresqlBackupService db; } ) cfg.databases);
   };
 
 }

From aee0f49fe6725f1a9551b546a757f523bd560681 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 17 Jun 2018 19:49:25 +0200
Subject: [PATCH 02/40] nixos/pgbackup: add postgres backup to the postgres
 test

---
 nixos/tests/postgresql.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix
index 0ce37b55bb7b3..2381939552e23 100644
--- a/nixos/tests/postgresql.nix
+++ b/nixos/tests/postgresql.nix
@@ -26,6 +26,9 @@ let
       {
         services.postgresql.package=postgresql-package;
         services.postgresql.enable = true;
+
+        services.postgresqlBackup.enable = true;
+        services.postgresqlBackup.databases = [ "postgres" ];
       };
 
     testScript = ''
@@ -46,6 +49,10 @@ let
       $machine->succeed(check_count("SELECT * FROM sth;", 5));
       $machine->fail(check_count("SELECT * FROM sth;", 4));
       $machine->succeed(check_count("SELECT xpath(\'/test/text()\', doc) FROM xmltest;", 1));
+
+      # Check backup service
+      $machine->succeed("systemctl start postgresqlBackup-postgres.service");
+      $machine->succeed("zcat /var/backup/postgresql/postgres.sql.gz | grep '<test>ok</test>'");
       $machine->shutdown;
     '';
 

From 36d44cfdd42bf1c90366606c094ba509e7d4689e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 19 Jun 2018 04:28:43 -0700
Subject: [PATCH 03/40] mate.mate-control-center: 1.20.2 -> 1.20.3

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

This update was made based on information from https://repology.org/metapackage/mate-control-center/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/9pj65djh4jdx8xc2c9m2s4jsji9g27fz-mate-control-center-1.20.3/bin/mate-at-properties had a zero exit code or showed the expected version
- /nix/store/9pj65djh4jdx8xc2c9m2s4jsji9g27fz-mate-control-center-1.20.3/bin/mate-appearance-properties passed the binary check.
- /nix/store/9pj65djh4jdx8xc2c9m2s4jsji9g27fz-mate-control-center-1.20.3/bin/mate-default-applications-properties passed the binary check.
- Warning: no invocation of /nix/store/9pj65djh4jdx8xc2c9m2s4jsji9g27fz-mate-control-center-1.20.3/bin/mate-display-properties had a zero exit code or showed the expected version
- /nix/store/9pj65djh4jdx8xc2c9m2s4jsji9g27fz-mate-control-center-1.20.3/bin/mate-keyboard-properties passed the binary check.
- Warning: no invocation of /nix/store/9pj65djh4jdx8xc2c9m2s4jsji9g27fz-mate-control-center-1.20.3/bin/mate-keybinding-properties had a zero exit code or showed the expected version
- /nix/store/9pj65djh4jdx8xc2c9m2s4jsji9g27fz-mate-control-center-1.20.3/bin/mate-mouse-properties passed the binary check.
- Warning: no invocation of /nix/store/9pj65djh4jdx8xc2c9m2s4jsji9g27fz-mate-control-center-1.20.3/bin/mate-network-properties had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/9pj65djh4jdx8xc2c9m2s4jsji9g27fz-mate-control-center-1.20.3/bin/mate-window-properties had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/9pj65djh4jdx8xc2c9m2s4jsji9g27fz-mate-control-center-1.20.3/bin/mate-about-me had a zero exit code or showed the expected version
- /nix/store/9pj65djh4jdx8xc2c9m2s4jsji9g27fz-mate-control-center-1.20.3/bin/mate-thumbnail-font passed the binary check.
- /nix/store/9pj65djh4jdx8xc2c9m2s4jsji9g27fz-mate-control-center-1.20.3/bin/mate-font-viewer passed the binary check.
- /nix/store/9pj65djh4jdx8xc2c9m2s4jsji9g27fz-mate-control-center-1.20.3/bin/mate-control-center passed the binary check.
- Warning: no invocation of /nix/store/9pj65djh4jdx8xc2c9m2s4jsji9g27fz-mate-control-center-1.20.3/bin/.mate-at-properties-wrapped had a zero exit code or showed the expected version
- /nix/store/9pj65djh4jdx8xc2c9m2s4jsji9g27fz-mate-control-center-1.20.3/bin/.mate-appearance-properties-wrapped passed the binary check.
- /nix/store/9pj65djh4jdx8xc2c9m2s4jsji9g27fz-mate-control-center-1.20.3/bin/.mate-default-applications-properties-wrapped passed the binary check.
- Warning: no invocation of /nix/store/9pj65djh4jdx8xc2c9m2s4jsji9g27fz-mate-control-center-1.20.3/bin/.mate-display-properties-wrapped had a zero exit code or showed the expected version
- /nix/store/9pj65djh4jdx8xc2c9m2s4jsji9g27fz-mate-control-center-1.20.3/bin/.mate-keyboard-properties-wrapped passed the binary check.
- Warning: no invocation of /nix/store/9pj65djh4jdx8xc2c9m2s4jsji9g27fz-mate-control-center-1.20.3/bin/.mate-keybinding-properties-wrapped had a zero exit code or showed the expected version
- /nix/store/9pj65djh4jdx8xc2c9m2s4jsji9g27fz-mate-control-center-1.20.3/bin/.mate-mouse-properties-wrapped passed the binary check.
- Warning: no invocation of /nix/store/9pj65djh4jdx8xc2c9m2s4jsji9g27fz-mate-control-center-1.20.3/bin/.mate-network-properties-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/9pj65djh4jdx8xc2c9m2s4jsji9g27fz-mate-control-center-1.20.3/bin/.mate-window-properties-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/9pj65djh4jdx8xc2c9m2s4jsji9g27fz-mate-control-center-1.20.3/bin/.mate-about-me-wrapped had a zero exit code or showed the expected version
- /nix/store/9pj65djh4jdx8xc2c9m2s4jsji9g27fz-mate-control-center-1.20.3/bin/.mate-thumbnail-font-wrapped passed the binary check.
- /nix/store/9pj65djh4jdx8xc2c9m2s4jsji9g27fz-mate-control-center-1.20.3/bin/.mate-font-viewer-wrapped passed the binary check.
- /nix/store/9pj65djh4jdx8xc2c9m2s4jsji9g27fz-mate-control-center-1.20.3/bin/.mate-control-center-wrapped passed the binary check.
- Warning: no invocation of /nix/store/9pj65djh4jdx8xc2c9m2s4jsji9g27fz-mate-control-center-1.20.3/bin/mate-display-properties-install-systemwide had a zero exit code or showed the expected version
- 14 of 27 passed binary check by having a zero exit code.
- 0 of 27 passed binary check by having the new version present in output.
- found 1.20.3 with grep in /nix/store/9pj65djh4jdx8xc2c9m2s4jsji9g27fz-mate-control-center-1.20.3
- directory tree listing: https://gist.github.com/d7dcbedb8c3ee980f47de7113356f554
- du listing: https://gist.github.com/eef8b0a5e0fc4b435fe0dcafa40e1e75
---
 pkgs/desktops/mate/mate-control-center/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix
index 6bde7d7a01722..bc7538b6306fc 100644
--- a/pkgs/desktops/mate/mate-control-center/default.nix
+++ b/pkgs/desktops/mate/mate-control-center/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-control-center-${version}";
-  version = "1.20.2";
+  version = "1.20.3";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1x40gxrz1hrzbdfl8vbag231g08h45vaky5z827k44qwl6pjd6nl";
+    sha256 = "0wpi8b3zz10xd5i7ir7nd737a9vl4q17rc5nh8vfrqpyrcilqzkd";
   };
 
   nativeBuildInputs = [

From f643a1c2a46017adb975c01746993f8d901f2289 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 19 Jun 2018 04:38:34 -0700
Subject: [PATCH 04/40] mate.mate-calc: 1.20.1 -> 1.20.2

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

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

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/zar9jk5047zkynk663v4143ap5q9ppzm-mate-calc-1.20.2/bin/mate-calc had a zero exit code or showed the expected version
- /nix/store/zar9jk5047zkynk663v4143ap5q9ppzm-mate-calc-1.20.2/bin/mate-calc-cmd passed the binary check.
- Warning: no invocation of /nix/store/zar9jk5047zkynk663v4143ap5q9ppzm-mate-calc-1.20.2/bin/.mate-calculator-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/zar9jk5047zkynk663v4143ap5q9ppzm-mate-calc-1.20.2/bin/mate-calculator had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/zar9jk5047zkynk663v4143ap5q9ppzm-mate-calc-1.20.2/bin/.mate-calc-wrapped had a zero exit code or showed the expected version
- /nix/store/zar9jk5047zkynk663v4143ap5q9ppzm-mate-calc-1.20.2/bin/.mate-calc-cmd-wrapped passed the binary check.
- 2 of 6 passed binary check by having a zero exit code.
- 0 of 6 passed binary check by having the new version present in output.
- found 1.20.2 with grep in /nix/store/zar9jk5047zkynk663v4143ap5q9ppzm-mate-calc-1.20.2
- directory tree listing: https://gist.github.com/3fe2665fbee32995f75e3c7a458a0ee9
- du listing: https://gist.github.com/1cedd9a494738bf479198ffe45dee0a7
---
 pkgs/desktops/mate/mate-calc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix
index 7e501fcf379b1..52f21225cbb8f 100644
--- a/pkgs/desktops/mate/mate-calc/default.nix
+++ b/pkgs/desktops/mate/mate-calc/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-calc-${version}";
-  version = "1.20.1";
+  version = "1.20.2";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "00k063ia4dclvcpg1q733lbi56533s6mj8bgb1nrgna6y7zw4q87";
+    sha256 = "1ghz03j9lfgrjrh8givsw83dpbkw4wlhq4ar3r5g1bf1z636jlx0";
   };
 
   nativeBuildInputs = [

From 32aeaf488882aa4473aeefb20697338d969065a6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 19 Jun 2018 04:57:43 -0700
Subject: [PATCH 05/40] mate.mate-notification-daemon: 1.20.0 -> 1.20.1

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

This update was made based on information from https://repology.org/metapackage/mate-notification-daemon/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/fgg4hxmh9x48wbxh0y07593193427q3n-mate-notification-daemon-1.20.1/bin/mate-notification-properties had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/fgg4hxmh9x48wbxh0y07593193427q3n-mate-notification-daemon-1.20.1/bin/.mate-notification-properties-wrapped had a zero exit code or showed the expected version
- 0 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 1.20.1 with grep in /nix/store/fgg4hxmh9x48wbxh0y07593193427q3n-mate-notification-daemon-1.20.1
- directory tree listing: https://gist.github.com/7f852125c1c6ce059b96b1278be2dc41
- du listing: https://gist.github.com/2fda2f0e9255e9383b2611f3eb16f78c
---
 pkgs/desktops/mate/mate-notification-daemon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix
index 59df2b7d59bde..748a45eda79c2 100644
--- a/pkgs/desktops/mate/mate-notification-daemon/default.nix
+++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-notification-daemon-${version}";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "0dq457npzid20yfwigdh8gfqgf5wv8p6jhbxfnzybam9xidlqc5f";
+    sha256 = "0hwswgc3i6d7zvmj0as95xjjw431spxkf1d37mxwaf6j80gx0p78";
   };
 
   nativeBuildInputs = [

From 85ef610da01f1e800e14019f2df4c4f168eef458 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 19 Jun 2018 06:04:08 -0700
Subject: [PATCH 06/40] mate.mate-menus: 1.20.0 -> 1.20.1

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

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

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 1.20.1 with grep in /nix/store/9hfl9953if9wmc6y8zyw5wmx61ngi9lh-mate-menus-1.20.1
- directory tree listing: https://gist.github.com/c04722d4564c89227f336ed797444a78
- du listing: https://gist.github.com/9a8dc65709b3969980df3dc3b8ffcc4b
---
 pkgs/desktops/mate/mate-menus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix
index 51263f0d74e71..9815952c5405a 100644
--- a/pkgs/desktops/mate/mate-menus/default.nix
+++ b/pkgs/desktops/mate/mate-menus/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-menus-${version}";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1w1k6kdabmabhpqvkizk1si6ri4rmspsbj0252ki834ml0dxpnhg";
+    sha256 = "1p8pkw6aby2hq2liqrnsf3lvyn2jqamfbs83fv6q7clw5w179sy6";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];

From c22558d1449ed177c8b98f38c76f8675deb85f86 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 19 Jun 2018 06:43:03 -0700
Subject: [PATCH 07/40] mate.libmateweather: 1.20.0 -> 1.20.1

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

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

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 1.20.1 with grep in /nix/store/h4792zpbkmkj75gzl056h8in9mwg651z-libmateweather-1.20.1
- directory tree listing: https://gist.github.com/3e9e247094f13369303bf230a02f3abe
- du listing: https://gist.github.com/a77cc48fd92236a8bb9c82f2f8c54a9b
---
 pkgs/desktops/mate/libmateweather/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix
index 7efad3a5e3ae8..9a7ba4f006f7b 100644
--- a/pkgs/desktops/mate/libmateweather/default.nix
+++ b/pkgs/desktops/mate/libmateweather/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libmateweather-${version}";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1c8mvydb0h7z3zn0qahwlp15z5wl6nrv24q4z7ldhm340jnxsvh7";
+    sha256 = "0bp1nn3b5gf5nqrdwl43fxbb82j74s3x8jkmp40ilv2qpc2mxwr1";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];

From 169678df561cd49e828f98aaa1665716df60c91a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 19 Jun 2018 07:39:46 -0700
Subject: [PATCH 08/40] mate.libmatemixer: 1.20.0 -> 1.20.1

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

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

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 1.20.1 with grep in /nix/store/11ay5byrlalp3z70d2nn3byf9i99m12p-libmatemixer-1.20.1
- directory tree listing: https://gist.github.com/6de4fa8f22cf5e05683ba4f03784a1f0
- du listing: https://gist.github.com/f63fa290542df670f00cabe5c6a7c5ca
---
 pkgs/desktops/mate/libmatemixer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix
index 10a690546f766..8bf0d9bec18cc 100644
--- a/pkgs/desktops/mate/libmatemixer/default.nix
+++ b/pkgs/desktops/mate/libmatemixer/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   name = "libmatemixer-${version}";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "0jpfaqbspn2mjv6ysgzdmzhb07gx61yiiiwmrw94qymld2igrzb5";
+    sha256 = "00p67mi0flsbgn15qpwq60rzf917s5islbmhirbvz6npcvv0d493";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];

From af832d9f38b91ef65a33ab6240149e0653f0422d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 19 Jun 2018 08:05:14 -0700
Subject: [PATCH 09/40] limesuite: 18.04.1 -> 18.06.0

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

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

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/7sh0p0mcw1v6f1r83i7wr7389lv5vm34-limesuite-18.06.0/bin/LimeSuiteGUI had a zero exit code or showed the expected version
- /nix/store/7sh0p0mcw1v6f1r83i7wr7389lv5vm34-limesuite-18.06.0/bin/LimeUtil passed the binary check.
- Warning: no invocation of /nix/store/7sh0p0mcw1v6f1r83i7wr7389lv5vm34-limesuite-18.06.0/bin/LimeQuickTest had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/7sh0p0mcw1v6f1r83i7wr7389lv5vm34-limesuite-18.06.0/bin/dualRXTX had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/7sh0p0mcw1v6f1r83i7wr7389lv5vm34-limesuite-18.06.0/bin/basicRX had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/7sh0p0mcw1v6f1r83i7wr7389lv5vm34-limesuite-18.06.0/bin/singleRX had a zero exit code or showed the expected version
- 1 of 6 passed binary check by having a zero exit code.
- 0 of 6 passed binary check by having the new version present in output.
- found 18.06.0 with grep in /nix/store/7sh0p0mcw1v6f1r83i7wr7389lv5vm34-limesuite-18.06.0
- directory tree listing: https://gist.github.com/3cfd23841be1388c02a3464057c0aa82
- du listing: https://gist.github.com/59c4481c8e54971db6beff9cee37c760
---
 pkgs/applications/misc/limesuite/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/limesuite/default.nix b/pkgs/applications/misc/limesuite/default.nix
index 4599fab0c6d6e..070073ea3e2cc 100644
--- a/pkgs/applications/misc/limesuite/default.nix
+++ b/pkgs/applications/misc/limesuite/default.nix
@@ -4,7 +4,7 @@
 } :
 
 let
-  version = "18.04.1";
+  version = "18.06.0";
 
 in stdenv.mkDerivation {
   name = "limesuite-${version}";
@@ -13,7 +13,7 @@ in stdenv.mkDerivation {
     owner = "myriadrf";
     repo = "LimeSuite";
     rev = "v${version}";
-    sha256 = "1aaqnwif1j045hvj011k5dyqxgxx72h33r4al74h5f8al81zvzj9";
+    sha256 = "0j6mxlvij2k6ib1d9jwzvilmqgm1h0q7wy9sf8a6bvidwlphvy25";
   };
 
   nativeBuildInputs = [ cmake ];

From b1fee32f7260aa527ef69ad571e798b388980582 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 19 Jun 2018 08:30:08 -0700
Subject: [PATCH 10/40] mate.libmatekbd: 1.20.1 -> 1.20.2

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

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

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 1.20.2 with grep in /nix/store/kpfg7m5x8b5w3iydb551k94gphgymfg5-libmatekbd-1.20.2
- directory tree listing: https://gist.github.com/6ce63d695062dd787500dd9e477d0fcc
- du listing: https://gist.github.com/e78f643a66509ed04601bc722d01d2f2
---
 pkgs/desktops/mate/libmatekbd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix
index fb7a8308ee5fa..15b81a628863d 100644
--- a/pkgs/desktops/mate/libmatekbd/default.nix
+++ b/pkgs/desktops/mate/libmatekbd/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libmatekbd-${version}";
-  version = "1.20.1";
+  version = "1.20.2";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1d80xnbb8w51cv9cziybdxca037lksqkc5bd8wqlyb2p79z77426";
+    sha256 = "1l1zbphs4snswf4bkrwkk6gsmb44bdhymcfgaaspzbrcmw3y7hr1";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];

From cf19770e714e28318a35ce9ca17d4d3542fd5815 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 19 Jun 2018 08:58:24 -0700
Subject: [PATCH 11/40] lasso: 2.5.1 -> 2.6.0

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

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

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 2.6.0 with grep in /nix/store/2l3v2ybw0d8i93jw1prz6gy8286sgk4h-lasso-2.6.0
- directory tree listing: https://gist.github.com/9c856166c934c662528486068343a94b
- du listing: https://gist.github.com/30bc3e59b3d6dd6dd2d45e467b955e1a
---
 pkgs/development/libraries/lasso/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/development/libraries/lasso/default.nix
index acd0d35a5f08e..873ccc5665df9 100644
--- a/pkgs/development/libraries/lasso/default.nix
+++ b/pkgs/development/libraries/lasso/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
 
   name = "lasso-${version}";
-  version = "2.5.1";
+  version = "2.6.0";
 
   src = fetchurl {
     url = "https://dev.entrouvert.org/lasso/lasso-${version}.tar.gz";
-    sha256 = "0n10zjjw84303c9vfy9bqhyzdl01459akbwy86cbgphd826mq45y";
+    sha256 = "1kqagm63a4mv5sw5qc3y0qlky7r9qg5lccq0c3cnfr0n4mxgysql";
 
   };
 

From 013c414e648a69a30be03961bc784778d094fffa Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 19 Jun 2018 11:32:20 -0700
Subject: [PATCH 12/40] godot: 3.0.2 -> 3.0.3

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

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

These checks were done:

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

diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix
index 88ea499d28cf3..ec5809b85aa83 100644
--- a/pkgs/development/tools/godot/default.nix
+++ b/pkgs/development/tools/godot/default.nix
@@ -10,13 +10,13 @@ let
   };
 in stdenv.mkDerivation rec {
   name    = "godot-${version}";
-  version = "3.0.2";
+  version = "3.0.3";
 
   src = fetchFromGitHub {
     owner  = "godotengine";
     repo   = "godot";
     rev    = "${version}-stable";
-    sha256 = "1ca1zznb7qqn4vf2nfwb8nww5x0k8fc4lwjvgydr6nr2mn70xka4";
+    sha256 = "060jb5jip1si32a0sm1mmkvy3nldl1cjb82kjh5wihzllph93sxd";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 2934f16553461f9afd90fdb1ce40b8a922053b23 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 19 Jun 2018 11:55:30 -0700
Subject: [PATCH 13/40] mate.eom: 1.20.0 -> 1.20.1

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

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

These checks were done:

- built on NixOS
- /nix/store/lxzkljx1yfkgqxpqgrf710ic9iq4qv3z-eom-1.20.1/bin/eom passed the binary check.
- /nix/store/lxzkljx1yfkgqxpqgrf710ic9iq4qv3z-eom-1.20.1/bin/.eom-wrapped passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 1.20.1 with grep in /nix/store/lxzkljx1yfkgqxpqgrf710ic9iq4qv3z-eom-1.20.1
- directory tree listing: https://gist.github.com/b79b00c09fe3737a787425500dfcaf9e
- du listing: https://gist.github.com/4ff844a1cc38d84e737d23f9140417ca
---
 pkgs/desktops/mate/eom/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix
index 23e167412919d..4062d7c512ff8 100644
--- a/pkgs/desktops/mate/eom/default.nix
+++ b/pkgs/desktops/mate/eom/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "eom-${version}";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "0320ph6cyh0m4cfyvky10j9prk2hry6rpm4jzgcn7ig03dnj4y0s";
+    sha256 = "0z9l96j0q637hw2mkcc2w737acl7g2c5brgrlk4h73hjamfmsdrm";
   };
 
   nativeBuildInputs = [

From bbef10b3b95183ae4b0dde17bd9c029c9cef97e3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 19 Jun 2018 12:35:00 -0700
Subject: [PATCH 14/40] eventstat: 0.04.03 -> 0.04.04

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

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

These checks were done:

- built on NixOS
- /nix/store/8maki50gwqm08fzrrw4nnnfr6alvqzr8-eventstat-0.04.04/bin/eventstat passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 0.04.04 with grep in /nix/store/8maki50gwqm08fzrrw4nnnfr6alvqzr8-eventstat-0.04.04
- directory tree listing: https://gist.github.com/5ed1c395b9ebbda292b165652d1666cf
- du listing: https://gist.github.com/83aba0c7903134aa17a6215a3a9b0b9f
---
 pkgs/os-specific/linux/eventstat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/eventstat/default.nix b/pkgs/os-specific/linux/eventstat/default.nix
index e2647112f1b2b..8d96a503c766a 100644
--- a/pkgs/os-specific/linux/eventstat/default.nix
+++ b/pkgs/os-specific/linux/eventstat/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "eventstat-${version}";
-  version = "0.04.03";
+  version = "0.04.04";
   src = fetchzip {
     url = "http://kernel.ubuntu.com/~cking/tarballs/eventstat/eventstat-${version}.tar.gz";
-    sha256 = "0yv7rpdg07rihw8iilvigib963nxf16mn26hzlb6qd1wv54k6dbr";
+    sha256 = "034xpdr3ip4w9k713wjc45x66k3nz6wg9wkzmchrjifxk4dldbd8";
   };
   buildInputs = [ ncurses ];
   installFlags = [ "DESTDIR=$(out)" ];

From 3a873fb3016de74cbb05ea75ba570aef49396102 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 19 Jun 2018 14:26:52 -0700
Subject: [PATCH 15/40] doclifter: 2.17 -> 2.18

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

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

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/qzimyzp6c58i4jmqkmijzicyxzbn3j0x-doclifter-2.18/bin/manlifter had a zero exit code or showed the expected version
- /nix/store/qzimyzp6c58i4jmqkmijzicyxzbn3j0x-doclifter-2.18/bin/doclifter passed the binary check.
- 1 of 2 passed binary check by having a zero exit code.
- 1 of 2 passed binary check by having the new version present in output.
- found 2.18 with grep in /nix/store/qzimyzp6c58i4jmqkmijzicyxzbn3j0x-doclifter-2.18
- directory tree listing: https://gist.github.com/5f26018de7c8c2bbf86953b19997143a
- du listing: https://gist.github.com/b556716e68094c4f1457bbbbe6467d55
---
 pkgs/development/tools/misc/doclifter/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/doclifter/default.nix b/pkgs/development/tools/misc/doclifter/default.nix
index 928f126029099..9b35d2960a4d3 100644
--- a/pkgs/development/tools/misc/doclifter/default.nix
+++ b/pkgs/development/tools/misc/doclifter/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, python}:
 
 stdenv.mkDerivation {
-  name = "doclifter-2.17";
+  name = "doclifter-2.18";
   src = fetchurl {
-    url = http://www.catb.org/~esr/doclifter/doclifter-2.17.tar.gz;
-    sha256 = "1m8yfjbl8wzcml9q4k7m1crwid0a14r07fqf33bmmgx1zpjk8kmv";
+    url = http://www.catb.org/~esr/doclifter/doclifter-2.18.tar.gz;
+    sha256 = "0g39lbml7dclm2nb20j4ffzhq28226qiwxq1w37p7mpqijm7x3hw";
   };
   buildInputs = [ python ];
   

From 911948612cbb2aa8d9ba6fd8acb04776c6aeb131 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 19 Jun 2018 14:41:07 -0700
Subject: [PATCH 16/40] cutecom: 0.40.0 -> 0.45.0

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

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

These checks were done:

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

diff --git a/pkgs/tools/misc/cutecom/default.nix b/pkgs/tools/misc/cutecom/default.nix
index b20e493a58559..3d6d2328da1e0 100644
--- a/pkgs/tools/misc/cutecom/default.nix
+++ b/pkgs/tools/misc/cutecom/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "cutecom-${version}";
-  version = "0.40.0";
+  version = "0.45.0";
   src = fetchFromGitHub {
     owner = "neundorf";
     repo = "CuteCom";
     rev = "v${version}";
-    sha256 = "1bn6vndqlvn73riq6p0nanmcl35ja9gsil5hvfpf509r7i8gx4ds";
+    sha256 = "07h1r7bcz86fvcvxq6g5zyh7fsginx27jbp81a7hjhhhn6v0dsmh";
   };
 
   preConfigure = ''

From 4a0f25a62b2851be1fa845d5c6597b4d6adacc7e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 19 Jun 2018 14:46:12 -0700
Subject: [PATCH 17/40] mate.engrampa: 1.20.0 -> 1.20.1

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

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

These checks were done:

- built on NixOS
- /nix/store/fk4bvvss8ciiw13halc37x6a4dpji36y-engrampa-1.20.1/bin/engrampa passed the binary check.
- /nix/store/fk4bvvss8ciiw13halc37x6a4dpji36y-engrampa-1.20.1/bin/.engrampa-wrapped passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 1.20.1 with grep in /nix/store/fk4bvvss8ciiw13halc37x6a4dpji36y-engrampa-1.20.1
- directory tree listing: https://gist.github.com/b73375db196ecf4ade754cfc0ce3b7c8
- du listing: https://gist.github.com/ff5ea27db0db941cee563d428c065f42
---
 pkgs/desktops/mate/engrampa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix
index 74d32ce1f216b..57e4ed100a024 100644
--- a/pkgs/desktops/mate/engrampa/default.nix
+++ b/pkgs/desktops/mate/engrampa/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "engrampa-${version}";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1pk053i14a0r5s9qkipwnp4qjg76b763203z64ymnpkslrrarnnm";
+    sha256 = "09p9jaljaihc723zp17la6lw7h7q16ysk7q0fr0al0k11ss16w6f";
   };
 
   nativeBuildInputs = [

From 48ef02ac9936e612d8b71aca1a4b459fda21b230 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 19 Jun 2018 16:24:45 -0700
Subject: [PATCH 18/40] abcmidi: 2018.05.02 -> 2018.06.13

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

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

These checks were done:

- built on NixOS
- /nix/store/vdps371mlbhdiyp2dijfxfricjm642kc-abcMIDI-2018.06.13/bin/abc2midi passed the binary check.
- /nix/store/vdps371mlbhdiyp2dijfxfricjm642kc-abcMIDI-2018.06.13/bin/midi2abc passed the binary check.
- /nix/store/vdps371mlbhdiyp2dijfxfricjm642kc-abcMIDI-2018.06.13/bin/abc2abc passed the binary check.
- /nix/store/vdps371mlbhdiyp2dijfxfricjm642kc-abcMIDI-2018.06.13/bin/mftext passed the binary check.
- /nix/store/vdps371mlbhdiyp2dijfxfricjm642kc-abcMIDI-2018.06.13/bin/yaps passed the binary check.
- Warning: no invocation of /nix/store/vdps371mlbhdiyp2dijfxfricjm642kc-abcMIDI-2018.06.13/bin/midicopy had a zero exit code or showed the expected version
- /nix/store/vdps371mlbhdiyp2dijfxfricjm642kc-abcMIDI-2018.06.13/bin/abcmatch passed the binary check.
- 6 of 7 passed binary check by having a zero exit code.
- 0 of 7 passed binary check by having the new version present in output.
- directory tree listing: https://gist.github.com/1bacbc0e094f32d6579ecca45ec92dc1
- du listing: https://gist.github.com/8b31f54a9e4b0cda7274d402fe6eda18
---
 pkgs/tools/audio/abcmidi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix
index a0e7b1f906c92..46b4ada3d5731 100644
--- a/pkgs/tools/audio/abcmidi/default.nix
+++ b/pkgs/tools/audio/abcmidi/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "abcMIDI-${version}";
-  version = "2018.05.02";
+  version = "2018.06.13";
 
   src = fetchzip {
     url = "http://ifdo.ca/~seymour/runabc/${name}.zip";
-    sha256 = "0pva0kwkwdrq4mfgiz389dhaqv66csqjaddirzxmhvvi6qji5d24";
+    sha256 = "0mmr0wfdwx9vfz17gp0arspv835l5gka78hm5hkri4h3cvxpflfy";
   };
 
   # There is also a file called "makefile" which seems to be preferred by the standard build phase

From 54aec3054bbe425bcf6d4e2c07fb16ad35330613 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 19 Jun 2018 16:28:42 -0700
Subject: [PATCH 19/40] mate.caja-extensions: 1.20.0 -> 1.20.1

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

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

These checks were done:

- built on NixOS
- /nix/store/1m1zknl4rxcnkkbqhd0ks341bh2ghl0y-caja-extensions-1.20.1/bin/caja-sendto passed the binary check.
- /nix/store/1m1zknl4rxcnkkbqhd0ks341bh2ghl0y-caja-extensions-1.20.1/bin/.caja-sendto-wrapped passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 1.20.1 with grep in /nix/store/1m1zknl4rxcnkkbqhd0ks341bh2ghl0y-caja-extensions-1.20.1
- directory tree listing: https://gist.github.com/6344a0c82a50b4091f71ada2afdffb14
- du listing: https://gist.github.com/e7f39d01f373332636f3b0e47953fb4c
---
 pkgs/desktops/mate/caja-extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix
index 3383847f16c61..cd47f7b62b4f4 100644
--- a/pkgs/desktops/mate/caja-extensions/default.nix
+++ b/pkgs/desktops/mate/caja-extensions/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "caja-extensions-${version}";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1abi7s31mx7v8x0f747bmb3s8hrv8fv007pflv2n545yvn0m1dpj";
+    sha256 = "01k7c3gw6rfd7vlch61zig22bvz40wlnalc5p3rz4d9i98fr643n";
   };
 
   nativeBuildInputs = [

From b83152c1352e7b9e49dd123d91496e446bae93e7 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 19 Jun 2018 17:12:13 -0700
Subject: [PATCH 20/40] mattermost: 4.10.0 -> 5.0.0

---
 nixos/modules/services/web-apps/mattermost.nix |  6 +++---
 pkgs/servers/mattermost/default.nix            | 11 +++--------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix
index be74a2b1955be..815e592a1d546 100644
--- a/nixos/modules/services/web-apps/mattermost.nix
+++ b/nixos/modules/services/web-apps/mattermost.nix
@@ -25,7 +25,7 @@ in
 {
   options = {
     services.mattermost = {
-      enable = mkEnableOption "Mattermost chat platform";
+      enable = mkEnableOption "Mattermost chat server";
 
       statePath = mkOption {
         type = types.str;
@@ -167,7 +167,7 @@ in
       '';
 
       systemd.services.mattermost = {
-        description = "Mattermost chat platform service";
+        description = "Mattermost chat service";
         wantedBy = [ "multi-user.target" ];
         after = [ "network.target" "postgresql.service" ];
 
@@ -201,7 +201,7 @@ in
           PermissionsStartOnly = true;
           User = cfg.user;
           Group = cfg.group;
-          ExecStart = "${pkgs.mattermost}/bin/mattermost-platform";
+          ExecStart = "${pkgs.mattermost}/bin/mattermost";
           WorkingDirectory = "${cfg.statePath}";
           JoinsNamespaceOf = mkIf cfg.localDatabaseCreate "postgresql.service";
           Restart = "always";
diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix
index 9943c0b9ab033..305ee174bf3c7 100644
--- a/pkgs/servers/mattermost/default.nix
+++ b/pkgs/servers/mattermost/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchFromGitHub, buildGoPackage, buildEnv }:
 
 let
-  version = "4.10.0";
+  version = "5.0.0";
 
   mattermost-server = buildGoPackage rec {
     name = "mattermost-server-${version}";
@@ -10,7 +10,7 @@ let
       owner = "mattermost";
       repo = "mattermost-server";
       rev = "v${version}";
-      sha256 = "02isw8qapp35pgriy4w1ar1ppvgc5a10j550hjbc1mylnhzkg1jf";
+      sha256 = "12wiw8k5is78ppazrf26y2xq73kwbafa9w75wjnb1839v2k9sark";
     };
 
     goPackagePath = "github.com/mattermost/mattermost-server";
@@ -20,11 +20,6 @@ let
         -X ${goPackagePath}/model.BuildNumber=nixpkgs-${version}
     '';
 
-    postInstall = ''
-      ln -s $bin/bin/mattermost-server $bin/bin/platform
-      ln -s $bin/bin/mattermost-server $bin/bin/mattermost-platform
-    '';
-
   };
 
   mattermost-webapp = stdenv.mkDerivation {
@@ -32,7 +27,7 @@ let
 
     src = fetchurl {
       url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
-      sha256 = "0pfj2dxl4qrv4w6yj0385nw0fa4flcg95kkahs0arwhan5bgifl5";
+      sha256 = "1pal65di6w9idf3rwxh77la1v816h8kama1ilkbs40cpp2vazw3b";
     };
 
     installPhase = ''

From dada18527a9699f80c005a4e20190dd1521eb0af Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Wed, 20 Jun 2018 10:37:00 +0900
Subject: [PATCH 21/40] rPackages.RcppEigen: fix Darwin build

---
 pkgs/development/r-modules/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 35822fa78bd41..25019f0d8a534 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -397,6 +397,7 @@ let
     RPushbullet = [ pkgs.which ];
     qtpaint = [ pkgs.cmake ];
     qtbase = [ pkgs.cmake pkgs.perl ];
+    RcppEigen = [ pkgs.libiconv ];
     RCurl = [ pkgs.curl.dev ];
     R2SWF = [ pkgs.pkgconfig ];
     rggobi = [ pkgs.pkgconfig ];

From f972a30f16b860cccaf4330d228ebcd5e0277e5b Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Wed, 20 Jun 2018 11:08:29 +0900
Subject: [PATCH 22/40] rPackages.igraph: fix Darwin build

---
 pkgs/development/r-modules/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 35822fa78bd41..b09f76cee0321 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -438,6 +438,7 @@ let
     nlme = [ pkgs.libiconv ];
     Matrix = [ pkgs.libiconv ];
     mgcv = [ pkgs.libiconv ];
+    igraph = [ pkgs.libiconv ];
   };
 
   packagesRequireingX = [

From 8ac1721cd644642d87b373ee6e1c3c0276810f4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Wed, 20 Jun 2018 09:28:48 +0200
Subject: [PATCH 23/40] teamspeak_client: 3.1.8 -> 3.1.10

---
 .../networking/instant-messengers/teamspeak/client.nix      | 6 +++---
 pkgs/top-level/all-packages.nix                             | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
index 23d2e640b4f00..7a50536cc0ff0 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
@@ -31,7 +31,7 @@ in
 stdenv.mkDerivation rec {
   name = "teamspeak-client-${version}";
 
-  version = "3.1.8";
+  version = "3.1.10";
 
   src = fetchurl {
     urls = [
@@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
       "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"
     ];
     sha256 = if stdenv.is64bit
-                then "0yav71sfklqg2k3ayd0bllsixd486l0587s5ygjlc9gnchw3zg6z"
-                else "1agf6jf5hkyxazxqcnvcjfb263p5532ahi7h4rkifnnvqay36v5i";
+                then "17gylj5pxba14c1c98b5rdyyb87c58z8l8yrd1iw5k293wf7iwv3"
+                else "1bkn3ykrc73wr02qaqwpr4garlqm3424y3dm2fjx6lqcfzm3ms2k";
   };
 
   # grab the plugin sdk for the desktop icon
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e66fa339ef3c7..b00fdaecfb4b5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18201,7 +18201,7 @@ with pkgs;
     gconf = gnome2.GConf;
   };
 
-  teamspeak_client = libsForQt59.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };
+  teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };
   teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { };
 
   uaskjuggler = callPackage ../applications/misc/taskjuggler { };

From a64b88a8332d4abce55ad2e2af1393507dc04f37 Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Wed, 20 Jun 2018 14:53:46 +0300
Subject: [PATCH 24/40] gopass: 1.7.1 -> 1.8.1

---
 pkgs/tools/security/gopass/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix
index fe7d506026281..2d7f8b86f0093 100644
--- a/pkgs/tools/security/gopass/default.nix
+++ b/pkgs/tools/security/gopass/default.nix
@@ -1,18 +1,18 @@
 { stdenv, buildGoPackage, fetchFromGitHub, git, gnupg, xclip, makeWrapper }:
 
 buildGoPackage rec {
-  version = "1.7.1";
+  version = "1.8.1";
   name = "gopass-${version}";
 
-  goPackagePath = "github.com/justwatchcom/gopass";
+  goPackagePath = "github.com/gopasspw/gopass";
 
   nativeBuildInputs = [ makeWrapper ];
 
   src = fetchFromGitHub {
-    owner = "justwatchcom";
+    owner = "gopasspw";
     repo = "gopass";
     rev = "v${version}";
-    sha256 = "01cif6a2xa3c8nki0pas9mywdxs8d9niv8z13mii5hcfqvm0s7aw";
+    sha256 = "1b3caydxz3zf1ky6qvkx0dgidlalvpmga6cjh3gqc269n00lwh6w";
   };
 
   wrapperPath = with stdenv.lib; makeBinPath ([
@@ -38,7 +38,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description     = "The slightly more awesome Standard Unix Password Manager for Teams. Written in Go.";
-    homepage        = https://www.justwatch.com/gopass/;
+    homepage        = https://www.gopass.pw/;
     license         = licenses.mit;
     maintainers     = with maintainers; [ andir ];
     platforms       = platforms.unix;

From e0d0460d0793a41c013e74e7f85e7dab76c5dea7 Mon Sep 17 00:00:00 2001
From: Frank Doepper <fd@taz.de>
Date: Wed, 20 Jun 2018 14:00:31 +0200
Subject: [PATCH 25/40] shotcut: 18.06.02 -> 18.05.08

also patched to build with qt511, see
https://github.com/mltframework/shotcut/issues/590
---
 pkgs/applications/video/shotcut/default.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index 6572164c797e5..710510144c80f 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -1,20 +1,20 @@
 { stdenv, fetchFromGitHub, SDL2, frei0r, gettext, mlt, jack1, pkgconfig, qtbase
 , qtmultimedia, qtwebkit, qtx11extras, qtwebsockets, qtquickcontrols
 , qtgraphicaleffects, libmlt
-, qmake, makeWrapper }:
+, qmake, makeWrapper, fetchpatch, qttools }:
 
 assert stdenv.lib.versionAtLeast libmlt.version "6.8.0";
 assert stdenv.lib.versionAtLeast mlt.version "6.8.0";
 
 stdenv.mkDerivation rec {
   name = "shotcut-${version}";
-  version = "18.05.08";
+  version = "18.06.02";
 
   src = fetchFromGitHub {
     owner = "mltframework";
     repo = "shotcut";
     rev = "v${version}";
-    sha256 = "1qm1ycsx93qpw2vga25m3cr82vzqla1qqardjiln3iqfa0m93qsk";
+    sha256 = "1pqpgsb8ix1akq326chf46vvl5h02dwmdskskf2n6impygsy4x7v";
   };
 
   enableParallelBuilding = true;
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
   ];
 
   NIX_CFLAGS_COMPILE = "-I${libmlt}/include/mlt++ -I${libmlt}/include/mlt";
+  qmakeFlags = [ "QMAKE_LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" ];
 
   prePatch = ''
     sed 's_shotcutPath, "qmelt"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp
@@ -34,6 +35,13 @@ stdenv.mkDerivation rec {
     sed "s_/usr/bin/nice_''${NICE}_" -i src/jobs/meltjob.cpp src/jobs/ffmpegjob.cpp
   '';
 
+  patchFlags = "-p0";
+  patches = [ (fetchpatch {
+    url = https://github.com/mltframework/shotcut/files/2075592/shotcut-18.06.02-qt.patch.txt;
+    name = "qt511.patch";
+    sha256 = "0kxpj2724zm2ka4y1yhfkjglri3p0ck459g93i814pv0j5wqs590";
+    } ) ];
+
   postInstall = ''
     mkdir -p $out/share/shotcut
     cp -r src/qml $out/share/shotcut/

From 0127c4295f985515ebd6381d42210118632455b9 Mon Sep 17 00:00:00 2001
From: Frank Doepper <fd@taz.de>
Date: Wed, 20 Jun 2018 16:15:51 +0200
Subject: [PATCH 26/40] shotcut: nicer patch url

---
 pkgs/applications/video/shotcut/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index 710510144c80f..0df5d42ee0ea8 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -35,11 +35,10 @@ stdenv.mkDerivation rec {
     sed "s_/usr/bin/nice_''${NICE}_" -i src/jobs/meltjob.cpp src/jobs/ffmpegjob.cpp
   '';
 
-  patchFlags = "-p0";
   patches = [ (fetchpatch {
-    url = https://github.com/mltframework/shotcut/files/2075592/shotcut-18.06.02-qt.patch.txt;
+    url = https://github.com/mltframework/shotcut/commit/f304b7403cc7beb57b1610afd9c5c8173749e80b.patch;
     name = "qt511.patch";
-    sha256 = "0kxpj2724zm2ka4y1yhfkjglri3p0ck459g93i814pv0j5wqs590";
+    sha256 = "1ynvyjchcb33a33x4w1ddnah2gyzmnm125ailgg6xy60lqsnsmp9";
     } ) ];
 
   postInstall = ''

From 4e1bbd189fc1a7bafcfcac3b881f1fcdbbf335fd Mon Sep 17 00:00:00 2001
From: Alexander Krupenkin <mail@akru.me>
Date: Wed, 20 Jun 2018 18:57:34 +0300
Subject: [PATCH 27/40] parity: 1.10.6 -> 1.10.7

---
 pkgs/applications/altcoins/parity/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix
index 3ba2495d45a23..707889b23eea9 100644
--- a/pkgs/applications/altcoins/parity/default.nix
+++ b/pkgs/applications/altcoins/parity/default.nix
@@ -1,7 +1,7 @@
 let
-  version     = "1.10.6";
-  sha256      = "1x2sm262z8fdkx8zin6r8nwbb7znziw9nm224pr6ap3p0jmv7fcq";
-  cargoSha256 = "1wf1lh32f9dlhv810gdcssv92g1yximx09lw63m0mxcjbn9813bs";
+  version     = "1.10.7";
+  sha256      = "0syhvr4n9zyxhx20xln7sf70ljzj6ab36xjz4710ivnwwz2pjajf";
+  cargoSha256 = "0zwk8xv71s7xkwvssh27772qfb23yhq5jlcny617qik6bwpcdh6b";
   patches     = [ ./patches/vendored-sources-1.10.patch ];
 in
   import ./parity.nix { inherit version sha256 cargoSha256 patches; }

From 6dc06fdd282dcfd1ca46160b196dc2c2676aa86d Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 19 Jun 2018 18:22:46 +0200
Subject: [PATCH 28/40] nixos/pgbackup: rename option period -> startAt

---
 nixos/modules/rename.nix                            | 6 ++++++
 nixos/modules/services/backup/postgresql-backup.nix | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index b15dd84999a99..26b20f5eb0df4 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -197,6 +197,12 @@ with lib;
     (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "forceAutohint" ] [ "fonts" "fontconfig" "forceAutohint" ])
     (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "renderMonoTTFAsBitmap" ] [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ])
 
+    # postgresqlBackup
+    (mkRemovedOptionModule [ "services" "postgresqlBackup" "period" ] ''
+       A systemd timer is now used instead of cron.
+       The starting time can be configured via <literal>services.postgresqlBackup.startAt</literal>.
+    '')
+
     # Profile splitting
     (mkRenamedOptionModule [ "virtualization" "growPartition" ] [ "boot" "growPartition" ])
 
diff --git a/nixos/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix
index 93dcd2f964797..2ec78ce6f2cfa 100644
--- a/nixos/modules/services/backup/postgresql-backup.nix
+++ b/nixos/modules/services/backup/postgresql-backup.nix
@@ -34,7 +34,7 @@ let
         User = "postgres";
       };
 
-      startAt = cfg.period;
+      startAt = cfg.startAt;
     };
 
 in {
@@ -50,10 +50,10 @@ in {
         '';
       };
 
-      period = mkOption {
+      startAt = mkOption {
         default = "*-*-* 01:15:00";
         description = ''
-          This option defines (in the format used by <literal>systemd.time</literal>) when the
+          This option defines (see <literal>systemd.time</literal> for format) when the
           databases should be dumped.
           The default is to update at 01:15 (at night) every day.
         '';

From 7a7463d0a3fe6d39a7fc499a0fd9756a3c671e62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 20 Jun 2018 17:31:25 +0100
Subject: [PATCH 29/40] pipenv: 11.9.0 -> 2018.5.18

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

diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix
index 153c0f76a4059..e58cc44884c8c 100644
--- a/pkgs/development/tools/pipenv/default.nix
+++ b/pkgs/development/tools/pipenv/default.nix
@@ -2,11 +2,11 @@
 with python3Packages; buildPythonApplication rec {
     name = "${pname}-${version}";
     pname = "pipenv";
-    version = "11.9.0";
+    version = "2018.5.18";
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "7b3c52fb57e17ca61b6141b75c8f5ba61a95c713ca470754240f7f1dbd0a4968";
+      sha256 = "1knyknmykjj7gixdpfyns77sv4mizl68addk09ajmw9z5aqaif84";
     };
 
     LC_ALL = "en_US.UTF-8";

From 94a926816e995eb174c08828a0246cbdbdba6574 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 20 Jun 2018 18:54:42 +0200
Subject: [PATCH 30/40] fribidi: fix dylib install_name on darwin

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

diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix
index 2bc36d1b2b9a6..7a903f00ae601 100644
--- a/pkgs/development/libraries/fribidi/default.nix
+++ b/pkgs/development/libraries/fribidi/default.nix
@@ -4,6 +4,7 @@
 , meson
 , ninja
 , pkgconfig
+, fixDarwinDylibNames
 }:
 
 stdenv.mkDerivation rec {
@@ -18,6 +19,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig ];
+  buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
   outputs = [ "out" "devdoc" ];
 

From b717ca8e45a6ba6925e00d7782baf5fb1ce5674b Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 20 Jun 2018 19:50:08 +0200
Subject: [PATCH 31/40] eclipse-plugin-spotbugs: 3.1.3 -> 3.1.5

---
 pkgs/applications/editors/eclipse/plugins.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index f381064c92cfd..801583299ab0f 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -532,11 +532,12 @@ rec {
 
   spotbugs = buildEclipseUpdateSite rec {
     name = "spotbugs-${version}";
-    version = "3.1.3";
+    version = "3.1.5";
 
     src = fetchzip {
+      stripRoot = false;
       url = "https://github.com/spotbugs/spotbugs/releases/download/${version}/eclipsePlugin.zip";
-      sha256 = "01zrmk497bxzqgwgbpsvi5iz5qk9b4q949h4918abm54zvkgndlg";
+      sha256 = "0fxdirz6ik9rqykm2lcr720apsaqgngr4c7q793rjb9b3bn30c85";
     };
 
     meta = with stdenv.lib; {

From 89678fc87d0232aaddc8170414986fe21bfab489 Mon Sep 17 00:00:00 2001
From: numkem <numkem@numkem.org>
Date: Wed, 20 Jun 2018 15:20:53 -0400
Subject: [PATCH 32/40] Update google-cloud-sdk to 206.0.0

---
 pkgs/tools/admin/google-cloud-sdk/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index b109a835635bd..c3d6faeac5274 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -19,18 +19,18 @@ let
   sources = name: system: {
     x86_64-darwin = {
       url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";
-      sha256 = "0c4jj580f7z6phiw4zhd32dlf4inkrxy3cig6ng66fi4zi6vnpc9";
+      sha256 = "0fdcd5d63e231443b9e032de4e2c2be9e4f1c766a25054ad93410f5213e45645";
     };
 
     x86_64-linux = {
       url = "${baseUrl}/${name}-linux-x86_64.tar.gz";
-      sha256 = "0rblb0akwdzr5i8al0dcz482xmx1xdnjnzgqywjvwd8fzdyzq7bp";
+      sha256 = "d39293914b2e969bfe18dd19eb77ba96d283995f8cf1e5d7ba6ac712a3c9479a";
     };
   }.${system};
 
 in stdenv.mkDerivation rec {
   name = "google-cloud-sdk-${version}";
-  version = "190.0.1";
+  version = "206.0.0";
 
   src = fetchurl (sources name stdenv.system);
 

From 1748313f30fb1614f80af6d873242060b6470456 Mon Sep 17 00:00:00 2001
From: Florian Engel <florianengel39@gmail.com>
Date: Wed, 20 Jun 2018 16:13:13 +0200
Subject: [PATCH 33/40] monetdb: 11.29.3 -> 11.29.7

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

diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix
index 6067d49838659..c32dcf475c5ce 100644
--- a/pkgs/servers/sql/monetdb/default.nix
+++ b/pkgs/servers/sql/monetdb/default.nix
@@ -3,14 +3,14 @@
 }:
 
 let
-  version = "11.29.3";
+  version = "11.29.7";
 in stdenv.mkDerivation rec {
 
   name = "monetdb-${version}";
 
   src = fetchurl {
     url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2";
-    sha256 = "18l4jkkryki5az5n7gnalfdxz6ibnkg3q2z4cwh1010b313wqi8s";
+    sha256 = "19f9zfg94k8hr9qc7jp1iwl8av08mibzgmid0gbqplyhf6x1j0r7";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From ec3957591f84f78e5606add6fd782abeeb5436ba Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Wed, 20 Jun 2018 16:28:25 -0400
Subject: [PATCH 34/40] emacs-mac: fix meta

- add myself as a maintainer
- fix name and description for emacs 26
---
 pkgs/applications/editors/emacs/macport.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix
index 9a32ea7f19f28..8f74aca44885f 100644
--- a/pkgs/applications/editors/emacs/macport.nix
+++ b/pkgs/applications/editors/emacs/macport.nix
@@ -75,10 +75,10 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = with stdenv.lib; {
-    description = "GNU Emacs 25, the extensible, customizable text editor";
+    description = "The extensible, customizable text editor";
     homepage    = http://www.gnu.org/software/emacs/;
     license     = licenses.gpl3Plus;
-    maintainers = with maintainers; [ jwiegley ];
+    maintainers = with maintainers; [ jwiegley matthewbauer ];
     platforms   = platforms.darwin;
 
     longDescription = ''
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
       extensions are distributed with GNU Emacs; others are available
       separately.
 
-      This is "Mac port" addition to GNU Emacs 25. This provides a native
+      This is the "Mac port" addition to GNU Emacs 26. This provides a native
       GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later
       already contain the official GUI support via the NS (Cocoa) port for
       Mac OS X 10.4 and later. So if it is good enough for you, then you

From 67c7b00abfcb45f2135d752bd3050c90fb38bd87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Wed, 20 Jun 2018 18:15:44 +0200
Subject: [PATCH 35/40] skypeforlinux: 8.18.0.6 -> 8.24.0.2

---
 .../instant-messengers/skypeforlinux/default.nix         | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
index 1cf7243476cf5..9ac3d870312d3 100644
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, dpkg, makeWrapper
 , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, glibc, gnome3
-, gtk2, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, xorg }:
+, gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, xorg }:
 
 let
 
   # Please keep the version x.y.0.z and do not update to x.y.76.z because the
   # source of the latter disappears much faster.
-  version = "8.18.0.6";
+  version = "8.24.0.2";
 
   rpath = stdenv.lib.makeLibraryPath [
     alsaLib
@@ -24,8 +24,7 @@ let
 
     gnome3.gconf
     gdk_pixbuf
-    gtk2
-
+    gtk3
 
     gnome3.gnome-keyring
 
@@ -57,7 +56,7 @@ let
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb";
-        sha256 = "193icz1s385d25qzm5vx58h66m4hfwwmkavn0p3w6631gj617hig";
+        sha256 = "079bv0wilwwd9gqykcyfs4bj8za140788dxi058k4275h1jlvrww";
       }
     else
       throw "Skype for linux is not supported on ${stdenv.system}";

From 173c749f31aff248b7d01e43f66a8d2082b3ce37 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 20 Jun 2018 23:00:27 +0200
Subject: [PATCH 36/40] sysprof: fix includedir in pc file

---
 pkgs/development/tools/profiling/sysprof/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix
index f28fe187e6cf4..a01d7dd42906c 100644
--- a/pkgs/development/tools/profiling/sysprof/default.nix
+++ b/pkgs/development/tools/profiling/sysprof/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , desktop-file-utils
 , fetchurl
+, fetchpatch
 , gettext
 , glib
 , gtk3
@@ -28,6 +29,15 @@ in stdenv.mkDerivation rec {
     sha256 = "05534dvwrzrmryb4y2m1sb2q0r8i6nr88pzjg7xs5nr9zq8a87p3";
   };
 
+  patches = [
+    # fix includedir in pkgconfig
+    # https://gitlab.gnome.org/GNOME/sysprof/merge_requests/2
+    (fetchpatch {
+      url = https://gitlab.gnome.org/GNOME/sysprof/commit/d19a496bb55b8646e866df8bb07bc6ad3c55eaf2.patch;
+      sha256 = "15w6di9c4n1gsymkpk413f5f9gd3iq23wdkzs01y9xrxwqpm7hm4";
+    })
+  ];
+
   nativeBuildInputs = [ desktop-file-utils gettext itstool libxml2 meson ninja pkgconfig shared-mime-info wrapGAppsHook ];
   buildInputs = [ glib gtk3 pango polkit systemd.dev systemd.lib ];
 

From 2f407c43b04902cc93f794b7c882f7ba969ce836 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Wed, 20 Jun 2018 23:18:14 +0200
Subject: [PATCH 37/40] tasknc: fix

---
 pkgs/applications/misc/tasknc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix
index 3f39569616173..e44690a5bd791 100644
--- a/pkgs/applications/misc/tasknc/default.nix
+++ b/pkgs/applications/misc/tasknc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, makeWrapper, perl, ncurses, taskwarrior }:
+{ stdenv, fetchFromGitHub, makeWrapper, perl, ncurses5, taskwarrior }:
 
 stdenv.mkDerivation rec {
   version = "2017-05-15";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     perl # For generating the man pages with pod2man
   ];
 
-  buildInputs = [ ncurses ];
+  buildInputs = [ ncurses5 ];
 
   hardeningDisable = [ "format" ];
 

From f85d30b3f859415dc8c3abcfc70ff042a46d466f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 20 Jun 2018 22:49:24 +0100
Subject: [PATCH 38/40] lxqt.lxqt-build-tools: 0.4.0 -> 0.5.0

---
 pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix
index 8d369f464335d..c52533a344b22 100644
--- a/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix
+++ b/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qt5 }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qt5, glib }:
 
 stdenv.mkDerivation rec {
   name = "lxqt-build-tools-${version}";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = "lxqt-build-tools";
     rev = version;
-    sha256 = "0i3pzgyd80n73dnqs8f6axinaji7biflgqsi33baxn4r1hy58ym1";
+    sha256 = "0dcwzrijmn4sgivmy2zwz3xa4y69pwhranyw0m90g0pp55di2psz";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig pcre qt5.qtbase ];
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [ qt5.qtbase glib pcre ];
 
   preConfigure = ''cmakeFlags+=" -DLXQT_ETC_XDG_DIR=$out/etc/xdg"'';
 

From 34758efc7044c0a7463defe75681e068d699051e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 20 Jun 2018 22:49:56 +0100
Subject: [PATCH 39/40] lxqt.pavucontrol-qt: 0.3.0 -> 0.4.0

---
 pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix
index 862a4ff9cf994..5a284d9b89a7c 100644
--- a/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix
+++ b/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "pavucontrol-qt";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "1pfqdzsbygvq77npsizydps25d9g6vgw177yqvmz3cg3a68dad27";
+    sha256 = "1bxqpasfvaagbq8azl7536z2zk2725xg7jkvad5xh95zq1gb4hgk";
   };
 
   nativeBuildInputs = [
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     description = "A Pulseaudio mixer in Qt (port of pavucontrol)";
     homepage = https://github.com/lxde/pavucontrol-qt;
     license = licenses.gpl2;
-    platforms = with platforms; unix;
+    platforms = with platforms; linux;
     maintainers = with maintainers; [ romildo ];
   };
 }

From b9c953eb19a0c6be88ce0a1cfe4db255b8e05a0f Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 18 Jun 2018 19:59:19 +0200
Subject: [PATCH 40/40] nixos/tests/tor: a minimal test

For now check that the default client config boots.

Ideas for the future:
- Expand on control via netcat
- Configure a circuit of nodes exercise various configs (e.g., check
  that a client node can access a hidden www service).  Needs setting up
  authoritative directory servers &c.
---
 nixos/release.nix   |  1 +
 nixos/tests/tor.nix | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 nixos/tests/tor.nix

diff --git a/nixos/release.nix b/nixos/release.nix
index 0fa8b22cc898d..881c9bafb4cba 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -398,6 +398,7 @@ in rec {
   tests.switchTest = callTest tests/switch-test.nix {};
   tests.taskserver = callTest tests/taskserver.nix {};
   tests.tomcat = callTest tests/tomcat.nix {};
+  tests.tor = callTest tests/tor.nix {};
   tests.transmission = callTest tests/transmission.nix {};
   tests.udisks2 = callTest tests/udisks2.nix {};
   tests.vault = callTest tests/vault.nix {};
diff --git a/nixos/tests/tor.nix b/nixos/tests/tor.nix
new file mode 100644
index 0000000000000..24d46a03897e5
--- /dev/null
+++ b/nixos/tests/tor.nix
@@ -0,0 +1,28 @@
+import ./make-test.nix ({ lib, ... }: with lib;
+
+rec {
+  name = "tor";
+  meta.maintainers = with maintainers; [ joachifm ];
+
+  common =
+    { config, ... }:
+    { boot.kernelParams = [ "audit=0" "apparmor=0" "quiet" ];
+      networking.firewall.enable = false;
+      networking.useDHCP = false;
+    };
+
+  nodes.client =
+    { config, pkgs, ... }:
+    { imports = [ common ];
+      environment.systemPackages = with pkgs; [ netcat ];
+      services.tor.enable = true;
+      services.tor.client.enable = true;
+      services.tor.controlPort = 9051;
+    };
+
+  testScript = ''
+    $client->waitForUnit("tor.service");
+    $client->waitForOpenPort(9051);
+    $client->succeed("echo GETINFO version | nc 127.0.0.1 9051") =~ /514 Authentication required./ or die;
+  '';
+})