From b872b47bf1283824205609939faa14c3c5a8a9d8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 28 Dec 2019 22:45:01 +0200 Subject: gnu: ruby-multi-json: Don't use unstable tarball. * gnu/packages/ruby.scm (ruby-multi-json)[source]: Download using git-fetch. --- gnu/packages/ruby.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index e1d69f9655..0fcb8aead8 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2015, 2016, 2017 Ben Woodcroft ;;; Copyright © 2017 ng0 ;;; Copyright © 2017, 2019 Marius Bakke -;;; Copyright © 2017, 2018 Efraim Flashner +;;; Copyright © 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017, 2018, 2019 Christopher Baines @@ -3515,15 +3515,16 @@ net/http library.") (version "1.13.1") (source (origin - (method url-fetch) + (method git-fetch) ;; Tests are not distributed at rubygems.org so download from GitHub ;; instead. - (uri (string-append "https://github.com/intridea/multi_json/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (git-reference + (url "https://github.com/intridea/multi_json") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1s64xqvrnrxmb59v6b2kchnisawg5ai9ky1w60dy6z6ws9la1xv4")))) + "18wpb6p01rrkl4v33byh70vxj2a5jxkfxzv3pz8z6pssy4ymwkm4")))) (build-system ruby-build-system) (arguments `(#:phases -- cgit v1.2.3 From 11d1b31807f283cbb93609853c6132e26a9eb6b8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 28 Dec 2019 22:48:02 +0200 Subject: gnu: ruby-ae: Don't use unstable tarball. * gnu/packages/ruby.scm (ruby-ae)[source]: Download using git-fetch. --- gnu/packages/ruby.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 0fcb8aead8..0d64e05494 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6802,15 +6802,15 @@ and locking between worker processes.") (version "1.8.2") (source (origin - (method url-fetch) + (method git-fetch) ;; Fetch from github so tests are included. - (uri (string-append - "https://github.com/rubyworks/ae/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (git-reference + (url "https://github.com/rubyworks/ae") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "147jmkx54x7asy2d8m4dyrhhf4hdx4galpnhwzai030y3cdsfrrl")))) + "11299jj5ma8mi7b4majkyjy70y6zlqpgl8aql1c5lvfjavlpwmlp")))) (build-system ruby-build-system) (arguments `(#:phases @@ -6836,7 +6836,7 @@ and locking between worker processes.") (description "Assertive Expressive (AE) is an assertions library specifically designed for reuse by other test frameworks.") - (home-page "https://rubyworks.github.io/ae") + (home-page "https://rubyworks.github.io/ae/") (license license:bsd-2))) (define-public ruby-lemon -- cgit v1.2.3 From 3d30c3321089c460d35f8bf09a435cc22a604477 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 28 Dec 2019 22:50:23 +0200 Subject: gnu: ruby-ansi: Don't use unstable tarball. * gnu/packages/ruby.scm (ruby-ansi)[source]: Download using git-fetch. --- gnu/packages/ruby.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 0d64e05494..c95123d432 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6578,14 +6578,15 @@ requests either using arguments or with an interactive prompt.") (version "1.5.0") (source (origin - (method url-fetch) + (method git-fetch) ;; Fetch from GitHub as the gem does not contain testing code. - (uri (string-append "https://github.com/rubyworks/ansi/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (git-reference + (url "https://github.com/rubyworks/ansi") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1zdip30hivyipi8hndhb457bhiz033awd00bgrsk5axjrwp6zhly")))) + "1wsz7xxwl3vkh277jb7fd7akqnqqgbvalxzpjwniiqk8ghfprbi5")))) (build-system ruby-build-system) (arguments `(#:phases @@ -6616,7 +6617,7 @@ methods, a @code{Mixin} module for including color methods, a @code{Logger}, a @code{ProgressBar}, and a @code{String} subclass. The library also includes a @code{Terminal} module which provides information about the current output device.") - (home-page "https://rubyworks.github.io/ansi") + (home-page "https://rubyworks.github.io/ansi/") (license license:bsd-2))) (define-public ruby-systemu -- cgit v1.2.3 From 3c6128f6f1b399b0cc9bc9364dcb9cbd3c68d1ee Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 28 Dec 2019 22:53:14 +0200 Subject: gnu: ruby-guard: Don't use unstable tarball. * gnu/packages/ruby.scm (ruby-guard)[source]: Download using git-fetch. [home-page]: Use https. --- gnu/packages/ruby.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index c95123d432..206f8e0527 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3930,16 +3930,17 @@ invocation, and source and documentation browsing.") (name "ruby-guard") (version "2.13.0") (source (origin - (method url-fetch) + (method git-fetch) ;; The gem does not include a Rakefile, nor does it contain a ;; gemspec file, nor does it come with the tests. This is why ;; we fetch the tarball from Github. - (uri (string-append "https://github.com/guard/guard/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (git-reference + (url "https://github.com/guard/guard") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1hwj0yi17k6f5axrm0k2bb7fq71dlp0zfywmd7pij9iimbppcca0")))) + "16pxcszr0g2jnl3090didxh1d8z5m2mly14m3w4rspb8fmclsnjs")))) (build-system ruby-build-system) (arguments `(#:tests? #f ; tests require cucumber @@ -3970,7 +3971,7 @@ invocation, and source and documentation browsing.") "Guard is a command line tool to easily handle events on file system modifications. Guard automates various tasks by running custom rules whenever file or directories are modified.") - (home-page "http://guardgem.org/") + (home-page "https://guardgem.org/") (license license:expat))) (define-public ruby-tilt -- cgit v1.2.3 From b09ef660c78f1b75e6da68b2d956864456fa832b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 28 Dec 2019 23:02:45 +0200 Subject: gnu: ruby-oj: Don't use unstable tarball. * gnu/packages/ruby.scm (ruby-oj)[source]: Download using git-fetch. --- gnu/packages/ruby.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 206f8e0527..482be70381 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4788,15 +4788,16 @@ unacceptable HTML and/or CSS from a string.") (version "3.6.7") (source (origin - (method url-fetch) + (method git-fetch) ;; Version on rubygems.org does not contain Rakefile, so download from ;; GitHub instead. - (uri (string-append "https://github.com/ohler55/oj/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (git-reference + (url "https://github.com/ohler55/oj") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1x28ga72jxlnmsd8g8c0fw81vlh54r0qgagw2lxsd3x3la091g2h")))) + "1fqx58pwjiln7053lw2jy6ns4agcpxq2ac4f2fkd2ca3fxwpmh03")))) (build-system ruby-build-system) (arguments '(#:test-target "test_all" @@ -4815,7 +4816,7 @@ unacceptable HTML and/or CSS from a string.") (description "Oj is a JSON parser and generator for Ruby, where the encoding and decoding of JSON is implemented as a C extension to Ruby.") - (home-page "http://www.ohler.com/oj") + (home-page "http://www.ohler.com/oj/") (license (list license:expat ; Ruby code license:bsd-3)))) ; extension code -- cgit v1.2.3 From a6cffe6ec4f168138a2deb929737ee06376cff5c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Dec 2019 12:36:54 +0200 Subject: gnu: ruby-puma: Don't use unstable tarball. * gnu/packages/ruby.scm (ruby-puma)[source]: Download using git-fetch. [home-page]: Use https. --- gnu/packages/ruby.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 482be70381..6203352687 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7054,14 +7054,15 @@ part of the Prawn PDF generator.") (version "3.9.1") (source (origin - (method url-fetch) + (method git-fetch) ;; Fetch from GitHub because distributed gem does not contain tests. - (uri (string-append "https://github.com/puma/puma/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (git-reference + (url "https://github.com/puma/puma") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "03pifga841h17brh4vgia8i2ybh3cmsyg0dbybzdf6dq51wzcxdx")))) + "1kj75k81iik3aj73pkc9ixj9rwf95ipkyma65n28m64dgw02qi1f")))) (build-system ruby-build-system) (arguments `(#:tests? #f ; Tests require an out-dated version of minitest. @@ -7079,7 +7080,7 @@ for Ruby/Rack applications. Puma is intended for use in both development and production environments. In order to get the best throughput, it is highly recommended that you use a Ruby implementation with real threads like Rubinius or JRuby.") - (home-page "http://puma.io") + (home-page "https://puma.io/") (license license:expat))) (define-public ruby-hoe-git -- cgit v1.2.3 From 83870c32e8bbe5a70d58cbc9bdd98892e95dc5dc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Dec 2019 12:46:55 +0200 Subject: gnu: ruby-rack: Don't use unstable tarball. * gnu/packages/ruby.scm (ruby-rack)[source]: Download using git-fetch. [arguments]: Add phase to make gzip files writable. --- gnu/packages/ruby.scm | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 6203352687..10c887eeaf 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5068,16 +5068,15 @@ generates Ruby program.") (version "2.0.6") (source (origin - (method url-fetch) + (method git-fetch) ;; Download from GitHub so that the patch can be applied. - (uri (string-append - "https://github.com/rack/rack/archive/" - version - ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (git-reference + (url "https://github.com/rack/rack") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0pb3g5ymvbf07xaxcn51dpqv3djlxavckp3qkxsjdxiqznb0d9p1")) + "1n7z4g1x6yxip096cdc04wq7yk7ywpinq28g2xjb46r4nlv5h0j6")) ;; Ignore test which fails inside the build environment but works ;; outside. (patches (search-patches "ruby-rack-ignore-failing-test.patch")))) @@ -5103,7 +5102,15 @@ generates Ruby program.") (number->string (+ 22 size-diff)) "-" (number->string (+ 33 size-diff)))))) - #t))))) + #t)) + (add-before 'reset-gzip-timestamps 'make-files-writable + (lambda* (#:key outputs #:allow-other-keys) + ;; Make sure .gz files are writable so that the + ;; 'reset-gzip-timestamps' phase can do its work. + (let ((out (assoc-ref outputs "out"))) + (for-each make-file-writable + (find-files out "\\.gz$")) + #t)))))) (native-inputs `(("ruby-minitest" ,ruby-minitest) ("ruby-minitest-sprint" ,ruby-minitest-sprint) -- cgit v1.2.3 From 4e1108256917aec3ceb833683f93e61a89d22c37 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Dec 2019 16:08:06 +0200 Subject: gnu: ruby-ttfunk: Don't use unstable tarball. * gnu/packages/ruby.scm (ruby-ttfunk)[source]: Download using git-fetch. --- gnu/packages/ruby.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 10c887eeaf..ba414747b2 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7013,15 +7013,15 @@ binary-to-text encoding. The main modern use of Ascii85 is in PostScript and (version "1.5.1") (source (origin - (method url-fetch) + (method git-fetch) ;; fetch from github as the gem does not contain testing code - (uri (string-append - "https://github.com/prawnpdf/ttfunk/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (git-reference + (url "https://github.com/prawnpdf/ttfunk") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1ymcn12n5iws401yz03zsj8rr653fdqq13czsrciq09phgh9jzc5")))) + "0dx9891zcli0sjrslmsvrwalv86hbjbqlmbrcasnjr069v05h9v9")))) (build-system ruby-build-system) (arguments `(#:test-target "spec" -- cgit v1.2.3 From bb1e7ed066e97fff06fd10a70be1a582daa97217 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Dec 2019 16:15:50 +0200 Subject: gnu: ruby-tzinfo-data: Don't use unstable tarball. * gnu/packages/ruby.scm (ruby-tzinfo-data)[source]: Download using git-fetch. --- gnu/packages/ruby.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index ba414747b2..a82e39b796 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4066,17 +4066,16 @@ aware transformations between times in different time zones.") (version "1.2017.3") (source (origin - (method url-fetch) + (method git-fetch) ;; Download from GitHub because the rubygems version does not contain ;; Rakefile or tests. - (uri (string-append - "https://github.com/tzinfo/tzinfo-data/archive/v" - version - ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (git-reference + (url "https://github.com/tzinfo/tzinfo-data") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "01wff7syqzikbxalbg3isgxasmvzicr85bzadzkb6bf20bip4v54")) + "0v3phl5l3jrm6waxcszqmj2dkjhqawxfsxb6mss7vkp1hlckqcdp")) ;; Remove the known test failure. ;; https://github.com/tzinfo/tzinfo-data/issues/10 ;; https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1587128 -- cgit v1.2.3 From f3fd70c00e242ecc5c59323f4d7ebe3fcaa9ec4d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Dec 2019 16:20:38 +0200 Subject: gnu: ruby-yard: Don't use unstable tarball. * gnu/packages/ruby.scm (ruby-yard)[source]: Download using git-fetch. --- gnu/packages/ruby.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index a82e39b796..ad675dc488 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5753,14 +5753,15 @@ A modified copy of yajl is used, and included in the package.") (version "0.9.16") (source (origin - (method url-fetch) + (method git-fetch) ;; Tests do not pass if we build from the distributed gem. - (uri (string-append "https://github.com/lsegal/yard/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (git-reference + (url "https://github.com/lsegal/yard") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0sqpbayy9sb406jh0zqg6qha1xds863qz9531dh6vp58hc00clfq")))) + "0a4r1pfs0ms4vlccsf1x2jckx35lqm8b8lh6rdjxqfr5fia5izpf")))) (build-system ruby-build-system) (arguments `(#:phases -- cgit v1.2.3