Merge branch 'staging' into 'core-updates'.

Conflicts:

	gnu/local.mk
	gnu/packages/cmake.scm
	gnu/packages/curl.scm
	gnu/packages/gl.scm
	gnu/packages/glib.scm
	gnu/packages/guile.scm
	gnu/packages/node.scm
	gnu/packages/openldap.scm
	gnu/packages/package-management.scm
	gnu/packages/python-xyz.scm
	gnu/packages/python.scm
	gnu/packages/tls.scm
	gnu/packages/vpn.scm
	gnu/packages/xorg.scm
This commit is contained in:
Maxim Cournoyer 2021-01-13 23:39:52 -05:00
commit 01f0707207
No known key found for this signature in database
GPG key ID: 1260E46482E63562
407 changed files with 75910 additions and 10423 deletions

View file

@ -23,6 +23,7 @@
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Holgr Peters <holger.peters@posteo.de>
;;;
;;; This file is part of GNU Guix.
;;;
@ -187,6 +188,20 @@ a focus on simplicity and productivity.")
(native-inputs
`(("autoconf" ,autoconf)))))
(define-public ruby-3.0
(package
(inherit ruby-2.7)
(version "3.0.0")
(source
(origin
(method url-fetch)
(uri (string-append "http://cache.ruby-lang.org/pub/ruby/"
(version-major+minor version)
"/ruby-" version ".tar.xz"))
(sha256
(base32
"1cbcixwnr0y8q0lg67wjgplp06kjd6p6hjjh680csv3v0bpsxgv8"))))))
(define-public ruby-2.5
(package
(inherit ruby-2.6)
@ -230,7 +245,7 @@ a focus on simplicity and productivity.")
(define-public mruby
(package
(name "mruby")
(version "2.0.0")
(version "2.1.2")
(source
(origin
(method git-fetch)
@ -240,7 +255,7 @@ a focus on simplicity and productivity.")
(file-name (git-file-name name version))
(sha256
(base32
"1r6w1asjshff43ymdwa6xmrkggza99mi2kw88k7ic6ag2j81hcj5"))))
"0fhfv8pi7i8jn2vgk2n2rjnbnfa12nhj514v8i4k353n7q4pmkh3"))))
(build-system gnu-build-system)
(arguments
`(#:test-target "test"
@ -5088,15 +5103,17 @@ across multiple CPU cores.")
(define-public ruby-parser
(package
(name "ruby-parser")
(version "2.7.1.4")
(version "2.7.2.0")
(source
(origin
(method url-fetch)
(uri (rubygems-uri "parser" version))
(sha256
(base32
"1030znhvhkfn39svwbj6qn4xb6hgl94gnvg57k4d3r76f9bryqmn"))))
"1f7gmm60yla325wlnd3qkxs59qm2y0aan8ljpg6k18rwzrrfil6z"))))
(build-system ruby-build-system)
(arguments
'(#:tests? #f)) ; tests not included in gem
(native-inputs
`(("bundler" ,bundler)
("ruby-cliver" ,ruby-cliver)
@ -6300,14 +6317,14 @@ alternative to Marshal for Object serialization. ")
(define-public ruby-pg
(package
(name "ruby-pg")
(version "1.1.4")
(version "1.2.3")
(source
(origin
(method url-fetch)
(uri (rubygems-uri "pg" version))
(sha256
(base32
"0fmnyxcyrvgdbgq7m09whgn9i8rwfybk0w8aii1nc4g5kqw0k2jy"))))
"13mfrysrdrh8cka1d96zm0lnfs59i5x2g6ps49r2kz5p3q81xrzj"))))
(build-system ruby-build-system)
(arguments
'(#:test-target "spec"))
@ -6936,7 +6953,7 @@ they match.")
(define-public ruby-regexp-parser
(package
(name "ruby-regexp-parser")
(version "1.7.1")
(version "2.0.0")
(source
(origin
(method git-fetch) ;bin/test missing from gem
@ -6946,7 +6963,7 @@ they match.")
(file-name (git-file-name name version))
(sha256
(base32
"0dk9d4vpw31cc06s29fqyr1kq0kipym1mydifkcrnppvpl3pd53r"))))
"09ddxdwlml30q6j4rqf06bbjj1mwx00rs0bksnyblhv85anrqz3k"))))
(build-system ruby-build-system)
(arguments
'(#:test-target "default"
@ -11672,3 +11689,30 @@ which snapshots to consider and what files to include.")
defined in @file{.travis.yml} on your local machine, using @code{rvm},
@code{rbenv}, or @code{chruby} to test different versions of Ruby.")
(license license:expat)))
(define-public ruby-rugged
(package
(name "ruby-rugged")
(version "1.1.0")
(home-page "https://www.rubydoc.info/gems/rugged")
(source
(origin
(method url-fetch)
(uri (rubygems-uri "rugged" version))
(sha256
(base32 "04aq913plcxjw71l5r62qgz3bx3466p0wvgyfqahg5n3nybmcwqy"))))
(build-system ruby-build-system)
(arguments
`(#:tests? #f
#:gem-flags (list "--" "--use-system-libraries")))
(inputs
`(("libgit2" ,libgit2)))
(native-inputs
`(("ruby-minitest" ,ruby-minitest)
("ruby-pry" ,ruby-pry)
("ruby-rake-compiler" ,ruby-rake-compiler)))
(synopsis "Ruby bindings to the libgit2 linkable C Git library")
(description "Rugged is a library for accessing libgit2 in Ruby. It gives
you the speed and portability of libgit2 with the beauty of the Ruby
language.")
(license license:expat)))