diff options
| author | Björn Höfling <bjoern.hoefling@bjoernhoefling.de> | 2019-12-07 23:36:49 +0100 |
|---|---|---|
| committer | Björn Höfling <bjoern.hoefling@bjoernhoefling.de> | 2019-12-09 00:35:42 +0100 |
| commit | 7fa83fa86031aa7dff759bc8025edc7057508ace (patch) | |
| tree | 95fe75dc596098c5fba964118d80ae2939d38b45 /gnu | |
| parent | 55cc5ef80d1537b591843df6ad7d683601826593 (diff) | |
| download | guix-7fa83fa86031aa7dff759bc8025edc7057508ace.tar.gz | |
gnu: ruby-safe-yaml: Update to 1.0.5.
* gnu/packages/ruby.scm(ruby-save-yaml): Update to 1.0.5. * gnu/packages/patches/ruby-safe-yaml-add-require-time.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/ruby-safe-yaml-add-require-time.patch | 19 | ||||
| -rw-r--r-- | gnu/packages/ruby.scm | 7 |
3 files changed, 2 insertions, 25 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 1c7386a95a..fbfbc567a3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1331,7 +1331,6 @@ dist_patch_DATA = \ %D%/packages/patches/retroarch-disable-online-updater.patch \ %D%/packages/patches/ruby-rubygems-276-for-ruby24.patch \ %D%/packages/patches/ruby-rack-ignore-failing-test.patch \ - %D%/packages/patches/ruby-safe-yaml-add-require-time.patch \ %D%/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch\ %D%/packages/patches/runc-CVE-2019-5736.patch \ %D%/packages/patches/rust-1.19-mrustc.patch \ diff --git a/gnu/packages/patches/ruby-safe-yaml-add-require-time.patch b/gnu/packages/patches/ruby-safe-yaml-add-require-time.patch deleted file mode 100644 index 92e5505985..0000000000 --- a/gnu/packages/patches/ruby-safe-yaml-add-require-time.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 9dd1e8d9ad0396a8c9092c2e9f17d498c58e0208 Mon Sep 17 00:00:00 2001 -From: elifoster <elifosterwy@gmail.com> -Date: Tue, 5 Dec 2017 14:30:13 -0800 -Subject: [PATCH] Fix uninitialized constant DateTime Close #80 - ---- - lib/safe_yaml/parse/date.rb | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/lib/safe_yaml/parse/date.rb b/lib/safe_yaml/parse/date.rb -index cd3c62a..3a30a8b 100644 ---- a/lib/safe_yaml/parse/date.rb -+++ b/lib/safe_yaml/parse/date.rb -@@ -1,3 +1,5 @@ -+require 'time' -+ - module SafeYAML - class Parse - class Date diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 84ca199b07..dc1ccf9993 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -8284,10 +8284,9 @@ indentation will probably be an issue and hence this gem.") (define-public ruby-safe-yaml (package (name "ruby-safe-yaml") - (version "1.0.4") + (version "1.0.5") (source (origin - ;; TODO Fetch from the git repository so a patch can be applied (method git-fetch) (uri (git-reference (url "https://github.com/dtao/safe_yaml.git") @@ -8295,9 +8294,7 @@ indentation will probably be an issue and hence this gem.") (file-name (git-file-name name version)) (sha256 (base32 - "1wnln8xdy8g6kwdj4amm8773xwffqxpf2sxslk6jjh2wxsy1lrig")) - (patches - (search-patches "ruby-safe-yaml-add-require-time.patch")))) + "1a0wh7y3va2m7bjza95na2snw0vrdh9syz40mpjvjphbc4ph3pzg")))) (build-system ruby-build-system) (native-inputs `(("ruby-rspec" ,ruby-rspec) |