File tree Expand file tree Collapse file tree 1 file changed +16
-4
lines changed Expand file tree Collapse file tree 1 file changed +16
-4
lines changed Original file line number Diff line number Diff line change 9696      if  builtins . pathExists lockPath  &&  lock . version ==  1  then 
9797        builtins . listToAttrs ( 
9898          map ( dep : { 
99-             inherit   ( dep )   name ; 
99+             name   =   dep . name   or   dep . id ; 
100100            value = 
101101              let 
102-                 path =  "${ root } /${ dep . path } @.toml" ; 
102+                 path =  "${ root } /${ dep . path   or   dep . id } @.toml" ; 
103103              in 
104-               if  dep  ? version  &&  dep  ? path  &&  builtins . pathExists path  then 
105-                 ( import ./importAtom.nix )  {  }  path 
104+               if  dep  ? version  &&  dep  ? id  then 
105+                 if  builtins . pathExists path  then 
106+                   ( import ./importAtom.nix )  {  }  path 
107+                 else 
108+                   let 
109+                     spec =  baseNameOf path ; 
110+                   in 
111+                   ( import ./importAtom.nix )  {  } 
112+                     "${  
113+                       ( builtins . fetchGit {  
114+                         inherit  ( dep )  url  rev ;  
115+                         ref =  "refs/atoms/${ dep . id } /${ dep . version } /atom" ;  
116+                       } )  
117+                     } /${ spec } " 
106118              else  if  dep  ? rev  then 
107119                let 
108120                  repo =  builtins . fetchGit { 
 
 
   
 
     
   
   
          
    
    
     
    
      
     
     
    You can’t perform that action at this time.
  
 
    
  
    
      
        
     
       
      
     
   
 
    
    
  
 
  
 
     
    
0 commit comments