diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fe162e3723fd..7cc648b1a9f3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -946,6 +946,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 909cd99e7ebb..397338eb8248 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21295,6 +21295,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 { }; @@ -21468,8 +21470,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 { }; @@ -23973,7 +23973,7 @@ in kooha = callPackage ../applications/video/kooha { }; - kotatogram-desktop = libsForQt514.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { }; + kotatogram-desktop = libsForQt5.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { }; kpt = callPackage ../applications/networking/cluster/kpt { }; @@ -26114,6 +26114,8 @@ in timewarrior = callPackage ../applications/misc/timewarrior { }; + timg = callPackage ../tools/graphics/timg { }; + timidity = callPackage ../tools/misc/timidity { }; tint2 = callPackage ../applications/misc/tint2 { }; @@ -30325,6 +30327,7 @@ in terraform_0_12 terraform_0_13 terraform_0_14 + terraform_0_15 terraform_plugins_test ; |