me/guix
Archived
1
0
Fork 0
Code Activity

gnu: ruby-ffi: Update to 1.15.5.

Browse source 
* gnu/packages/libffi.scm (ruby-ffi): Update to 1.15.5.
[arguments]: Remove custom 'do-not-depend-on-ccache phase. Adjust custom
'remove-git-ls-files phase to changes in the code. Remove trailing #t
from phases.
This commit is contained in:
Efraim Flashner 2022-08-28 10:23:37 +03:00
parent 9ad4d90a61
commit 8df29c26ba
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gnu/packages/libffi.scm
View file

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