diff options
| author | Bernardo Meurer <bernardo@meurer.org> | 2022-01-24 18:59:09 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-24 18:59:09 +0000 |
| commit | e84e966bbdb182fabd0dbf7f084a406f04064891 (patch) | |
| tree | ad67a70289ad3ea523bec3bf819a89c0d5ef0800 /pkgs/tools/misc | |
| parent | 8bd7d6d6e0994aea4d2f2d42b7283db497dd5c30 (diff) | |
| parent | 282788713f3c3d13d52290f6db18ab312fc889bd (diff) | |
| download | nixpkgs-e84e966bbdb182fabd0dbf7f084a406f04064891.tar nixpkgs-e84e966bbdb182fabd0dbf7f084a406f04064891.tar.gz nixpkgs-e84e966bbdb182fabd0dbf7f084a406f04064891.tar.bz2 nixpkgs-e84e966bbdb182fabd0dbf7f084a406f04064891.tar.lz nixpkgs-e84e966bbdb182fabd0dbf7f084a406f04064891.tar.xz nixpkgs-e84e966bbdb182fabd0dbf7f084a406f04064891.tar.zst nixpkgs-e84e966bbdb182fabd0dbf7f084a406f04064891.zip | |
Merge pull request #156418 from lovesegfault/tlp-1.5.0
tlp: 1.4.0 -> 1.5.0
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/tlp/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/tools/misc/tlp/patches/0002-reintroduce-tlp-sleep-service.patch (renamed from pkgs/tools/misc/tlp/patches/0002-tlp-sleep.service-reintroduce.patch) | 17 |
2 files changed, 4 insertions, 22 deletions
diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index 84c927260c0..151b8292a59 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -24,19 +24,19 @@ , networkmanager }: stdenv.mkDerivation rec { pname = "tlp"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "linrunner"; repo = "TLP"; rev = version; - sha256 = "sha256-Blwj4cqrrYXohnGyJYe+1NYifxqfS4DoVUHmxFf62i4="; + sha256 = "sha256-hHel3BVMzTYfE59kxxADnm8tqtUFntqS3RzmJSZlWjM="; }; # XXX: See patch files for relevant explanations. patches = [ ./patches/0001-makefile-correctly-sed-paths.patch - ./patches/0002-tlp-sleep.service-reintroduce.patch + ./patches/0002-reintroduce-tlp-sleep-service.patch ]; buildInputs = [ perl ]; @@ -50,12 +50,11 @@ # [1]: https://github.com/NixOS/nixpkgs/issues/65718 # [2]: https://github.com/linrunner/TLP/blob/ab788abf4936dfb44fbb408afc34af834230a64d/Makefile#L4-L46 makeFlags = [ - "DESTDIR=${placeholder "out"}" - "TLP_NO_INIT=1" "TLP_WITH_ELOGIND=0" "TLP_WITH_SYSTEMD=1" + "DESTDIR=${placeholder "out"}" "TLP_BATD=/share/tlp/bat.d" "TLP_BIN=/bin" "TLP_CONFDEF=/share/tlp/defaults.conf" diff --git a/pkgs/tools/misc/tlp/patches/0002-tlp-sleep.service-reintroduce.patch b/pkgs/tools/misc/tlp/patches/0002-reintroduce-tlp-sleep-service.patch index 40d89e207dc..08bbafc4b9d 100644 --- a/pkgs/tools/misc/tlp/patches/0002-tlp-sleep.service-reintroduce.patch +++ b/pkgs/tools/misc/tlp/patches/0002-reintroduce-tlp-sleep-service.patch @@ -57,23 +57,6 @@ index ab05720..075b42f 100644 rm -f $(_ELOD)/49-tlp-sleep rm -f $(_SHCPL)/tlp-stat rm -f $(_SHCPL)/bluetooth -diff --git a/tlp-sleep b/tlp-sleep -deleted file mode 100644 -index e548d55..0000000 ---- a/tlp-sleep -+++ /dev/null -@@ -1,11 +0,0 @@ --#!/bin/sh -- --# tlp - systemd suspend/resume hook --# --# Copyright (c) 2021 Thomas Koch <linrunner at gmx.net> and others. --# This software is licensed under the GPL v2 or later. -- --case $1 in -- pre) tlp suspend ;; -- post) tlp resume ;; --esac diff --git a/tlp-sleep.service.in b/tlp-sleep.service.in new file mode 100644 index 0000000..79c202c |