Unverified Commit 123b4aa0 authored by Bernardo Meurer's avatar Bernardo Meurer Committed by GitHub
Browse files

tlp: 1.6.1 -> 1.7.0 (#348774)

parents 82393b99 751e4a4c

pkgs/tools/misc/tlp/default.nix

+2 −3
Original line number Diff line number Diff line
@@ -24,13 +24,13 @@ 
, networkmanager

}: stdenv.mkDerivation rec {

  pname = "tlp";

  version = "1.6.1";

  version = "1.7.0";



  src = fetchFromGitHub {

    owner = "linrunner";

    repo = "TLP";

    rev = version;

    hash = "sha256-CxO1KU7F6sT5D8vjKOmntjDxcieoRSHTvuSqXfplcHk=";

    hash = "sha256-kjtszDLlnIkBi3yU/AyGSV8q7QBuZbDhsqJ8AvULb0M=";

  };



  # XXX: See patch files for relevant explanations.
@@ -100,7 +100,6 @@ 
        $out/share/tlp/tlp-pcilist

        $out/share/tlp/tlp-readconfs

        $out/share/tlp/tlp-usblist

        $out/share/tlp/tpacpi-bat

      )

      for f in "''${fixup_perl[@]}"; do

        wrapProgram "$f" --prefix PATH : "${paths}"

pkgs/tools/misc/tlp/patches/0001-makefile-correctly-sed-paths.patch

+7 −11
Original line number Diff line number Diff line 
From 5c5d878bf49bae5920c330482217477819ba9bc2 Mon Sep 17 00:00:00 2001

From 6500d02a70572f94e7b7df4d70b391ac27ac8bcb Mon Sep 17 00:00:00 2001

From: Bernardo Meurer <bernardo@meurer.org>

Date: Fri, 15 Oct 2021 23:22:50 -0700

Subject: [PATCH 1/2] makefile: correctly sed paths
@@ -15,14 +15,14 @@ The reason DESTDIR is used at all, as opposed to the more appropriate 
PREFIX, is covered in the nix formula, and is (also) due to the Makefile

being a bit "different."

---

 Makefile | 20 ++++++++++----------

 1 file changed, 10 insertions(+), 10 deletions(-)

 Makefile | 18 +++++++++---------

 1 file changed, 9 insertions(+), 9 deletions(-)



diff --git a/Makefile b/Makefile

index 8042517..1c436ad 100644

index 41eb38d..df3abb7 100644

--- a/Makefile

+++ b/Makefile

@@ -57,20 +57,20 @@ _TPACPIBAT = $(DESTDIR)$(TPACPIBAT)

@@ -57,17 +57,17 @@ _VAR     = $(DESTDIR)$(TLP_VAR)

 

 SED = sed \

 	-e "s|@TLPVER@|$(TLPVER)|g" \
@@ -47,12 +47,8 @@ index 8042517..1c436ad 100644 
+	-e "s|@TLP_CONFDPR@|$(_CONFDPR)|g" \

+	-e "s|@TLP_CONF@|$(_CONF)|g" \

 	-e "s|@TLP_RUN@|$(TLP_RUN)|g"   \

 	-e "s|@TLP_VAR@|$(TLP_VAR)|g"   \

-	-e "s|@TPACPIBAT@|$(TPACPIBAT)|g"

+	-e "s|@TPACPIBAT@|$(_TPACPIBAT)|g"

 	-e "s|@TLP_VAR@|$(TLP_VAR)|g"

 

 INFILES = \

 	tlp \

-- 

2.41.0

2.44.1

pkgs/tools/misc/tlp/patches/0002-reintroduce-tlp-sleep-service.patch

+8 −8
Original line number Diff line number Diff line 
From a3506c9bc8929645b7b08859e47039b8cc830d22 Mon Sep 17 00:00:00 2001

From 4ae0e860aa2c8c056379a7b6cc0f7a735de9ab12 Mon Sep 17 00:00:00 2001

From: Bernardo Meurer <bernardo@meurer.org>

Date: Fri, 15 Oct 2021 23:07:40 -0700

Subject: [PATCH 2/2] tlp-sleep.service: reintroduce
@@ -18,10 +18,10 @@ systemd itself to not use the hook scripts. As per the manual: 
 create mode 100644 tlp-sleep.service.in



diff --git a/Makefile b/Makefile

index 1c436ad..fd5211b 100644

index df3abb7..5a47001 100644

--- a/Makefile

+++ b/Makefile

@@ -84,6 +84,7 @@ INFILES = \

@@ -83,6 +83,7 @@ INFILES = \

 	tlp.rules \

 	tlp-readconfs \

 	tlp-run-on \
@@ -29,7 +29,7 @@ index 1c436ad..fd5211b 100644 
 	tlp.service \

 	tlp-stat \

 	tlp.upstart \

@@ -115,7 +116,6 @@ SHFILES = \

@@ -114,7 +115,6 @@ SHFILES = \

 	tlp-rdw-udev.in \

 	tlp-rf.in \

 	tlp-run-on.in \
@@ -37,7 +37,7 @@ index 1c436ad..fd5211b 100644 
 	tlp-sleep.elogind \

 	tlp-stat.in \

 	tlp-usb-udev.in \

@@ -172,7 +172,7 @@ ifneq ($(TLP_NO_INIT),1)

@@ -170,7 +170,7 @@ ifneq ($(TLP_NO_INIT),1)

 endif

 ifneq ($(TLP_WITH_SYSTEMD),0)

 	install -D -m 644 tlp.service $(_SYSD)/tlp.service
@@ -46,15 +46,15 @@ index 1c436ad..fd5211b 100644 
 endif

 ifneq ($(TLP_WITH_ELOGIND),0)

 	install -D -m 755 tlp-sleep.elogind $(_ELOD)/49-tlp-sleep

@@ -240,7 +240,7 @@ uninstall-tlp:

@@ -253,7 +253,7 @@ uninstall-tlp:

 	rm $(_ULIB)/rules.d/85-tlp.rules

 	rm -f $(_SYSV)/tlp

 	rm -f $(_SYSD)/tlp.service

-	rm -f $(_SDSL)/tlp-sleep

+	rm -f $(_SYSD)/tlp-sleep.service

 	rm -f $(_ELOD)/49-tlp-sleep

 	rm -f $(_SHCPL)/tlp

 	rm -f $(_SHCPL)/tlp-stat

 	rm -f $(_SHCPL)/bluetooth

diff --git a/tlp-sleep.service.in b/tlp-sleep.service.in

new file mode 100644

index 0000000..79c202c
@@ -81,5 +81,5 @@ index 0000000..79c202c 
+[Install]

+WantedBy=sleep.target

-- 

2.41.0

2.44.1