diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-18 11:43:54 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-18 11:43:54 +0200 |
commit | 8d8dc1fa34fe1d3b99b14f87f483f44b589009ae (patch) | |
tree | b4a36a1aa716d01d4e19529ed38a97decac7dbd2 /pkgs/top-level/aliases.nix | |
parent | b889d7a43fd49798a315f9a4c7c05b90b8c600d0 (diff) | |
parent | 821a3beb1048273bbba5e9636916281fce5dd577 (diff) | |
download | nixlib-8d8dc1fa34fe1d3b99b14f87f483f44b589009ae.tar nixlib-8d8dc1fa34fe1d3b99b14f87f483f44b589009ae.tar.gz nixlib-8d8dc1fa34fe1d3b99b14f87f483f44b589009ae.tar.bz2 nixlib-8d8dc1fa34fe1d3b99b14f87f483f44b589009ae.tar.lz nixlib-8d8dc1fa34fe1d3b99b14f87f483f44b589009ae.tar.xz nixlib-8d8dc1fa34fe1d3b99b14f87f483f44b589009ae.tar.zst nixlib-8d8dc1fa34fe1d3b99b14f87f483f44b589009ae.zip |
Merge master into staging
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 b9ee19d2af31..0f243df540da 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -319,6 +319,7 @@ mapAliases ({ xmonad_log_applet_gnome3 = xmonad_log_applet; # added 2018-05-01 xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 xlibs = xorg; # added 2015-09 + xpraGtk3 = xpra; # added 2018-09-13 youtubeDL = youtube-dl; # added 2014-10-26 # added 2017-05-27 |