me/guix
Archived
1
0
Fork 0
Code Activity

gnu: crun: Adjust package ideation.

Browse source 
The release package provides the configured version, so there is no need
to use git commit to adjust version detection.

* gnu/packages/containers.scm (crun): Remove let and indent the package.
[arguments] <#:phases>: Remove 'do-no-depend-on-git phase as the package
includes release version.

Change-Id: Ie50fe1f5f8ed69a77e353033679bfd98db6e56f4
This commit is contained in:
Sharlatan Hellseher 2024-02-14 15:21:09 +00:00
parent 6002e9e771
commit b24c1bab47
No known key found for this signature in database
GPG key ID: 76D727BFF62CD2B5
1 changed files with 43 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

98
gnu/packages/containers.scm
View file

@ -54,62 +54,50 @@
#:use-module (gnu packages wget)) #:use-module (gnu packages wget))
(define-public crun (define-public crun
(let ((commit "de537a7965bfbe9992e2cfae0baeb56a08128171")) (package
(package (name "crun")
(name "crun") (version "1.14.1")
(version "1.14.1") (source
(source (origin
(origin (method url-fetch)
(method url-fetch) (uri (string-append
(uri (string-append "https://github.com/containers/crun/releases/download/"
"https://github.com/containers/crun/releases/download/" version
version "/crun-" version ".tar.gz"))
"/crun-" version ".tar.gz")) (sha256
(sha256 (base32
(base32 "02lplc2asyllb58mvy7l8b9gsk7fxs95g928xk28yzmf592ay33x"))))
"02lplc2asyllb58mvy7l8b9gsk7fxs95g928xk28yzmf592ay33x")))) (build-system gnu-build-system)
(build-system gnu-build-system) (arguments
(arguments `(#:configure-flags '("--disable-systemd")
`(#:configure-flags '("--disable-systemd") #:tests? #f ; XXX: needs /sys/fs/cgroup mounted
#:tests? #f ; XXX: needs /sys/fs/cgroup mounted #:phases
#:phases (modify-phases %standard-phases
(modify-phases %standard-phases (add-after 'unpack 'fix-tests
(add-after 'unpack 'do-not-depend-on-git (lambda _
(lambda _ (substitute* (find-files "tests" "\\.(c|py)")
(substitute* "autogen.sh" (("/bin/true") (which "true"))
(("^git submodule update.*") (("/bin/false") (which "false"))
"")) ; relies on sd_notify which requires systemd?
(with-output-to-file "git-version.h" (("\"sd-notify\" : test_sd_notify,") "")
(lambda () (("\"sd-notify-file\" : test_sd_notify_file,") "")))))))
(display (string-append (inputs
"/* autogenerated. */\n#ifndef GIT_VERSION\n# define GIT_VERSION \"" (list libcap
,commit libseccomp
"\"\n#endif\n")))))) yajl))
(add-after 'unpack 'fix-tests (native-inputs
(lambda _ (list automake
(substitute* (find-files "tests" "\\.(c|py)") autoconf
(("/bin/true") (which "true")) git
(("/bin/false") (which "false")) libtool
; relies on sd_notify which requires systemd? pkg-config
(("\"sd-notify\" : test_sd_notify,") "") python-3))
(("\"sd-notify-file\" : test_sd_notify_file,") ""))))))) (home-page "https://github.com/containers/crun")
(inputs (synopsis "Open Container Initiative (OCI) Container runtime")
(list libcap (description
libseccomp "crun is a fast and low-memory footprint Open Container Initiative (OCI)
yajl))
(native-inputs
(list automake
autoconf
git
libtool
pkg-config
python-3))
(home-page "https://github.com/containers/crun")
(synopsis "Open Container Initiative (OCI) Container runtime")
(description
"crun is a fast and low-memory footprint Open Container Initiative (OCI)
Container Runtime fully written in C.") Container Runtime fully written in C.")
(license license:gpl2+)))) (license license:gpl2+)))
(define-public conmon (define-public conmon
(package (package