From 67a7f01005321b751a44e07b06a708a3ba165d74 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 8 Aug 2021 04:20:00 +0000 Subject: [PATCH] buildkit: 0.8.3 -> 0.9.0 https://github.com/moby/buildkit/releases/tag/v0.9.0 --- pkgs/development/tools/buildkit/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index f6eb7aef1ed..12d35c07db3 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -1,20 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "buildkit"; - version = "0.8.3"; - - goPackagePath = "github.com/moby/buildkit"; - subPackages = [ "cmd/buildctl" ] ++ lib.optionals stdenv.isLinux [ "cmd/buildkitd" ]; + version = "0.9.0"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - sha256 = "sha256-dHtGxugTtxHcfZHMIHinlcH05ss7zT/+Ll1WboAhw9o="; + sha256 = "0i04b5ngvhkan45mx6xjcia0dsx0dc6w8bwy90yg3qnz7yzidm2d"; }; - buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/version.Version=${version} -X ${goPackagePath}/version.Revision=${src.rev}" ]; + vendorSha256 = null; + + subPackages = [ "cmd/buildctl" ] ++ lib.optionals stdenv.isLinux [ "cmd/buildkitd" ]; + + ldflags = [ "-s" "-w" "-X github.com/moby/buildkit/version.Version=${version}" "-X github.com/moby/buildkit/version.Revision=${src.rev}" ]; + + doCheck = false; meta = with lib; { description = "Concurrent, cache-efficient, and Dockerfile-agnostic builder toolkit";