Merge branch 'master' into staging-next

2019-09-04 11:00:56 +02:00
parent 2c5835b09a 1d8a3973f4
commit 4aad2947f8
217 changed files with 7332 additions and 2071 deletions
@@ -19,8 +19,6 @@ let
      runHook postUnpack
    '';

-    doConfigure = false;
-
    installPhase = ''
      runHook preInstall

@@ -54,11 +52,4 @@ in {
    version = "5.11.39";
    sha256 = "0v1gnvdazxa3bcbq8hl6796yw0mxzki2xn4s5im5k5ngmfmnswyj";
  };
-
-  # TODO: update as it is outdated
-  unifiTesting = generic {
-    version = "5.11.18";
-    suffix = "-996baf2ca5";
-    sha256 = "14yyfn39ix8bnn0cb6bn0ly6pqxg81lvy83y40bk0y8vxfg6maqc";
-  };
 }