summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--krebs/5pkgs/lentil/default.nix2
-rw-r--r--shared/1systems/wolf.nix13
2 files changed, 13 insertions, 2 deletions
diff --git a/krebs/5pkgs/lentil/default.nix b/krebs/5pkgs/lentil/default.nix
index fc9b4fd31..8a57a77fe 100644
--- a/krebs/5pkgs/lentil/default.nix
+++ b/krebs/5pkgs/lentil/default.nix
@@ -1,6 +1,6 @@
{ pkgs, ... }:
-(pkgs.haskellngPackages.override {
+(pkgs.haskellPackages.override {
overrides = self: super: {
lentil = super.lentil.override {
mkDerivation = (attrs: self.mkDerivation (attrs // {
diff --git a/shared/1systems/wolf.nix b/shared/1systems/wolf.nix
index f05356f0f..8cf5be71c 100644
--- a/shared/1systems/wolf.nix
+++ b/shared/1systems/wolf.nix
@@ -12,10 +12,21 @@ in
../2configs/shack-nix-cacher.nix
../2configs/shack-drivedroid.nix
../2configs/buildbot-standalone.nix
- ../2configs/graphite.nix
+ # ../2configs/graphite.nix
];
# use your own binary cache, fallback use cache.nixos.org (which is used by
# apt-cacher-ng in first place)
+
+ services.grafana = {
+ enable = true;
+ addr = "0.0.0.0";
+ extraOptions = { "AUTH_ANONYMOUS_ENABLED" = "true"; };
+ users.allowSignUp = true;
+ users.allowOrgCreate = true;
+ users.autoAssignOrg = true;
+ security = import <secrets/grafana_security.nix>;
+ };
+
nix.binaryCaches = [ "http://localhost:3142/nixos" "https://cache.nixos.org" ];
networking = {