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 'master' into staging

Browse source
This commit is contained in:
Marius Bakke 2022-08-28 15:43:30 +02:00
commit dedbaa3a69
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
27 changed files with 472 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

20
gnu/packages/libffi.scm
View file

@ -171,28 +171,22 @@ project.")
(define-public ruby-ffi
(package
(name "ruby-ffi")
(version "1.12.2")
(version "1.15.5")
(source (origin
;; Pull from git because the RubyGems release bundles LibFFI,
;; and comes with a gemspec that makes it difficult to unbundle.
(method git-fetch)
(uri (git-reference
(url "https://github.com/ffi/ffi")
(commit version)))
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1cvqsbjr2gfjgqggq9kdx90qhhzr7qkyr9wmxdsfsik6cnxnnpmd"))))
"1qk55s1zwpdjykwkj9l37m71i5n228i7f8bg3ply3ks9py16m7s6"))))
(build-system ruby-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'do-not-depend-on-ccache
(lambda _
(substitute* "spec/ffi/fixtures/GNUmakefile"
(("^CCACHE := .*")
""))
#t))
(replace 'replace-git-ls-files
(lambda _
;; Do not try to execute git, or include the (un)bundled LibFFI.
@ -202,9 +196,10 @@ project.")
(("lfs \\+?= .*")
"lfs = []\n"))
(substitute* "Rakefile"
(("git .*ls-files -z")
"find * -type f -print0 | sort -z")
(("LIBFFI_GIT_FILES = .*")
"LIBFFI_GIT_FILES = []\n"))
#t))
"LIBFFI_GIT_FILES = []\n"))))
(replace 'build
(lambda _
;; Tests depend on the native extensions, so we build it
@ -223,8 +218,7 @@ project.")
(setenv "MAKE" "make")
(setenv "CC" "gcc")
(invoke "rspec" "spec"))
(format #t "test suite not run~%"))
#t)))))
(format #t "test suite not run~%")))))))
(native-inputs
(list ruby-rake-compiler ruby-rspec ruby-rubygems-tasks))
(inputs