summary refs log tree commit diff
path: root/gnu/packages
diff options
context:
space:
mode:
authorEric Bavier <bavier@member.fsf.org>2016-09-22 22:33:19 -0500
committerEric Bavier <bavier@member.fsf.org>2016-09-22 22:33:37 -0500
commit694196552684002daf590f10b9800f51eed69e08 (patch)
treeadcde59dec51b6981c5d9c3a0019f9df8cca5b52 /gnu/packages
parentcdf26f40b0e8cb969a880a53f8606663229e46ff (diff)
downloadguix-694196552684002daf590f10b9800f51eed69e08.tar.gz
gnu: boost: Upgrade to 1.61.0.
* gnu/packages/boost.scm (boost): Upgrade to 1.61.0
* gnu/packages/databases.scm (mysql)[arguments]: Compute boost minor
version for substitution.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/boost.scm4
-rw-r--r--gnu/packages/databases.scm6
2 files changed, 6 insertions, 4 deletions
diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
index 8fe8c8e899..ccc1f0664f 100644
--- a/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@@ -34,7 +34,7 @@
 (define-public boost
   (package
     (name "boost")
-    (version "1.60.0")
+    (version "1.61.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -43,7 +43,7 @@
                     ".tar.bz2"))
               (sha256
                (base32
-                "0fzx6dwqbrkd4bcd8pjv0fpapwmrxxwr8yx9g67lihlsk3zzysk8"))))
+                "0h5nk7pgxf7xsvvshj9qfpsfp9wx6gq9r78n3nx736pxq83bsix5"))))
     (build-system gnu-build-system)
     (inputs `(("zlib" ,zlib)))
     (native-inputs
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 4f345e20a4..d517805f35 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -222,7 +222,7 @@ SQL, Key/Value, XML/XQuery or Java Object storage for their data model.")
                "0mlrxcvkn6bf869hjw9fb6m24ak26ndffnd91b4mknmz8cqkb1ch"))))
     (build-system cmake-build-system)
     (arguments
-     '(#:configure-flags
+     `(#:configure-flags
        '("-DBUILD_CONFIG=mysql_release"
          "-DWITH_SSL=system"
          "-DWITH_ZLIB=system"
@@ -249,7 +249,9 @@ SQL, Key/Value, XML/XQuery or Java Object storage for their data model.")
                    (lambda _
                      ;; Mysql wants boost-1.59.0 specifically
                      (substitute* "cmake/boost.cmake"
-                                  (("59") "60"))))
+                       (("59")
+                        ,(match (string-split (package-version boost) #\.)
+                           ((_ minor . _) minor))))))
                   (add-after
                    'install 'remove-extra-binaries
                    (lambda* (#:key outputs #:allow-other-keys)