diff --git a/devShell.nix b/devShell.nix
index 4f4075cf9..dd81b8282 100644
--- a/devShell.nix
+++ b/devShell.nix
@@ -29,8 +29,7 @@
           select-shell
           pkgs.nix-unit
           pkgs.tea
-          # Better error messages than nix 2.18
-          pkgs.nixVersions.latest
+          pkgs.nix
           self'.packages.tea-create-pr
           self'.packages.merge-after-ci
           self'.packages.pending-reviews
diff --git a/pkgs/clan-cli/default.nix b/pkgs/clan-cli/default.nix
index 0d80f1bdc..9b6ae9cce 100644
--- a/pkgs/clan-cli/default.nix
+++ b/pkgs/clan-cli/default.nix
@@ -63,10 +63,8 @@ let
   nixpkgs' =
     runCommand "nixpkgs"
       {
-        nativeBuildInputs = [
-          # old nix version doesn't support --flake flag
-          (if lib.versionAtLeast nix.version "2.24" then nix else nixVersions.latest)
-        ];
+        # Not all versions have `nix flake update --flake` option
+        nativeBuildInputs = [ nixVersions.stable ];
       }
       ''
         mkdir $out