mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
Merge branch 'master' into core-updates-frozen
Conflicts: gnu/packages/algebra.scm gnu/packages/games.scm gnu/packages/golang.scm gnu/packages/kerberos.scm gnu/packages/mail.scm gnu/packages/python.scm gnu/packages/ruby.scm gnu/packages/scheme.scm gnu/packages/tex.scm gnu/packages/tls.scm gnu/packages/version-control.scm
This commit is contained in:
commit
c4133c43c7
181 changed files with 256111 additions and 218870 deletions
|
@ -1381,6 +1381,15 @@ including field and record folding.")))
|
|||
(delete 'configure)
|
||||
;; The default target is only needed for tests and built on demand.
|
||||
(delete 'build)
|
||||
(add-before 'check 'mount-tmp
|
||||
;; Use the provided workspace directory for test files.
|
||||
;; Otherwise, /tmp is used which is a mount namespace on /gnu/store.
|
||||
;; This speeds up the build when the host /tmp is a proper tmpfs or
|
||||
;; other fast filesystem, as opposed to /gnu which may be a HDD.
|
||||
(lambda _
|
||||
(let ((test-dir (string-append (getcwd) "/../test")))
|
||||
(mkdir test-dir)
|
||||
(setenv "TEST_TMPDIR" (canonicalize-path test-dir)))))
|
||||
(add-before 'check 'disable-optimizations
|
||||
(lambda _
|
||||
;; Prevent the build from passing '-march=native' to the compiler.
|
||||
|
@ -1612,14 +1621,14 @@ changes.")
|
|||
(define-public tdb
|
||||
(package
|
||||
(name "tdb")
|
||||
(version "1.4.3")
|
||||
(version "1.4.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.samba.org/ftp/tdb/tdb-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"06waz0k50c7v3chd08mzp2rv7w4k4q9isbxx3vhlfpx1vy9q61f8"))))
|
||||
"0h8fkblws3d4vf37yhbrbw2nfxg5vk2v3i5mk04hhcbh9y4fvz5w"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue