From 18da6364bbdda34a847b6b7596c6b761f152a7d1 Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Tue, 25 Jul 2023 19:31:10 -0500
Subject: [PATCH] Fix guix build

---
 guix.scm | 51 ++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 38 insertions(+), 13 deletions(-)

diff --git a/guix.scm b/guix.scm
index e8d20e69d08bc7ba2bff08f900fdee1083f7cf3c..6322a6c35da5eb09414f94fca7ef598c2d95f94f 100644
--- a/guix.scm
+++ b/guix.scm
@@ -106,7 +106,7 @@
        ("ruby-yard" ,ruby-yard)
        ("ruby-countdownlatch" ,ruby-countdownlatch)
        ("ruby-rb-fsevent" ,ruby-rb-fsevent)
-       ("ruby-mocha" ,ruby-mocha)))
+       ("ruby-mocha" ,ruby-mocha-1)))
     (synopsis
       "An XMPP DSL for Ruby written on top of EventMachine and Nokogiri")
     (description
@@ -114,10 +114,31 @@
     (home-page "http://adhearsion.com/blather")
     (license license:expat)))
 
+(define-public ruby-rspec-junit-formatter
+  (package
+    (name "ruby-rspec-junit-formatter")
+    (version "0.6.0")
+    (source (origin
+              (method url-fetch)
+              (uri (rubygems-uri "rspec_junit_formatter" version))
+              (sha256
+               (base32
+                "059bnq1gcwl9g93cqf13zpz38zk7jxaa43anzz06qkmfwrsfdpa0"))))
+    (build-system ruby-build-system)
+    (arguments
+     `(#:tests? #f))
+    (propagated-inputs (list ruby-rspec-core))
+    (synopsis
+     "RSpec results that your continuous integration service can read.")
+    (description
+     "RSpec results that your continuous integration service can read.")
+    (home-page "https://github.com/sj26/rspec_junit_formatter")
+    (license license:expat)))
+
 (define-public ruby-braintree
   (package
     (name "ruby-braintree")
-    (version "4.4.0")
+    (version "4.12.0")
     (source
      (origin
        (method git-fetch)
@@ -129,7 +150,7 @@
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "0dzf26yhmlf65464nranvqg5rzhrc8gfaqbg3p4ld3abz8ccnw08"))))
+         "0gfgkymy3655drwgs42bj9ap9qib1l30sajxmypmp6s75m9w3gsh"))))
     (build-system ruby-build-system)
     (arguments
      `(#:test-target "test:unit"
@@ -139,19 +160,23 @@
            (lambda _
              (substitute* "Gemfile"
                (("gem \"libxml-ruby\", \"3.2.0\"") "gem \"libxml-ruby\", \"~> 3.0.0\"")
-               (("gem \"rspec\", \"3.9.0\"") "gem \"rspec\", \"~> 3.8.0\"")
-               (("gem \"rubocop\", \"~>1.12.0\"") "gem \"rubocop\", \"~> 1.10.0\""))
-             #t)))))
+               (("gem \"rubocop\".*") "")
+               (("gem \"rake\", \"13.0.1\"") "gem \"rake\", \"~> 13.0.6\"")
+               (("gem \"rspec\", \"3.9.0\"") "gem \"rspec\", \"~> 3.12.0\"")
+               (("gem \"pry\", \"0.13.1\"") "gem \"pry\", \"~> 0.14.2\""))
+             (substitute* "Rakefile"
+               (("sh \"rubocop\"") "")))))))
     (propagated-inputs
       `(("ruby-builder" ,ruby-builder)
         ("ruby-rexml" ,ruby-rexml)))
     (native-inputs
-     `(("ruby-rspec" ,ruby-rspec)
-       ("ruby-libxml" ,ruby-libxml)
-       ("ruby-pry" ,ruby-pry)
-       ("ruby-rake" ,ruby-rake)
-       ("ruby-webrick" ,ruby-webrick)
-       ("ruby-rubocop" ,ruby-rubocop)))
+	  (list
+		ruby-rspec
+		ruby-libxml
+		ruby-pry
+		ruby-rake
+		ruby-webrick
+		ruby-rspec-junit-formatter))
     (synopsis
       "Resources and tools for developers to integrate Braintree's global payments platform.")
     (description
@@ -484,7 +509,7 @@
     (propagated-inputs `(("ruby-money" ,ruby-money)))
     (native-inputs
      `(("ruby-minitest" ,ruby-minitest)
-       ("ruby-mocha" ,ruby-mocha)
+       ("ruby-mocha" ,ruby-mocha-1)
        ("ruby-timecop" ,ruby-timecop)
        ("ruby-webmock" ,ruby-webmock)
        ("ruby-monetize" ,ruby-monetize)