docuseal: remove in-tree yarn.lock (#459892)
This commit is contained in:
@@ -10,7 +10,7 @@
|
||||
bundler,
|
||||
fetchYarnDeps,
|
||||
yarn,
|
||||
fixup-yarn-lock,
|
||||
yarnConfigHook,
|
||||
nodejs,
|
||||
}:
|
||||
|
||||
@@ -45,13 +45,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
;
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = ./yarn.lock;
|
||||
hash = "sha256-IQOWLkVueuRs0CBv3lEdj6DOiumC4ZPuQRDxQHFh5fQ=";
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-WypnmgUbt+qlJivg1oWX6dabD/1o0H6c3ODcv+S5Ptw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
yarn
|
||||
fixup-yarn-lock
|
||||
yarnConfigHook
|
||||
nodejs
|
||||
finalAttrs.rubyEnv
|
||||
];
|
||||
@@ -64,12 +64,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
runHook preBuild
|
||||
|
||||
export HOME=$(mktemp -d)
|
||||
fixup-yarn-lock yarn.lock
|
||||
|
||||
yarn config --offline set yarn-offline-mirror $offlineCache
|
||||
|
||||
yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress
|
||||
patchShebangs node_modules
|
||||
|
||||
bundle exec rails assets:precompile
|
||||
bundle exec rails shakapacker:compile
|
||||
@@ -88,7 +82,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildInputs = [ finalAttrs.rubyEnv ];
|
||||
propagatedBuildInputs = [ finalAttrs.rubyEnv.wrappedRuby ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
RAILS_ENV = "production";
|
||||
BUNDLE_WITHOUT = "development:test";
|
||||
|
||||
@@ -32,15 +32,8 @@ BUNDLE_GEMFILE="$repo/Gemfile" bundler lock --remove-platform aarch64-linux --lo
|
||||
# generate gemset.nix
|
||||
bundix --lock --lockfile="$repo/Gemfile.lock" --gemfile="$repo/Gemfile" --gemset="$dir/gemset.nix"
|
||||
|
||||
# patch yarn.lock
|
||||
sed -i 's$, "@hotwired/turbo@https://github.com/docusealco/turbo#main"$$g' "$repo/yarn.lock"
|
||||
|
||||
# calc yarn hash
|
||||
YARN_HASH="$(prefetch-yarn-deps "$repo/yarn.lock")"
|
||||
YARN_HASH="$(nix --extra-experimental-features nix-command hash to-sri --type sha256 "$YARN_HASH")"
|
||||
|
||||
# update
|
||||
cp "$repo/Gemfile" "$repo/Gemfile.lock" "$repo/yarn.lock" "$dir/"
|
||||
cp "$repo/Gemfile" "$repo/Gemfile.lock" "$dir/"
|
||||
nix-update docuseal --version "$latest"
|
||||
nix-update docuseal --subpackage "docusealWeb"
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user