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

Merge pull request #87458 from zowoq/shellfiles

Browse Source 
containerd, docker, runc: use/update installShellFiles
This commit is contained in:
Jaka Hudoklin 2020-05-10 02:35:15 +00:00 committed by GitHub
commit 91271207ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, buildGoPackage, btrfs-progs, go-md2man, utillinux }: { lib, fetchFromGitHub, buildGoPackage, btrfs-progs, go-md2man, installShellFiles, utillinux }:
with lib; with lib;
@ -18,7 +18,7 @@ buildGoPackage rec {
goPackagePath = "github.com/containerd/containerd"; goPackagePath = "github.com/containerd/containerd";
outputs = [ "out" "man" ]; outputs = [ "out" "man" ];
nativeBuildInputs = [ go-md2man utillinux ]; nativeBuildInputs = [ go-md2man installShellFiles utillinux ];
buildInputs = [ btrfs-progs ]; buildInputs = [ btrfs-progs ];
@ -39,14 +39,7 @@ buildGoPackage rec {
done done
make man make man
manRoot="$man/share/man" installManPage man/*.[1-9]
mkdir -p "$manRoot"
for manFile in man/*; do
manName="$(basename "$manFile")" # "docker-build.1"
number="$(echo $manName | rev | cut -d'.' -f1 | rev)"
mkdir -p "$manRoot/man$number"
gzip -c "$manFile" > "$manRoot/man$number/$manName.gz"
done
''; '';
meta = { meta = {

21
pkgs/applications/virtualization/docker/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, pkgconfig { stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, installShellFiles, pkgconfig
, go-md2man, go, containerd, runc, docker-proxy, tini, libtool , go-md2man, go, containerd, runc, docker-proxy, tini, libtool
, sqlite, iproute, lvm2, systemd , sqlite, iproute, lvm2, systemd
, btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs, git , btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs, git
@ -78,7 +78,7 @@ rec {
sha256 = sha256; sha256 = sha256;
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ installShellFiles pkgconfig ];
buildInputs = [ buildInputs = [
makeWrapper removeReferencesTo go-md2man go libtool makeWrapper removeReferencesTo go-md2man go libtool
] ++ optionals (stdenv.isLinux) [ ] ++ optionals (stdenv.isLinux) [
@ -147,9 +147,9 @@ rec {
--prefix PATH : "$out/libexec/docker:$extraPath" --prefix PATH : "$out/libexec/docker:$extraPath"
# completion (cli) # completion (cli)
install -Dm644 ./components/cli/contrib/completion/bash/docker $out/share/bash-completion/completions/docker installShellCompletion --bash ./components/cli/contrib/completion/bash/docker
install -Dm644 ./components/cli/contrib/completion/fish/docker.fish $out/share/fish/vendor_completions.d/docker.fish installShellCompletion --fish ./components/cli/contrib/completion/fish/docker.fish
install -Dm644 ./components/cli/contrib/completion/zsh/_docker $out/share/zsh/site-functions/_docker installShellCompletion --zsh ./components/cli/contrib/completion/zsh/_docker
# Include contributed man pages (cli) # Include contributed man pages (cli)
# Generate man pages from cobra commands # Generate man pages from cobra commands
@ -163,16 +163,7 @@ rec {
echo "Generate legacy manpages" echo "Generate legacy manpages"
./man/md2man-all.sh -q ./man/md2man-all.sh -q
manRoot="$man/share/man" installManPage man/*/*.[1-9]
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
''; '';
preFixup = '' preFixup = ''

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

@ -39,7 +39,7 @@ buildGoPackage rec {
installPhase = '' installPhase = ''
install -Dm755 runc $out/bin/runc install -Dm755 runc $out/bin/runc
installManPage man/*/* installManPage man/*/*.[1-9]
''; '';
meta = with lib; { meta = with lib; {