From 7351e143c5212c1d83ad674e5a730dde7927ab15 Mon Sep 17 00:00:00 2001
From: Daniel Barlow <dan@telent.net>
Date: Wed, 28 Aug 2024 21:28:27 +0100
Subject: [PATCH] remove redundant sourcing of ${serviceFns}

this is done by the oneshot and longrun functions
---
 examples/arhcive.nix         | 2 --
 examples/demo.nix            | 1 -
 examples/recovery.nix        | 2 --
 modules/dnsmasq/service.nix  | 1 -
 modules/network/address.nix  | 1 -
 modules/profiles/gateway.nix | 1 -
 modules/profiles/wap.nix     | 1 -
 modules/secrets/outboard.nix | 1 -
 8 files changed, 10 deletions(-)

diff --git a/examples/arhcive.nix b/examples/arhcive.nix
index d678ac9..3674e3a 100644
--- a/examples/arhcive.nix
+++ b/examples/arhcive.nix
@@ -52,7 +52,6 @@ in rec {
     dependencies = [ services.dhcpc ];
     name = "resolvconf";
     up = ''
-      . ${serviceFns}
       ( in_outputs ${name}
       for i in $(output ${services.dhcpc} dns); do
         echo "nameserver $i" > resolv.conf
@@ -93,7 +92,6 @@ in rec {
       secrets_file = oneshot rec {
         name = "rsync-secrets";
         up = ''
-          . ${serviceFns}
           (in_outputs ${name}
            echo  "backup:${secrets.rsync_secret}" > secrets)
         '';
diff --git a/examples/demo.nix b/examples/demo.nix
index 5bf2cf4..721c9ec 100644
--- a/examples/demo.nix
+++ b/examples/demo.nix
@@ -137,7 +137,6 @@ in rec {
     dependencies = [ services.wan ];
     name = "resolvconf";
     up = ''
-      . ${serviceFns}
       ( in_outputs ${name}
        echo "nameserver $(output ${services.wan} ns1)" > resolv.conf
        echo "nameserver $(output ${services.wan} ns2)" >> resolv.conf
diff --git a/examples/recovery.nix b/examples/recovery.nix
index a2243b1..9b0320e 100644
--- a/examples/recovery.nix
+++ b/examples/recovery.nix
@@ -60,7 +60,6 @@ in rec {
     dependencies = [ services.dhcpc ];
     name = "resolvconf";
     up = ''
-      . ${serviceFns}
       ( in_outputs ${name}
       for i in $(output ${services.dhcpc} dns); do
         echo "nameserver $i" > resolv.conf
@@ -72,7 +71,6 @@ in rec {
   services.growfs = let name = "growfs"; in oneshot {
     inherit name;
     up = ''
-      . ${serviceFns}
       device=$(grep /persist /proc/1/mountinfo | cut -f9 -d' ')
       ${pkgs.e2fsprogs}/bin/resize2fs $device
     '';
diff --git a/modules/dnsmasq/service.nix b/modules/dnsmasq/service.nix
index 3c50596..bc05b40 100644
--- a/modules/dnsmasq/service.nix
+++ b/modules/dnsmasq/service.nix
@@ -26,7 +26,6 @@ longrun {
   inherit name;
   dependencies = [ interface ];
   run = ''
-    . ${serviceFns}
     ${dnsmasq}/bin/dnsmasq \
     --user=${user} \
     --domain=${domain} \
diff --git a/modules/network/address.nix b/modules/network/address.nix
index ce939f4..15fa81e 100644
--- a/modules/network/address.nix
+++ b/modules/network/address.nix
@@ -11,7 +11,6 @@ let
   # prefixes, or the same but different protocols
   name = "${interface.name}.a.${address}";
   up = ''
-    . ${serviceFns}
     dev=$(output ${interface} ifname)
     ip address add ${address}/${toString prefixLength} dev $dev
     (in_outputs ${name}
diff --git a/modules/profiles/gateway.nix b/modules/profiles/gateway.nix
index 3938bb2..ef6eca6 100644
--- a/modules/profiles/gateway.nix
+++ b/modules/profiles/gateway.nix
@@ -149,7 +149,6 @@ in {
       dependencies = [ config.services.wan ];
       name = "resolvconf";
       up = ''
-        . ${serviceFns}
         ( in_outputs ${name}
          echo "nameserver $(output ${config.services.wan} ns1)" > resolv.conf
          echo "nameserver $(output ${config.services.wan} ns2)" >> resolv.conf
diff --git a/modules/profiles/wap.nix b/modules/profiles/wap.nix
index ccd73bb..815d974 100644
--- a/modules/profiles/wap.nix
+++ b/modules/profiles/wap.nix
@@ -81,7 +81,6 @@ in {
       # 'A list of DNS server' but doesn't say what separates the
       # list members. Assuming it's a space or other IFS character
       up = ''
-        . ${serviceFns}
         ( in_outputs ${name}
         for i in $(output ${config.services.dhcpc} dns); do
           echo "nameserver $i" > resolv.conf
diff --git a/modules/secrets/outboard.nix b/modules/secrets/outboard.nix
index ac78ca0..c443843 100644
--- a/modules/secrets/outboard.nix
+++ b/modules/secrets/outboard.nix
@@ -9,7 +9,6 @@ in longrun {
   inherit name;
   buildInputs = [ json-to-fstree ];
   run = ''
-    . ${serviceFns}
     ${optionalString (username != null) ''
       export NETRC=$(mkstate ${name})/netrc
       (echo default ; echo login ${username} ; echo password ${password} ) > $NETRC