diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-01 09:42:54 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-01 09:42:54 +0200 |
| commit | 55e4555b77ff7506579c1d4f5d9b562ca6e853b4 (patch) | |
| tree | adbc42e629ea3441456eb5e5e4e0b3a7fa2d867a /pkgs/top-level/aliases.nix | |
| parent | f498a8b7af41401c167baa6879a8b0271e8ffbf5 (diff) | |
| parent | ff13b6f1acceac062e66a2b0f39a59bcb5570a87 (diff) | |
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, 0 insertions, 2 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6616960a76eb..bb5fddf532b8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -379,8 +379,6 @@ mapAliases ({ xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 xlibs = xorg; # added 2015-09 xpraGtk3 = xpra; # added 2018-09-13 - yarn2nix = throw "Use upstream https://github.com/moretea/yarn2nix"; # added 2019-04-12 - mkYarnPackage = yarn2nix; # added 2019-04-12 youtubeDL = youtube-dl; # added 2014-10-26 zdfmediathk = mediathekview; # added 2019-01-19 |