Merge master into staging-next

2020-05-11 09:19:26 +02:00
parent 303adc7697 3a768184f4
commit d20d734bcf
89 changed files with 3895 additions and 2740 deletions
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
  pname = "qbs";

-  version = "1.15.0";
+  version = "1.16.0";

  src = fetchFromGitHub {
    owner = "qbs";
    repo = "qbs";
    rev = "v${version}";
-    sha256 = "0hq2lx5w5lsiy9c69bcps4wyn2sa9s88hj0bq95p93sfiwq6mxlr";
+    sha256 = "1kg11s3figpkvgd85p0zk416s57gnvlzrz1isbc2lv13adidf041";
  };

  nativeBuildInputs = [ qmake ];