···16 overrides = packageOverrides;
17 };
1819-plat = if stdenv.isLinux then "linux"
020 else if stdenv.isDarwin then "macosx"
21 else if stdenv.hostPlatform.isMinGW then "mingw"
22 else if stdenv.isFreeBSD then "freebsd"
···16 overrides = packageOverrides;
17 };
1819+plat = if (stdenv.isLinux && lib.versionOlder self.luaversion "5.4") then "linux"
20+ else if (stdenv.isLinux && lib.versionAtLeast self.luaversion "5.4") then "linux-readline"
21 else if stdenv.isDarwin then "macosx"
22 else if stdenv.hostPlatform.isMinGW then "mingw"
23 else if stdenv.isFreeBSD then "freebsd"
···910buildPythonPackage rec {
11 pname = "annexremote";
12- version = "1.4.5";
1314 # use fetchFromGitHub instead of fetchPypi because the test suite of
15 # the package is not included into the PyPI tarball
···17 rev = "v${version}";
18 owner = "Lykos153";
19 repo = "AnnexRemote";
20- sha256 = "0r5chdk2aiqcz7z8r8m1j657cz79f6bbv96xdmhj4m5fiqn672if";
21 };
2223 propagatedBuildInputs = [ future ];
···910buildPythonPackage rec {
11 pname = "annexremote";
12+ version = "1.6.0";
1314 # use fetchFromGitHub instead of fetchPypi because the test suite of
15 # the package is not included into the PyPI tarball
···17 rev = "v${version}";
18 owner = "Lykos153";
19 repo = "AnnexRemote";
20+ sha256 = "08myswj1vqkl4s1glykq6xn76a070nv5mxj0z8ibl6axz89bvypi";
21 };
2223 propagatedBuildInputs = [ future ];
···23perlPackages.buildPerlPackage rec {
4 pname = "pgformatter";
5- version = "5.0";
67 src = fetchFromGitHub {
8 owner = "darold";
9 repo = "pgFormatter";
10 rev = "v${version}";
11- sha256 = "10ml3va6ip501ibaykbhq8282y1j6r8bc8azc1gqxskk5jvfz1jm";
12 };
1314 outputs = [ "out" ];
1516 makeMakerFlags = [ "INSTALLDIRS=vendor" ];
0001718 # Makefile.PL only accepts DESTDIR and INSTALLDIRS, but we need to set more to make this work for NixOS.
19 patchPhase = ''
···23perlPackages.buildPerlPackage rec {
4 pname = "pgformatter";
5+ version = "5.1";
67 src = fetchFromGitHub {
8 owner = "darold";
9 repo = "pgFormatter";
10 rev = "v${version}";
11+ sha256 = "1a6rmph96s7c8lpmpkizcvdf0x4jlsr5iqi7qjprxqsf6zak2rfg";
12 };
1314 outputs = [ "out" ];
1516 makeMakerFlags = [ "INSTALLDIRS=vendor" ];
17+18+ # Avoid creating perllocal.pod, which contains a timestamp
19+ installTargets = [ "pure_install" ];
2021 # Makefile.PL only accepts DESTDIR and INSTALLDIRS, but we need to set more to make this work for NixOS.
22 patchPhase = ''
···1-2- makefile: correctly sed paths
3-4- The default Makefile for tlp makes a mess with catenating `DESTDIR` to
5- everything, but then not actualy using the catenated (_ prefixed)
6- variables to sed it's `.in` files.
7-8- This patch makes sure that it correctly sets the paths, taking `DESTDIR`
9- in account where it makes sense (e.g. /bin where we want $out/bin) but
10- not where it doesn't (/etc/tlp.conf should be just that).
11-12- The reason DESTDIR is used at all, as opposed to the more appropriate
13- PREFIX, is covered in the nix formula, and is (also) due to the Makefile
14- being a bit "different."
15-16-diff --git a/Makefile b/Makefile
17-index e9bbab4..6b66651 100644
18---- a/Makefile
19-+++ b/Makefile
20-@@ -51,19 +51,19 @@ _TPACPIBAT = $(DESTDIR)$(TPACPIBAT)
21-22- SED = sed \
23- -e "s|@TLPVER@|$(TLPVER)|g" \
24-- -e "s|@TLP_SBIN@|$(TLP_SBIN)|g" \
25-- -e "s|@TLP_TLIB@|$(TLP_TLIB)|g" \
26-- -e "s|@TLP_FLIB@|$(TLP_FLIB)|g" \
27-- -e "s|@TLP_ULIB@|$(TLP_ULIB)|g" \
28-- -e "s|@TLP_BATD@|$(TLP_BATD)|g" \
29-+ -e "s|@TLP_SBIN@|$(_SBIN)|g" \
30-+ -e "s|@TLP_TLIB@|$(_TLIB)|g" \
31-+ -e "s|@TLP_FLIB@|$(_FLIB)|g" \
32-+ -e "s|@TLP_ULIB@|$(_ULIB)|g" \
33-+ -e "s|@TLP_BATD@|$(_BATD)|g" \
34- -e "s|@TLP_CONFUSR@|$(TLP_CONFUSR)|g" \
35- -e "s|@TLP_CONFDIR@|$(TLP_CONFDIR)|g" \
36-- -e "s|@TLP_CONFDEF@|$(TLP_CONFDEF)|g" \
37-- -e "s|@TLP_CONFREN@|$(TLP_CONFREN)|g" \
38-+ -e "s|@TLP_CONFDEF@|$(_CONFDEF)|g" \
39-+ -e "s|@TLP_CONFREN@|$(_CONFREN)|g" \
40- -e "s|@TLP_CONF@|$(TLP_CONF)|g" \
41- -e "s|@TLP_RUN@|$(TLP_RUN)|g" \
42- -e "s|@TLP_VAR@|$(TLP_VAR)|g" \
43-- -e "s|@TPACPIBAT@|$(TPACPIBAT)|g"
44-+ -e "s|@TPACPIBAT@|$(_TPACPIBAT)|g"
45-46- INFILES = \
47- tlp \
···1-2- tlp-sleep.service: reintroduce
0034- This patch reintroduces tlp-sleep as a systemd unit as opposed to a
5- systemd system-sleep hook script. This is due to the recommendation by
6- systemd itself to not use the hook scripts. As per the manual:
78- > Note that scripts or binaries dropped in /usr/lib/systemd/system-sleep/
9- > are intended for local use only and should be considered hacks. If
10- > applications want to react to system suspend/hibernation and resume,
11- > they should rather use the Inhibitor interface[1].
00000001213diff --git a/Makefile b/Makefile
14-index e9bbab4..7d71e02 100644
15--- a/Makefile
16+++ b/Makefile
17@@ -76,6 +76,7 @@ INFILES = \
···35 ifneq ($(TLP_WITH_SYSTEMD),0)
36 install -D -m 644 tlp.service $(_SYSD)/tlp.service
37- install -D -m 755 tlp-sleep $(_SDSL)/tlp
38-+ install -D -m 644 tlp-sleep.service $(_SDSL)/tlp-sleep.service
39 endif
40 ifneq ($(TLP_WITH_ELOGIND),0)
41 install -D -m 755 tlp-sleep.elogind $(_ELOD)/49-tlp-sleep
···44 rm -f $(_SYSV)/tlp
45 rm -f $(_SYSD)/tlp.service
46- rm -f $(_SDSL)/tlp-sleep
47-+ rm -f $(_SDSL)/tlp-sleep.service
48 rm -f $(_ELOD)/49-tlp-sleep
49 rm -f $(_SHCPL)/tlp-stat
50 rm -f $(_SHCPL)/bluetooth
···67-esac
68diff --git a/tlp-sleep.service.in b/tlp-sleep.service.in
69new file mode 100644
70-index 0000000..4ac17bd
71--- /dev/null
72+++ b/tlp-sleep.service.in
73@@ -0,0 +1,19 @@
74+# tlp - systemd suspend/resume service
75+#
76-+# Copyright (c) 2020 Thomas Koch <linrunner at gmx.net> and others.
77+# This software is licensed under the GPL v2 or later.
78+
79+[Unit]
···90+
91+[Install]
92+WantedBy=sleep.target
000
···1+From a3506c9bc8929645b7b08859e47039b8cc830d22 Mon Sep 17 00:00:00 2001
2+From: Bernardo Meurer <bernardo@meurer.org>
3+Date: Fri, 15 Oct 2021 23:07:40 -0700
4+Subject: [PATCH 2/2] tlp-sleep.service: reintroduce
56+This patch reintroduces tlp-sleep as a systemd unit as opposed to a
7+systemd system-sleep hook script. This is due to the recommendation by
8+systemd itself to not use the hook scripts. As per the manual:
910+> Note that scripts or binaries dropped in /usr/lib/systemd/system-sleep/
11+> are intended for local use only and should be considered hacks. If
12+> applications want to react to system suspend/hibernation and resume,
13+> they should rather use the Inhibitor interface[1].
14+---
15+ Makefile | 6 +++---
16+ tlp-sleep | 11 -----------
17+ tlp-sleep.service.in | 19 +++++++++++++++++++
18+ 3 files changed, 22 insertions(+), 14 deletions(-)
19+ delete mode 100644 tlp-sleep
20+ create mode 100644 tlp-sleep.service.in
2122diff --git a/Makefile b/Makefile
23+index ab05720..075b42f 100644
24--- a/Makefile
25+++ b/Makefile
26@@ -76,6 +76,7 @@ INFILES = \
···44 ifneq ($(TLP_WITH_SYSTEMD),0)
45 install -D -m 644 tlp.service $(_SYSD)/tlp.service
46- install -D -m 755 tlp-sleep $(_SDSL)/tlp
47++ install -D -m 644 tlp-sleep.service $(_SYSD)/tlp-sleep.service
48 endif
49 ifneq ($(TLP_WITH_ELOGIND),0)
50 install -D -m 755 tlp-sleep.elogind $(_ELOD)/49-tlp-sleep
···53 rm -f $(_SYSV)/tlp
54 rm -f $(_SYSD)/tlp.service
55- rm -f $(_SDSL)/tlp-sleep
56++ rm -f $(_SYSD)/tlp-sleep.service
57 rm -f $(_ELOD)/49-tlp-sleep
58 rm -f $(_SHCPL)/tlp-stat
59 rm -f $(_SHCPL)/bluetooth
···76-esac
77diff --git a/tlp-sleep.service.in b/tlp-sleep.service.in
78new file mode 100644
79+index 0000000..79c202c
80--- /dev/null
81+++ b/tlp-sleep.service.in
82@@ -0,0 +1,19 @@
83+# tlp - systemd suspend/resume service
84+#
85++# Copyright (c) 2021 Thomas Koch <linrunner at gmx.net> and others.
86+# This software is licensed under the GPL v2 or later.
87+
88+[Unit]
···99+
100+[Install]
101+WantedBy=sleep.target
102+--
103+2.33.0
104+
···616 osquery = throw "osquery has been removed."; # added 2019-11-24
617 osxfuse = macfuse-stubs; # added 2021-03-20
618 otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # added 2020-02-02
00619 owncloudclient = owncloud-client; # added 2016-08
620 ocz-ssd-guru = throw "ocz-ssd-guru has been removed due to there being no source available"; # added 2021-07-12
621 p11_kit = p11-kit; # added 2018-02-25
···616 osquery = throw "osquery has been removed."; # added 2019-11-24
617 osxfuse = macfuse-stubs; # added 2021-03-20
618 otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # added 2020-02-02
619+ OVMF-CSM = throw "OVMF-CSM has been removed in favor of OVMFFull"; # added 2021-10-16
620+ OVMF-secureBoot = throw "OVMF-secureBoot has been removed in favor of OVMFFull"; # added 2021-10-16
621 owncloudclient = owncloud-client; # added 2016-08
622 ocz-ssd-guru = throw "ocz-ssd-guru has been removed due to there being no source available"; # added 2021-07-12
623 p11_kit = p11-kit; # added 2018-02-25