diff --git a/srcpkgs/yarn/patches/yarn-bundle-entry.patch b/srcpkgs/yarn/patches/yarn-bundle-entry.patch deleted file mode 100644 index f75de5bf8bc..00000000000 --- a/srcpkgs/yarn/patches/yarn-bundle-entry.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- bin/yarn-bundle-entry.js.orig 2017-07-04 18:50:29.701379167 -0500 -+++ bin/yarn-bundle-entry.js 2017-07-04 17:27:32.749746288 -0500 -@@ -3,5 +3,5 @@ - /* eslint-disable flowtype/require-valid-file-annotation */ - 'use strict'; - --require('../lib/v8-compile-cache'); --module.exports = require('../lib/yarn-cli'); -+require('/usr/lib/yarn/v8-compile-cache'); -+module.exports = require('/usr/lib/yarn/yarn-cli'); diff --git a/srcpkgs/yarn/patches/yarn.patch b/srcpkgs/yarn/patches/yarn.patch new file mode 100644 index 00000000000..4587c31d859 --- /dev/null +++ b/srcpkgs/yarn/patches/yarn.patch @@ -0,0 +1,11 @@ +--- bin/yarn.js.orig 2017-09-14 18:50:29.701379167 -0500 ++++ bin/yarn.js 2017-09-14 17:27:32.749746288 -0500 +@@ -11,7 +11,7 @@ + console.error('Node version ' + ver + ' is not supported, please use Node.js 4.0 or higher.'); + process.exitCode = 1; + } else { +- var dirPath = '../lib/'; ++ var dirPath = '/usr/lib/yarn/'; + var v8CompileCachePath = dirPath + 'v8-compile-cache'; + var fs = require('fs'); + // We don't have/need this on legacy builds and dev builds diff --git a/srcpkgs/yarn/template b/srcpkgs/yarn/template index 97ad7b669ed..72f627160bb 100644 --- a/srcpkgs/yarn/template +++ b/srcpkgs/yarn/template @@ -1,6 +1,6 @@ # Template file for 'yarn' pkgname=yarn -version=0.28.4 +version=1.0.2 revision=1 hostmakedepends="yarn-bin" depends="nodejs" @@ -10,7 +10,7 @@ license="2-cause-BSD" homepage="https://yarnpkg.com/" distfiles="https://github.com/yarnpkg/${pkgname}/archive/v${version}.tar.gz" conflicts="yarn-bin>=0" -checksum=96dd6774bdd5fe1c19f7f15614a85581c2125f0ad8157926b1932974f63ab79b +checksum=da7ba9013a272a135543243c4e171f50f1199934fa04a339a8d1245ce92a4419 pre_build() { yarn @@ -24,7 +24,7 @@ do_install() { vmkdir /usr/lib/yarn vmkdir /usr/bin vcopy dist/lib/v8-compile-cache.js /usr/lib/yarn - vcopy dist/lib/yarn-cli.js /usr/lib/yarn + vcopy dist/lib/cli.js /usr/lib/yarn vbin dist/bin/yarn.js yarn }