From 4461230cc5e11952407f8ddd205df9834786e6e4 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 15 Apr 2021 10:19:52 +0200 Subject: [PATCH] man-pages-posix: rename from posix_man_pages Make attribute name match upstream name. --- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 557c083c5f0..cb219cc84ed 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -940,6 +940,8 @@ mapAliases ({ zplugin = zinit; # Added 2021-01-30 + posix_man_pages = man-pages-posix; # Added 2021-04-15 + /* If these are in the scope of all-packages.nix, they cause collisions between mixed versions of qt. See: https://github.com/NixOS/nixpkgs/pull/101369 */ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7649839ace8..ab2ef5d68f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21301,6 +21301,8 @@ in man-pages = callPackage ../data/documentation/man-pages { }; + man-pages-posix = callPackage ../data/documentation/man-pages-posix { }; + manrope = callPackage ../data/fonts/manrope { }; marwaita = callPackage ../data/themes/marwaita { }; @@ -21474,8 +21476,6 @@ in inherit (plasma5Packages) breeze-icons; }; - posix_man_pages = callPackage ../data/documentation/man-pages-posix { }; - powerline-fonts = callPackage ../data/fonts/powerline-fonts { }; powerline-symbols = callPackage ../data/fonts/powerline-symbols { };