diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-12 09:55:31 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-12 09:55:31 +0100 |
| commit | 424697d51222211c33d37b5925d56731362f8e86 (patch) | |
| tree | b9d7eff6ada864d357dabaaa13fb86cbb65c3327 /pkgs/top-level/aliases.nix | |
| parent | 1a6c3cb06bbdd8dbd0bafc02f35a113fd50544ba (diff) | |
| parent | c6218f9e9950e46ed89fc8e606523c03ad20292e (diff) | |
| download | nixlib-424697d51222211c33d37b5925d56731362f8e86.tar nixlib-424697d51222211c33d37b5925d56731362f8e86.tar.gz nixlib-424697d51222211c33d37b5925d56731362f8e86.tar.bz2 nixlib-424697d51222211c33d37b5925d56731362f8e86.tar.lz nixlib-424697d51222211c33d37b5925d56731362f8e86.tar.xz nixlib-424697d51222211c33d37b5925d56731362f8e86.tar.zst nixlib-424697d51222211c33d37b5925d56731362f8e86.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level/aliases.nix')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8c7a728654ae..4b4991cf9791 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -347,6 +347,7 @@ mapAliases ({ pinentry_gtk2 = pinentry-gtk2; # added 2019-10-14 pinentry_qt = pinentry-qt; # added 2019-10-14 pinentry_gnome = pinentry-gnome; # added 2019-10-14 + pinentry_qt5 = pinentry-qt; # added 2020-02-11 postgis = postgresqlPackages.postgis; # end ppl-address-book = throw "deprecated in 2019-05-02: abandoned by upstream."; |