From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Thompson Subject: [PATCHES] Add ruby-pg and adjust Ruby build system Date: Sat, 29 Aug 2015 22:07:40 -0400 Message-ID: <874mjhplzn.fsf@izanagi.i-did-not-set--mail-host-address--so-tickle-me> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:40887) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZVs23-0003qO-9G for guix-devel@gnu.org; Sat, 29 Aug 2015 22:07:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZVs21-0003q8-QY for guix-devel@gnu.org; Sat, 29 Aug 2015 22:07:43 -0400 Received: from mail.fsf.org ([208.118.235.13]:58531) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZVs21-0003q4-M8 for guix-devel@gnu.org; Sat, 29 Aug 2015 22:07:41 -0400 Received: from c-73-188-137-88.hsd1.de.comcast.net ([73.188.137.88]:50292 helo=izanagi) by mail.fsf.org with esmtpsa (TLS-1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1ZVs21-000237-3D for guix-devel@gnu.org; Sat, 29 Aug 2015 22:07:41 -0400 List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org --=-=-= Content-Type: text/plain Unlike a lot of other gems, I was pleasantly surprised that I could actually run ruby-pg's test suite successfully. However, I had to tweak the build system to use shorter file names for the build directory because the test suite was trying to create a UNIX-domain socket longer than the maximum of 107. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-build-ruby-Avoid-long-build-directory-names.patch >From 8f29026d37a66d8bcbddc6f32a6354d93d40f50d Mon Sep 17 00:00:00 2001 From: David Thompson Date: Sat, 29 Aug 2015 21:55:12 -0400 Subject: [PATCH 1/2] build: ruby: Avoid long build directory names. Having the hash of the source gem in the source directory file name proved to be problematic when running the test suite for the 'pg' gem that creates UNIX-domain sockets in the source directory and exceeded the 108 character limit on GNU/Linux systems. * guix/build/ruby-build-system.scm (unpack): Rename unpacked gem directory to "gem". --- guix/build/ruby-build-system.scm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/guix/build/ruby-build-system.scm b/guix/build/ruby-build-system.scm index 90fab92..4184ccc 100644 --- a/guix/build/ruby-build-system.scm +++ b/guix/build/ruby-build-system.scm @@ -44,12 +44,16 @@ directory." (define* (unpack #:key source #:allow-other-keys) "Unpack the gem SOURCE and enter the resulting directory." (and (zero? (system* "gem" "unpack" source)) - (begin - ;; The unpacked gem directory is named the same as the archive, sans - ;; the ".gem" extension. - (chdir (match:substring (string-match "^(.*)\\.gem$" - (basename source)) - 1)) + ;; The unpacked gem directory is named the same as the archive, sans + ;; the ".gem" extension. It is renamed to simply "gem" in an effort to + ;; keep file names shorter to avoid UNIX-domain socket file names and + ;; shebangs that exceed the system's fixed maximum length when running + ;; test suites. + (let ((dir (match:substring (string-match "^(.*)\\.gem$" + (basename source)) + 1))) + (rename-file dir "gem") + (chdir "gem") #t))) (define* (build #:key source #:allow-other-keys) -- 2.5.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-gnu-Add-ruby-pg.patch >From efced81a77bc4a5a72a430987ab8168196358d47 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Sat, 29 Aug 2015 22:03:51 -0400 Subject: [PATCH 2/2] gnu: Add ruby-pg. * gnu/packages/ruby.scm (ruby-pg): New variable. --- gnu/packages/ruby.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 33da738..29aaffc 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -23,6 +23,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) #:use-module (gnu packages compression) + #:use-module (gnu packages databases) #:use-module (gnu packages readline) #:use-module (gnu packages autotools) #:use-module (gnu packages libffi) @@ -707,3 +708,29 @@ messing up your system.") both CSS3 selector and XPath 1.0 support.") (home-page "http://www.nokogiri.org/") (license license:expat))) + +(define-public ruby-pg + (package + (name "ruby-pg") + (version "0.18.2") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "pg" version)) + (sha256 + (base32 + "1axxbf6ij1iqi3i1r3asvjc80b0py5bz0m2wy5kdi5xkrpr82kpf")))) + (build-system ruby-build-system) + (arguments + '(#:test-target "spec")) + (native-inputs + `(("ruby-rake-compiler" ,ruby-rake-compiler) + ("ruby-hoe" ,ruby-hoe) + ("ruby-rspec" ,ruby-rspec))) + (inputs + `(("postgresql" ,postgresql))) + (synopsis "Ruby interface to PostgreSQL") + (description "Pg is the Ruby interface to the PostgreSQL RDBMS. It works +with PostgreSQL 8.4 and later.") + (home-page "https://bitbucket.org/ged/ruby-pg") + (license license:ruby))) -- 2.5.0 --=-=-= Content-Type: text/plain -- David Thompson GPG Key: 0FF1D807 --=-=-=--