From 405d540652fc706eca3d3a0baf68f63e07bf0071 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 27 Jul 2020 19:30:08 +0000 Subject: [PATCH 1/2] linuxkit: 0.7 -> 0.8 --- pkgs/development/tools/misc/linuxkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/linuxkit/default.nix b/pkgs/development/tools/misc/linuxkit/default.nix index 4fe7740cadf4..f9cecc6fc95e 100644 --- a/pkgs/development/tools/misc/linuxkit/default.nix +++ b/pkgs/development/tools/misc/linuxkit/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "linuxkit"; - version = "0.7"; + version = "0.8"; goPackagePath = "github.com/linuxkit/linuxkit"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "linuxkit"; repo = "linuxkit"; rev = "v${version}"; - sha256 = "1mnaqzd4r0fdgjhjvbi4p0wwvz69i82b33iizz81wvkr1mkakgl2"; + sha256 = "15jj60k8wz9cahjbdscnwyyfb1k1grjh7yrilb1cj4r8mby4sp2g"; }; subPackages = [ "src/cmd/linuxkit" ]; From 67de12f99115fafba5ee5e2c83eec82acfee2f57 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 27 Jul 2020 16:20:00 -0500 Subject: [PATCH 2/2] linuxkit: use buildFlagsArray --- pkgs/development/tools/misc/linuxkit/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/linuxkit/default.nix b/pkgs/development/tools/misc/linuxkit/default.nix index f9cecc6fc95e..eeb2102bdf0c 100644 --- a/pkgs/development/tools/misc/linuxkit/default.nix +++ b/pkgs/development/tools/misc/linuxkit/default.nix @@ -15,9 +15,7 @@ buildGoPackage rec { subPackages = [ "src/cmd/linuxkit" ]; - preBuild = '' - buildFlagsArray+=("-ldflags" "-X github.com/linuxkit/linuxkit/src/cmd/linuxkit/version.Version=${src.rev}") - ''; + buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/src/cmd/linuxkit/version.GitCommit=${src.rev} -X ${goPackagePath}/src/cmd/linuxkit/version.Version=${version}" ]; meta = with lib; { description = "A toolkit for building secure, portable and lean operating systems for containers";