guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

51/100: gnu: ruby-marcel: Fix build.


From: guix-commits
Subject: 51/100: gnu: ruby-marcel: Fix build.
Date: Mon, 10 Jul 2023 03:27:33 -0400 (EDT)

cbaines pushed a commit to branch master
in repository guix.

commit 158b3dc693c8991caac85945f861f74f47274e71
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Wed Jun 28 08:41:22 2023 +0100

    gnu: ruby-marcel: Fix build.
    
    * gnu/packages/rails.scm (ruby-marcel)[arguments]: Remove the byebug
    dependency.
    [native-inputs]: Remove ruby-byebug.
---
 gnu/packages/rails.scm | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm
index fc9a8f04e6..de0e17440e 100644
--- a/gnu/packages/rails.scm
+++ b/gnu/packages/rails.scm
@@ -977,18 +977,25 @@ already included in Rails.")
                 "1i1x24afmn09n48fj4yz2pdm6vlfnq14gism0cgxsyqmlrvsxajn"))))
     (build-system ruby-build-system)
     (arguments
-     (list #:test-target "default"
-           #:phases #~(modify-phases %standard-phases
-                        (add-before 'check 'disable-problematic-tests
-                          (lambda _
-                            (substitute* "test/mime_type_test.rb"
-                              ;; One test fails because of the newer rack
-                              ;; version used (see:
-                              ;; https://github.com/rails/marcel/issues/91).
-                              (("test \"gets content type.*" all)
-                               (string-append
-                                all "    skip('fails on guix')\n"))))))))
-    (native-inputs (list ruby-byebug ruby-nokogiri ruby-rack))
+     (list
+      #:test-target "default"
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch
+            (lambda _
+              ;; Remove byebug dependency
+              (substitute* "test/test_helper.rb"
+                (("require 'byebug'") ""))))
+          (add-before 'check 'disable-problematic-tests
+            (lambda _
+              (substitute* "test/mime_type_test.rb"
+                ;; One test fails because of the newer rack
+                ;; version used (see:
+                ;; https://github.com/rails/marcel/issues/91).
+                (("test \"gets content type.*" all)
+                 (string-append
+                  all "    skip('fails on guix')\n"))))))))
+    (native-inputs (list ruby-nokogiri ruby-rack))
     (propagated-inputs (list ruby-mimemagic))
     (synopsis "MIME type detection using magic numbers, filenames and 
extensions")
     (description



reply via email to

[Prev in Thread] Current Thread [Next in Thread]