···

       
38
       
38
       
 
       
      substr = builtins.substring prefixLen filenameLen filename;

     

       
39
       
39
       
 
       
      in substr;

     

       
40
       
40
       
 
       


     

       
41
       
41
       
-
       
  removeNixpkgs = removeFilenamePrefix pkgs.path;

     

       
41
       
41
       
+
       
  removeNixpkgs = removeFilenamePrefix (builtins.toString pkgs.path);

     

       
42
       
42
       
 
       


     

       
43
       
43
       
 
       
  liblocations =

     

       
44
       
44
       
 
       
    builtins.filter

     

···

       
140
       
140
       
 
       
      origSrc = if isFiltered then src.origSrc else src;

     

       
141
       
141
       
 
       
    in lib.cleanSourceWith {

     

       
142
       
142
       
 
       
      filter = (path: type:

     

       
143
       
143
       
-
       
        let relPath = lib.removePrefix (origSrc + "/") (path);

     

       
143
       
143
       
+
       
        let relPath = lib.removePrefix (toString origSrc + "/") (toString path);

     

       
144
       
144
       
 
       
        in lib.any (re: match re relPath != null) regexes);

     

       
145
       
145
       
 
       
      inherit src;

     

       
146
       
146
       
 
       
    };

     
···

       
175
       
175
       
 
       
  */

     

       
176
       
176
       
 
       
  commitIdFromGitRepo =

     

       
177
       
177
       
 
       
    let readCommitFromFile = file: path:

     

       
178
       
178
       
-
       
        let fileName       = path + "/" + file;

     

       
179
       
179
       
-
       
            packedRefsName = path + "/packed-refs";

     

       
178
       
178
       
+
       
        let fileName       = toString path + "/" + file;

     

       
179
       
179
       
+
       
            packedRefsName = toString path + "/packed-refs";

     

       
180
       
180
       
 
       
            absolutePath   = base: path:

     

       
181
       
181
       
 
       
              if lib.hasPrefix "/" path

     

       
182
       
182
       
 
       
              then path

     

       
183
       
183
       
-
       
              else /. + "${base}/${path}";

     

       
183
       
183
       
+
       
              else toString (/. + "${base}/${path}");

     

       
184
       
184
       
 
       
        in if pathIsRegularFile path

     

       
185
       
185
       
 
       
           # Resolve git worktrees. See gitrepository-layout(5)

     

       
186
       
186
       
 
       
           then

     
···

       
226
       
226
       
 
       


     

       
227
       
227
       
 
       
  pathHasContext = builtins.hasContext or (lib.hasPrefix storeDir);

     

       
228
       
228
       
 
       


     

       
229
       
229
       
-
       
  canCleanSource = src: src ? _isLibCleanSourceWith || !(pathHasContext src);

     

       
229
       
229
       
+
       
  canCleanSource = src: src ? _isLibCleanSourceWith || !(pathHasContext (toString src));

     

       
230
       
230
       
 
       


     

       
231
       
231
       
 
       
  # -------------------------------------------------------------------------- #

     

       
232
       
232
       
 
       
  # Internal functions

     

···

       
213
       
213
       
 
       
    # Default value to return if revision can not be determined

     

       
214
       
214
       
 
       
    default:

     

       
215
       
215
       
 
       
    let

     

       
216
       
216
       
-
       
      revisionFile = ./.. + "/.git-revision";

     

       
217
       
217
       
-
       
      gitRepo      = ./.. + "/.git";

     

       
216
       
216
       
+
       
      revisionFile = "${toString ./..}/.git-revision";

     

       
217
       
217
       
+
       
      gitRepo      = "${toString ./..}/.git";

     

       
218
       
218
       
 
       
    in if lib.pathIsGitRepo gitRepo

     

       
219
       
219
       
 
       
       then lib.commitIdFromGitRepo gitRepo

     

       
220
       
220
       
 
       
       else if lib.pathExists revisionFile then lib.fileContents revisionFile