@@ -157,7 +157,7 @@ class Package {
157157 * src: {
158158 * type: 'url',
159159 * url: string,
160- * sha1 ?: string,
160+ * hash ?: string,
161161 * } | {
162162 * type: 'local',
163163 * },
@@ -200,8 +200,8 @@ class Package {
200200 */
201201 static create (
202202 pkgInfo ,
203- // @ts -ignore because there is no optionalDependencies in the type
204- { version, resolved, dependencies = { } , optionalDependencies = { } }
203+ // @ts -ignore because type lacks: integrity, optionalDependencies
204+ { version, integrity , resolved, dependencies = { } , optionalDependencies = { } }
205205 ) {
206206 const { scope = '' , name } = Id . parse ( pkgInfo . name ) ;
207207
@@ -211,14 +211,14 @@ class Package {
211211 const parsedUrl = new URL ( resolved ) ;
212212 // prettier-ignore
213213 if ( [ 'registry.yarnpkg.com' , 'registry.npmjs.org' ] . includes ( parsedUrl . host ) ) {
214+ const hash = integrity || parsedUrl . hash . slice ( 1 ) ;
214215 src = {
215- sha1 : parsedUrl . hash . slice ( 1 ) , // cut off the first ('#') character
216216 url : parsedUrl . origin + parsedUrl . pathname ,
217217 type : 'url' ,
218218 } ;
219219 } else {
220220 src = {
221- sha1 : undefined , // We don't provide sha in order to force to override it manually
221+ hash : undefined , // We don't provide hash in order to force to override it manually
222222 url : parsedUrl . origin + parsedUrl . pathname ,
223223 type : 'url' ,
224224 } ;
@@ -306,7 +306,7 @@ class Package {
306306 renderSrc ( ) {
307307 switch ( this . src . type ) {
308308 case 'url' :
309- const { url, sha1 } = this . src ;
309+ const { url, hash } = this . src ;
310310 // Some of the urls can look like "https://codeload.github.com/xolvio/cucumber-js/tar.gz/cf953cb5b5de30dbcc279f59e4ebff3aa040071c",
311311 // i.e. no extention given. That's why Nix unable to recognize the type of archive so we need to have
312312 // name specified explicitly to all Nix to infer the archive type.
@@ -339,13 +339,8 @@ class Package {
339339 : ''
340340 }
341341 url = "${ url } ";
342- ${
343- sha1
344- ? `sha1 = "${ sha1 } "`
345- : `sha256 = abort ''
346-
347-
348- Failed to infer \`sha256\` hash of the \`${ this . renderKey ( ) } \` package source from
342+ hash = ${ hash ? `"${ hash } "` : `abort ''
343+ Failed to infer hash of the \`${ this . renderKey ( ) } \` package source from
349344 \`${ url } \`.
350345
351346 Override \`"${ this . renderKey ( ) } ".src.sha256\` attribute in order to provide this missing piece to Nix.
0 commit comments