Archived
1
0
Fork 0

gnu: earlyoom: Update to latest commit to resolve a test failure.

* gnu/packages/linux.scm (earlyoom): Update to commit
7bd4b2c9a285d2b9a4ef6e7a080e83ab95fcdeea.
This commit is contained in:
Maxim Cournoyer 2020-02-27 09:27:14 -05:00
parent e64c5a8fe4
commit faa0fa3978
No known key found for this signature in database
GPG key ID: 1260E46482E63562

View file

@ -2737,49 +2737,54 @@ kmod. The aim is to be compatible with tools, configurations and indices
from the module-init-tools project.") from the module-init-tools project.")
(license license:gpl2+))) ; library under lgpl2.1+ (license license:gpl2+))) ; library under lgpl2.1+
;;; Use a recent commit, because the latest 1.3 tag suffers from test failures
;;; (see:
;;; https://github.com/rfjakob/earlyoom/issues/156#issuecomment-591997405).
(define-public earlyoom (define-public earlyoom
(package (let ((commit "7bd4b2c9a285d2b9a4ef6e7a080e83ab95fcdeea")
(name "earlyoom") (revision "1"))
(version "1.3") (package
(source (origin (name "earlyoom")
(method git-fetch) (version (git-version "1.3" revision commit))
(uri (git-reference (source (origin
(url "https://github.com/rfjakob/earlyoom.git") (method git-fetch)
(commit (string-append "v" version)))) (uri (git-reference
(file-name (git-file-name name version)) (url "https://github.com/rfjakob/earlyoom.git")
(sha256 (commit commit)))
(base32 (file-name (git-file-name name version))
"0fwbx0y80nqgkxrc9kf9j3iwa0wbps2jmqir3pgqbc2cj0wjh0lr")))) (sha256
(build-system gnu-build-system) (base32
(arguments "0sxk8gh734q4rbh9r1q8ab840bn4kffdm8j93x55jspnmmy1wd2c"))))
`(#:phases (modify-phases %standard-phases (build-system gnu-build-system)
(delete 'configure) (arguments
(add-before 'check 'set-home `(#:phases (modify-phases %standard-phases
(lambda _ (delete 'configure)
(setenv "HOME" (getcwd)) (add-before 'check 'set-home
#t)) (lambda _
(add-after 'build 'install-contribs (setenv "HOME" (getcwd))
;; Install what seems useful from the contrib directory. #t))
(lambda* (#:key outputs #:allow-other-keys) (add-after 'build 'install-contribs
(let* ((out (assoc-ref outputs "out")) ;; Install what seems useful from the contrib directory.
(contrib (string-append (lambda* (#:key outputs #:allow-other-keys)
out "/share/earlyoom/contrib"))) (let* ((out (assoc-ref outputs "out"))
(install-file "contrib/notify_all_users.py" contrib) (contrib (string-append
#t)))) out "/share/earlyoom/contrib")))
#:make-flags (let* ((prefix (assoc-ref %outputs "out"))) (install-file "contrib/notify_all_users.py" contrib)
(list "CC=gcc" #t))))
(string-append "VERSION=v" ,version) #:make-flags (let* ((prefix (assoc-ref %outputs "out")))
(string-append "PREFIX=" prefix) (list "CC=gcc"
(string-append "SYSCONFDIR=" prefix "/etc"))) (string-append "VERSION=v" ,version)
#:test-target "test")) (string-append "PREFIX=" prefix)
(native-inputs `(("go" ,go) ;for the test suite (string-append "SYSCONFDIR=" prefix "/etc")))
("pandoc" ,ghc-pandoc))) ;to generate the manpage #:test-target "test"))
(home-page "https://github.com/rfjakob/earlyoom") (native-inputs `(("go" ,go) ;for the test suite
(synopsis "Simple out of memory (OOM) daemon for the Linux kernel") ("pandoc" ,ghc-pandoc))) ;to generate the manpage
(description "Early OOM is a minimalist out of memory (OOM) daemon that (home-page "https://github.com/rfjakob/earlyoom")
(synopsis "Simple out of memory (OOM) daemon for the Linux kernel")
(description "Early OOM is a minimalist out of memory (OOM) daemon that
runs in user space and provides a more responsive and configurable alternative runs in user space and provides a more responsive and configurable alternative
to the in-kernel OOM killer.") to the in-kernel OOM killer.")
(license license:expat))) (license license:expat))))
(define-public eudev (define-public eudev
;; The post-systemd fork, maintained by Gentoo. ;; The post-systemd fork, maintained by Gentoo.