diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-03 18:05:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-03 18:05:45 +0000 |
| commit | 97eab40fb7b116c9552608cc51d6266ad2a6a3bd (patch) | |
| tree | e01e6af9d883edb9737f295aea9f96178265e843 /pkgs/top-level | |
| parent | c29f27003ccb9ca36aad2bd5514006f3c07ddd2b (diff) | |
| parent | adfbccfa7fbeb5617b7a2cd44e53f3f207853937 (diff) | |
| download | nixlib-97eab40fb7b116c9552608cc51d6266ad2a6a3bd.tar nixlib-97eab40fb7b116c9552608cc51d6266ad2a6a3bd.tar.gz nixlib-97eab40fb7b116c9552608cc51d6266ad2a6a3bd.tar.bz2 nixlib-97eab40fb7b116c9552608cc51d6266ad2a6a3bd.tar.lz nixlib-97eab40fb7b116c9552608cc51d6266ad2a6a3bd.tar.xz nixlib-97eab40fb7b116c9552608cc51d6266ad2a6a3bd.tar.zst nixlib-97eab40fb7b116c9552608cc51d6266ad2a6a3bd.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 58f0eea3e4dd..3dfc5cf510d6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -799,6 +799,7 @@ mapAliases ({ nix_2_4 = nixVersions.nix_2_4; nix_2_5 = nixVersions.nix_2_5; nix_2_6 = nixVersions.nix_2_6; + nixopsUnstable = nixops_unstable; # Added 2022-03-03 nmap-unfree = nmap; # Added 2021-04-06 nmap_graphical = throw "'nmap_graphical' has been renamed to/replaced by 'nmap-graphical'"; # Converted to throw 2022-02-22 nologin = throw "'nologin' has been renamed to/replaced by 'shadow'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f9f2070ff42..f1a7fa77abc7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33316,7 +33316,7 @@ with pkgs; nixops = callPackage ../tools/package-management/nixops { }; - nixopsUnstable = lowPrio (callPackage ../applications/networking/cluster/nixops { }); + nixops_unstable = lowPrio (callPackage ../applications/networking/cluster/nixops { }); nixops-dns = callPackage ../tools/package-management/nixops/nixops-dns.nix { }; |