Merge pull request #255511 from evils/rasdaemon

rasdaemon: 0.7.0 -> 0.8.0
This commit is contained in:
Peder Bergebakken Sundt 2023-11-25 16:47:52 +01:00 committed by GitHub
commit 7812141f86
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,22 +1,22 @@
{ lib, stdenv, fetchFromGitHub { lib, stdenv, fetchFromGitHub
, autoreconfHook , autoreconfHook, pkg-config
, glibcLocales, kmod, coreutils, perl , glibcLocales, kmod, coreutils, perl
, dmidecode, hwdata, sqlite , dmidecode, hwdata, sqlite, libtraceevent
, nixosTests , nixosTests
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rasdaemon"; pname = "rasdaemon";
version = "0.7.0"; version = "0.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mchehab"; owner = "mchehab";
repo = "rasdaemon"; repo = "rasdaemon";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-oLwR+bNgKceVgLTOLYiKHNUkRmLouaQshdp/8UJnfqg="; sha256 = "sha256-BX3kc629FOh5cnD6Sa/69wKdhmhT3Rpz5ZvhnD4MclQ=";
}; };
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ buildInputs = [
coreutils coreutils
@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
hwdata hwdata
kmod kmod
sqlite sqlite
libtraceevent
(perl.withPackages (ps: with ps; [ DBI DBDSQLite ])) (perl.withPackages (ps: with ps; [ DBI DBDSQLite ]))
] ]
++ lib.optionals (!stdenv.isAarch64) [ dmidecode ]; ++ lib.optionals (!stdenv.isAarch64) [ dmidecode ];
@ -32,20 +33,8 @@ stdenv.mkDerivation rec {
"--sysconfdir=/etc" "--sysconfdir=/etc"
"--localstatedir=/var" "--localstatedir=/var"
"--with-sysconfdefdir=${placeholder "out"}/etc/sysconfig" "--with-sysconfdefdir=${placeholder "out"}/etc/sysconfig"
"--enable-sqlite3" "--enable-all"
"--enable-aer" ];
"--enable-mce"
"--enable-extlog"
"--enable-non-standard"
"--enable-abrt-report"
"--enable-hisi-ns-decode"
"--enable-devlink"
"--enable-diskerror"
"--enable-memory-failure"
"--enable-memory-ce-pfa"
"--enable-amp-ns-decode"
]
++ lib.optionals (stdenv.isAarch64) [ "--enable-arm" ];
# The installation attempts to create the following directories: # The installation attempts to create the following directories:
# /var/lib/rasdaemon # /var/lib/rasdaemon