Commit c701a4dd authored by Silvan Mosberger's avatar Silvan Mosberger
Browse files

lib.sources.pathType and co.: Move to lib.filesystem 

These functions only work with the filesystem, they don't import
anything as sources
parent a8e4f58d

lib/default.nix

+3 −2
Original line number Diff line number Diff line
@@ -117,10 +117,11 @@ let 
    inherit (self.meta) addMetaAttrs dontDistribute setName updateName

      appendToName mapDerivationAttrset setPrio lowPrio lowPrioSet hiPrio

      hiPrioSet getLicenseFromSpdxId getExe;

    inherit (self.sources) pathType pathIsDirectory cleanSourceFilter

    inherit (self.filesystem) pathType pathIsDirectory pathIsRegularFile;

    inherit (self.sources) cleanSourceFilter

      cleanSource sourceByRegex sourceFilesBySuffices

      commitIdFromGitRepo cleanSourceWith pathHasContext

      canCleanSource pathIsRegularFile pathIsGitRepo;

      canCleanSource pathIsGitRepo;

    inherit (self.modules) evalModules setDefaultModuleLocation

      unifyModuleSyntax applyModuleArgsIfFunction mergeModules

      mergeModules' mergeOptionDecls evalOptionValue mergeDefinitions

lib/filesystem.nix

+26 −0
Original line number Diff line number Diff line
@@ -2,12 +2,38 @@ 
{ lib }:



let

  inherit (builtins)

    getAttr

    readDir

    pathExists

    ;



  inherit (lib.strings)

    hasPrefix

    ;



  inherit (lib.filesystem)

    pathType

    ;

in



{



  /*

    Returns the type of a path: regular (for file), symlink, or directory.

  */

  pathType = path: getAttr (baseNameOf path) (readDir (dirOf path));



  /*

    Returns true if the path exists and is a directory, false otherwise.

  */

  pathIsDirectory = path: if pathExists path then (pathType path) == "directory" else false;



  /*

    Returns true if the path exists and is a regular file, false otherwise.

  */

  pathIsRegularFile = path: if pathExists path then (pathType path) == "regular" else false;



  /*

    A map of all haskell packages defined in the given path,

    identified by having a cabal file with the same name as the

lib/sources.nix

+18 −19
Original line number Diff line number Diff line
@@ -18,21 +18,11 @@ let 
    pathExists

    readFile

    ;



  /*

    Returns the type of a path: regular (for file), symlink, or directory.

  */

  pathType = path: getAttr (baseNameOf path) (readDir (dirOf path));



  /*

    Returns true if the path exists and is a directory, false otherwise.

  */

  pathIsDirectory = path: if pathExists path then (pathType path) == "directory" else false;



  /*

    Returns true if the path exists and is a regular file, false otherwise.

  */

  pathIsRegularFile = path: if pathExists path then (pathType path) == "regular" else false;

  inherit (lib.filesystem)

    pathType

    pathIsDirectory

    pathIsRegularFile

    ;



  /*

    A basic filter for `cleanSourceWith` that removes
@@ -271,11 +261,20 @@ let 
    };



in {

  inherit

    pathType

    pathIsDirectory

    pathIsRegularFile



  pathType = lib.warnIf (lib.isInOldestRelease 2305)

    "lib.sources.pathType has been moved to lib.filesystem.pathType."

    lib.filesystem.pathType;



  pathIsDirectory = lib.warnIf (lib.isInOldestRelease 2305)

    "lib.sources.pathIsDirectory has been moved to lib.filesystem.pathIsDirectory."

    lib.filesystem.pathIsDirectory;



  pathIsRegularFile = lib.warnIf (lib.isInOldestRelease 2305)

    "lib.sources.pathIsRegularFile has been moved to lib.filesystem.pathIsRegularFile."

    lib.filesystem.pathIsRegularFile;



  inherit

    pathIsGitRepo

    commitIdFromGitRepo