Merge branch 'master' into staging

Hydra: ?compare=1430035
2018-01-30 19:51:33 +01:00
parent e851d53cea 078fc69425
commit c9171e5a4c
196 changed files with 2733 additions and 1587 deletions
@@ -3,11 +3,11 @@

 stdenv.mkDerivation rec {
  name = "i3lock-${version}";
-  version = "2.9.1";
+  version = "2.10";

  src = fetchurl {
    url = "https://i3wm.org/i3lock/${name}.tar.bz2";
-    sha256 = "1467ha4ssbfjk1jh0ya2i5ljzm554ln18nyrppvsipg8shb1cshh";
+    sha256 = "1vn8828ih7mpdl58znfnzpdwdgwksq16rghm5qlppbbz66zk5sr9";
  };

  nativeBuildInputs = [ pkgconfig ];