Merge master into staging-next

pkgs/development/tools/misc/d-feet/default.nix

@@ -3,14 +3,14 @@
 
 let
   pname = "d-feet";
-  version = "0.3.13";
+  version = "0.3.14";
 in python3Packages.buildPythonApplication rec {
   name = "${pname}-${version}";
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/d-feet/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1md3lzs55sg04ds69dbginpxqvgg3qnf1lfx3vmsxph6bbd2y6ll";
+    sha256 = "1m8lwiwl5jhi0x7y6x5zmd3hjplgvdjrb8a8jg74rvkygslj1p7f";
   };
 
   nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook libxml2 ];

pkgs/development/tools/misc/dialog/default.nix

@@ -9,14 +9,14 @@ assert unicodeSupport -> ncurses.unicode && ncurses != null;
 
 stdenv.mkDerivation rec {
   name = "dialog-${version}";
-  version = "1.3-20180621";
+  version = "1.3-20181107";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.invisible-island.net/dialog/${name}.tgz"
       "https://invisible-mirror.net/archives/dialog/${name}.tgz"
     ];
-    sha256 = "0yjqczlf64yppgvk4i6s0jm06mdr0mb5m6sj39nf891dnbi5jj2a";
+    sha256 = "0mv4a31sz5kc1hyc51cvg9dq54vhlz0vbizn7jgkm9fx4y0cmspg";
   };
 
   buildInputs = [ ncurses ];

pkgs/development/tools/misc/fswatch/default.nix

@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   name = "fswatch-${version}";
-  version = "1.13.0";
+  version = "1.14.0";
 
   src = fetchFromGitHub {
     owner = "emcrisostomo";
     repo = "fswatch";
     rev = version;
-    sha256 = "18nrp2l1rzrhnw4p6d9r6jaxkkvxkiahvahgws2j00q623v0f3ij";
+    sha256 = "1d1fvm36qgh6a5j9v24wai61d297pvzxr14jngjlhh4i474ff21i";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

pkgs/development/tools/misc/msitools/default.nix

@@ -1,21 +1,21 @@
-{stdenv, fetchurl, intltool, glib, pkgconfig, libgsf, libuuid, gcab, bzip2}:
+{ stdenv, fetchurl, intltool, glib, pkgconfig, libgsf, libuuid, gcab, bzip2 }:
 
 stdenv.mkDerivation rec {
-  version = "0.97";
+  version = "0.98";
   name = "msitools-${version}";
 
   src = fetchurl {
-    url = "https://ftp.gnome.org/pub/GNOME/sources/msitools/0.97/${name}.tar.xz";
-    sha256 = "0pn6izlgwi4ngpk9jk2n38gcjjpk29nm15aad89bg9z3k9n2hnrs";
+    url = "mirror://gnome/sources/msitools/${version}/${name}.tar.xz";
+    sha256 = "19wb3n3nwkpc6bjr0q3f1znaxsfaqgjbdxxnbx8ic8bb5b49hwac";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [intltool glib libgsf libuuid gcab bzip2];
+  nativeBuildInputs = [ intltool pkgconfig ];
+  buildInputs = [ glib libgsf libuuid gcab bzip2 ];
 
   meta = with stdenv.lib; {
     description = "Set of programs to inspect and build Windows Installer (.MSI) files";
     homepage = https://wiki.gnome.org/msitools;
-    license = [licenses.gpl2 licenses.lgpl21];
+    license = [ licenses.gpl2 licenses.lgpl21 ];
     platforms = platforms.unix;
   };
 }

pkgs/development/tools/misc/premake/3.nix

@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     install -Dm755 bin/premake $out/bin/premake
   '';
 
-  premake_cmd = "premake3";
+  premake_cmd = "premake";
   setupHook = ./setup-hook.sh;
 
   meta = {