From 4f652cfaf41b39ebc395976fbecfb446bfc3d8c8 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 9 Oct 2025 12:22:37 -0700 Subject: [PATCH] lib.filesystem: remove Nix 2.14 shim It was added in fcaa2b1097e46. Lix is based off of 2.18, and the minimum version for Nixpkgs has long since incorporated this builtin. --- lib/filesystem.nix | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/lib/filesystem.nix b/lib/filesystem.nix index afc4c2698291..750d47f8de18 100644 --- a/lib/filesystem.nix +++ b/lib/filesystem.nix @@ -56,25 +56,7 @@ in ::: */ - pathType = - builtins.readFileType or - # Nix <2.14 compatibility shim - ( - path: - if - !pathExists path - # Fail irrecoverably to mimic the historic behavior of this function and - # the new builtins.readFileType - then - abort "lib.filesystem.pathType: Path ${toString path} does not exist." - # The filesystem root is the only path where `dirOf / == /` and - # `baseNameOf /` is not valid. We can detect this and directly return - # "directory", since we know the filesystem root can't be anything else. - else if dirOf path == path then - "directory" - else - (readDir (dirOf path)).${baseNameOf path} - ); + pathType = builtins.readFileType; /** Whether a path exists and is a directory.