Merge staging-next into staging

pkgs/tools/misc/bat/default.nix

@@ -4,25 +4,22 @@
 
 rustPlatform.buildRustPackage rec {
   name    = "bat-${version}";
-  version = "0.8.0";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner  = "sharkdp";
     repo   = "bat";
     rev    = "v${version}";
-    sha256 = "1xvjw61q0qbnzj95g7g8xckcqha9jrf2172b5l7faj7i0jhmz2kx";
+    sha256 = "13c88h1m9flmx3x2h7xrnb1wy4vgdxsqahw8cqa0x61ay0019a7s";
     fetchSubmodules = true;
   };
 
-  cargoSha256 = "0xv769f2iqrgnbmb7ma9p3gbb2xpx2lhqc0kq5nizf8w8xdc5m11";
+  cargoSha256 = "1clng4rl7mq50z8d5ipmr9fapjj4qmpf4gmdnfl6vs35pq3wp9j4";
 
   nativeBuildInputs = [ cmake pkgconfig zlib ];
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security libiconv ];
 
-  # https://github.com/NixOS/nixpkgs/issues/49642
-  doCheck = !stdenv.isDarwin;
-
   postInstall = ''
     install -m 444 -Dt $out/share/man/man1 doc/bat.1
 

pkgs/tools/misc/desktop-file-utils/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, libintl }:
+{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, libintl }:
 
 with stdenv.lib;
 
@@ -10,6 +10,14 @@ stdenv.mkDerivation rec {
     sha256 = "119kj2w0rrxkhg4f9cf5waa55jz1hj8933vh47vcjipcplql02bc";
   };
 
+  patches = [
+    # Makes font a recognized media type. Committed upstream, but no release has been made.
+    (fetchpatch {
+      url = "https://gitlab.freedesktop.org/xdg/desktop-file-utils/commit/92af4108750ceaf4191fd54e255885c7d8a78b70.patch";
+      sha256 = "14sqy10p5skp6hv4hgiwnj9hpr460250x42k5z0390l6nr6gahsq";
+    })
+  ];
+
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ glib libintl ];
 

pkgs/tools/misc/i3minator/default.nix

@@ -1,12 +1,14 @@
-{ stdenv, fetchurl, pythonPackages, glibcLocales }:
+{ stdenv, fetchFromGitHub, pythonPackages, glibcLocales }:
 
 pythonPackages.buildPythonApplication rec {
   name = "i3minator-${version}";
   version = "0.0.4";
 
-  src = fetchurl {
-    url = "https://github.com/carlesso/i3minator/archive/${version}.tar.gz";
-    sha256 = "11dn062788kwfs8k2ry4v8zr2gn40r6lsw770s9g2gvhl5n469dw";
+  src = fetchFromGitHub {
+    owner = "carlesso";
+    repo = "i3minator";
+    rev = version;
+    sha256 = "07dic5d2m0zw0psginpl43xn0mpxw7wilj49d02knz69f7c416lm";
   };
 
   LC_ALL = "en_US.UTF-8";

pkgs/tools/misc/ostree/default.nix

@@ -4,7 +4,7 @@
 }:
 
 let
-  version = "2018.8";
+  version = "2018.9";
 
   libglnx-src = fetchFromGitHub {
     owner = "GNOME";
@@ -28,7 +28,7 @@ in stdenv.mkDerivation {
     rev = "v${version}";
     owner = "ostreedev";
     repo = "ostree";
-    sha256 = "0i7b7hvlv8m44k39fr5389wskf810vda8s7ivy2whj1nan5951yx";
+    sha256 = "0a8gr4qqxcvz3fqv9w4dxy6iq0rq4kdzf08rzv8xg4gic3ldgyvj";
   };
 
   patches = [

pkgs/tools/misc/sutils/default.nix

@@ -1,15 +1,20 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub, alsaLib }:
 
 stdenv.mkDerivation rec {
-   name = "sutils-0.1";
+   version = "0.2";
+   name = "sutils-${version}";
 
-   src = fetchurl {
-     url = "https://github.com/baskerville/sutils/archive/0.1.tar.gz";
-     sha256 = "0xqk42vl82chy458d64fj68a4md4bxaip8n3xw9skxz0a1sgvks8";
+   src = fetchFromGitHub {
+     owner = "baskerville";
+     repo = "sutils";
+     rev = version;
+     sha256 = "0i2g6a6xdaq3w613dhq7mnsz4ymwqn6kvkyan5kgy49mzq97va6j";
    };
 
    hardeningDisable = [ "format" ];
 
+   buildInputs = [ alsaLib ];
+
    prePatch = ''sed -i "s@/usr/local@$out@" Makefile'';
 
    meta = {

pkgs/tools/misc/umlet/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   major = "14";
-  minor = "2";
-  version = "${major}.${minor}";
+  minor = "3";
+  version = "${major}.${minor}.0";
   name = "umlet-${version}";
 
   src = fetchurl {
     url = "http://www.umlet.com/umlet_${major}_${minor}/umlet-standalone-${version}.zip";
-    sha256 = "1fcc7ms92vcc4b8jh56bd3zrqdb0bwhbbzdxycc952fb0j6m62fw";
+    sha256 = "0jfyxjxsjx29xhs3fl0f574nyncmk9j5jp8zlgd401mcaznn9c7l";
   };
 
   buildInputs = [ unzip ];
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://www.umlet.com;
     license = licenses.gpl3;
-    maintainers = [ ];
+    maintainers = with maintainers; [ geistesk ];
     platforms = platforms.all;
   };
 }

pkgs/tools/misc/unicode/default.nix

@@ -2,18 +2,18 @@
 
 python3Packages.buildPythonApplication rec {
   name = "unicode-${version}";
-  version = "2.5";
+  version = "2.6";
 
   src = fetchFromGitHub {
     owner = "garabik";
     repo = "unicode";
     rev = "v${version}";
-    sha256 = "0vg1zshlzgdva8gzw6fya28fc4jhypjkj743x3q0yabx6934k0g2";
+    sha256 = "17hh4nwl5njsh7lnff583j2axn6rfvfbiqwp72n7vcsgkiszw4kg";
   };
 
   ucdtxt = fetchurl {
-    url = http://www.unicode.org/Public/10.0.0/ucd/UnicodeData.txt;
-    sha256 = "1cfak1j753zcrbgixwgppyxhm4w8vda8vxhqymi7n5ljfi6kwhjj";
+    url = http://www.unicode.org/Public/11.0.0/ucd/UnicodeData.txt;
+    sha256 = "16b0jzvvzarnlxdvs2izd5ia0ipbd87md143dc6lv6xpdqcs75s9";
   };
 
   postFixup = ''

pkgs/tools/misc/wl-clipboard/default.nix

@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig
+, wayland, wayland-protocols }:
+
+stdenv.mkDerivation rec {
+  name = "wl-clipboard-${version}";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "bugaevc";
+    repo = "wl-clipboard";
+    rev = "v${version}";
+    sha256 = "03h6ajcc30w6928bkd4h6xfj4iy2359ww6hdlybq8mr1zwmb2h0q";
+  };
+
+  nativeBuildInputs = [ meson ninja pkgconfig wayland-protocols ];
+  buildInputs = [ wayland ];
+  mesonFlags = [ "-Dauto_features=enabled" ];
+
+  meta = with stdenv.lib; {
+    description = "Command-line copy/paste utilities for Wayland";
+    homepage = https://github.com/bugaevc/wl-clipboard;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ dywedir ];
+    platforms = platforms.linux;
+  };
+}