Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4cfe8fbf4cb3
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: eb8a1281c83c
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 12, 2020

  1. runc: fix manpages

    @zowoq
    zowoq committed Apr 12, 2020
    Copy the full SHA
    c533af1 View commit details

  2. Merge pull request #85071 from zowoq/runc 

    runc: fix manpages
    @bhipple
    bhipple authored Apr 12, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    eb8a128 View commit details
Showing with 18 additions and 23 deletions.
  1. +18 −23 pkgs/applications/virtualization/runc/default.nix
41 changes: 18 additions & 23 deletions pkgs/applications/virtualization/runc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
{ lib, fetchFromGitHub, buildGoPackage, go-md2man
, pkgconfig, libapparmor, apparmor-parser, libseccomp, which }:

with lib;
{ lib
, fetchFromGitHub
, buildGoPackage
, go-md2man
, installShellFiles
, pkg-config
, which
, libapparmor
, apparmor-parser
, libseccomp
}:

buildGoPackage rec {
pname = "runc";
@@ -17,10 +24,10 @@ buildGoPackage rec {
goPackagePath = "github.com/opencontainers/runc";
outputs = [ "bin" "out" "man" ];

hardeningDisable = ["fortify"];
hardeningDisable = [ "fortify" ];

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ go-md2man libseccomp libapparmor apparmor-parser which ];
nativeBuildInputs = [ go-md2man installShellFiles pkg-config which ];
buildInputs = [ libseccomp libapparmor apparmor-parser ];

makeFlags = [ "BUILDTAGS+=seccomp" "BUILDTAGS+=apparmor" ];

@@ -29,28 +36,16 @@ buildGoPackage rec {
patchShebangs .
substituteInPlace libcontainer/apparmor/apparmor.go \
--replace /sbin/apparmor_parser ${apparmor-parser}/bin/apparmor_parser
make ${toString makeFlags} runc
make ${toString makeFlags} runc man
'';

installPhase = ''
install -Dm755 runc $bin/bin/runc
# Include contributed man pages
man/md2man-all.sh -q
manRoot="$man/share/man"
mkdir -p "$manRoot"
for manDir in man/man?; do
manBase="$(basename "$manDir")" # "man1"
for manFile in "$manDir"/*; do
manName="$(basename "$manFile")" # "docker-build.1"
mkdir -p "$manRoot/$manBase"
gzip -c "$manFile" > "$manRoot/$manBase/$manName.gz"
done
done
installManPage man/*/*
'';

meta = {
homepage = "https://runc.io/";
meta = with lib; {
homepage = "https://github.com/opencontainers/runc";
description = "A CLI tool for spawning and running containers according to the OCI specification";
license = licenses.asl20;
maintainers = with maintainers; [ offline ] ++ teams.podman.members;