commit 5a7118da750f58e5c701f541859fbe58c27b9bef · pyrox.dev/nixpkgs

+1 -1

lib/fileset/default.nix

···

       312
       312
        
                 lib.fileset.fromSource: The source origin of the argument is of type ${typeOf path}, but it should be a path instead.''

     

       313
       313
        
           else if ! pathExists path then

     

       314
       314
        
             throw ''

     

       315
       315
       -
               lib.fileset.fromSource: The source origin (${toString path}) of the argument does not exist.''

     

       315
       315
       +
               lib.fileset.fromSource: The source origin (${toString path}) of the argument is a path that does not exist.''

     

       316
       316
        
           else if isFiltered then

     

       317
       317
        
             _fromSourceFilter path source.filter

     

       318
       318
        
           else

+4 -4

lib/fileset/internal.nix

···

       381
       381
        
       

     

       382
       382
        
         # Turn a fileset into a source filter function suitable for `builtins.path`

     

       383
       383
        
         # Only directories recursively containing at least one files are recursed into

     

       384
       384
       -
         # Type: Path -> fileset -> (String -> String -> Bool)

     

       384
       384
       +
         # Type: fileset -> (String -> String -> Bool)

     

       385
       385
        
         _toSourceFilter = fileset:

     

       386
       386
        
           let

     

       387
       387
        
             # Simplify the tree, necessary to make sure all empty directories are null

     
···

       753
       753
        
       

     

       754
       754
        
             resultingTree =

     

       755
       755
        
               _differenceTree

     

       756
       756
       -
               positive._internalBase

     

       757
       757
       -
               positive._internalTree

     

       758
       758
       -
               negativeTreeWithPositiveBase;

     

       756
       756
       +
                 positive._internalBase

     

       757
       757
       +
                 positive._internalTree

     

       758
       758
       +
                 negativeTreeWithPositiveBase;

     

       759
       759
        
           in

     

       760
       760
        
           # If the first file set is empty, we can never have any files in the result

     

       761
       761
        
           if positive._internalIsEmptyWithoutBase then

+6 -1

lib/fileset/tests.sh

···

       1064
       1064
        
       ## lib.fileset.fromSource

     

       1065
       1065
        
       

     

       1066
       1066
        
       # Check error messages

     

       1067
       1067
       -
       expectFailure 'fromSource null' 'lib.fileset.fromSource: The source origin of the argument is of type null, but it should be a path instead.'

     

       1068
       1067
        
       

     

       1068
       1068
       +
       # String-like values are not supported

     

       1069
       1069
        
       expectFailure 'fromSource (lib.cleanSource "")' 'lib.fileset.fromSource: The source origin of the argument is a string-like value \(""\), but it should be a path instead.

     

       1070
       1070
        
       \s*Sources created from paths in strings cannot be turned into file sets, use `lib.sources` or derivations instead.'

     

       1071
       1071
        
       

     

       1072
       1072
       +
       # Wrong type

     

       1073
       1073
       +
       expectFailure 'fromSource null' 'lib.fileset.fromSource: The source origin of the argument is of type null, but it should be a path instead.'

     

       1072
       1074
        
       expectFailure 'fromSource (lib.cleanSource null)' 'lib.fileset.fromSource: The source origin of the argument is of type null, but it should be a path instead.'

     

       1075
       1075
       +
       

     

       1076
       1076
       +
       # fromSource on non-existent paths gives an error

     

       1077
       1077
       +
       expectFailure 'fromSource ./a' 'lib.fileset.fromSource: The source origin \('"$work"'/a\) of the argument is a path that does not exist.'

     

       1073
       1078
        
       

     

       1074
       1079
        
       # fromSource on a path works and is the same as coercing that path

     

       1075
       1080
        
       mkdir a