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

This commit is contained in:
Brian Picciano 2023-08-25 15:19:31 +02:00
parent b5e8ad274e
commit 661e2b28cb
35 changed files with 23 additions and 16 deletions

View File

@ -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 { dnsmasq = (pkgs.callPackage ./nix/dnsmasq.nix {
stdenv = pkgs.pkgsStatic.stdenv; stdenv = pkgs.pkgsStatic.stdenv;
@ -104,7 +125,7 @@ in rec {
nebula nebula
garage garage
pkgs.minio-client pkgs.minio-client
entrypoint goBinaries
] ++ (if bootstrap != null then [ rootedBootstrap ] else []); ] ++ (if bootstrap != null then [ rootedBootstrap ] else []);
}; };

View File

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