Merge branch 'master' into ksaric/GH-208

Author: ksaric

.gitignore

@@ -12,6 +12,7 @@ configuration/server/
 
 # Config files
 .ghci
+cabal.project.local
 
 # Our custom build script (util-scripts/build.sh)
 b
@@ -115,4 +116,4 @@ result*
 cabal.config
 
 # avoid issues when running /nix/regenerate.sh
-.stack-to-nix.cache
+.stack-to-nix.cache

cabal.project

@@ -4,22 +4,29 @@ packages:
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/iohk-monitoring-framework
-  tag: cbe7ab32354f3838dc8c95c64109904c8f503347
+  tag: e2dc8b2160bb2ccd1ef9817a6498cda06ad36580
   subdir: contra-tracer
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/iohk-monitoring-framework
-  tag: cbe7ab32354f3838dc8c95c64109904c8f503347
+  tag: e2dc8b2160bb2ccd1ef9817a6498cda06ad36580
   subdir: iohk-monitoring
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-sl-x509
-  tag: e8bfc1294e088f90e5ae0b4aedbc82ee46ac5ee4
+  tag: ec96c64c665b741c17b4e38f611315bae9b0b054
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-prelude
-  tag: 2256fd727c5f92e6218afdcf8cddf6e01c4a9dcd
+  tag: fda38e60007a019c0c8569e8a0fc08f2102c92cc
 
+source-repository-package
+  type: git
+  location: http://github.com/well-typed/canonical-json
+  tag: ddfe3593b80b5ceb88842bb7a6f2268df75d2c2f
+
+constraints:
+  libsystemd-journal >= 1.4.4

default.nix

@@ -55,12 +55,12 @@ let
 in defaultNix // {
   # ... and add additional packages we want to build on CI:
 
-  env = defaultNix.nix-tools.shellFor {
+  shell = defaultNix.nix-tools.shellFor {
     inherit withHoogle;
     # env will provide the dependencies of cardano-shell
     packages = ps: with ps; [ cardano-shell ];
     # This adds git to the shell, which is used by stack.
-    buildInputs = with pkgs; [ git stack commonLib.stack-hpc-coveralls ];
+    buildInputs = with pkgs; [ git stack commonLib.stack-hpc-coveralls pkgconfig systemd ];
   };
 
   runCoveralls = pkgs.stdenv.mkDerivation {

nix/.stack.nix/canonical-json.nix

@@ -1,7 +1,7 @@
 {
   "url": "https://github.com/input-output-hk/iohk-nix",
-  "rev": "8a7faeddf108515a8d64cb3dcf552bbd432865a3",
-  "date": "2019-05-31T03:32:45+00:00",
-  "sha256": "0cjsnzfnyhbvjvw9lk2z6bznjnpq452d629319km29yvqqg2n9yk",
+  "rev": "eec83e9bba05093c94004a001caebae252c0c83b",
+  "date": "2019-06-26T17:23:10+00:00",
+  "sha256": "00b11qmgr57pm6gg7a8m6fzjj6m5wmh8hnwg16jnqsmf52882y2j",
   "fetchSubmodules": false
 }

nix/.stack.nix/cardano-prelude-test.nix

@@ -8,6 +8,10 @@ commonLib.nix-tools.release-nix {
   # are interested in building on CI via nix-tools.
   packages = [ "cardano-shell" ];
 
+  # non nix-tools jobs from default.nix that we want to build for
+  # all supported systems.
+  builds-on-supported-systems = [ "shell" ];
+
   # The set of jobs we consider crutial for each CI run.
   # if a single one of these fails, the build will be marked
   # as failed.

nix/.stack.nix/cardano-prelude.nix

@@ -1,6 +1,6 @@
 let
   localPkgs = import ./. { };
-  mainShell = localPkgs.env;
+  mainShell = localPkgs.shell;
 in mainShell // {
   inherit (localPkgs) runCoveralls;
 }

nix/.stack.nix/cardano-sl-x509.nix

@@ -1 +1 @@
-(import ./. { withHoogle = false; }).env
+(import ./. { withHoogle = false; }).shell