* [bug#39157] [PATCH 0/2] Update ruby-sassc and ruby-sqlite3.
@ 2020-01-16 22:24 Christopher Baines
2020-01-16 22:28 ` [bug#39157] [PATCH 1/2] gnu: ruby-sassc: Update to 2.2.1 Christopher Baines
2020-01-30 14:26 ` bug#39157: [PATCH 0/2] Update ruby-sassc and ruby-sqlite3 Christopher Baines
0 siblings, 2 replies; 4+ messages in thread
From: Christopher Baines @ 2020-01-16 22:24 UTC (permalink / raw)
To: 39157
[-- Attachment #1: Type: text/plain, Size: 208 bytes --]
Christopher Baines (2):
gnu: ruby-sassc: Update to 2.2.1.
gnu: ruby-sqlite3: Update to 1.4.2.
gnu/packages/ruby.scm | 29 ++++++++++++++++++++---------
1 file changed, 20 insertions(+), 9 deletions(-)
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 962 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* [bug#39157] [PATCH 1/2] gnu: ruby-sassc: Update to 2.2.1.
2020-01-16 22:24 [bug#39157] [PATCH 0/2] Update ruby-sassc and ruby-sqlite3 Christopher Baines
@ 2020-01-16 22:28 ` Christopher Baines
2020-01-16 22:28 ` [bug#39157] [PATCH 2/2] gnu: ruby-sqlite3: Update to 1.4.2 Christopher Baines
2020-01-30 14:26 ` bug#39157: [PATCH 0/2] Update ruby-sassc and ruby-sqlite3 Christopher Baines
1 sibling, 1 reply; 4+ messages in thread
From: Christopher Baines @ 2020-01-16 22:28 UTC (permalink / raw)
To: 39157
* gnu/packages/ruby.scm (ruby-sassc): Update to 2.2.1.
[arguments]: Fix using the included libsass copy.
[native-inputs]: Add ruby-rake-compiler.
---
gnu/packages/ruby.scm | 25 ++++++++++++++++++-------
1 file changed, 18 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index ad675dc488..bc4752ba29 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -7764,23 +7764,34 @@ features that don't exist yet like variables, nesting, mixins and inheritance.")
(define-public ruby-sassc
(package
(name "ruby-sassc")
- (version "2.0.1")
+ (version "2.2.1")
(source
(origin
(method url-fetch)
(uri (rubygems-uri "sassc" version))
(sha256
(base32
- "1sr4825rlwsrl7xrsm0sgalcpf5zgp4i56dbi3qxfa9lhs8r6zh4"))))
+ "09bnid7r5z5hcin5hykvpvv8xig27wbbckxwis60z2aaxq4j9siz"))))
(build-system ruby-build-system)
(arguments
- '(#:phases
+ '(#:modules ((guix build ruby-build-system)
+ (guix build utils)
+ (ice-9 textual-ports))
+ #:phases
(modify-phases %standard-phases
;; TODO: This would be better as a snippet, but the ruby-build-system
;; doesn't seem to support that
(add-after 'unpack 'remove-libsass
(lambda _
(delete-file-recursively "ext")
+ (with-atomic-file-replacement "sassc.gemspec"
+ (lambda (in out)
+ (let* ((gemspec (get-string-all in))
+ (index (string-contains gemspec "libsass_dir")))
+ (display (string-append
+ (string-take gemspec index)
+ "\nend\n")
+ out))))
#t))
(add-after 'unpack 'dont-check-the-libsass-version
(lambda _
@@ -7790,18 +7801,17 @@ features that don't exist yet like variables, nesting, mixins and inheritance.")
(add-after 'unpack 'remove-git-from-gemspec
(lambda _
(substitute* "sassc.gemspec"
- (("`git ls-files -z`") "`find . -type f -print0 |sort -z`")
- (("`git submodule --quiet foreach pwd`") "''"))
+ (("`git ls-files -z`") "`find . -type f -print0 |sort -z`"))
#t))
(add-after 'unpack 'remove-extensions-from-gemspec
(lambda _
(substitute* "sassc.gemspec"
- (("\\[\"ext/Rakefile\"\\]") "[]"))
+ (("\\[\"ext/extconf.rb\"\\]") "[]"))
#t))
(add-after 'unpack 'fix-Rakefile
(lambda _
(substitute* "Rakefile"
- (("test: 'libsass:compile'") ":test"))
+ (("test: 'compile:libsass'") ":test"))
#t))
(add-after 'unpack 'remove-unnecessary-dependencies
(lambda _
@@ -7826,6 +7836,7 @@ features that don't exist yet like variables, nesting, mixins and inheritance.")
`(("libsass" ,libsass)))
(native-inputs
`(("bundler" ,bundler)
+ ("ruby-rake-compiler" ,ruby-rake-compiler)
("ruby-minitest-around" ,ruby-minitest-around)
("ruby-test-construct" ,ruby-test-construct)))
(synopsis "Use libsss from Ruby")
--
2.24.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#39157] [PATCH 2/2] gnu: ruby-sqlite3: Update to 1.4.2.
2020-01-16 22:28 ` [bug#39157] [PATCH 1/2] gnu: ruby-sassc: Update to 2.2.1 Christopher Baines
@ 2020-01-16 22:28 ` Christopher Baines
0 siblings, 0 replies; 4+ messages in thread
From: Christopher Baines @ 2020-01-16 22:28 UTC (permalink / raw)
To: 39157
* gnu/packages/ruby.scm (ruby-sqlite3): Update to 1.4.2.
---
gnu/packages/ruby.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index bc4752ba29..5505a50d37 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -6076,14 +6076,14 @@ neither too verbose nor too minimal.")
(define-public ruby-sqlite3
(package
(name "ruby-sqlite3")
- (version "1.3.13")
+ (version "1.4.2")
(source
(origin
(method url-fetch)
(uri (rubygems-uri "sqlite3" version))
(sha256
(base32
- "01ifzp8nwzqppda419c9wcvr8n82ysmisrs0hph9pdmv1lpa4f5i"))))
+ "0lja01cp9xd5m6vmx99zwn4r7s97r1w5cb76gqd8xhbm1wxyzf78"))))
(build-system ruby-build-system)
(arguments
`(#:phases
--
2.24.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* bug#39157: [PATCH 0/2] Update ruby-sassc and ruby-sqlite3.
2020-01-16 22:24 [bug#39157] [PATCH 0/2] Update ruby-sassc and ruby-sqlite3 Christopher Baines
2020-01-16 22:28 ` [bug#39157] [PATCH 1/2] gnu: ruby-sassc: Update to 2.2.1 Christopher Baines
@ 2020-01-30 14:26 ` Christopher Baines
1 sibling, 0 replies; 4+ messages in thread
From: Christopher Baines @ 2020-01-30 14:26 UTC (permalink / raw)
To: 39157-done
[-- Attachment #1: Type: text/plain, Size: 330 bytes --]
Christopher Baines <mail@cbaines.net> writes:
> Christopher Baines (2):
> gnu: ruby-sassc: Update to 2.2.1.
> gnu: ruby-sqlite3: Update to 1.4.2.
>
> gnu/packages/ruby.scm | 29 ++++++++++++++++++++---------
> 1 file changed, 20 insertions(+), 9 deletions(-)
I've pushed these as e7cdba61cf67abb5844c342a7614b9cd871c7a8d.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 962 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-01-30 14:27 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-16 22:24 [bug#39157] [PATCH 0/2] Update ruby-sassc and ruby-sqlite3 Christopher Baines
2020-01-16 22:28 ` [bug#39157] [PATCH 1/2] gnu: ruby-sassc: Update to 2.2.1 Christopher Baines
2020-01-16 22:28 ` [bug#39157] [PATCH 2/2] gnu: ruby-sqlite3: Update to 1.4.2 Christopher Baines
2020-01-30 14:26 ` bug#39157: [PATCH 0/2] Update ruby-sassc and ruby-sqlite3 Christopher Baines
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).