diff options
author | Marius Bakke <mbakke@fastmail.com> | 2018-08-25 16:38:51 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2018-08-25 16:38:51 +0200 |
commit | 173d291466175fd8c2ba117272685ef9722a5b7f (patch) | |
tree | 5658fb5ea06aba970e8ae26fe88f8ba4fd0c8255 /gnu/packages/databases.scm | |
parent | 233df51ebc162bf95dfadf914914cbfbc6984651 (diff) | |
parent | 94e9d750a22e30459732d2ae14d71c5f3acabd91 (diff) | |
download | patches-173d291466175fd8c2ba117272685ef9722a5b7f.tar patches-173d291466175fd8c2ba117272685ef9722a5b7f.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/databases.scm')
-rw-r--r-- | gnu/packages/databases.scm | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index a6e447894c..dc8e52036c 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -549,20 +549,6 @@ RDBMS systems (which are deep in functionality).") ;; Some parts are licensed under the Apache License license:asl2.0)))) -(define boost-for-mysql - (package - (inherit boost) - (version "1.59.0") - (source (origin - (method url-fetch) - (uri (string-append - "mirror://sourceforge/boost/boost/" version "/boost_" - (string-map (lambda (x) (if (eq? x #\.) #\_ x)) version) - ".tar.bz2")) - (sha256 - (base32 - "1jj1aai5rdmd72g90a3pd8sw9vi32zad46xv5av8fhnr48ir6ykj")))))) - ;; XXX When updating, check whether boost-for-mysql is still needed. ;; It might suffice to patch ‘cmake/boost.cmake’ as done in the past. (define-public mysql @@ -1474,16 +1460,15 @@ columns, primary keys, unique constraints and relationships.") (define-public perl-dbd-mysql (package (name "perl-dbd-mysql") - (version "4.043") + (version "4.046") (source (origin (method url-fetch) - (uri (string-append "mirror://cpan/authors/id/M/MI/MICHIELB/" + (uri (string-append "mirror://cpan/authors/id/C/CA/CAPTTOFU/" "DBD-mysql-" version ".tar.gz")) (sha256 (base32 - "16bg7l28n65ngi1abjxvwk906a80i2vd5vzjn812dx8phdg8d7v2")) - (patches (search-patches "perl-dbd-mysql-CVE-2017-10788.patch")))) + "1xziv9w87cl3fbl1mqkdrx28mdqly3gs6gs1ynbmpl2rr4p6arb1")))) (build-system perl-build-system) ;; Tests require running MySQL server (arguments `(#:tests? #f)) |