diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-04-15 18:13:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-15 18:13:27 +0000 |
| commit | dfd4f1430301305a0c543f034a95aaae6e3ce09d (patch) | |
| tree | e451a4f3f1defad8765a1bdcee54846f014741fd /pkgs/top-level/aliases.nix | |
| parent | 80e725f3dc9daff0b720b4cb7d7088cdc65e015d (diff) | |
| parent | bc5c0c559f1c93ccea9a7f21066b6314831bea3d (diff) | |
| download | nixlib-dfd4f1430301305a0c543f034a95aaae6e3ce09d.tar nixlib-dfd4f1430301305a0c543f034a95aaae6e3ce09d.tar.gz nixlib-dfd4f1430301305a0c543f034a95aaae6e3ce09d.tar.bz2 nixlib-dfd4f1430301305a0c543f034a95aaae6e3ce09d.tar.lz nixlib-dfd4f1430301305a0c543f034a95aaae6e3ce09d.tar.xz nixlib-dfd4f1430301305a0c543f034a95aaae6e3ce09d.tar.zst nixlib-dfd4f1430301305a0c543f034a95aaae6e3ce09d.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level/aliases.nix')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 2 |
1 files changed, 2 insertions, 0 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 */ |