diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/misc/tlp/default.nix')
-rw-r--r-- | nixpkgs/pkgs/tools/misc/tlp/default.nix | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/tools/misc/tlp/default.nix b/nixpkgs/pkgs/tools/misc/tlp/default.nix index a615330a4a8f..84c927260c06 100644 --- a/nixpkgs/pkgs/tools/misc/tlp/default.nix +++ b/nixpkgs/pkgs/tools/misc/tlp/default.nix @@ -13,6 +13,7 @@ , makeWrapper , pciutils , perl +, perlcritic , shellcheck , smartmontools , systemd @@ -23,17 +24,20 @@ , networkmanager }: stdenv.mkDerivation rec { pname = "tlp"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "linrunner"; repo = "TLP"; rev = version; - sha256 = "14fcnaz9pw534v4d8dddqq4wcvpf1kghr8zlrk62r5lrl46sp1p5"; + sha256 = "sha256-Blwj4cqrrYXohnGyJYe+1NYifxqfS4DoVUHmxFf62i4="; }; # XXX: See patch files for relevant explanations. - patches = [ ./patches/fix-makefile-sed.patch ./patches/tlp-sleep-service.patch ]; + patches = [ + ./patches/0001-makefile-correctly-sed-paths.patch + ./patches/0002-tlp-sleep.service-reintroduce.patch + ]; buildInputs = [ perl ]; nativeBuildInputs = [ makeWrapper gnused ]; @@ -52,8 +56,10 @@ "TLP_WITH_ELOGIND=0" "TLP_WITH_SYSTEMD=1" + "TLP_BATD=/share/tlp/bat.d" "TLP_BIN=/bin" "TLP_CONFDEF=/share/tlp/defaults.conf" + "TLP_CONFREN=/share/tlp/rename.conf" "TLP_FLIB=/share/tlp/func.d" "TLP_MAN=/share/man" "TLP_META=/share/metainfo" @@ -65,12 +71,11 @@ installTargets = [ "install-tlp" "install-man" ] ++ lib.optionals enableRDW [ "install-rdw" "install-man-rdw" ]; - # XXX: This is disabled because it's basically just noise since upstream - # itself does not seem to care about the zillion shellcheck errors. - doCheck = false; - checkInputs = [ checkbashisms shellcheck ]; + doCheck = true; + checkInputs = [ checkbashisms perlcritic shellcheck ]; checkTarget = [ "checkall" ]; + # TODO: Consider using resholve here postInstall = let paths = lib.makeBinPath ( [ @@ -107,12 +112,16 @@ $out/etc/NetworkManager/dispatcher.d/* $out/lib/udev/tlp-* $out/sbin/* + $out/share/tlp/bat.d/* $out/share/tlp/func.d/* $out/share/tlp/tlp-func-base ) for f in "''${fixup_bash[@]}"; do sed -i '2iexport PATH=${paths}:$PATH' "$f" done + + rm -rf $out/var + rm -rf $out/share/metainfo ''; meta = with lib; { |