Merge branch 'master' into staging

2018-07-15 12:31:18 +02:00
parent 0ef2389327 64a64e7483
commit 18774d4173
127 changed files with 1842 additions and 1472 deletions
@@ -5,11 +5,11 @@
 stdenv.mkDerivation rec {
  name = "${pname}-${version}";
  pname  = "xfce4-hardware-monitor-plugin";
-  version = "1.5.0";
+  version = "1.6.0";

  src = fetchurl {
    url = "https://git.xfce.org/panel-plugins/${pname}/snapshot/${name}.tar.bz2";
-    sha256 = "0sqvisr8gagpywq9sfyzqw37hxmj54ii89j5s2g8hx8bng5a98z1";
+    sha256 = "0xg5har11fk1wmdymydxlbk1z8aa39j8k0p4gzw2iqslv3n0zf7b";
  };

  nativeBuildInputs = [