Merge branch 'master' into staging

This commit is contained in:
Marius Bakke 2019-11-15 20:11:35 +01:00
commit f056553c6b
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
192 changed files with 6400 additions and 2868 deletions

View file

@ -3682,13 +3682,13 @@ to reproduce user environments.")
(define-public ruby-nokogiri
(package
(name "ruby-nokogiri")
(version "1.10.4")
(version "1.10.5")
(source (origin
(method url-fetch)
(uri (rubygems-uri "nokogiri" version))
(sha256
(base32
"0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv"))))
"185g3dwba73jqxjr94bd2zk6fil6n9hmcfnfyzh3p1w47vm296r7"))))
(build-system ruby-build-system)
(arguments
;; Tests fail because Nokogiri can only test with an installed extension,
@ -8784,18 +8784,17 @@ then check out http://127.0.0.1:1080 to see the mail.")
(define-public ruby-backport
(package
(name "ruby-backport")
(version "1.1.1")
(version "1.1.2")
(source
(origin
;; The gem does not include test code, so fetch from the Git repository
;; The gem does not include test code, so fetch from the Git repository.
(method git-fetch)
(uri (git-reference
(url "https://github.com/castwide/backport.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0ii3y1wx1n48nd2mhlv0v61b2m21h7dg30if9vc2idza7k4afyw8"))))
(base32 "18fpg1n7n2z02ykz9v1x1q0cqa2lvivf8ygka768s01q1r9wfwv2"))))
(build-system ruby-build-system)
(arguments
`(#:test-target "spec"))