From f7b4258aedf33cf8469429dde929c5f961a78d11 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Wed, 28 Jun 2023 08:38:50 +0100 Subject: gnu: %ruby-rails-version: Update to 7.0.5.1. * gnu/packages/rails.scm (%ruby-rails-version): Update to 7.0.5.1. (ruby-rails-monorepo): Update hash. (ruby-activesupport)[propagated-inputs]: Switch to ruby-minitest-5.15 to ruby-minitest. (ruby-activerecord)[native-inputs]: Add ruby-mini-portile-2. --- gnu/packages/rails.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index 87ac5def12..b90c479ae6 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -35,7 +35,7 @@ #:use-module (gnu packages version-control) #:use-module (guix build-system ruby)) -(define %ruby-rails-version "7.0.4.3") +(define %ruby-rails-version "7.0.5.1") (define ruby-rails-monorepo (origin @@ -46,7 +46,7 @@ (file-name (git-file-name "ruby-rails" %ruby-rails-version)) (sha256 (base32 - "0f5f8r8wdmdmbyl07b0z555arai4ys2j8dj3fy0mq63y9bfhcqqk")))) + "0s16i73rqzlrx5icn848mf2nmblmgxk06wj9576dkadsb8pspv0l")))) (define-public ruby-activesupport (package @@ -109,10 +109,7 @@ (propagated-inputs (list ruby-concurrent ruby-i18n - ;; This is sub-optimal, but apparently necessary (see: - ;; https://github.com/rails/rails/commit/ - ;; 9766eb4a833c26c64012230b96dd1157ebb8e8a2). - ruby-minitest-5.15 + ruby-minitest ruby-tzinfo ruby-tzinfo-data)) (synopsis "Ruby on Rails utility library") @@ -344,7 +341,9 @@ serialization, internationalization, and testing.") ;; A few tests require to set the timezone. (setenv "TZDIR" (search-input-directory (or native-inputs inputs) "share/zoneinfo"))))))) - (native-inputs (list tzdata-for-tests)) + (native-inputs + (list tzdata-for-tests + ruby-mini-portile-2)) (propagated-inputs (list ruby-activemodel ruby-activesupport ruby-sqlite3)) (synopsis "Ruby library to connect to relational databases") (description -- cgit v1.2.3