commit 45ab6d11c704244eddfaea8319c413874875a3cc
parent 2c24a012357955e4144647f470d1ed19ca978732
Author: Vincent Demeester <vincent@sbr.pm>
Date: Fri, 1 Dec 2023 16:45:33 +0100
Remove buildkit and buildx
Already present upstream. Use upstream as well.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Diffstat:
6 files changed, 3 insertions(+), 63 deletions(-)
diff --git a/nix/packages/buildkit/default.nix b/nix/packages/buildkit/default.nix
@@ -1,28 +0,0 @@
-{ stdenv, lib, fetchFromGitHub, buildGoModule }:
-
-buildGoModule rec {
- name = "buildkit-${version}";
- version = "0.9.3";
- rev = "v${version}";
-
- subPackages = [ "cmd/buildctl" "cmd/buildkitd" ];
-
- ldflags = [
- "-X github.com/moby/buildkit/version.Version=${version}"
- ];
-
- src = fetchFromGitHub {
- inherit rev;
- owner = "moby";
- repo = "buildkit";
- sha256 = "sha256-xjuHMjJjA4sx2Hrr6tPpvKtSmhGZ3AZka733DLxmYfk=";
- };
- vendorSha256 = null;
- doCheck = false;
-
- meta = {
- description = "concurrent, cache-efficient, and Dockerfile-agnostic builder toolkit";
- homepage = https://github.com/moby/buildkit;
- license = lib.licenses.asl20;
- };
-}
diff --git a/nix/packages/buildx/default.nix b/nix/packages/buildx/default.nix
@@ -1,28 +0,0 @@
-{ stdenv, lib, fetchFromGitHub, buildGoModule }:
-
-buildGoModule rec {
- name = "buildx-${version}";
- version = "0.7.1";
- rev = "v${version}";
-
- subPackages = [ "cmd/buildx" ];
-
- ldflags = [
- "-X github.com/docker/buildx/version.Version=${version}"
- ];
-
- src = fetchFromGitHub {
- inherit rev;
- owner = "docker";
- repo = "buildx";
- sha256 = "sha256-5EV0Rw1+ufxQ1wmQ0EJXQ7HVtXVbB4do/tet0QFRi08=";
- };
- vendorSha256 = null;
- doCheck = false;
-
- meta = {
- description = "Docker CLI plugin for extended build capabilities with buildkit";
- homepage = https://github.com/docker/buildx;
- license = lib.licenses.asl20;
- };
-}
diff --git a/nix/packages/default.nix b/nix/packages/default.nix
@@ -32,9 +32,5 @@ rec {
manifest-tool = pkgs.callPackage ./manifest-tool { };
- # Upstream
- buildkit = pkgs.callPackage ./buildkit { };
- buildx = pkgs.callPackage ./buildx { };
-
adi1090x-plymouth = pkgs.callPackage ./adi1090x-plymouth { };
}
diff --git a/systems/modules/dev/containers.nix b/systems/modules/dev/containers.nix
@@ -112,7 +112,7 @@ in
};
};
environment.systemPackages = with pkgs; [
- my.buildx
+ buildx
];
networking.firewall.trustedInterfaces = [ "docker0" "podman" ];
})
diff --git a/systems/modules/profiles/docker.nix b/systems/modules/profiles/docker.nix
@@ -70,7 +70,7 @@ in
};
};
environment.systemPackages = with pkgs; [
- my.buildx
+ buildx
];
networking.firewall.trustedInterfaces = [ "docker0" ];
};
diff --git a/systems/modules/profiles/docker.stable.nix b/systems/modules/profiles/docker.stable.nix
@@ -65,7 +65,7 @@ in
{"features":{"buildkit": true}, "insecure-registries": ["172.30.0.0/16", "192.168.12.0/16", "massimo.home:5000", "r.svc.home:5000", "r.svc.home" ]}
'';
environment.systemPackages = with pkgs; [
- my.buildx
+ buildx
];
networking.firewall.trustedInterfaces = [ "docker0" ];
};