diff options
author | Leo Famulari <leo@famulari.name> | 2021-02-09 15:09:43 -0500 |
---|---|---|
committer | Leo Famulari <leo@famulari.name> | 2021-02-09 15:09:43 -0500 |
commit | 388bd35dd0df2d231bc2cce3746d7d5fd15df23a (patch) | |
tree | 82e7cc45b8279f83439214c7c79dc7161ffda94d /gnu/packages/hardware.scm | |
parent | f1c7c2f697877fcb68b53ea062ff8a88f274a2fe (diff) | |
parent | d00380b0077b0df2a0b790bb115d07c1533b8863 (diff) | |
download | guix-patches-388bd35dd0df2d231bc2cce3746d7d5fd15df23a.tar guix-patches-388bd35dd0df2d231bc2cce3746d7d5fd15df23a.tar.gz |
Merge branch 'master' into staging-next
Diffstat (limited to 'gnu/packages/hardware.scm')
-rw-r--r-- | gnu/packages/hardware.scm | 128 |
1 files changed, 109 insertions, 19 deletions
diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index a3418878e7..10672f52f3 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -2,6 +2,8 @@ ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> +;;; Copyright © 2021 Evgeny Pisemsky <evgeny@pisemsky.com> +;;; Copyright © 2021 Léo Le Bouter <lle-bout@zaclys.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,16 +28,23 @@ #:use-module (gnu packages check) #:use-module (gnu packages cpp) #:use-module (gnu packages crypto) + #:use-module (gnu packages curl) #:use-module (gnu packages documentation) #:use-module (gnu packages gcc) + #:use-module (gnu packages gettext) #:use-module (gnu packages glib) + #:use-module (gnu packages gtk) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages ncurses) #:use-module (gnu packages openldap) + #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) #:use-module (gnu packages protobuf) + #:use-module (gnu packages python) + #:use-module (gnu packages tls) + #:use-module (gnu packages web) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) @@ -128,6 +137,45 @@ calibrated, and restored when the calibration is applied.") human-readable format and checks if it conforms to the standards.") (license license:expat)))) +(define-public libsmbios + (package + (name "libsmbios") + (version "2.4.3") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url (string-append "https://github.com/dell/" name)) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0krwwydyvb9224r884y1mlmzyxhlfrcqw73vi1j8787rl0gl5a2i")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("gettext" ,gettext-minimal) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config) + ("perl" ,perl) + ("python" ,python))) + (inputs + `(("libxml2" ,libxml2))) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'bootstrap + (lambda _ (invoke "autoreconf" "-vfi")))))) + (synopsis "Library for interacting with Dell SMBIOS tables") + (description + "libsmbios provides a library to interface with the SMBIOS tables. It +also provides extensions for proprietary methods of interfacing with Dell +specific SMBIOS tables.") + (home-page "https://github.com/dell/libsmbios") + (license + (list license:osl2.1 license:gpl2+ license:bsd-3 license:boost1.0)))) + ;; Distinct from memtest86, which is obsolete. (define-public memtest86+ (package @@ -289,7 +337,7 @@ be dangerous and may void your CPU or system board's warranty.") (define-public wavemon (package (name "wavemon") - (version "0.9.2") + (version "0.9.3") (source (origin (method git-fetch) @@ -298,24 +346,7 @@ be dangerous and may void your CPU or system board's warranty.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0y984wm03lzqf7bk06a07mw7d1fzjsp9x7zxcvlx4xqmv7wlgb29")) - (patches - (list - ;; Two upstream commits required to find the correct <ncurses.h>. - (origin - (method url-fetch) - (uri (string-append - "https://github.com/uoaerg/wavemon/commit/" - "ce7f9c4da90767bb50e4b80cdb3cee61264d8d12.patch")) - (sha256 - (base32 "04b4qbsa5l0jr41dkj0c8yw74lm8z8b50nw1iwas6hnzq41dwdm3"))) - (origin - (method url-fetch) - (uri (string-append - "https://github.com/uoaerg/wavemon/commit/" - "31e3def1c7332ad830bd966e7d21b343b4f2da54.patch")) - (sha256 - (base32 "0kyv3sbkv9hl8b88xnk6bq550axh9wzfjlhp3jbvqd4fqf7663br"))))))) + (base32 "0m9n5asjxs1ir5rqprigqcrm976mgjvh4yql1jhfnbszwbf95193")))) (build-system gnu-build-system) (arguments `(#:make-flags @@ -482,3 +513,62 @@ authorization policies (what kind of USB devices are authorized) as well as method of use policies (how a USB device may interact with the system). Simply put, it is a USB device whitelisting tool.") (license license:gpl2))) + +(define-public screentest + (package + (name "screentest") + (version "2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/TobiX/screentest") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0gv3xj9sbk1wsyijfw9xjnvy8pg7j4arjnma2r2kfi18qy32wd30")))) + (build-system gnu-build-system) + (inputs + `(("glib" ,glib) + ("gtk+" ,gtk+-2))) + (native-inputs + `(("autoconf" ,autoconf) + ("intltool" ,intltool) + ("libtool" ,libtool) + ("glib" ,glib "bin") + ("automake" ,automake) + ("pkg-config" ,pkg-config))) + (synopsis "Simple screen testing tool") + (description "This is a program for testing the quality of CRT/LCD +screens. It displays various patterns and allows you to estimate the quality +of your CRT/LCD monitor.") + (home-page "https://github.com/TobiX/screentest") + (license license:gpl2))) + +(define-public tpm2-tss + (package + (name "tpm2-tss") + (version "3.0.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/tpm2-software/tpm2-tss" + "/releases/download/" version "/tpm2-tss-" version + ".tar.gz")) + (sha256 + (base32 "05xynpwq851fp8f5fy7ac0blvz8mr5m5cbqj3gslgbwv63kjnfbq")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("curl" ,curl) + ("json-c" ,json-c) + ("openssl" ,openssl))) + (home-page "https://tpm2-software.github.io/") + (synopsis "OSS Implementation of the TCG TPM2 Software Stack (TSS2)") + (description + "This package provides the @acronym{TCG, Trusted Computing Group} +@acronym{TSS2, TPM2 Software Stack}. The stack contains libtss2-fapi, +libtss2-esys, libtss2-sys, libtss2-mu, libtss2-tcti-device, libtss2-tcti-swtpm +and libtss2-tcti-mssim.") + (license license:bsd-2))) |