Merge branch 'master' into staging

Evaluation was blocked on Hydra; this should fix it.
2017-10-05 12:34:05 +02:00
parent 81025f9ef7 623df97af5
commit 0be2928ac9
26 changed files with 637 additions and 483 deletions
--- a/pkgs/development/tools/analysis/snowman/default.nix
+++ b/pkgs/development/tools/analysis/snowman/default.nix
@@ -6,13 +6,13 @@ assert qtbase != null -> qt4 == null;

 stdenv.mkDerivation rec {
  name = "snowman-${version}";
-  version = "2017-07-22";
+  version = "2017-08-13";

  src = fetchFromGitHub {
    owner = "yegord";
    repo = "snowman";
-    rev = "6c4d9cceb56bf2fd0f650313131a2240579d1bea";
-    sha256 = "1d0abh0fg637jksk7nl4yl54b4cadinj93qqvsm138zyx7h57xqf";
+    rev = "cd9edcddf873fc40d7bcb1bb1eae815faedd3a03";
+    sha256 = "10f3kd5m5xw7hqh92ba7dcczwbznxvk1qxg0yycqz7y9mfr2282n";
  };

  nativeBuildInputs = [ cmake ];