diff options
| author | talyz <kim.lindberger@gmail.com> | 2021-07-07 12:51:28 +0200 |
|---|---|---|
| committer | talyz <kim.lindberger@gmail.com> | 2021-07-14 13:18:12 +0200 |
| commit | a2dbc3af1d50edb8d646817e7abe799bcf369f20 (patch) | |
| tree | ad5fa9c96012217d2aa442877c6b66034bae611f | |
| parent | 20548f050e72a789ebbfe413b0fe7aa815e55c27 (diff) | |
| download | nixpkgs-a2dbc3af1d50edb8d646817e7abe799bcf369f20.tar nixpkgs-a2dbc3af1d50edb8d646817e7abe799bcf369f20.tar.gz nixpkgs-a2dbc3af1d50edb8d646817e7abe799bcf369f20.tar.bz2 nixpkgs-a2dbc3af1d50edb8d646817e7abe799bcf369f20.tar.lz nixpkgs-a2dbc3af1d50edb8d646817e7abe799bcf369f20.tar.xz nixpkgs-a2dbc3af1d50edb8d646817e7abe799bcf369f20.tar.zst nixpkgs-a2dbc3af1d50edb8d646817e7abe799bcf369f20.zip | |
discourse: Remove architecture bound platforms from Gemfile.lock
Maybe bundix doesn't handle them properly? They cause runtime issues and don't seem necessary when the binary gems are built from scratch anyway.
| -rw-r--r-- | pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock | 12 | ||||
| -rwxr-xr-x | pkgs/servers/web-apps/discourse/update.py | 4 |
2 files changed, 5 insertions, 11 deletions
diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock index af968cdf331..adefcc318a6 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock @@ -186,11 +186,6 @@ GEM jwt (2.2.3) kgio (2.11.3) libv8-node (15.14.0.1) - libv8-node (15.14.0.1-arm64-darwin-20) - libv8-node (15.14.0.1-x86_64-darwin-18) - libv8-node (15.14.0.1-x86_64-darwin-19) - libv8-node (15.14.0.1-x86_64-darwin-20) - libv8-node (15.14.0.1-x86_64-linux) listen (3.5.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) @@ -465,12 +460,7 @@ GEM zeitwerk (2.4.2) PLATFORMS - arm64-darwin-20 ruby - x86_64-darwin-18 - x86_64-darwin-19 - x86_64-darwin-20 - x86_64-linux DEPENDENCIES actionmailer (= 6.1.3.2) @@ -600,4 +590,4 @@ DEPENDENCIES yaml-lint BUNDLED WITH - 2.2.16 + 2.2.20 diff --git a/pkgs/servers/web-apps/discourse/update.py b/pkgs/servers/web-apps/discourse/update.py index d10a49be58f..ae4dadfc3a7 100755 --- a/pkgs/servers/web-apps/discourse/update.py +++ b/pkgs/servers/web-apps/discourse/update.py @@ -173,6 +173,10 @@ def update(rev): f.write(repo.get_file(fn, rev)) subprocess.check_output(['bundle', 'lock'], cwd=rubyenv_dir) + for platform in ['arm64-darwin-20', 'x86_64-darwin-18', + 'x86_64-darwin-19', 'x86_64-darwin-20', + 'x86_64-linux']: + subprocess.check_output(['bundle', 'lock', '--remove-platform', platform], cwd=rubyenv_dir) subprocess.check_output(['bundix'], cwd=rubyenv_dir) _call_nix_update('discourse', repo.rev2version(rev)) |