aboutsummaryrefslogtreecommitdiff
path: root/nix
diff options
context:
space:
mode:
Diffstat (limited to 'nix')
-rw-r--r--nix/common.nix1
-rw-r--r--nix/kaniko.nix24
-rw-r--r--nix/manifest-tool.nix24
-rw-r--r--nix/toolchain.nix11
4 files changed, 1 insertions, 59 deletions
diff --git a/nix/common.nix b/nix/common.nix
index 323c3882..1ad809bb 100644
--- a/nix/common.nix
+++ b/nix/common.nix
@@ -14,4 +14,5 @@ rec {
pkgsSrc = flake.defaultNix.inputs.nixpkgs;
cargo2nix = flake.defaultNix.inputs.cargo2nix;
cargo2nixOverlay = cargo2nix.overlays.default;
+ devShells = builtins.getAttr builtins.currentSystem flake.defaultNix.devShells;
}
diff --git a/nix/kaniko.nix b/nix/kaniko.nix
deleted file mode 100644
index 8380fa2f..00000000
--- a/nix/kaniko.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgs:
-pkgs.buildGoModule rec {
- pname = "kaniko";
- version = "1.9.2";
-
- src = pkgs.fetchFromGitHub {
- owner = "GoogleContainerTools";
- repo = "kaniko";
- rev = "v${version}";
- sha256 = "dXQ0/o1qISv+sjNVIpfF85bkbM9sGOGwqVbWZpMWfMY=";
- };
-
- vendorSha256 = null;
-
- checkPhase = "true";
-
- meta = with pkgs.lib; {
- description =
- "kaniko is a tool to build container images from a Dockerfile, inside a container or Kubernetes cluster.";
- homepage = "https://github.com/GoogleContainerTools/kaniko";
- license = licenses.asl20;
- platforms = platforms.linux;
- };
-}
diff --git a/nix/manifest-tool.nix b/nix/manifest-tool.nix
deleted file mode 100644
index 1090a6ef..00000000
--- a/nix/manifest-tool.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgs:
-pkgs.buildGoModule rec {
- pname = "manifest-tool";
- version = "2.0.5";
-
- src = pkgs.fetchFromGitHub {
- owner = "estesp";
- repo = "manifest-tool";
- rev = "v${version}";
- sha256 = "hjCGKnE0yrlnF/VIzOwcDzmQX3Wft+21KCny/opqdLg=";
- } + "/v2";
-
- vendorSha256 = null;
-
- checkPhase = "true";
-
- meta = with pkgs.lib; {
- description =
- "Command line tool to create and query container image manifest list/indexes";
- homepage = "https://github.com/estesp/manifest-tool";
- license = licenses.asl20;
- platforms = platforms.linux;
- };
-}
diff --git a/nix/toolchain.nix b/nix/toolchain.nix
deleted file mode 100644
index c4fef9ab..00000000
--- a/nix/toolchain.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ system ? builtins.currentSystem, }:
-
-with import ./common.nix;
-
-let
- pkgsHost = import pkgsSrc { };
- kaniko = (import ./kaniko.nix) pkgsHost;
- winscp = (import ./winscp.nix) pkgsHost;
- manifestTool = (import ./manifest-tool.nix) pkgsHost;
-in [ kaniko winscp manifestTool ]
-