From 09e268920b43cd49cc0bdcfdc4805a4b87eab00d Mon Sep 17 00:00:00 2001 From: David Arnold Date: Fri, 28 May 2021 14:31:36 -0500 Subject: [PATCH] ref: move source code to ./src (clean top level) --- lib/compat.nix => compat.nix | 0 default.nix | 2 +- shell.nix | 2 +- {generators => src/generators}/istio/default.nix | 0 {generators => src/generators}/istio/istio-schema.json | 0 {generators => src/generators}/k8s/default.nix | 0 kubenix.nix => src/kubenix.nix | 0 {lib => src/lib}/default.nix | 0 {lib => src/lib}/docker/default.nix | 0 {lib => src/lib}/helm/chart2json.nix | 0 {lib => src/lib}/helm/default.nix | 0 {lib => src/lib}/helm/fetchhelm.nix | 0 {lib => src/lib}/helm/test.nix | 0 {lib => src/lib}/k8s/default.nix | 0 {lib => src/lib}/upstreamables.nix | 0 {modules => src/modules}/base.nix | 0 {modules => src/modules}/default.nix | 0 {modules => src/modules}/docker.nix | 0 {modules => src/modules}/generated/v1.19.nix | 0 {modules => src/modules}/generated/v1.20.nix | 0 {modules => src/modules}/generated/v1.21.nix | 0 {modules => src/modules}/helm.nix | 0 {modules => src/modules}/istio-overrides.nix | 0 {modules => src/modules}/istio.nix | 0 {modules => src/modules}/k8s.nix | 0 {modules => src/modules}/submodule.nix | 0 {modules => src/modules}/submodules.nix | 0 {modules => src/modules}/testing/default.nix | 0 {modules => src/modules}/testing/docker.nix | 0 {modules => src/modules}/testing/driver/kubetest.nix | 0 {modules => src/modules}/testing/driver/kubetestdrv.nix | 0 {modules => src/modules}/testing/evalTest.nix | 0 {modules => src/modules}/testing/runtime/local.nix | 0 {modules => src/modules}/testing/runtime/nixos-k8s.nix | 0 {modules => src/modules}/testing/test-options.nix | 0 35 files changed, 2 insertions(+), 2 deletions(-) rename lib/compat.nix => compat.nix (100%) rename {generators => src/generators}/istio/default.nix (100%) rename {generators => src/generators}/istio/istio-schema.json (100%) rename {generators => src/generators}/k8s/default.nix (100%) rename kubenix.nix => src/kubenix.nix (100%) rename {lib => src/lib}/default.nix (100%) rename {lib => src/lib}/docker/default.nix (100%) rename {lib => src/lib}/helm/chart2json.nix (100%) rename {lib => src/lib}/helm/default.nix (100%) rename {lib => src/lib}/helm/fetchhelm.nix (100%) rename {lib => src/lib}/helm/test.nix (100%) rename {lib => src/lib}/k8s/default.nix (100%) rename {lib => src/lib}/upstreamables.nix (100%) rename {modules => src/modules}/base.nix (100%) rename {modules => src/modules}/default.nix (100%) rename {modules => src/modules}/docker.nix (100%) rename {modules => src/modules}/generated/v1.19.nix (100%) rename {modules => src/modules}/generated/v1.20.nix (100%) rename {modules => src/modules}/generated/v1.21.nix (100%) rename {modules => src/modules}/helm.nix (100%) rename {modules => src/modules}/istio-overrides.nix (100%) rename {modules => src/modules}/istio.nix (100%) rename {modules => src/modules}/k8s.nix (100%) rename {modules => src/modules}/submodule.nix (100%) rename {modules => src/modules}/submodules.nix (100%) rename {modules => src/modules}/testing/default.nix (100%) rename {modules => src/modules}/testing/docker.nix (100%) rename {modules => src/modules}/testing/driver/kubetest.nix (100%) rename {modules => src/modules}/testing/driver/kubetestdrv.nix (100%) rename {modules => src/modules}/testing/evalTest.nix (100%) rename {modules => src/modules}/testing/runtime/local.nix (100%) rename {modules => src/modules}/testing/runtime/nixos-k8s.nix (100%) rename {modules => src/modules}/testing/test-options.nix (100%) diff --git a/lib/compat.nix b/compat.nix similarity index 100% rename from lib/compat.nix rename to compat.nix diff --git a/default.nix b/default.nix index 4ac6bdb..ec9884d 100644 --- a/default.nix +++ b/default.nix @@ -1,7 +1,7 @@ { system ? builtins.currentSystem }: let in ( - (import ./lib/compat.nix).flake-compat { + (import ./compat.nix).flake-compat { src = ./.; inherit system; } diff --git a/shell.nix b/shell.nix index fe9feb6..5d9a2d3 100644 --- a/shell.nix +++ b/shell.nix @@ -1,7 +1,7 @@ { system ? builtins.currentSystem }: let in ( - (import ./lib/compat.nix).flake-compat { + (import ./compat.nix).flake-compat { src = ./.; inherit system; } diff --git a/generators/istio/default.nix b/src/generators/istio/default.nix similarity index 100% rename from generators/istio/default.nix rename to src/generators/istio/default.nix diff --git a/generators/istio/istio-schema.json b/src/generators/istio/istio-schema.json similarity index 100% rename from generators/istio/istio-schema.json rename to src/generators/istio/istio-schema.json diff --git a/generators/k8s/default.nix b/src/generators/k8s/default.nix similarity index 100% rename from generators/k8s/default.nix rename to src/generators/k8s/default.nix diff --git a/kubenix.nix b/src/kubenix.nix similarity index 100% rename from kubenix.nix rename to src/kubenix.nix diff --git a/lib/default.nix b/src/lib/default.nix similarity index 100% rename from lib/default.nix rename to src/lib/default.nix diff --git a/lib/docker/default.nix b/src/lib/docker/default.nix similarity index 100% rename from lib/docker/default.nix rename to src/lib/docker/default.nix diff --git a/lib/helm/chart2json.nix b/src/lib/helm/chart2json.nix similarity index 100% rename from lib/helm/chart2json.nix rename to src/lib/helm/chart2json.nix diff --git a/lib/helm/default.nix b/src/lib/helm/default.nix similarity index 100% rename from lib/helm/default.nix rename to src/lib/helm/default.nix diff --git a/lib/helm/fetchhelm.nix b/src/lib/helm/fetchhelm.nix similarity index 100% rename from lib/helm/fetchhelm.nix rename to src/lib/helm/fetchhelm.nix diff --git a/lib/helm/test.nix b/src/lib/helm/test.nix similarity index 100% rename from lib/helm/test.nix rename to src/lib/helm/test.nix diff --git a/lib/k8s/default.nix b/src/lib/k8s/default.nix similarity index 100% rename from lib/k8s/default.nix rename to src/lib/k8s/default.nix diff --git a/lib/upstreamables.nix b/src/lib/upstreamables.nix similarity index 100% rename from lib/upstreamables.nix rename to src/lib/upstreamables.nix diff --git a/modules/base.nix b/src/modules/base.nix similarity index 100% rename from modules/base.nix rename to src/modules/base.nix diff --git a/modules/default.nix b/src/modules/default.nix similarity index 100% rename from modules/default.nix rename to src/modules/default.nix diff --git a/modules/docker.nix b/src/modules/docker.nix similarity index 100% rename from modules/docker.nix rename to src/modules/docker.nix diff --git a/modules/generated/v1.19.nix b/src/modules/generated/v1.19.nix similarity index 100% rename from modules/generated/v1.19.nix rename to src/modules/generated/v1.19.nix diff --git a/modules/generated/v1.20.nix b/src/modules/generated/v1.20.nix similarity index 100% rename from modules/generated/v1.20.nix rename to src/modules/generated/v1.20.nix diff --git a/modules/generated/v1.21.nix b/src/modules/generated/v1.21.nix similarity index 100% rename from modules/generated/v1.21.nix rename to src/modules/generated/v1.21.nix diff --git a/modules/helm.nix b/src/modules/helm.nix similarity index 100% rename from modules/helm.nix rename to src/modules/helm.nix diff --git a/modules/istio-overrides.nix b/src/modules/istio-overrides.nix similarity index 100% rename from modules/istio-overrides.nix rename to src/modules/istio-overrides.nix diff --git a/modules/istio.nix b/src/modules/istio.nix similarity index 100% rename from modules/istio.nix rename to src/modules/istio.nix diff --git a/modules/k8s.nix b/src/modules/k8s.nix similarity index 100% rename from modules/k8s.nix rename to src/modules/k8s.nix diff --git a/modules/submodule.nix b/src/modules/submodule.nix similarity index 100% rename from modules/submodule.nix rename to src/modules/submodule.nix diff --git a/modules/submodules.nix b/src/modules/submodules.nix similarity index 100% rename from modules/submodules.nix rename to src/modules/submodules.nix diff --git a/modules/testing/default.nix b/src/modules/testing/default.nix similarity index 100% rename from modules/testing/default.nix rename to src/modules/testing/default.nix diff --git a/modules/testing/docker.nix b/src/modules/testing/docker.nix similarity index 100% rename from modules/testing/docker.nix rename to src/modules/testing/docker.nix diff --git a/modules/testing/driver/kubetest.nix b/src/modules/testing/driver/kubetest.nix similarity index 100% rename from modules/testing/driver/kubetest.nix rename to src/modules/testing/driver/kubetest.nix diff --git a/modules/testing/driver/kubetestdrv.nix b/src/modules/testing/driver/kubetestdrv.nix similarity index 100% rename from modules/testing/driver/kubetestdrv.nix rename to src/modules/testing/driver/kubetestdrv.nix diff --git a/modules/testing/evalTest.nix b/src/modules/testing/evalTest.nix similarity index 100% rename from modules/testing/evalTest.nix rename to src/modules/testing/evalTest.nix diff --git a/modules/testing/runtime/local.nix b/src/modules/testing/runtime/local.nix similarity index 100% rename from modules/testing/runtime/local.nix rename to src/modules/testing/runtime/local.nix diff --git a/modules/testing/runtime/nixos-k8s.nix b/src/modules/testing/runtime/nixos-k8s.nix similarity index 100% rename from modules/testing/runtime/nixos-k8s.nix rename to src/modules/testing/runtime/nixos-k8s.nix diff --git a/modules/testing/test-options.nix b/src/modules/testing/test-options.nix similarity index 100% rename from modules/testing/test-options.nix rename to src/modules/testing/test-options.nix