Merge #529

iohk-bors[bot] · disassembler · iohk-bors[bot] · commit 90dc423813f2 · 2019-02-13T16:48:16.000Z
529: [DEVOPS-1216] 18.09 fixes (hydra/ntp/extra-statsd) r=disassembler a=disassembler



Co-authored-by: Samuel Leathers &lt;samuel.leathers@iohk.io&gt;
diff --git a/modules/common.nix b/modules/common.nix
@@ -4,7 +4,6 @@ with (import ./../lib.nix);
 
 {
   imports = [
-    ./ntp_fix.nix
     ./extra-statsd.nix
   ];
   boot.kernel.sysctl = {
diff --git a/modules/extra-statsd.nix b/modules/extra-statsd.nix
@@ -5,8 +5,8 @@ let
   extra-statsd = pkgs.callPackage (pkgs.fetchFromGitHub {
     owner = "cleverca22";
     repo = "extra-statsd";
-    rev = "bb4d394b224184f59369d44abecd455c4ca8195b";
-    sha256 = "048r26p853scf5ms71lqa5h97jg1fqbq1dphdx7ink0mdw6hqjpa";
+    rev = "343e8793594c91126dfd18fb31b07fba605711ab";
+    sha256 = "1qf1grqcp232s3vafvrq58xa29yqbnhfnpq2v03dhsfcqr63pdvz";
   }) {};
 in {
   options = {
diff --git a/modules/hydra-master-main.nix b/modules/hydra-master-main.nix
@@ -58,8 +58,8 @@ in {
       src = pkgs.fetchFromGitHub {
         owner = "input-output-hk";
         repo = "hydra";
-        rev = "1d613d05814f6074048933fe6c422ea059ce4130";
-        sha256 = "1wwy9llp10i1c793dlba2iryr54yahqxqfdsl3m1zq698v92ssw3";
+        rev = "5fb456cadc71458279d653bd08327aec51024598";
+        sha256 = "1w78psnqgjv7dx6lnvkf949mjx5wf7iq1j1c53w39n0ax6ln88hb";
       };
     };
     # max output is 4GB because of amis
diff --git a/modules/ntp_fix.nix b/modules/ntp_fix.nix
diff --git a/modules/openat.patch b/modules/openat.patch
diff --git a/nixpkgs-src.json b/nixpkgs-src.json
@@ -1,6 +1,6 @@
 {
     "owner":  "NixOS",
     "repo":   "nixpkgs",
-    "rev": "43c77db3aa58e06cc3ced846431dd4228f93cd5d",
-    "sha256": "12rrnzxyv1yh237ndnx3qc37hwlag4ncciwipadfg6m5nzllhmm8"
+    "rev": "e39e43a349d5f4f661d929fbe9a31129bda0acb2",
+    "sha256": "04ygzqd4kayx1rnfgv6zl77k591lb29wh9a1zim78r1gacnxr7ng"
 }
diff --git a/shell.nix b/shell.nix
@@ -7,7 +7,7 @@ let
   iohk-ops = iohkpkgs.iohk-ops;
   justIo = pkgs.mkShell {
     name = "io";
-    buildInputs = with pkgs; [ iohk-ops terraform_0_11 iohkpkgs.nixops cabal-install ];
+    buildInputs = with pkgs; [ iohk-ops terraform_0_11 iohkpkgs.nixops ];
     passthru = {
       inherit ioSelfBuild withAuxx;
     };

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ with (import ./../lib.nix);`
`4`	`4`
`5`	`5`	`{`
`6`	`6`	`imports = [`
`7`		`- ./ntp_fix.nix`
`8`	`7`	`./extra-statsd.nix`
`9`	`8`	`];`
`10`	`9`	`boot.kernel.sysctl = {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"owner": "NixOS",`
`3`	`3`	`"repo": "nixpkgs",`
`4`		`- "rev": "43c77db3aa58e06cc3ced846431dd4228f93cd5d",`
`5`		`- "sha256": "12rrnzxyv1yh237ndnx3qc37hwlag4ncciwipadfg6m5nzllhmm8"`
	`4`	`+ "rev": "e39e43a349d5f4f661d929fbe9a31129bda0acb2",`
	`5`	`+ "sha256": "04ygzqd4kayx1rnfgv6zl77k591lb29wh9a1zim78r1gacnxr7ng"`
`6`	`6`	`}`