git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #119519 from sternenseemann/posix-man-pages

man-pages-posix: 2013-a -> 2017-a

commitf21304cfa5913a9e117c4a531fd05f55e19564b3 authorJörg Thalheim <Mic92@users.noreply.github.com> dateThu 15 Apr 2021, 14:33 (6 years ago) parente754546b4279a3
3 files changed+12−9
pkgs/data/documentation/man-pages-posix/default.nix+8−7 pkgs/top-level/aliases.nix+2 pkgs/top-level/all-packages.nix+2−2
pkgs/data/documentation/man-pages-posix/default.nix+8−7
@@ -1,21 +1,22 @@
11{lib, stdenv, fetchurl}:
22
33stdenv.mkDerivation rec {
4− name = "man-pages-posix-2013-a";
4+ pname = "man-pages-posix";
5+ version = "2017-a";
56
67 src = fetchurl {
7− url = "mirror://kernel/linux/docs/man-pages/man-pages-posix/${name}.tar.xz";
8− sha256 = "0258j05zdrxpgdj8nndbyi7bvrs8fxdksb0xbfrylzgzfmf3lqqr";
8+ url = "mirror://kernel/linux/docs/man-pages/man-pages-posix/${pname}-${version}.tar.xz";
9+ sha256 = "ce67bb25b5048b20dad772e405a83f4bc70faf051afa289361c81f9660318bc3";
910 };
1011
11− preBuild =
12− ''
13− makeFlagsArray=(MANDIR=$out/share/man)
14− '';
12+ makeFlags = [
13+ "MANDIR=${placeholder "out"}/share/man"
14+ ];
1515
1616 meta = {
1717 description = "POSIX man-pages (0p, 1p, 3p)";
1818 homepage = "https://www.kernel.org/doc/man-pages/";
1919 platforms = lib.platforms.unix;
20+ maintainers = [ lib.maintainers.sternenseemann ];
2021 };
2122}
pkgs/top-level/aliases.nix+2
@@ -940,6 +940,8 @@ mapAliases ({
940940
941941 zplugin = zinit; # Added 2021-01-30
942942
943+ posix_man_pages = man-pages-posix; # Added 2021-04-15
944+
943945 /* If these are in the scope of all-packages.nix, they cause collisions
944946 between mixed versions of qt. See:
945947 https://github.com/NixOS/nixpkgs/pull/101369 */
pkgs/top-level/all-packages.nix+2−2
@@ -21301,6 +21301,8 @@ in
2130121301
2130221302 man-pages = callPackage ../data/documentation/man-pages { };
2130321303
21304+ man-pages-posix = callPackage ../data/documentation/man-pages-posix { };
21305+
2130421306 manrope = callPackage ../data/fonts/manrope { };
2130521307
2130621308 marwaita = callPackage ../data/themes/marwaita { };
@@ -21474,8 +21476,6 @@ in
2147421476 inherit (plasma5Packages) breeze-icons;
2147521477 };
2147621478
21477− posix_man_pages = callPackage ../data/documentation/man-pages-posix { };
21478−
2147921479 powerline-fonts = callPackage ../data/fonts/powerline-fonts { };
2148021480
2148121481 powerline-symbols = callPackage ../data/fonts/powerline-symbols { };