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

Merge pull request #131211 from NixOS/backport-130814-to-release-21.05

Browse Source 
[Backport release-21.05] man-pages: 5.11 -> 5.12
This commit is contained in:
davidak
2021-07-24 08:14:20 +02:00
committed by GitHub
parent 1a52f18432 e7c07d8edb
commit 537678cb1e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/data/documentation/man-pages/default.nix
+4 -4
View File
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "man-pages"; pname = "man-pages";
version = "5.11"; version = "5.12";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/docs/man-pages/${pname}-${version}.tar.xz"; url = "mirror://kernel/linux/docs/man-pages/${pname}-${version}.tar.xz";
sha256 = "sha256-PtpdzlGEWZ7Dfa40lM+WTFUDYumkH7ckeS2mEL2xPKo="; sha256 = "07ip4f70nyxn24wy0fin6klq1hm1cjjvzr9zh5baqzssl1hckxbs";
}; };
makeFlags = [ "MANDIR=$(out)/share/man" ]; makeFlags = [ "prefix=$(out)" ];
postInstall = '' postInstall = ''
# conflict with shadow-utils # conflict with shadow-utils
rm $out/share/man/man5/passwd.5 \ rm $out/share/man/man5/passwd.5 \
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Linux development manual pages"; description = "Linux development manual pages";
homepage = "https://www.kernel.org/doc/man-pages/"; homepage = "https://www.kernel.org/doc/man-pages/";
repositories.git = "http://git.kernel.org/pub/scm/docs/man-pages/man-pages"; repositories.git = "https://git.kernel.org/pub/scm/docs/man-pages/man-pages";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
platforms = with platforms; unix; platforms = with platforms; unix;
priority = 30; # if a package comes with its own man page, prefer it priority = 30; # if a package comes with its own man page, prefer it