Merge branch 'master' into staging-next

Hydra: ?compare=1473892
2018-08-17 13:45:21 +02:00
parent 7a22083e12 93147d737d
commit cbabebcc2e
263 changed files with 5922 additions and 4627 deletions
@@ -19,7 +19,7 @@

 stdenv.mkDerivation rec {
  name = "singularity-${version}";
-  version = "2.5.2";
+  version = "2.6.0";

  enableParallelBuilding = true;

@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
    owner = "singularityware";
    repo = "singularity";
    rev = version;
-    sha256 = "09wv8xagr5fjfhra5vyig0f1frfp97g99baqkh4avbzpg296q933";
+    sha256 = "0bi7acgppbkfbra8r29s1ldq02lazdww0z2h1rfvv8spr8dzzi94";
  };

  nativeBuildInputs = [ autoreconfHook makeWrapper ];