sharlatan pushed a commit to branch ruby-team
in repository guix.

commit 92e7f7902f332caadc9a8667c10c8284ab7d37b6
Author: Nicolas Graves <[email protected]>
AuthorDate: Fri Jan 31 09:19:55 2025 +0100

    gnu: ruby-importmap-rails: Update package.
    
    * gnu/packages/rails.scm (ruby-importmap-rails):
    [arguments]<#:phases>: Adapt all phases to ruby-rails update.
    [native-inputs]: Add git-minimal/pinned.
    
    Signed-off-by: Sharlatan Hellseher <[email protected]>
---
 gnu/packages/rails.scm | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm
index f590947461..086c127e4f 100644
--- a/gnu/packages/rails.scm
+++ b/gnu/packages/rails.scm
@@ -952,8 +952,8 @@ already included in Rails.")
            #~(modify-phases %standard-phases
                (add-after 'extract-gemspec 'relax-requirements
                  (lambda _
-                   (delete-file "gemfiles/rails_7_propshaft.gemfile.lock")
-                   (substitute* "gemfiles/rails_7_propshaft.gemfile"
+                   (delete-file "gemfiles/rails_7_1_propshaft.gemfile.lock")
+                   (substitute* "gemfiles/rails_7_1_propshaft.gemfile"
                      ((".*gem \"byebug\".*") "")
                      ;; Remove appraisal, and add tzinfo-data, which needs to
                      ;; be in the Gemfile to become available.
@@ -964,16 +964,21 @@ already included in Rails.")
                      ((".*gem \"webdrivers\".*") ""))))
                (add-before 'check 'set-BUNDLE_GEMFILE
                  (lambda _
-                   ;; The default Gemfile is for Rails 6.
                    (setenv "BUNDLE_GEMFILE"
-                           "gemfiles/rails_7_propshaft.gemfile")))
+                           "gemfiles/rails_7_1_propshaft.gemfile")))
                (add-before 'check 'disable-problematic-tests
                  (lambda _
+                   ;; All bin/importmap invocation fail.
+                   ;; At least one requires networking.
+                   (delete-file "test/commands_test.rb")
+                   ;; Bundler, probably requires networking
+                   (delete-file "test/installer_test.rb")
                    ;; The integration tests require networking; disable them.
                    (delete-file "test/npm_integration_test.rb")
                    (delete-file "test/packager_integration_test.rb"))))))
     (native-inputs
-     (list ruby-capybara
+     (list git-minimal/pinned
+           ruby-capybara
            ruby-propshaft
            ruby-rails
            ruby-rexml

Reply via email to