Merge branch 'staging-next'

Rebuild on Hydra seems OK-ish. mongodb.nix needed some conflict resolution (scons versions); all four versions seem to build fine.
2020-07-25 16:18:40 +02:00
parent fdbae69e8c 744b380a0e
commit 2b7c0dcdaa
104 changed files with 1077 additions and 451 deletions
@@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "fly";
-  version = "6.3.0";
+  version = "6.4.0";

  src = fetchFromGitHub {
    owner = "concourse";
    repo = "concourse";
    rev = "v${version}";
-    sha256 = "006qkg661hzbc2gpcnpxm09bp1kbb98y0bgdr49bjlnapcmdgr1b";
+    sha256 = "08lw345kzkic5b2dqj3d0d9x1mas9rpi4rdmbhww9r60swj169i7";
  };

-  vendorSha256 = "03az7l9rf2syw837zliny82xhkqlad16z0vfcg5h21m3bhz6v6jy";
+  vendorSha256 = "0a78cjfj909ic8wci8id2h5f6r34h90myk6z7m918n08vxv60jvw";

  subPackages = [ "fly" ];