Move go code into 'go' tld, to make organization clearer

main
Brian Picciano 9 months ago
parent b5e8ad274e
commit 661e2b28cb
  1. 25
      default.nix
  2. 14
      entrypoint/default.nix
  3. 0
      go/admin/admin.go
  4. 0
      go/bootstrap/bootstrap.go
  5. 0
      go/bootstrap/garage.go
  6. 0
      go/bootstrap/garage_global_bucket.go
  7. 0
      go/bootstrap/hosts.go
  8. 0
      go/cmd/entrypoint/admin.go
  9. 0
      go/cmd/entrypoint/bootstrap_util.go
  10. 0
      go/cmd/entrypoint/daemon.go
  11. 0
      go/cmd/entrypoint/daemon_util.go
  12. 0
      go/cmd/entrypoint/dnsmasq_util.go
  13. 0
      go/cmd/entrypoint/garage.go
  14. 0
      go/cmd/entrypoint/garage_util.go
  15. 0
      go/cmd/entrypoint/hosts.go
  16. 0
      go/cmd/entrypoint/logger.go
  17. 0
      go/cmd/entrypoint/main.go
  18. 0
      go/cmd/entrypoint/nebula_util.go
  19. 0
      go/cmd/entrypoint/proc_lock.go
  20. 0
      go/cmd/entrypoint/sub_cmd.go
  21. 0
      go/cmd/entrypoint/version.go
  22. 0
      go/daemon/config.go
  23. 0
      go/daemon/daemon.go
  24. 0
      go/dnsmasq/dnsmasq.go
  25. 0
      go/dnsmasq/tpl.go
  26. 0
      go/garage/admin_client.go
  27. 0
      go/garage/client.go
  28. 0
      go/garage/garage.go
  29. 0
      go/garage/peer.go
  30. 0
      go/garage/tpl.go
  31. 0
      go/go.mod
  32. 0
      go/go.sum
  33. 0
      go/nebula/nebula.go
  34. 0
      go/nebula/nebula_test.go
  35. 0
      go/yamlutil/yamlutil.go

@ -59,7 +59,28 @@ in rec {
'';
};
entrypoint = pkgs.callPackage ./entrypoint {};
goBinaries = pkgs.buildGoModule {
pname = "isle-go-binaries";
version = "unstable";
# If this seems pointless, that's because it is! buildGoModule doesn't like
# it if the src derivation's name ends in "-go". So this mkDerivation here
# only serves to give buildGoModule a src derivation with a name it likes.
src = pkgs.stdenv.mkDerivation {
name = "isle-go-src";
src = ./go;
builder = builtins.toFile "builder.sh" ''
source $stdenv/setup
cp -r "$src" "$out"
'';
};
vendorSha256 = "sha256-P1TXG0fG8/6n37LmM5ApYctqoZzJFlvFAO2Zl85SVvk=";
subPackages = [
"./cmd/entrypoint"
];
};
dnsmasq = (pkgs.callPackage ./nix/dnsmasq.nix {
stdenv = pkgs.pkgsStatic.stdenv;
@ -104,7 +125,7 @@ in rec {
nebula
garage
pkgs.minio-client
entrypoint
goBinaries
] ++ (if bootstrap != null then [ rootedBootstrap ] else []);
};

@ -1,14 +0,0 @@
{
buildGoModule,
}: buildGoModule {
pname = "isle-entrypoint";
version = "unstable";
src = ./src;
vendorSha256 = "sha256-P1TXG0fG8/6n37LmM5ApYctqoZzJFlvFAO2Zl85SVvk=";
subPackages = [
"cmd/entrypoint"
];
}
Loading…
Cancel
Save