diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-04-20 05:38:13 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-20 05:38:13 +0100 |
commit | b442f8ea9f2107a825838a2d260f37f421b86969 (patch) | |
tree | f524570266885e9e8c28e8ec4ed9a6cf028944da /pkgs/top-level | |
parent | e4db75f46dc54e55a86d5c09f752e9dc334ac076 (diff) | |
parent | bff2c1258eb2cce8d78dbce343cb36232d2272e3 (diff) | |
download | nixlib-b442f8ea9f2107a825838a2d260f37f421b86969.tar nixlib-b442f8ea9f2107a825838a2d260f37f421b86969.tar.gz nixlib-b442f8ea9f2107a825838a2d260f37f421b86969.tar.bz2 nixlib-b442f8ea9f2107a825838a2d260f37f421b86969.tar.lz nixlib-b442f8ea9f2107a825838a2d260f37f421b86969.tar.xz nixlib-b442f8ea9f2107a825838a2d260f37f421b86969.tar.zst nixlib-b442f8ea9f2107a825838a2d260f37f421b86969.zip |
Merge pull request #85566 from kirelagin/lieer
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8d289c0101bf..4714ec9e93ee 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -152,6 +152,7 @@ mapAliases ({ gettextWithExpat = gettext; # 2016-02-19 git-hub = gitAndTools.git-hub; # added 2016-04-29 glib_networking = glib-networking; # added 2018-02-25 + gmailieer = lieer; # added 2020-04-19 gnome-mpv = celluloid; # added 2019-08-22 gnome15 = throw "gnome15 has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # added 2019-12-10 gmic_krita_qt = gmic-qt-krita; # added 2019-09-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1b7fbc81064..e0562f885708 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16473,8 +16473,6 @@ in gfxtablet = callPackage ../os-specific/linux/gfxtablet {}; - gmailieer = callPackage ../applications/networking/gmailieer {}; - gmailctl = callPackage ../applications/networking/gmailctl {}; gpm = callPackage ../servers/gpm { @@ -16581,6 +16579,8 @@ in libnl = callPackage ../os-specific/linux/libnl { }; + lieer = callPackage ../applications/networking/lieer {}; + linuxConsoleTools = callPackage ../os-specific/linux/consoletools { }; openelec-dvb-firmware = callPackage ../os-specific/linux/firmware/openelec-dvb-firmware { }; |