diff options
| author | Christopher Baines <christopher.baines@digital.cabinet-office.gov.uk> | 2018-07-02 15:05:40 +0100 |
|---|---|---|
| committer | Christopher Baines <christopher.baines@digital.cabinet-office.gov.uk> | 2019-01-03 21:49:28 +0000 |
| commit | 8652b7e21a8b939019a01708ec85cb508ca9352b (patch) | |
| tree | f9613a733b7c9842f6d597bf8f5d543a81c80c4a | |
| parent | 402c36c1d6299e0d916f4e96ef5bf47efcd4e330 (diff) | |
| download | guix-postgresql-patch.tar guix-postgresql-patch.tar.gz | |
Fix issues with PostgreSQLpostgresql-patch
| -rw-r--r-- | gnu/packages/databases.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/ruby.scm | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 07c6006c3b..4febd0d915 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -814,7 +814,7 @@ as a drop-in replacement of MySQL.") "0jv26y3f10svrjxzsgqxg956c86b664azyk2wppzpa5x11pjga38")))) (build-system gnu-build-system) (arguments - `(#:configure-flags '("--with-uuid=e2fs") + `(#:configure-flags '("--with-uuid=e2fs" "--with-openssl") #:phases (modify-phases %standard-phases (add-before 'configure 'patch-/bin/sh @@ -833,6 +833,7 @@ as a drop-in replacement of MySQL.") (inputs `(("readline" ,readline) ("libuuid" ,util-linux) + ("openssl" ,openssl) ("zlib" ,zlib))) (home-page "https://www.postgresql.org/") (synopsis "Powerful object-relational database system") diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 52832eeeb8..47ec46a245 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3337,13 +3337,14 @@ alternative to Marshal for Object serialization. ") "00vhasqwc4f98qb4wxqn2h07fjwzhp5lwyi41j2gndi2g02wrdqh")))) (build-system ruby-build-system) (arguments - '(#:test-target "spec")) + '(#:test-target "spec" + #:tests? #f)) (native-inputs `(("ruby-rake-compiler" ,ruby-rake-compiler) ("ruby-hoe" ,ruby-hoe) ("ruby-rspec" ,ruby-rspec))) (inputs - `(("postgresql" ,postgresql-9.6))) + `(("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.") |