diff options
| author | Bernardo Meurer <bernardo@meurer.org> | 2022-01-24 23:29:44 -0800 |
|---|---|---|
| committer | Bernardo Meurer <bernardo@meurer.org> | 2022-01-26 10:32:56 -0800 |
| commit | 5210313299beadedb004cfd4dc1758be10d65031 (patch) | |
| tree | 519adbb79ed825f11d1c0629b628862ea92ebd41 /pkgs | |
| parent | 65f90920df524c4eb706c84bff248ac24ff0ff7b (diff) | |
| download | nixpkgs-5210313299beadedb004cfd4dc1758be10d65031.tar nixpkgs-5210313299beadedb004cfd4dc1758be10d65031.tar.gz nixpkgs-5210313299beadedb004cfd4dc1758be10d65031.tar.bz2 nixpkgs-5210313299beadedb004cfd4dc1758be10d65031.tar.lz nixpkgs-5210313299beadedb004cfd4dc1758be10d65031.tar.xz nixpkgs-5210313299beadedb004cfd4dc1758be10d65031.tar.zst nixpkgs-5210313299beadedb004cfd4dc1758be10d65031.zip | |
nixStable: make an alias of nix
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/misc/hydra/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/aliases.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
4 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index ac5600519b4..f0786d54b4f 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, nixStable, callPackage, nixUnstable, nixosTests }: +{ fetchFromGitHub, nix, callPackage, nixUnstable, nixosTests }: { hydra-unstable = callPackage ./common.nix { diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 58bbee29053..7643f9836b8 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -44,9 +44,7 @@ let inherit storeDir stateDir confDir; }; in rec { - nix = nixStable; - - nixStable = nix_2_5; + nix = nix_2_5; nix_2_3 = buildNix rec { version = "2.3.16"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2c33cff14a0..7d9d56ba269 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -663,7 +663,8 @@ mapAliases ({ nilfs_utils = nilfs-utils; # added 2018-04-25 nix-direnv-flakes = nix-direnv; nix-review = nixpkgs-review; # added 2019-12-22 - nixFlakes = nixStable; # added 2021-05-21 + nixFlakes = nix; # added 2021-05-21 + nixStable = nix; # added-2022-01-24 nmap_graphical = nmap-graphical; # added 2017-01-19 nmap-unfree = nmap; # added 2021-04-06 nologin = shadow; # added 2018-04-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 387c26cdbe9..ea9e1340f99 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33134,7 +33134,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }) nix - nixStable nix_2_3 nix_2_4 nix_2_5 |