amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'origin/core-updates-next' into core-updates

Browse source
This commit is contained in:
Ricardo Wurmus 2018-06-06 23:01:48 +02:00
commit 8709624756
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
22 changed files with 397 additions and 191 deletions
Download patch file Download diff file Expand all files Collapse all files

11
gnu/packages/cmake.scm
View file

@ -43,7 +43,7 @@
(define-public cmake
(package
(name "cmake")
(version "3.11.0")
(version "3.11.1")
(source (origin
(method url-fetch)
(uri (string-append "https://www.cmake.org/files/v"
@ -51,7 +51,7 @@
"/cmake-" version ".tar.gz"))
(sha256
(base32
"0sv5k9q6braa8hhw0y3w19avqn0xn5czv5jf5fz5blnlf7ivw4y3"))
"033x45q0lyaqr32pv92pv87pw20nja6i9794hmijrm6ilinbrgjp"))
(modules '((guix build utils)))
(snippet
'(begin
@ -86,6 +86,13 @@
" --exclude-regex ^\\(" (string-join skipped-tests "\\|") "\\)$")))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'split-package
;; Remove files that have been packaged in other package recipes.
(lambda _
(delete-file "Auxiliary/cmake-mode.el")
(substitute* "Auxiliary/CMakeLists.txt"
((".*cmake-mode.el.*") ""))
#t))
(add-before 'configure 'patch-bin-sh
(lambda _
;; Replace "/bin/sh" by the right path in... a lot of