Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ jobs:
cache: 'yarn'
- name: Install dependencies
run: yarn install
- name: Install libvips
run: sudo apt-get install -y libvips
- name: Compile assets
run: RAILS_ENV=test bundle exec rails assets:precompile
- name: Run tests
Expand Down Expand Up @@ -120,5 +122,7 @@ jobs:
cache: 'yarn'
- name: Install dependencies
run: yarn install
- name: Install libvips
run: sudo apt-get install -y libvips
- name: Compile assets
run: bundle exec rails assets:precompile
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ gem 'pagy' # Use pagy for pagination
gem 'pg' # Use postgresql as the database for Active Record
gem 'puma' # Use the Puma web server [https://github.com/puma/puma]
gem 'pundit' # Use pundit for easy authorization
gem 'ruby-vips' # Transform images
gem 'turbo-rails' # Use Turbo for progressive enhancement of requests
gem 'view_component' # Use ViewComponent to replace partials
gem 'vite_rails' # Use ViteRails to compile assets
Expand Down
5 changes: 3 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ GEM
ruby-lsp-rails (0.4.8)
ruby-lsp (>= 0.26.0, < 0.27.0)
ruby-progressbar (1.13.0)
ruby-vips (2.2.3)
ruby-vips (2.3.0)
ffi (~> 1.12)
logger
rubyzip (3.2.2)
Expand Down Expand Up @@ -425,6 +425,7 @@ DEPENDENCIES
rubocop-rails
ruby-lsp
ruby-lsp-rails
ruby-vips
selenium-webdriver
sentry-rails
sentry-ruby
Expand Down Expand Up @@ -549,7 +550,7 @@ CHECKSUMS
ruby-lsp (0.26.4) sha256=1cb3046a066c8f1983dfe5f0cd3baa76034d6ba156e8ab460b15ab129d37a9f7
ruby-lsp-rails (0.4.8) sha256=f09d1f926d4063deeb2f3049311925c20dfe6c912371e3bcd04a265a865c44ae
ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33
ruby-vips (2.2.3) sha256=41d12b1a805cd6ead4a7965201a8f7c5fe459bb58d3a7d967c9eb0719a6edc92
ruby-vips (2.3.0) sha256=e685ec02c13969912debbd98019e50492e12989282da5f37d05f5471442f5374
rubyzip (3.2.2) sha256=c0ed99385f0625415c8f05bcae33fe649ed2952894a95ff8b08f26ca57ea5b3c
sax-machine (1.3.2) sha256=a1112678039eea4c402827ca0d377744e0f882fd6386f29f7b0023d938750d3a
securerandom (0.4.1) sha256=cc5193d414a4341b6e225f0cb4446aceca8e50d5e1888743fac16987638ea0b1
Expand Down
12 changes: 6 additions & 6 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,19 @@
lockfile = ./Gemfile.lock;
gemset = ./gemset.nix;
groups = [ "default" "development" "test" "production" ];
gemConfig = pkgs.defaultGemConfig // {
ruby-vips = attrs: {
# We override the postInstall from nixpkgs, as ruby-vips changed this a bit in v2.3.0
postInstall = ''
cd "$(cat $out/nix-support/gem-meta/install-path)"

substituteInPlace lib/vips.rb \
--replace 'FFI.library_name("vips", 42)' '"${pkgs.lib.getLib pkgs.vips}/lib/libvips${pkgs.stdenv.hostPlatform.extensions.sharedLibrary}"' \
--replace 'FFI.library_name("glib-2.0", 0)' '"${pkgs.glib.out}/lib/libglib-2.0${pkgs.stdenv.hostPlatform.extensions.sharedLibrary}"' \
--replace 'FFI.library_name("gobject-2.0", 0)' '"${pkgs.glib.out}/lib/libgobject-2.0${pkgs.stdenv.hostPlatform.extensions.sharedLibrary}"'
'';
};
};
};
node-modules = pkgs.mkYarnModules {
pname = "feed-reader-modules";
Expand Down
4 changes: 2 additions & 2 deletions gemset.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.