public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #130579 from NixOS/backport-127145-to-release-21.05 

[Backport release-21.05] containerd: 1.5.1 -> 1.5.2
This commit is contained in:
adisbladis 2021-07-25 12:43:16 -05:00 committed by GitHub
parent 9317b77a1d c557fc6061
commit ecd1adcea0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/applications/virtualization/containerd/default.nix
View File

@ -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
'';

7
pkgs/applications/virtualization/runc/default.nix
View File

@ -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