From 2faa381f1ec14dc68607466d36a3917ffb4e4219 Mon Sep 17 00:00:00 2001 From: Alexander Diemand Date: Mon, 20 Jan 2020 15:29:39 +0100 Subject: [PATCH] CAD-419 update Prometheus adaptor Signed-off-by: Alexander Diemand --- cabal.project | 2 +- nix/.stack.nix/contra-tracer.nix | 47 ++++- nix/.stack.nix/default.nix | 4 +- nix/.stack.nix/ekg-prometheus-adapter.nix | 69 +++++-- nix/.stack.nix/iohk-monitoring.nix | 176 +++++++++++------- nix/.stack.nix/lobemo-backend-aggregation.nix | 65 +++++-- nix/.stack.nix/lobemo-backend-editor.nix | 73 ++++++-- nix/.stack.nix/lobemo-backend-ekg.nix | 71 +++++-- nix/.stack.nix/lobemo-backend-graylog.nix | 63 +++++-- nix/.stack.nix/lobemo-backend-monitoring.nix | 130 ++++++++----- .../lobemo-backend-trace-acceptor.nix | 63 +++++-- .../lobemo-backend-trace-forwarder.nix | 63 +++++-- nix/.stack.nix/lobemo-examples.nix | 111 +++++++---- nix/.stack.nix/lobemo-scribe-systemd.nix | 69 +++++-- nix/.stack.nix/tracer-transformers.nix | 71 +++++-- nix/iohk-nix-src.json | 6 +- plugins/backend-ekg/lobemo-backend-ekg.cabal | 2 +- stack.yaml | 12 +- 18 files changed, 824 insertions(+), 273 deletions(-) diff --git a/cabal.project b/cabal.project index 59ff21a6..1f19e8ed 100644 --- a/cabal.project +++ b/cabal.project @@ -31,6 +31,6 @@ package tracer-transformers source-repository-package type: git location: https://github.com/CodiePP/ekg-prometheus-adapter - tag: 1a258b6df7d9807d4c4ff3e99722223d31a2c320 + tag: 1e43f9feca182cb073d92e76ce2808cc8977519a reorder-goals: True diff --git a/nix/.stack.nix/contra-tracer.nix b/nix/.stack.nix/contra-tracer.nix index fb1382ce..c35112cd 100644 --- a/nix/.stack.nix/contra-tracer.nix +++ b/nix/.stack.nix/contra-tracer.nix @@ -1,4 +1,43 @@ -{ system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }: +let + buildDepError = pkg: + builtins.throw '' + The Haskell package set does not contain the package: ${pkg} (build dependency). + + If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix. + ''; + sysDepError = pkg: + builtins.throw '' + The Nixpkgs package set does not contain the package: ${pkg} (system dependency). + + You may need to augment the system package mapping in haskell.nix so that it can be found. + ''; + pkgConfDepError = pkg: + builtins.throw '' + The pkg-conf packages does not contain the package: ${pkg} (pkg-conf dependency). + + You may need to augment the pkg-conf package mapping in haskell.nix so that it can be found. + ''; + exeDepError = pkg: + builtins.throw '' + The local executable components do not include the component: ${pkg} (executable dependency). + ''; + legacyExeDepError = pkg: + builtins.throw '' + The Haskell package set does not contain the package: ${pkg} (executable dependency). + + If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix. + ''; + buildToolDepError = pkg: + builtins.throw '' + Neither the Haskell package set or the Nixpkgs package set contain the package: ${pkg} (build tool dependency). + + If this is a system dependency: + You may need to augment the system package mapping in haskell.nix so that it can be found. + + If this is a Haskell dependency: + If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix. + ''; +in { system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }: { flags = {}; package = { @@ -13,12 +52,14 @@ synopsis = "A simple interface for logging, tracing or monitoring."; description = ""; buildType = "Simple"; + isLocal = true; }; components = { "library" = { depends = [ - (hsPkgs.base) - ] ++ (pkgs.lib).optional (compiler.isGhc && (compiler.version).lt "8.5") (hsPkgs.contravariant); + (hsPkgs."base" or (buildDepError "base")) + ] ++ (pkgs.lib).optional (compiler.isGhc && (compiler.version).lt "8.5") (hsPkgs."contravariant" or (buildDepError "contravariant")); + buildable = true; }; }; } // rec { src = (pkgs.lib).mkDefault ../.././contra-tracer; } \ No newline at end of file diff --git a/nix/.stack.nix/default.nix b/nix/.stack.nix/default.nix index 64aa7aff..81278b3e 100644 --- a/nix/.stack.nix/default.nix +++ b/nix/.stack.nix/default.nix @@ -3,10 +3,9 @@ { packages = { "time-units" = (((hackage.time-units)."1.0.0").revisions).default; - "prometheus" = (((hackage.prometheus)."2.1.2").revisions).default; + "prometheus" = (((hackage.prometheus)."2.1.3").revisions).default; "libsystemd-journal" = (((hackage.libsystemd-journal)."1.4.4").revisions).default; "katip" = (((hackage.katip)."0.8.3.0").revisions).default; - } // { contra-tracer = ./contra-tracer.nix; tracer-transformers = ./tracer-transformers.nix; iohk-monitoring = ./iohk-monitoring.nix; @@ -25,5 +24,6 @@ compiler.nix-name = "ghc865"; }; resolver = "lts-13.26"; + modules = [ ({ lib, ... }: { packages = {}; }) { packages = {}; } ]; compiler = "ghc-8.6.5"; } \ No newline at end of file diff --git a/nix/.stack.nix/ekg-prometheus-adapter.nix b/nix/.stack.nix/ekg-prometheus-adapter.nix index a27716d1..40eec060 100644 --- a/nix/.stack.nix/ekg-prometheus-adapter.nix +++ b/nix/.stack.nix/ekg-prometheus-adapter.nix @@ -1,4 +1,43 @@ -{ system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }: +let + buildDepError = pkg: + builtins.throw '' + The Haskell package set does not contain the package: ${pkg} (build dependency). + + If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix. + ''; + sysDepError = pkg: + builtins.throw '' + The Nixpkgs package set does not contain the package: ${pkg} (system dependency). + + You may need to augment the system package mapping in haskell.nix so that it can be found. + ''; + pkgConfDepError = pkg: + builtins.throw '' + The pkg-conf packages does not contain the package: ${pkg} (pkg-conf dependency). + + You may need to augment the pkg-conf package mapping in haskell.nix so that it can be found. + ''; + exeDepError = pkg: + builtins.throw '' + The local executable components do not include the component: ${pkg} (executable dependency). + ''; + legacyExeDepError = pkg: + builtins.throw '' + The Haskell package set does not contain the package: ${pkg} (executable dependency). + + If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix. + ''; + buildToolDepError = pkg: + builtins.throw '' + Neither the Haskell package set or the Nixpkgs package set contain the package: ${pkg} (build tool dependency). + + If this is a system dependency: + You may need to augment the system package mapping in haskell.nix so that it can be found. + + If this is a Haskell dependency: + If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix. + ''; +in { system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }: { flags = {}; package = { @@ -13,30 +52,36 @@ synopsis = "Easily expose your EKG metrics to Prometheus"; description = "Forked from original implementation by Alfredo Di Napoli on https://github.com/adinapoli/ekg-prometheus-adapter"; buildType = "Simple"; + isLocal = true; }; components = { "library" = { depends = [ - (hsPkgs.base) - (hsPkgs.prometheus) - (hsPkgs.ekg-core) - (hsPkgs.unordered-containers) - (hsPkgs.containers) - (hsPkgs.text) - (hsPkgs.transformers) - (hsPkgs.microlens-th) + (hsPkgs."base" or (buildDepError "base")) + (hsPkgs."prometheus" or (buildDepError "prometheus")) + (hsPkgs."ekg-core" or (buildDepError "ekg-core")) + (hsPkgs."unordered-containers" or (buildDepError "unordered-containers")) + (hsPkgs."containers" or (buildDepError "containers")) + (hsPkgs."text" or (buildDepError "text")) + (hsPkgs."transformers" or (buildDepError "transformers")) + (hsPkgs."microlens-th" or (buildDepError "microlens-th")) ]; + buildable = true; }; tests = { "tests" = { - depends = [ (hsPkgs.base) (hsPkgs.ekg-prometheus-adapter) ]; + depends = [ + (hsPkgs."base" or (buildDepError "base")) + (hsPkgs."ekg-prometheus-adapter" or (buildDepError "ekg-prometheus-adapter")) + ]; + buildable = true; }; }; }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/CodiePP/ekg-prometheus-adapter"; - rev = "1a258b6df7d9807d4c4ff3e99722223d31a2c320"; - sha256 = "0jzr1afb4vanhcc2gzlybzr0jnh66cap8kh00fkd4c22882jqkh8"; + rev = "1e43f9feca182cb073d92e76ce2808cc8977519a"; + sha256 = "1kavwhncj6z1sqvhl4nhh5437gq9497bq0ibf53g2lqvkydyan9r"; }); } \ No newline at end of file diff --git a/nix/.stack.nix/iohk-monitoring.nix b/nix/.stack.nix/iohk-monitoring.nix index d4f49230..e2570b08 100644 --- a/nix/.stack.nix/iohk-monitoring.nix +++ b/nix/.stack.nix/iohk-monitoring.nix @@ -1,4 +1,43 @@ -{ system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }: +let + buildDepError = pkg: + builtins.throw '' + The Haskell package set does not contain the package: ${pkg} (build dependency). + + If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix. + ''; + sysDepError = pkg: + builtins.throw '' + The Nixpkgs package set does not contain the package: ${pkg} (system dependency). + + You may need to augment the system package mapping in haskell.nix so that it can be found. + ''; + pkgConfDepError = pkg: + builtins.throw '' + The pkg-conf packages does not contain the package: ${pkg} (pkg-conf dependency). + + You may need to augment the pkg-conf package mapping in haskell.nix so that it can be found. + ''; + exeDepError = pkg: + builtins.throw '' + The local executable components do not include the component: ${pkg} (executable dependency). + ''; + legacyExeDepError = pkg: + builtins.throw '' + The Haskell package set does not contain the package: ${pkg} (executable dependency). + + If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix. + ''; + buildToolDepError = pkg: + builtins.throw '' + Neither the Haskell package set or the Nixpkgs package set contain the package: ${pkg} (build tool dependency). + + If this is a system dependency: + You may need to augment the system package mapping in haskell.nix so that it can be found. + + If this is a Haskell dependency: + If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix. + ''; +in { system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }: { flags = { disable-observables = false; performance-test-queue = false; }; package = { @@ -13,82 +52,85 @@ synopsis = "logging, benchmarking and monitoring framework"; description = ""; buildType = "Simple"; + isLocal = true; }; components = { "library" = { depends = [ - (hsPkgs.base) - (hsPkgs.contra-tracer) - (hsPkgs.aeson) - (hsPkgs.array) - (hsPkgs.async) - (hsPkgs.async-timer) - (hsPkgs.attoparsec) - (hsPkgs.auto-update) - (hsPkgs.base64-bytestring) - (hsPkgs.bytestring) - (hsPkgs.clock) - (hsPkgs.containers) - (hsPkgs.contravariant) - (hsPkgs.directory) - (hsPkgs.filepath) - (hsPkgs.katip) - (hsPkgs.lens) - (hsPkgs.mtl) - (hsPkgs.safe) - (hsPkgs.safe-exceptions) - (hsPkgs.scientific) - (hsPkgs.stm) - (hsPkgs.template-haskell) - (hsPkgs.text) - (hsPkgs.time) - (hsPkgs.time-units) - (hsPkgs.tracer-transformers) - (hsPkgs.transformers) - (hsPkgs.unordered-containers) - (hsPkgs.vector) - (hsPkgs.yaml) - (hsPkgs.libyaml) + (hsPkgs."base" or (buildDepError "base")) + (hsPkgs."contra-tracer" or (buildDepError "contra-tracer")) + (hsPkgs."aeson" or (buildDepError "aeson")) + (hsPkgs."array" or (buildDepError "array")) + (hsPkgs."async" or (buildDepError "async")) + (hsPkgs."async-timer" or (buildDepError "async-timer")) + (hsPkgs."attoparsec" or (buildDepError "attoparsec")) + (hsPkgs."auto-update" or (buildDepError "auto-update")) + (hsPkgs."base64-bytestring" or (buildDepError "base64-bytestring")) + (hsPkgs."bytestring" or (buildDepError "bytestring")) + (hsPkgs."clock" or (buildDepError "clock")) + (hsPkgs."containers" or (buildDepError "containers")) + (hsPkgs."contravariant" or (buildDepError "contravariant")) + (hsPkgs."directory" or (buildDepError "directory")) + (hsPkgs."filepath" or (buildDepError "filepath")) + (hsPkgs."katip" or (buildDepError "katip")) + (hsPkgs."lens" or (buildDepError "lens")) + (hsPkgs."mtl" or (buildDepError "mtl")) + (hsPkgs."safe" or (buildDepError "safe")) + (hsPkgs."safe-exceptions" or (buildDepError "safe-exceptions")) + (hsPkgs."scientific" or (buildDepError "scientific")) + (hsPkgs."stm" or (buildDepError "stm")) + (hsPkgs."template-haskell" or (buildDepError "template-haskell")) + (hsPkgs."text" or (buildDepError "text")) + (hsPkgs."time" or (buildDepError "time")) + (hsPkgs."time-units" or (buildDepError "time-units")) + (hsPkgs."tracer-transformers" or (buildDepError "tracer-transformers")) + (hsPkgs."transformers" or (buildDepError "transformers")) + (hsPkgs."unordered-containers" or (buildDepError "unordered-containers")) + (hsPkgs."vector" or (buildDepError "vector")) + (hsPkgs."yaml" or (buildDepError "yaml")) + (hsPkgs."libyaml" or (buildDepError "libyaml")) ] ++ (if system.isWindows - then [ (hsPkgs.Win32) ] - else [ (hsPkgs.unix) ]); + then [ (hsPkgs."Win32" or (buildDepError "Win32")) ] + else [ (hsPkgs."unix" or (buildDepError "unix")) ]); + buildable = true; }; tests = { "tests" = { depends = [ - (hsPkgs.base) - (hsPkgs.contra-tracer) - (hsPkgs.iohk-monitoring) - (hsPkgs.aeson) - (hsPkgs.array) - (hsPkgs.async) - (hsPkgs.bytestring) - (hsPkgs.clock) - (hsPkgs.containers) - (hsPkgs.directory) - (hsPkgs.filepath) - (hsPkgs.mtl) - (hsPkgs.process) - (hsPkgs.QuickCheck) - (hsPkgs.random) - (hsPkgs.semigroups) - (hsPkgs.split) - (hsPkgs.stm) - (hsPkgs.tasty) - (hsPkgs.tasty-hunit) - (hsPkgs.tasty-quickcheck) - (hsPkgs.temporary) - (hsPkgs.text) - (hsPkgs.time) - (hsPkgs.time-units) - (hsPkgs.tracer-transformers) - (hsPkgs.transformers) - (hsPkgs.unordered-containers) - (hsPkgs.vector) - (hsPkgs.void) - (hsPkgs.yaml) - (hsPkgs.libyaml) + (hsPkgs."base" or (buildDepError "base")) + (hsPkgs."contra-tracer" or (buildDepError "contra-tracer")) + (hsPkgs."iohk-monitoring" or (buildDepError "iohk-monitoring")) + (hsPkgs."aeson" or (buildDepError "aeson")) + (hsPkgs."array" or (buildDepError "array")) + (hsPkgs."async" or (buildDepError "async")) + (hsPkgs."bytestring" or (buildDepError "bytestring")) + (hsPkgs."clock" or (buildDepError "clock")) + (hsPkgs."containers" or (buildDepError "containers")) + (hsPkgs."directory" or (buildDepError "directory")) + (hsPkgs."filepath" or (buildDepError "filepath")) + (hsPkgs."mtl" or (buildDepError "mtl")) + (hsPkgs."process" or (buildDepError "process")) + (hsPkgs."QuickCheck" or (buildDepError "QuickCheck")) + (hsPkgs."random" or (buildDepError "random")) + (hsPkgs."semigroups" or (buildDepError "semigroups")) + (hsPkgs."split" or (buildDepError "split")) + (hsPkgs."stm" or (buildDepError "stm")) + (hsPkgs."tasty" or (buildDepError "tasty")) + (hsPkgs."tasty-hunit" or (buildDepError "tasty-hunit")) + (hsPkgs."tasty-quickcheck" or (buildDepError "tasty-quickcheck")) + (hsPkgs."temporary" or (buildDepError "temporary")) + (hsPkgs."text" or (buildDepError "text")) + (hsPkgs."time" or (buildDepError "time")) + (hsPkgs."time-units" or (buildDepError "time-units")) + (hsPkgs."tracer-transformers" or (buildDepError "tracer-transformers")) + (hsPkgs."transformers" or (buildDepError "transformers")) + (hsPkgs."unordered-containers" or (buildDepError "unordered-containers")) + (hsPkgs."vector" or (buildDepError "vector")) + (hsPkgs."void" or (buildDepError "void")) + (hsPkgs."yaml" or (buildDepError "yaml")) + (hsPkgs."libyaml" or (buildDepError "libyaml")) ]; + buildable = true; }; }; }; diff --git a/nix/.stack.nix/lobemo-backend-aggregation.nix b/nix/.stack.nix/lobemo-backend-aggregation.nix index b477a9a0..e001102a 100644 --- a/nix/.stack.nix/lobemo-backend-aggregation.nix +++ b/nix/.stack.nix/lobemo-backend-aggregation.nix @@ -1,4 +1,43 @@ -{ system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }: +let + buildDepError = pkg: + builtins.throw '' + The Haskell package set does not contain the package: ${pkg} (build dependency). + + If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix. + ''; + sysDepError = pkg: + builtins.throw '' + The Nixpkgs package set does not contain the package: ${pkg} (system dependency). + + You may need to augment the system package mapping in haskell.nix so that it can be found. + ''; + pkgConfDepError = pkg: + builtins.throw '' + The pkg-conf packages does not contain the package: ${pkg} (pkg-conf dependency). + + You may need to augment the pkg-conf package mapping in haskell.nix so that it can be found. + ''; + exeDepError = pkg: + builtins.throw '' + The local executable components do not include the component: ${pkg} (executable dependency). + ''; + legacyExeDepError = pkg: + builtins.throw '' + The Haskell package set does not contain the package: ${pkg} (executable dependency). + + If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix. + ''; + buildToolDepError = pkg: + builtins.throw '' + Neither the Haskell package set or the Nixpkgs package set contain the package: ${pkg} (build tool dependency). + + If this is a system dependency: + You may need to augment the system package mapping in haskell.nix so that it can be found. + + If this is a Haskell dependency: + If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix. + ''; +in { system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }: { flags = {}; package = { @@ -16,22 +55,24 @@ synopsis = "provides a backend implementation to aggregate traced values"; description = ""; buildType = "Simple"; + isLocal = true; }; components = { "library" = { depends = [ - (hsPkgs.base) - (hsPkgs.iohk-monitoring) - (hsPkgs.aeson) - (hsPkgs.async) - (hsPkgs.text) - (hsPkgs.time) - (hsPkgs.safe-exceptions) - (hsPkgs.stm) - (hsPkgs.unordered-containers) + (hsPkgs."base" or (buildDepError "base")) + (hsPkgs."iohk-monitoring" or (buildDepError "iohk-monitoring")) + (hsPkgs."aeson" or (buildDepError "aeson")) + (hsPkgs."async" or (buildDepError "async")) + (hsPkgs."text" or (buildDepError "text")) + (hsPkgs."time" or (buildDepError "time")) + (hsPkgs."safe-exceptions" or (buildDepError "safe-exceptions")) + (hsPkgs."stm" or (buildDepError "stm")) + (hsPkgs."unordered-containers" or (buildDepError "unordered-containers")) ] ++ (if system.isWindows - then [ (hsPkgs.Win32) ] - else [ (hsPkgs.unix) ]); + then [ (hsPkgs."Win32" or (buildDepError "Win32")) ] + else [ (hsPkgs."unix" or (buildDepError "unix")) ]); + buildable = true; }; }; } // rec { src = (pkgs.lib).mkDefault ../.././plugins/backend-aggregation; } \ No newline at end of file diff --git a/nix/.stack.nix/lobemo-backend-editor.nix b/nix/.stack.nix/lobemo-backend-editor.nix index d34a7246..f70eb54b 100644 --- a/nix/.stack.nix/lobemo-backend-editor.nix +++ b/nix/.stack.nix/lobemo-backend-editor.nix @@ -1,4 +1,43 @@ -{ system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }: +let + buildDepError = pkg: + builtins.throw '' + The Haskell package set does not contain the package: ${pkg} (build dependency). + + If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix. + ''; + sysDepError = pkg: + builtins.throw '' + The Nixpkgs package set does not contain the package: ${pkg} (system dependency). + + You may need to augment the system package mapping in haskell.nix so that it can be found. + ''; + pkgConfDepError = pkg: + builtins.throw '' + The pkg-conf packages does not contain the package: ${pkg} (pkg-conf dependency). + + You may need to augment the pkg-conf package mapping in haskell.nix so that it can be found. + ''; + exeDepError = pkg: + builtins.throw '' + The local executable components do not include the component: ${pkg} (executable dependency). + ''; + legacyExeDepError = pkg: + builtins.throw '' + The Haskell package set does not contain the package: ${pkg} (executable dependency). + + If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix. + ''; + buildToolDepError = pkg: + builtins.throw '' + Neither the Haskell package set or the Nixpkgs package set contain the package: ${pkg} (build tool dependency). + + If this is a system dependency: + You may need to augment the system package mapping in haskell.nix so that it can be found. + + If this is a Haskell dependency: + If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix. + ''; +in { system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }: { flags = {}; package = { @@ -13,26 +52,28 @@ synopsis = "provides a backend implementation to interactively manage configuration"; description = ""; buildType = "Simple"; + isLocal = true; }; components = { "library" = { depends = [ - (hsPkgs.base) - (hsPkgs.iohk-monitoring) - (hsPkgs.aeson) - (hsPkgs.async) - (hsPkgs.bytestring) - (hsPkgs.directory) - (hsPkgs.filepath) - (hsPkgs.safe) - (hsPkgs.safe-exceptions) - (hsPkgs.text) - (hsPkgs.time) - (hsPkgs.threepenny-gui) - (hsPkgs.unordered-containers) + (hsPkgs."base" or (buildDepError "base")) + (hsPkgs."iohk-monitoring" or (buildDepError "iohk-monitoring")) + (hsPkgs."aeson" or (buildDepError "aeson")) + (hsPkgs."async" or (buildDepError "async")) + (hsPkgs."bytestring" or (buildDepError "bytestring")) + (hsPkgs."directory" or (buildDepError "directory")) + (hsPkgs."filepath" or (buildDepError "filepath")) + (hsPkgs."safe" or (buildDepError "safe")) + (hsPkgs."safe-exceptions" or (buildDepError "safe-exceptions")) + (hsPkgs."text" or (buildDepError "text")) + (hsPkgs."time" or (buildDepError "time")) + (hsPkgs."threepenny-gui" or (buildDepError "threepenny-gui")) + (hsPkgs."unordered-containers" or (buildDepError "unordered-containers")) ] ++ (if system.isWindows - then [ (hsPkgs.Win32) ] - else [ (hsPkgs.unix) ]); + then [ (hsPkgs."Win32" or (buildDepError "Win32")) ] + else [ (hsPkgs."unix" or (buildDepError "unix")) ]); + buildable = true; }; }; } // rec { src = (pkgs.lib).mkDefault ../.././plugins/backend-editor; } \ No newline at end of file diff --git a/nix/.stack.nix/lobemo-backend-ekg.nix b/nix/.stack.nix/lobemo-backend-ekg.nix index 3bbd750e..a65cc79e 100644 --- a/nix/.stack.nix/lobemo-backend-ekg.nix +++ b/nix/.stack.nix/lobemo-backend-ekg.nix @@ -1,4 +1,43 @@ -{ system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }: +let + buildDepError = pkg: + builtins.throw '' + The Haskell package set does not contain the package: ${pkg} (build dependency). + + If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix. + ''; + sysDepError = pkg: + builtins.throw '' + The Nixpkgs package set does not contain the package: ${pkg} (system dependency). + + You may need to augment the system package mapping in haskell.nix so that it can be found. + ''; + pkgConfDepError = pkg: + builtins.throw '' + The pkg-conf packages does not contain the package: ${pkg} (pkg-conf dependency). + + You may need to augment the pkg-conf package mapping in haskell.nix so that it can be found. + ''; + exeDepError = pkg: + builtins.throw '' + The local executable components do not include the component: ${pkg} (executable dependency). + ''; + legacyExeDepError = pkg: + builtins.throw '' + The Haskell package set does not contain the package: ${pkg} (executable dependency). + + If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix. + ''; + buildToolDepError = pkg: + builtins.throw '' + Neither the Haskell package set or the Nixpkgs package set contain the package: ${pkg} (build tool dependency). + + If this is a system dependency: + You may need to augment the system package mapping in haskell.nix so that it can be found. + + If this is a Haskell dependency: + If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix. + ''; +in { system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }: { flags = {}; package = { @@ -13,25 +52,27 @@ synopsis = "provides a backend implementation to EKG"; description = ""; buildType = "Simple"; + isLocal = true; }; components = { "library" = { depends = [ - (hsPkgs.base) - (hsPkgs.iohk-monitoring) - (hsPkgs.aeson) - (hsPkgs.async) - (hsPkgs.ekg) - (hsPkgs.ekg-core) - (hsPkgs.ekg-prometheus-adapter) - (hsPkgs.prometheus) - (hsPkgs.safe-exceptions) - (hsPkgs.stm) - (hsPkgs.text) - (hsPkgs.time) - (hsPkgs.unordered-containers) - (hsPkgs.warp) + (hsPkgs."base" or (buildDepError "base")) + (hsPkgs."iohk-monitoring" or (buildDepError "iohk-monitoring")) + (hsPkgs."aeson" or (buildDepError "aeson")) + (hsPkgs."async" or (buildDepError "async")) + (hsPkgs."ekg" or (buildDepError "ekg")) + (hsPkgs."ekg-core" or (buildDepError "ekg-core")) + (hsPkgs."ekg-prometheus-adapter" or (buildDepError "ekg-prometheus-adapter")) + (hsPkgs."prometheus" or (buildDepError "prometheus")) + (hsPkgs."safe-exceptions" or (buildDepError "safe-exceptions")) + (hsPkgs."stm" or (buildDepError "stm")) + (hsPkgs."text" or (buildDepError "text")) + (hsPkgs."time" or (buildDepError "time")) + (hsPkgs."unordered-containers" or (buildDepError "unordered-containers")) + (hsPkgs."warp" or (buildDepError "warp")) ]; + buildable = true; }; }; } // rec { src = (pkgs.lib).mkDefault ../.././plugins/backend-ekg; } \ No newline at end of file diff --git a/nix/.stack.nix/lobemo-backend-graylog.nix b/nix/.stack.nix/lobemo-backend-graylog.nix index 42ba9276..21572e56 100644 --- a/nix/.stack.nix/lobemo-backend-graylog.nix +++ b/nix/.stack.nix/lobemo-backend-graylog.nix @@ -1,4 +1,43 @@ -{ system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }: +let + buildDepError = pkg: + builtins.throw '' + The Haskell package set does not contain the package: ${pkg} (build dependency). + + If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix. + ''; + sysDepError = pkg: + builtins.throw '' + The Nixpkgs package set does not contain the package: ${pkg} (system dependency). + + You may need to augment the system package mapping in haskell.nix so that it can be found. + ''; + pkgConfDepError = pkg: + builtins.throw '' + The pkg-conf packages does not contain the package: ${pkg} (pkg-conf dependency). + + You may need to augment the pkg-conf package mapping in haskell.nix so that it can be found. + ''; + exeDepError = pkg: + builtins.throw '' + The local executable components do not include the component: ${pkg} (executable dependency). + ''; + legacyExeDepError = pkg: + builtins.throw '' + The Haskell package set does not contain the package: ${pkg} (executable dependency). + + If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix. + ''; + buildToolDepError = pkg: + builtins.throw '' + Neither the Haskell package set or the Nixpkgs package set contain the package: ${pkg} (build tool dependency). + + If this is a system dependency: + You may need to augment the system package mapping in haskell.nix so that it can be found. + + If this is a Haskell dependency: + If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix. + ''; +in { system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }: { flags = {}; package = { @@ -13,21 +52,23 @@ synopsis = "provides a backend implementation to Graylog"; description = ""; buildType = "Simple"; + isLocal = true; }; components = { "library" = { depends = [ - (hsPkgs.base) - (hsPkgs.iohk-monitoring) - (hsPkgs.aeson) - (hsPkgs.async) - (hsPkgs.bytestring) - (hsPkgs.network) - (hsPkgs.safe-exceptions) - (hsPkgs.stm) - (hsPkgs.text) - (hsPkgs.time) + (hsPkgs."base" or (buildDepError "base")) + (hsPkgs."iohk-monitoring" or (buildDepError "iohk-monitoring")) + (hsPkgs."aeson" or (buildDepError "aeson")) + (hsPkgs."async" or (buildDepError "async")) + (hsPkgs."bytestring" or (buildDepError "bytestring")) + (hsPkgs."network" or (buildDepError "network")) + (hsPkgs."safe-exceptions" or (buildDepError "safe-exceptions")) + (hsPkgs."stm" or (buildDepError "stm")) + (hsPkgs."text" or (buildDepError "text")) + (hsPkgs."time" or (buildDepError "time")) ]; + buildable = true; }; }; } // rec { src = (pkgs.lib).mkDefault ../.././plugins/backend-graylog; } \ No newline at end of file diff --git a/nix/.stack.nix/lobemo-backend-monitoring.nix b/nix/.stack.nix/lobemo-backend-monitoring.nix index a8748d0d..b91e9138 100644 --- a/nix/.stack.nix/lobemo-backend-monitoring.nix +++ b/nix/.stack.nix/lobemo-backend-monitoring.nix @@ -1,4 +1,43 @@ -{ system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }: +let + buildDepError = pkg: + builtins.throw '' + The Haskell package set does not contain the package: ${pkg} (build dependency). + + If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix. + ''; + sysDepError = pkg: + builtins.throw '' + The Nixpkgs package set does not contain the package: ${pkg} (system dependency). + + You may need to augment the system package mapping in haskell.nix so that it can be found. + ''; + pkgConfDepError = pkg: + builtins.throw '' + The pkg-conf packages does not contain the package: ${pkg} (pkg-conf dependency). + + You may need to augment the pkg-conf package mapping in haskell.nix so that it can be found. + ''; + exeDepError = pkg: + builtins.throw '' + The local executable components do not include the component: ${pkg} (executable dependency). + ''; + legacyExeDepError = pkg: + builtins.throw '' + The Haskell package set does not contain the package: ${pkg} (executable dependency). + + If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix. + ''; + buildToolDepError = pkg: + builtins.throw '' + Neither the Haskell package set or the Nixpkgs package set contain the package: ${pkg} (build tool dependency). + + If this is a system dependency: + You may need to augment the system package mapping in haskell.nix so that it can be found. + + If this is a Haskell dependency: + If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix. + ''; +in { system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }: { flags = {}; package = { @@ -13,59 +52,62 @@ synopsis = "provides a backend implementation for monitoring"; description = ""; buildType = "Simple"; + isLocal = true; }; components = { "library" = { depends = [ - (hsPkgs.base) - (hsPkgs.iohk-monitoring) - (hsPkgs.aeson) - (hsPkgs.async) - (hsPkgs.safe-exceptions) - (hsPkgs.stm) - (hsPkgs.text) - (hsPkgs.time) - (hsPkgs.unordered-containers) + (hsPkgs."base" or (buildDepError "base")) + (hsPkgs."iohk-monitoring" or (buildDepError "iohk-monitoring")) + (hsPkgs."aeson" or (buildDepError "aeson")) + (hsPkgs."async" or (buildDepError "async")) + (hsPkgs."safe-exceptions" or (buildDepError "safe-exceptions")) + (hsPkgs."stm" or (buildDepError "stm")) + (hsPkgs."text" or (buildDepError "text")) + (hsPkgs."time" or (buildDepError "time")) + (hsPkgs."unordered-containers" or (buildDepError "unordered-containers")) ] ++ (if system.isWindows - then [ (hsPkgs.Win32) ] - else [ (hsPkgs.unix) ]); + then [ (hsPkgs."Win32" or (buildDepError "Win32")) ] + else [ (hsPkgs."unix" or (buildDepError "unix")) ]); + buildable = true; }; tests = { "tests" = { depends = [ - (hsPkgs.base) - (hsPkgs.contra-tracer) - (hsPkgs.iohk-monitoring) - (hsPkgs.lobemo-backend-monitoring) - (hsPkgs.aeson) - (hsPkgs.array) - (hsPkgs.async) - (hsPkgs.bytestring) - (hsPkgs.clock) - (hsPkgs.containers) - (hsPkgs.directory) - (hsPkgs.filepath) - (hsPkgs.mtl) - (hsPkgs.process) - (hsPkgs.QuickCheck) - (hsPkgs.random) - (hsPkgs.semigroups) - (hsPkgs.split) - (hsPkgs.stm) - (hsPkgs.tasty) - (hsPkgs.tasty-hunit) - (hsPkgs.tasty-quickcheck) - (hsPkgs.temporary) - (hsPkgs.text) - (hsPkgs.time) - (hsPkgs.time-units) - (hsPkgs.transformers) - (hsPkgs.unordered-containers) - (hsPkgs.vector) - (hsPkgs.void) - (hsPkgs.yaml) - (hsPkgs.libyaml) + (hsPkgs."base" or (buildDepError "base")) + (hsPkgs."contra-tracer" or (buildDepError "contra-tracer")) + (hsPkgs."iohk-monitoring" or (buildDepError "iohk-monitoring")) + (hsPkgs."lobemo-backend-monitoring" or (buildDepError "lobemo-backend-monitoring")) + (hsPkgs."aeson" or (buildDepError "aeson")) + (hsPkgs."array" or (buildDepError "array")) + (hsPkgs."async" or (buildDepError "async")) + (hsPkgs."bytestring" or (buildDepError "bytestring")) + (hsPkgs."clock" or (buildDepError "clock")) + (hsPkgs."containers" or (buildDepError "containers")) + (hsPkgs."directory" or (buildDepError "directory")) + (hsPkgs."filepath" or (buildDepError "filepath")) + (hsPkgs."mtl" or (buildDepError "mtl")) + (hsPkgs."process" or (buildDepError "process")) + (hsPkgs."QuickCheck" or (buildDepError "QuickCheck")) + (hsPkgs."random" or (buildDepError "random")) + (hsPkgs."semigroups" or (buildDepError "semigroups")) + (hsPkgs."split" or (buildDepError "split")) + (hsPkgs."stm" or (buildDepError "stm")) + (hsPkgs."tasty" or (buildDepError "tasty")) + (hsPkgs."tasty-hunit" or (buildDepError "tasty-hunit")) + (hsPkgs."tasty-quickcheck" or (buildDepError "tasty-quickcheck")) + (hsPkgs."temporary" or (buildDepError "temporary")) + (hsPkgs."text" or (buildDepError "text")) + (hsPkgs."time" or (buildDepError "time")) + (hsPkgs."time-units" or (buildDepError "time-units")) + (hsPkgs."transformers" or (buildDepError "transformers")) + (hsPkgs."unordered-containers" or (buildDepError "unordered-containers")) + (hsPkgs."vector" or (buildDepError "vector")) + (hsPkgs."void" or (buildDepError "void")) + (hsPkgs."yaml" or (buildDepError "yaml")) + (hsPkgs."libyaml" or (buildDepError "libyaml")) ]; + buildable = true; }; }; }; diff --git a/nix/.stack.nix/lobemo-backend-trace-acceptor.nix b/nix/.stack.nix/lobemo-backend-trace-acceptor.nix index 94e091c6..4a3ca7dd 100644 --- a/nix/.stack.nix/lobemo-backend-trace-acceptor.nix +++ b/nix/.stack.nix/lobemo-backend-trace-acceptor.nix @@ -1,4 +1,43 @@ -{ system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }: +let + buildDepError = pkg: + builtins.throw '' + The Haskell package set does not contain the package: ${pkg} (build dependency). + + If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix. + ''; + sysDepError = pkg: + builtins.throw '' + The Nixpkgs package set does not contain the package: ${pkg} (system dependency). + + You may need to augment the system package mapping in haskell.nix so that it can be found. + ''; + pkgConfDepError = pkg: + builtins.throw '' + The pkg-conf packages does not contain the package: ${pkg} (pkg-conf dependency). + + You may need to augment the pkg-conf package mapping in haskell.nix so that it can be found. + ''; + exeDepError = pkg: + builtins.throw '' + The local executable components do not include the component: ${pkg} (executable dependency). + ''; + legacyExeDepError = pkg: + builtins.throw '' + The Haskell package set does not contain the package: ${pkg} (executable dependency). + + If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix. + ''; + buildToolDepError = pkg: + builtins.throw '' + Neither the Haskell package set or the Nixpkgs package set contain the package: ${pkg} (build tool dependency). + + If this is a system dependency: + You may need to augment the system package mapping in haskell.nix so that it can be found. + + If this is a Haskell dependency: + If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix. + ''; +in { system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }: { flags = {}; package = { @@ -16,21 +55,23 @@ synopsis = "a trace acceptor backend"; description = ""; buildType = "Simple"; + isLocal = true; }; components = { "library" = { depends = [ - (hsPkgs.base) - (hsPkgs.iohk-monitoring) - (hsPkgs.aeson) - (hsPkgs.async) - (hsPkgs.bytestring) - (hsPkgs.network) - (hsPkgs.safe-exceptions) - (hsPkgs.stm) - (hsPkgs.text) - (hsPkgs.time) + (hsPkgs."base" or (buildDepError "base")) + (hsPkgs."iohk-monitoring" or (buildDepError "iohk-monitoring")) + (hsPkgs."aeson" or (buildDepError "aeson")) + (hsPkgs."async" or (buildDepError "async")) + (hsPkgs."bytestring" or (buildDepError "bytestring")) + (hsPkgs."network" or (buildDepError "network")) + (hsPkgs."safe-exceptions" or (buildDepError "safe-exceptions")) + (hsPkgs."stm" or (buildDepError "stm")) + (hsPkgs."text" or (buildDepError "text")) + (hsPkgs."time" or (buildDepError "time")) ]; + buildable = true; }; }; } // rec { diff --git a/nix/.stack.nix/lobemo-backend-trace-forwarder.nix b/nix/.stack.nix/lobemo-backend-trace-forwarder.nix index e76c1f75..717d70cd 100644 --- a/nix/.stack.nix/lobemo-backend-trace-forwarder.nix +++ b/nix/.stack.nix/lobemo-backend-trace-forwarder.nix @@ -1,4 +1,43 @@ -{ system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }: +let + buildDepError = pkg: + builtins.throw '' + The Haskell package set does not contain the package: ${pkg} (build dependency). + + If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix. + ''; + sysDepError = pkg: + builtins.throw '' + The Nixpkgs package set does not contain the package: ${pkg} (system dependency). + + You may need to augment the system package mapping in haskell.nix so that it can be found. + ''; + pkgConfDepError = pkg: + builtins.throw '' + The pkg-conf packages does not contain the package: ${pkg} (pkg-conf dependency). + + You may need to augment the pkg-conf package mapping in haskell.nix so that it can be found. + ''; + exeDepError = pkg: + builtins.throw '' + The local executable components do not include the component: ${pkg} (executable dependency). + ''; + legacyExeDepError = pkg: + builtins.throw '' + The Haskell package set does not contain the package: ${pkg} (executable dependency). + + If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix. + ''; + buildToolDepError = pkg: + builtins.throw '' + Neither the Haskell package set or the Nixpkgs package set contain the package: ${pkg} (build tool dependency). + + If this is a system dependency: + You may need to augment the system package mapping in haskell.nix so that it can be found. + + If this is a Haskell dependency: + If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix. + ''; +in { system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }: { flags = {}; package = { @@ -16,21 +55,23 @@ synopsis = "this backend forwards log items to a trace acceptor"; description = ""; buildType = "Simple"; + isLocal = true; }; components = { "library" = { depends = [ - (hsPkgs.base) - (hsPkgs.iohk-monitoring) - (hsPkgs.aeson) - (hsPkgs.async) - (hsPkgs.bytestring) - (hsPkgs.network) - (hsPkgs.safe-exceptions) - (hsPkgs.stm) - (hsPkgs.text) - (hsPkgs.time) + (hsPkgs."base" or (buildDepError "base")) + (hsPkgs."iohk-monitoring" or (buildDepError "iohk-monitoring")) + (hsPkgs."aeson" or (buildDepError "aeson")) + (hsPkgs."async" or (buildDepError "async")) + (hsPkgs."bytestring" or (buildDepError "bytestring")) + (hsPkgs."network" or (buildDepError "network")) + (hsPkgs."safe-exceptions" or (buildDepError "safe-exceptions")) + (hsPkgs."stm" or (buildDepError "stm")) + (hsPkgs."text" or (buildDepError "text")) + (hsPkgs."time" or (buildDepError "time")) ]; + buildable = true; }; }; } // rec { diff --git a/nix/.stack.nix/lobemo-examples.nix b/nix/.stack.nix/lobemo-examples.nix index fdd1372d..e8b77b88 100644 --- a/nix/.stack.nix/lobemo-examples.nix +++ b/nix/.stack.nix/lobemo-examples.nix @@ -1,4 +1,43 @@ -{ system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }: +let + buildDepError = pkg: + builtins.throw '' + The Haskell package set does not contain the package: ${pkg} (build dependency). + + If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix. + ''; + sysDepError = pkg: + builtins.throw '' + The Nixpkgs package set does not contain the package: ${pkg} (system dependency). + + You may need to augment the system package mapping in haskell.nix so that it can be found. + ''; + pkgConfDepError = pkg: + builtins.throw '' + The pkg-conf packages does not contain the package: ${pkg} (pkg-conf dependency). + + You may need to augment the pkg-conf package mapping in haskell.nix so that it can be found. + ''; + exeDepError = pkg: + builtins.throw '' + The local executable components do not include the component: ${pkg} (executable dependency). + ''; + legacyExeDepError = pkg: + builtins.throw '' + The Haskell package set does not contain the package: ${pkg} (executable dependency). + + If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix. + ''; + buildToolDepError = pkg: + builtins.throw '' + Neither the Haskell package set or the Nixpkgs package set contain the package: ${pkg} (build tool dependency). + + If this is a system dependency: + You may need to augment the system package mapping in haskell.nix so that it can be found. + + If this is a Haskell dependency: + If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix. + ''; +in { system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }: { flags = {}; package = { @@ -13,54 +52,58 @@ synopsis = "examples of logging, benchmarking, and monitoring"; description = ""; buildType = "Simple"; + isLocal = true; }; components = { exes = { "example-simple" = { depends = [ - (hsPkgs.base) - (hsPkgs.base) - (hsPkgs.aeson) - (hsPkgs.iohk-monitoring) - (hsPkgs.lobemo-backend-editor) - (hsPkgs.lobemo-scribe-systemd) - (hsPkgs.async) - (hsPkgs.bytestring) - (hsPkgs.mtl) + (hsPkgs."base" or (buildDepError "base")) + (hsPkgs."base" or (buildDepError "base")) + (hsPkgs."aeson" or (buildDepError "aeson")) + (hsPkgs."iohk-monitoring" or (buildDepError "iohk-monitoring")) + (hsPkgs."lobemo-backend-editor" or (buildDepError "lobemo-backend-editor")) + (hsPkgs."lobemo-scribe-systemd" or (buildDepError "lobemo-scribe-systemd")) + (hsPkgs."async" or (buildDepError "async")) + (hsPkgs."bytestring" or (buildDepError "bytestring")) + (hsPkgs."mtl" or (buildDepError "mtl")) ] ++ (if system.isWindows - then [ (hsPkgs.Win32) ] - else [ (hsPkgs.unix) ]); + then [ (hsPkgs."Win32" or (buildDepError "Win32")) ] + else [ (hsPkgs."unix" or (buildDepError "unix")) ]); + buildable = true; }; "example-complex" = { depends = ([ - (hsPkgs.base) - (hsPkgs.iohk-monitoring) - (hsPkgs.lobemo-backend-aggregation) - (hsPkgs.lobemo-backend-editor) - (hsPkgs.lobemo-backend-ekg) - (hsPkgs.lobemo-backend-monitoring) - (hsPkgs.async) - (hsPkgs.bytestring) - (hsPkgs.mtl) - (hsPkgs.random) - (hsPkgs.text) - (hsPkgs.tracer-transformers) - (hsPkgs.unordered-containers) + (hsPkgs."base" or (buildDepError "base")) + (hsPkgs."iohk-monitoring" or (buildDepError "iohk-monitoring")) + (hsPkgs."lobemo-backend-aggregation" or (buildDepError "lobemo-backend-aggregation")) + (hsPkgs."lobemo-backend-editor" or (buildDepError "lobemo-backend-editor")) + (hsPkgs."lobemo-backend-ekg" or (buildDepError "lobemo-backend-ekg")) + (hsPkgs."lobemo-backend-monitoring" or (buildDepError "lobemo-backend-monitoring")) + (hsPkgs."async" or (buildDepError "async")) + (hsPkgs."bytestring" or (buildDepError "bytestring")) + (hsPkgs."mtl" or (buildDepError "mtl")) + (hsPkgs."random" or (buildDepError "random")) + (hsPkgs."text" or (buildDepError "text")) + (hsPkgs."tracer-transformers" or (buildDepError "tracer-transformers")) + (hsPkgs."unordered-containers" or (buildDepError "unordered-containers")) ] ++ (if system.isWindows - then [ (hsPkgs.Win32) ] + then [ (hsPkgs."Win32" or (buildDepError "Win32")) ] else [ - (hsPkgs.unix) - ])) ++ (pkgs.lib).optional (system.isLinux) (hsPkgs.download); + (hsPkgs."unix" or (buildDepError "unix")) + ])) ++ (pkgs.lib).optional (system.isLinux) (hsPkgs."download" or (buildDepError "download")); + buildable = true; }; "example-performance" = { depends = [ - (hsPkgs.base) - (hsPkgs.iohk-monitoring) - (hsPkgs.async) - (hsPkgs.criterion) - (hsPkgs.text) - (hsPkgs.unordered-containers) + (hsPkgs."base" or (buildDepError "base")) + (hsPkgs."iohk-monitoring" or (buildDepError "iohk-monitoring")) + (hsPkgs."async" or (buildDepError "async")) + (hsPkgs."criterion" or (buildDepError "criterion")) + (hsPkgs."text" or (buildDepError "text")) + (hsPkgs."unordered-containers" or (buildDepError "unordered-containers")) ]; + buildable = true; }; }; }; diff --git a/nix/.stack.nix/lobemo-scribe-systemd.nix b/nix/.stack.nix/lobemo-scribe-systemd.nix index b3a7112d..7163dc09 100644 --- a/nix/.stack.nix/lobemo-scribe-systemd.nix +++ b/nix/.stack.nix/lobemo-scribe-systemd.nix @@ -1,4 +1,43 @@ -{ system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }: +let + buildDepError = pkg: + builtins.throw '' + The Haskell package set does not contain the package: ${pkg} (build dependency). + + If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix. + ''; + sysDepError = pkg: + builtins.throw '' + The Nixpkgs package set does not contain the package: ${pkg} (system dependency). + + You may need to augment the system package mapping in haskell.nix so that it can be found. + ''; + pkgConfDepError = pkg: + builtins.throw '' + The pkg-conf packages does not contain the package: ${pkg} (pkg-conf dependency). + + You may need to augment the pkg-conf package mapping in haskell.nix so that it can be found. + ''; + exeDepError = pkg: + builtins.throw '' + The local executable components do not include the component: ${pkg} (executable dependency). + ''; + legacyExeDepError = pkg: + builtins.throw '' + The Haskell package set does not contain the package: ${pkg} (executable dependency). + + If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix. + ''; + buildToolDepError = pkg: + builtins.throw '' + Neither the Haskell package set or the Nixpkgs package set contain the package: ${pkg} (build tool dependency). + + If this is a system dependency: + You may need to augment the system package mapping in haskell.nix so that it can be found. + + If this is a Haskell dependency: + If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix. + ''; +in { system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }: { flags = {}; package = { @@ -13,24 +52,28 @@ synopsis = "provides a backend for logging to systemd/journal"; description = ""; buildType = "Simple"; + isLocal = true; }; components = { "library" = { depends = ([ - (hsPkgs.base) - (hsPkgs.iohk-monitoring) - (hsPkgs.aeson) - (hsPkgs.bytestring) - (hsPkgs.katip) - (hsPkgs.text) - (hsPkgs.template-haskell) - (hsPkgs.unordered-containers) + (hsPkgs."base" or (buildDepError "base")) + (hsPkgs."iohk-monitoring" or (buildDepError "iohk-monitoring")) + (hsPkgs."aeson" or (buildDepError "aeson")) + (hsPkgs."bytestring" or (buildDepError "bytestring")) + (hsPkgs."katip" or (buildDepError "katip")) + (hsPkgs."text" or (buildDepError "text")) + (hsPkgs."template-haskell" or (buildDepError "template-haskell")) + (hsPkgs."unordered-containers" or (buildDepError "unordered-containers")) ] ++ (if system.isWindows - then [ (hsPkgs.Win32) ] - else [ (hsPkgs.unix) ])) ++ (pkgs.lib).optionals (system.isLinux) [ - (hsPkgs.hsyslog) - (hsPkgs.libsystemd-journal) + then [ (hsPkgs."Win32" or (buildDepError "Win32")) ] + else [ + (hsPkgs."unix" or (buildDepError "unix")) + ])) ++ (pkgs.lib).optionals (system.isLinux) [ + (hsPkgs."hsyslog" or (buildDepError "hsyslog")) + (hsPkgs."libsystemd-journal" or (buildDepError "libsystemd-journal")) ]; + buildable = true; }; }; } // rec { src = (pkgs.lib).mkDefault ../.././plugins/scribe-systemd; } \ No newline at end of file diff --git a/nix/.stack.nix/tracer-transformers.nix b/nix/.stack.nix/tracer-transformers.nix index 0f0f38b4..7bf22fcc 100644 --- a/nix/.stack.nix/tracer-transformers.nix +++ b/nix/.stack.nix/tracer-transformers.nix @@ -1,4 +1,43 @@ -{ system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }: +let + buildDepError = pkg: + builtins.throw '' + The Haskell package set does not contain the package: ${pkg} (build dependency). + + If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix. + ''; + sysDepError = pkg: + builtins.throw '' + The Nixpkgs package set does not contain the package: ${pkg} (system dependency). + + You may need to augment the system package mapping in haskell.nix so that it can be found. + ''; + pkgConfDepError = pkg: + builtins.throw '' + The pkg-conf packages does not contain the package: ${pkg} (pkg-conf dependency). + + You may need to augment the pkg-conf package mapping in haskell.nix so that it can be found. + ''; + exeDepError = pkg: + builtins.throw '' + The local executable components do not include the component: ${pkg} (executable dependency). + ''; + legacyExeDepError = pkg: + builtins.throw '' + The Haskell package set does not contain the package: ${pkg} (executable dependency). + + If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix. + ''; + buildToolDepError = pkg: + builtins.throw '' + Neither the Haskell package set or the Nixpkgs package set contain the package: ${pkg} (build tool dependency). + + If this is a system dependency: + You may need to augment the system package mapping in haskell.nix so that it can be found. + + If this is a Haskell dependency: + If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix. + ''; +in { system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }: { flags = {}; package = { @@ -13,32 +52,36 @@ synopsis = "tracer transformers and examples showing their use"; description = ""; buildType = "Simple"; + isLocal = true; }; components = { "library" = { depends = [ - (hsPkgs.base) - (hsPkgs.contra-tracer) - (hsPkgs.time) - (hsPkgs.safe-exceptions) - ] ++ (pkgs.lib).optional (compiler.isGhc && (compiler.version).lt "8.5") (hsPkgs.contravariant); + (hsPkgs."base" or (buildDepError "base")) + (hsPkgs."contra-tracer" or (buildDepError "contra-tracer")) + (hsPkgs."time" or (buildDepError "time")) + (hsPkgs."safe-exceptions" or (buildDepError "safe-exceptions")) + ] ++ (pkgs.lib).optional (compiler.isGhc && (compiler.version).lt "8.5") (hsPkgs."contravariant" or (buildDepError "contravariant")); + buildable = true; }; exes = { "tracer-transfomers-example1" = { depends = [ - (hsPkgs.base) - (hsPkgs.contra-tracer) - (hsPkgs.time) - (hsPkgs.tracer-transformers) + (hsPkgs."base" or (buildDepError "base")) + (hsPkgs."contra-tracer" or (buildDepError "contra-tracer")) + (hsPkgs."time" or (buildDepError "time")) + (hsPkgs."tracer-transformers" or (buildDepError "tracer-transformers")) ]; + buildable = true; }; "tracer-transfomers-example2" = { depends = [ - (hsPkgs.base) - (hsPkgs.contra-tracer) - (hsPkgs.text) - (hsPkgs.tracer-transformers) + (hsPkgs."base" or (buildDepError "base")) + (hsPkgs."contra-tracer" or (buildDepError "contra-tracer")) + (hsPkgs."text" or (buildDepError "text")) + (hsPkgs."tracer-transformers" or (buildDepError "tracer-transformers")) ]; + buildable = true; }; }; }; diff --git a/nix/iohk-nix-src.json b/nix/iohk-nix-src.json index 2f1f7d72..3fefce8f 100644 --- a/nix/iohk-nix-src.json +++ b/nix/iohk-nix-src.json @@ -1,7 +1,7 @@ { "url": "https://github.com/input-output-hk/iohk-nix", - "rev": "8c91eb3e1593202b92ded827d88ef2e4768a2dc5", - "date": "2019-09-09T08:23:48+00:00", - "sha256": "1lw8g1h5ip6xajrsakxllnlk4ic7p9yn1zsgn341sbqhfy5yk7vv", + "rev": "4c7d599978c482b546677ec376b389e47c86a966", + "date": "2020-01-17T15:27:19+00:00", + "sha256": "1rmy0gcv950phhz985lb0h4g759bxh2fdvcgb6aka71i6mf8qakk", "fetchSubmodules": false } diff --git a/plugins/backend-ekg/lobemo-backend-ekg.cabal b/plugins/backend-ekg/lobemo-backend-ekg.cabal index 5fdbcada..8fd276da 100644 --- a/plugins/backend-ekg/lobemo-backend-ekg.cabal +++ b/plugins/backend-ekg/lobemo-backend-ekg.cabal @@ -26,7 +26,7 @@ library ekg, ekg-core, ekg-prometheus-adapter, - prometheus == 2.1.2, + prometheus == 2.1.3, safe-exceptions, stm, text, diff --git a/stack.yaml b/stack.yaml index 2d0856a6..fc4bc238 100644 --- a/stack.yaml +++ b/stack.yaml @@ -16,11 +16,17 @@ packages: extra-deps: - time-units-1.0.0 - - prometheus-2.1.2 + - prometheus-2.1.3 - libsystemd-journal-1.4.4 - katip-0.8.3.0 - git: https://github.com/CodiePP/ekg-prometheus-adapter - commit: 1a258b6df7d9807d4c4ff3e99722223d31a2c320 + commit: 1e43f9feca182cb073d92e76ce2808cc8977519a nix: - shell-file: scripts/nix/stack-shell.nix + pure: true + packages: [ zlib.dev, zlib.out + , haskell.compiler.ghc865 + , pkg-config + , systemd.dev + ] +