···

       
166
       
166
       
 
       
      in type == "directory" || lib.any (ext: lib.hasSuffix ext base) exts;

     

       
167
       
167
       
 
       
    in cleanSourceWith { inherit filter src; };

     

       
168
       
168
       
 
       


     

       
169
       
169
       
-
       
  pathIsGitRepo = path: (tryEval (commitIdFromGitRepo path)).success;

     

       
169
       
169
       
+
       
  pathIsGitRepo = path: (commitIdFromGitRepoOrError path)?value;

     

       
170
       
170
       
+
       


     

       
171
       
171
       
+
       
  /*

     

       
172
       
172
       
+
       
    Get the commit id of a git repo.

     

       
173
       
173
       
+
       


     

       
174
       
174
       
+
       
    Example: commitIdFromGitRepo <nixpkgs/.git>

     

       
175
       
175
       
+
       
  */

     

       
176
       
176
       
+
       
  commitIdFromGitRepo = path:

     

       
177
       
177
       
+
       
    let commitIdOrError = commitIdFromGitRepoOrError path;

     

       
178
       
178
       
+
       
    in commitIdOrError.value or (throw commitIdOrError.error);

     

       
170
       
179
       
 
       


     

       
171
       
180
       
 
       
  /*

     

       
172
       
181
       
 
       
    Get the commit id of a git repo.

     

       
173
       
182
       
 
       


     

       
183
       
183
       
+
       
    Returns `{ value = commitHash }` or `{ error = "... message ..." }`.

     

       
184
       
184
       
+
       


     

       
174
       
185
       
 
       
    Example: commitIdFromGitRepo <nixpkgs/.git>

     

       
175
       
186
       
 
       
  */

     

       
176
       
176
       
-
       
  commitIdFromGitRepo =

     

       
187
       
187
       
+
       
  commitIdFromGitRepoOrError =

     

       
177
       
188
       
 
       
    let readCommitFromFile = file: path:

     

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

     

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

     

       
189
       
189
       
+
       
        let fileName       = path + "/${file}";

     

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

     

       
180
       
191
       
 
       
            absolutePath   = base: path:

     

       
181
       
192
       
 
       
              if lib.hasPrefix "/" path

     

       
182
       
193
       
 
       
              then path

     
···

       
186
       
197
       
 
       
           then

     

       
187
       
198
       
 
       
             let m   = match "^gitdir: (.*)$" (lib.fileContents path);

     

       
188
       
199
       
 
       
             in if m == null

     

       
189
       
189
       
-
       
                then throw ("File contains no gitdir reference: " + path)

     

       
200
       
200
       
+
       
                then { error = "File contains no gitdir reference: " + path; }

     

       
190
       
201
       
 
       
                else

     

       
191
       
202
       
 
       
                  let gitDir      = absolutePath (dirOf path) (lib.head m);

     

       
192
       
203
       
 
       
                      commonDir'' = if pathIsRegularFile "${gitDir}/commondir"

     
···

       
204
       
215
       
 
       
             let fileContent = lib.fileContents fileName;

     

       
205
       
216
       
 
       
                 matchRef    = match "^ref: (.*)$" fileContent;

     

       
206
       
217
       
 
       
             in if  matchRef == null

     

       
207
       
207
       
-
       
                then fileContent

     

       
218
       
218
       
+
       
                then { value = fileContent; }

     

       
208
       
219
       
 
       
                else readCommitFromFile (lib.head matchRef) path

     

       
209
       
220
       
 
       


     

       
210
       
221
       
 
       
           else if pathIsRegularFile packedRefsName

     
···

       
218
       
229
       
 
       
                 # https://github.com/NixOS/nix/issues/2147#issuecomment-659868795

     

       
219
       
230
       
 
       
                 refs = filter isRef (split "\n" fileContent);

     

       
220
       
231
       
 
       
             in if refs == []

     

       
221
       
221
       
-
       
                then throw ("Could not find " + file + " in " + packedRefsName)

     

       
222
       
222
       
-
       
                else lib.head (matchRef (lib.head refs))

     

       
232
       
232
       
+
       
                then { error = "Could not find " + file + " in " + packedRefsName; }

     

       
233
       
233
       
+
       
                else { value = lib.head (matchRef (lib.head refs)); }

     

       
223
       
234
       
 
       


     

       
224
       
224
       
-
       
           else throw ("Not a .git directory: " + path);

     

       
235
       
235
       
+
       
           else { error = "Not a .git directory: " + toString path; };

     

       
225
       
236
       
 
       
    in readCommitFromFile "HEAD";

     

       
226
       
237
       
 
       


     

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

     

···

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

     

       
214
       
214
       
 
       
    default:

     

       
215
       
215
       
 
       
    let

     

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

     

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

     

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

     

       
217
       
217
       
+
       
      gitRepo      = ./.. + "/.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