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 remote-tracking branch 'savannah/master' into core-updates

Browse source 
Conflicts:
	gnu/local.mk
	gnu/packages/autotools.scm
	gnu/packages/cmake.scm
	gnu/packages/gnuzilla.scm
	gnu/packages/haskell.scm
	gnu/packages/pdf.scm
	gnu/packages/python-xyz.scm
	gnu/packages/samba.scm
	gnu/packages/tex.scm
	gnu/packages/tls.scm
	gnu/packages/wxwidgets.scm
This commit is contained in:
Christopher Baines 2023-03-02 10:37:28 +00:00
commit 7df09ee0ab
No known key found for this signature in database
GPG key ID: 5E28A33B0B84F577
402 changed files with 27182 additions and 15696 deletions
Download patch file Download diff file Expand all files Collapse all files

17
gnu/packages/cmake.scm
View file

@ -330,6 +330,23 @@ and workspaces that can be used in the compiler environment of your choice.")
(package
(inherit cmake-minimal)
(name "cmake")
(version "3.25.1")
(source (origin
(inherit (package-source cmake-minimal))
(method url-fetch)
(uri (string-append "https://cmake.org/files/v"
(version-major+minor version)
"/cmake-" version ".tar.gz"))
(snippet (match (origin-snippet (package-source cmake-minimal))
(('begin ('define 'preserved-files ('quote x))
rest ...)
`(begin (define preserved-files
',(cons "Utilities/cmelf" x))
,@rest))))
(sha256
(base32
"1n4inb3fvk70sni5gmkljqw3cyllalyg3fnr9rlr7x3aa44isl8w"))
(patches (search-patches "cmake-curl-certificates-3.24.patch"))))
(outputs '("out" "doc"))
(arguments
(substitute-keyword-arguments (package-arguments cmake-minimal)