From 49c22083b92404ddbeb6a88ce87cc5fbd6b879e2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 21 May 2021 15:21:31 +0200 Subject: [PATCH] nixFlakes: Turn into an alias --- pkgs/tools/package-management/nix/default.nix | 2 -- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 0d93d1d7b1b..159fc5b39c1 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -227,6 +227,4 @@ in rec { ]; }); - nixFlakes = nixUnstable; - } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a275fbd8057..6fddebdfc55 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -492,6 +492,7 @@ mapAliases ({ nginxUnstable = nginxMainline; # added 2018-04-25 nilfs_utils = nilfs-utils; # added 2018-04-25 nix-review = nixpkgs-review; # added 2019-12-22 + nixFlakes = nixUnstable; # added 2021-05-21 nmap_graphical = nmap-graphical; # added 2017-01-19 nologin = shadow; # added 2018-04-25 nxproxy = nx-libs; # added 2019-02-15 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f7954947659..74ce21be654 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30321,8 +30321,7 @@ in }) nix nixStable - nixUnstable - nixFlakes; + nixUnstable; nixStatic = pkgsStatic.nix;