From 1c3fa3341e5aa54b4c983f66e914c326981da240 Mon Sep 17 00:00:00 2001
From: Brian Picciano <mediocregopher@gmail.com>
Date: Fri, 7 Oct 2022 15:25:47 +0200
Subject: [PATCH] Move each overlay into its own file

---
 nix/nebula.nix | 25 +++++++++++++++++++++++
 nix/pkgs.nix   | 55 +++-----------------------------------------------
 nix/rebase.nix | 18 +++++++++++++++++
 nix/yq-go.nix  | 19 +++++++++++++++++
 4 files changed, 65 insertions(+), 52 deletions(-)
 create mode 100644 nix/nebula.nix
 create mode 100644 nix/rebase.nix
 create mode 100644 nix/yq-go.nix

diff --git a/nix/nebula.nix b/nix/nebula.nix
new file mode 100644
index 0000000..d3f891a
--- /dev/null
+++ b/nix/nebula.nix
@@ -0,0 +1,25 @@
+{
+
+  buildGoModule,
+  fetchFromGitHub,
+
+}: buildGoModule rec {
+
+  pname = "nebula";
+
+  # If this changes, remember to change:
+  # - the AppDir/etc/daemon.yml vpn.firewall docs
+  # - the version imported in go-workspace
+  version = "1.4.0";
+
+  src = fetchFromGitHub {
+    owner = "slackhq";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "lu2/rSB9cFD7VUiK+niuqCX9CI2x+k4Pi+U5yksETSU=";
+  };
+
+  vendorSha256 = "p1inJ9+NAb2d81cn+y+ofhxFz9ObUiLgj+9cACa6Jqg=";
+
+  subPackages = [ "cmd/nebula" "cmd/nebula-cert" ];
+}
diff --git a/nix/pkgs.nix b/nix/pkgs.nix
index 699907c..d55d27c 100644
--- a/nix/pkgs.nix
+++ b/nix/pkgs.nix
@@ -4,19 +4,6 @@ rec {
 
     (final: prev: {
 
-      # rebase is a helper which takes all files/dirs under oldroot, and
-      # creates a new derivation with those files/dirs copied under newroot
-      # (where newroot is a relative path to the root of the derivation).
-      rebase = name: oldroot: newroot: prev.stdenv.mkDerivation {
-        name = name;
-        inherit oldroot newroot;
-        builder = builtins.toFile "builder.sh" ''
-          source $stdenv/setup
-          mkdir -p "$out"/"$newroot"
-          cp -rL "$oldroot"/* "$out"/"$newroot"
-        '';
-      };
-
       # make buildGoModule default to static compilation
       buildGoModule = args: prev.buildGoModule ({
         doCheck = false;
@@ -27,45 +14,9 @@ rec {
 
     })
 
-    (final: prev: {
-
-      yq-go = prev.buildGoModule rec {
-
-        pname = "yq-go";
-        version = "4.21.1";
-
-        src = prev.fetchFromGitHub {
-          owner = "mikefarah";
-          repo = "yq";
-          rev = "v${version}";
-          sha256 = "sha256-283xe7FVHYSsRl4cZD7WDzIW1gqNAFsNrWYJkthZheU=";
-        };
-
-        vendorSha256 = "sha256-F11FnDYJ59aKrdRXDPpKlhX52yQXdaN1sblSkVI2j9w=";
-      };
-
-      nebula = prev.buildGoModule rec {
-        pname = "nebula";
-
-        # If this changes, remember to change:
-        # - the AppDir/etc/daemon.yml vpn.firewall docs
-        # - the version imported in go-workspace
-        version = "1.4.0";
-
-        src = prev.fetchFromGitHub {
-          owner = "slackhq";
-          repo = pname;
-          rev = "v${version}";
-          sha256 = "lu2/rSB9cFD7VUiK+niuqCX9CI2x+k4Pi+U5yksETSU=";
-        };
-
-        vendorSha256 = "p1inJ9+NAb2d81cn+y+ofhxFz9ObUiLgj+9cACa6Jqg=";
-
-        subPackages = [ "cmd/nebula" "cmd/nebula-cert" ];
-      };
-
-    })
-
+    (final: prev: { rebase = prev.callPackage ./rebase.nix {}; })
+    (final: prev: { yq-go = prev.callPackage ./yq-go.nix {}; })
+    (final: prev: { nebula = prev.callPackage ./nebula.nix {}; })
   ];
 
   stableSrc = fetchTarball {
diff --git a/nix/rebase.nix b/nix/rebase.nix
new file mode 100644
index 0000000..1f557ce
--- /dev/null
+++ b/nix/rebase.nix
@@ -0,0 +1,18 @@
+# rebase is a helper which takes all files/dirs under oldroot, and
+# creates a new derivation with those files/dirs copied under newroot
+# (where newroot is a relative path to the root of the derivation).
+
+{
+
+  stdenv,
+
+}: name: oldroot: newroot: stdenv.mkDerivation {
+
+  inherit name oldroot newroot;
+
+  builder = builtins.toFile "builder.sh" ''
+    source $stdenv/setup
+    mkdir -p "$out"/"$newroot"
+    cp -rL "$oldroot"/* "$out"/"$newroot"
+  '';
+}
diff --git a/nix/yq-go.nix b/nix/yq-go.nix
new file mode 100644
index 0000000..8689bca
--- /dev/null
+++ b/nix/yq-go.nix
@@ -0,0 +1,19 @@
+{
+
+  buildGoModule,
+  fetchFromGitHub,
+
+}: buildGoModule rec {
+
+  pname = "yq-go";
+  version = "4.21.1";
+
+  src = fetchFromGitHub {
+    owner = "mikefarah";
+    repo = "yq";
+    rev = "v${version}";
+    sha256 = "sha256-283xe7FVHYSsRl4cZD7WDzIW1gqNAFsNrWYJkthZheU=";
+  };
+
+  vendorSha256 = "sha256-F11FnDYJ59aKrdRXDPpKlhX52yQXdaN1sblSkVI2j9w=";
+}