diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-02-17 07:58:47 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-02-17 08:05:24 +0100 |
| commit | f7f1a2f54ef2b744a26e37418dd6354bc46aa20a (patch) | |
| tree | 03b40b737111f3677fbf508dce58a29cfc81fc1b /pkgs/top-level/aliases.nix | |
| parent | 705167a5dceb53befd22f4e6184bbfba0813b73d (diff) | |
| parent | c904c2ec09cbee8b46bee136e062e611d249cdf2 (diff) | |
| download | nixlib-f7f1a2f54ef2b744a26e37418dd6354bc46aa20a.tar nixlib-f7f1a2f54ef2b744a26e37418dd6354bc46aa20a.tar.gz nixlib-f7f1a2f54ef2b744a26e37418dd6354bc46aa20a.tar.bz2 nixlib-f7f1a2f54ef2b744a26e37418dd6354bc46aa20a.tar.lz nixlib-f7f1a2f54ef2b744a26e37418dd6354bc46aa20a.tar.xz nixlib-f7f1a2f54ef2b744a26e37418dd6354bc46aa20a.tar.zst nixlib-f7f1a2f54ef2b744a26e37418dd6354bc46aa20a.zip | |
Merge branch 'master' into staging-next
A mass darwin rebuild from master (#55784).
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 43103586b1c3..7634a678e74d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -209,6 +209,7 @@ mapAliases ({ nilfs_utils = nilfs-utils; # added 2018-04-25 nmap_graphical = nmap-graphical; # added 2017-01-19 nologin = shadow; # added 2018-04-25 + nxproxy = nx-libs; # added 2019-02-15 opencascade_oce = opencascade; # added 2018-04-25 opencl-icd = ocl-icd; # added 2017-01-20 openexr_ctl = ctl; # added 2018-04-25 |