From 5a7a7e2b306dd7a139cff6565a6aa1c3ce7419a0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 19 May 2021 15:47:00 -0700 Subject: [PATCH 1/2] containerd: 1.5.1 -> 1.5.2, use buildGoModule (cherry picked from commit daed0cc14f83ecde8190feba3e80246d5a2b88a3) --- .../virtualization/containerd/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 5435c88f58d..ca9ae20f346 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -1,6 +1,6 @@ { lib , fetchFromGitHub -, buildGoPackage +, buildGoModule , btrfs-progs , go-md2man , installShellFiles @@ -8,19 +8,20 @@ , nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "containerd"; - version = "1.5.1"; + version = "1.5.2"; + + outputs = [ "out" "man" ]; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "sha256-jVyg+fyMuDnV/TM0Z2t+Cr17a6XBv11aWijhsqMnA5s="; + sha256 = "sha256-RDLAmPBjDHCx9al+gstUTrvKc/L0vAm8IEd/mvX5Als="; }; - goPackagePath = "github.com/containerd/containerd"; - outputs = [ "out" "man" ]; + vendorSha256 = null; nativeBuildInputs = [ go-md2man installShellFiles util-linux ]; @@ -28,11 +29,9 @@ buildGoPackage rec { buildFlags = [ "VERSION=v${version}" "REVISION=${src.rev}" ]; - BUILDTAGS = [ ] - ++ lib.optional (btrfs-progs == null) "no_btrfs"; + BUILDTAGS = lib.optionals (btrfs-progs == null) [ "no_btrfs" ]; buildPhase = '' - cd go/src/${goPackagePath} patchShebangs . make binaries man $buildFlags ''; From c557fc6061f4a9e66f6ccd48c511cd2acd155da7 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 17 Jun 2021 08:52:14 +1000 Subject: [PATCH 2/2] runc: use buildGoModule (cherry picked from commit d152d3cc423f102b183c25d9f0aeb9eab414a9d8) --- pkgs/applications/virtualization/runc/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index 795971a7492..b3578e175d4 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -1,6 +1,6 @@ { lib , fetchFromGitHub -, buildGoPackage +, buildGoModule , go-md2man , installShellFiles , pkg-config @@ -14,7 +14,7 @@ , nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "runc"; version = "1.0.0-rc95"; @@ -25,7 +25,7 @@ buildGoPackage rec { sha256 = "sha256-q4sXcvJO9gyo7m0vlaMrwh7ZZHYa58FJy3GatWndS6M="; }; - goPackagePath = "github.com/opencontainers/runc"; + vendorSha256 = null; outputs = [ "out" "man" ]; nativeBuildInputs = [ go-md2man installShellFiles makeWrapper pkg-config which ]; @@ -36,7 +36,6 @@ buildGoPackage rec { buildPhase = '' runHook preBuild - cd go/src/${goPackagePath} patchShebangs . make ${toString makeFlags} runc man runHook postBuild