ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: boost: Move 1.59.0 definition to boost.scm.

Browse source 
Fixes a regression introduced in commit
7cbf06d8c2 where the top-level code of
these two modules would depend on each other, leading to "boost: unbound
variable" kind of errors in some circumstances.

* gnu/packages/databases.scm (boost-for-mysql): Move to...
* gnu/packages/boost.scm (boost-for-mysql): ... here.  Make public and
add 'properties' field.
This commit is contained in:
Ludovic Courtès 2018-08-24 00:33:34 +02:00
parent d32da49c76
commit 444488fc1b
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gnu/packages/boost.scm
View file

@ -110,6 +110,22 @@ (define-public boost
(license (license:x11-style "https://www.boost.org/LICENSE_1_0.txt" (license (license:x11-style "https://www.boost.org/LICENSE_1_0.txt"
"Some components have other similar licences.")))) "Some components have other similar licences."))))
(define-public boost-for-mysql
;; Older version for MySQL 5.7.23.
(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"))))
(properties '((hidden? . #t)))))
(define-public boost-sync (define-public boost-sync
(let ((commit "c72891d9b90e2ceb466ec859f640cd012b2d8709") (let ((commit "c72891d9b90e2ceb466ec859f640cd012b2d8709")
(version "1.55") (version "1.55")

14
gnu/packages/databases.scm
View file

@ -549,20 +549,6 @@ (define-public mongodb
;; Some parts are licensed under the Apache License ;; Some parts are licensed under the Apache License
license:asl2.0)))) 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. ;; XXX When updating, check whether boost-for-mysql is still needed.
;; It might suffice to patch ‘cmake/boost.cmake’ as done in the past. ;; It might suffice to patch ‘cmake/boost.cmake’ as done in the past.
(define-public mysql (define-public mysql