diff options
author | Marius Bakke <marius@gnu.org> | 2020-10-19 00:17:48 +0200 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2020-10-19 00:17:48 +0200 |
commit | 1a8f7a0f584e5dd6e8f1a379b92f689b71902295 (patch) | |
tree | 8586450fc3068b217e60a7e942fa4c7d89ad74e7 /gnu/packages/admin.scm | |
parent | 19d42e0e23a7f90ac2dcc1c279bd23a967ff0314 (diff) | |
parent | 2a4f3c1711fdb947e615b5a89e285421b3bf0925 (diff) | |
download | guix-patches-1a8f7a0f584e5dd6e8f1a379b92f689b71902295.tar guix-patches-1a8f7a0f584e5dd6e8f1a379b92f689b71902295.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/admin.scm')
-rw-r--r-- | gnu/packages/admin.scm | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 1b80eb8ab7..2cfa4a05e3 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1809,21 +1809,24 @@ network, which causes enabled computers to power on.") (define-public dmidecode (package (name "dmidecode") - (version "3.2") - (source (origin - (method url-fetch) - (uri (string-append - "mirror://savannah/dmidecode/dmidecode-" - version ".tar.xz")) - (sha256 - (base32 - "1pcfhcgs2ifdjwp7amnsr3lq95pgxpr150bjhdinvl505px0cw07")))) + (version "3.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://savannah/dmidecode/dmidecode-" + version ".tar.xz")) + (sha256 + (base32 "0m8lzg9rf1qssasiix672bxk5qwms90561g8hfkkhk31h2kkgiw2")))) (build-system gnu-build-system) (arguments - '(#:phases (modify-phases %standard-phases (delete 'configure)) - #:tests? #f ; no 'check' target - #:make-flags (list (string-append "prefix=" - (assoc-ref %outputs "out"))))) + `(#:tests? #f ; no 'check' target + #:make-flags + (list (string-append "CC=" ,(cc-for-target)) + (string-append "prefix=" + (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) ; no configure script (home-page "https://www.nongnu.org/dmidecode/") (synopsis "Read hardware information from the BIOS") (description @@ -2690,9 +2693,8 @@ results (ndiff), and a packet generation and response analysis tool (nping).") (build-system gnu-build-system) (arguments `(#:tests? #f ; no make check - #:make-flags (let ((out (assoc-ref %outputs "out"))) - (list (string-append "DESTDIR=" out) - "prefix=/")) + #:make-flags + (list (string-append "prefix=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-python3-DeprecationWarning |