From 6f6187c61c1483a31685f76e87a5bcad52a2684e Mon Sep 17 00:00:00 2001 From: Piotr Dobrowolski Date: Sat, 16 Oct 2021 23:22:22 +0200 Subject: [PATCH] hswaw/machines/customs: unpin hscloud/nixpkgs in certain modules Change-Id: I1c02a485b76955e3de3859fca4d6c7e8e69ef09b Reviewed-on: https://gerrit.hackerspace.pl/c/hscloud/+/1170 Reviewed-by: informatic --- hswaw/machines/customs.hackerspace.pl/configuration.nix | 9 +-------- .../customs.hackerspace.pl/mikrotik-exporter.nix | 7 +------ 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/hswaw/machines/customs.hackerspace.pl/configuration.nix b/hswaw/machines/customs.hackerspace.pl/configuration.nix index f7441547..ff8ea002 100644 --- a/hswaw/machines/customs.hackerspace.pl/configuration.nix +++ b/hswaw/machines/customs.hackerspace.pl/configuration.nix @@ -1,13 +1,6 @@ { config, pkgs, ... }: let - # hscloud checkout, hscloud.routing used to set up dynamic routing (OSPFv6 via bird) - hscloud = fetchGit { - url = "https://gerrit.hackerspace.pl/hscloud.git"; - name = "hscloud"; - rev = "e401735fdd241b25dac4cb82d828dcfa6f84b198"; - }; - hw = builtins.fromJSON (builtins.readFile ./hw.json); fw = import ./fw-7535.nix; vuko-pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFhaCaC/CVYv6hphqmEdKaPrIn+Q946+myvL9SSnzFZk vuko@eagle"; @@ -52,7 +45,7 @@ in { #./hardware-configuration.nix - "${hscloud}/bgpwtf/machines/modules/routing.nix" + ../../../bgpwtf/machines/modules/routing.nix ./checkinator-tracker.nix ./checkinator-web.nix ./mikrotik-exporter.nix diff --git a/hswaw/machines/customs.hackerspace.pl/mikrotik-exporter.nix b/hswaw/machines/customs.hackerspace.pl/mikrotik-exporter.nix index 8ea056e9..ad182008 100644 --- a/hswaw/machines/customs.hackerspace.pl/mikrotik-exporter.nix +++ b/hswaw/machines/customs.hackerspace.pl/mikrotik-exporter.nix @@ -1,11 +1,6 @@ { pkgs, ... }: let - unstable = import (fetchTarball { - sha256 = "0ww70kl08rpcsxb9xdx8m48vz41dpss4hh3vvsmswll35l158x0v"; - url = "https://api.github.com/repos/NixOS/nixpkgs-channels/tarball/84d74ae9c9cbed73274b8e4e00be14688ffc93fe"; - }) {config = pkgs.config; }; - name = "mikrotik-exporter"; user = name; group = name; @@ -28,6 +23,6 @@ in { wantedBy = [ "multi-user.target" ]; serviceConfig.Type = "simple"; serviceConfig.ExecStartPre = [ "!${prepare-secrets}" ]; - serviceConfig.ExecStart = "${unstable.prometheus-mikrotik-exporter}/bin/mikrotik-exporter -config-file /mnt/secrets/${name}/ap.yml -port 127.0.0.1:9436"; + serviceConfig.ExecStart = "${pkgs.prometheus-mikrotik-exporter}/bin/mikrotik-exporter -config-file /mnt/secrets/${name}/ap.yml -port 127.0.0.1:9436"; }; }