···1616 overrides = packageOverrides;
1717 };
18181919-plat = if stdenv.isLinux then "linux"
1919+plat = if (stdenv.isLinux && lib.versionOlder self.luaversion "5.4") then "linux"
2020+ else if (stdenv.isLinux && lib.versionAtLeast self.luaversion "5.4") then "linux-readline"
2021 else if stdenv.isDarwin then "macosx"
2122 else if stdenv.hostPlatform.isMinGW then "mingw"
2223 else if stdenv.isFreeBSD then "freebsd"
···991010buildPythonPackage rec {
1111 pname = "annexremote";
1212- version = "1.4.5";
1212+ version = "1.6.0";
13131414 # use fetchFromGitHub instead of fetchPypi because the test suite of
1515 # the package is not included into the PyPI tarball
···1717 rev = "v${version}";
1818 owner = "Lykos153";
1919 repo = "AnnexRemote";
2020- sha256 = "0r5chdk2aiqcz7z8r8m1j657cz79f6bbv96xdmhj4m5fiqn672if";
2020+ sha256 = "08myswj1vqkl4s1glykq6xn76a070nv5mxj0z8ibl6axz89bvypi";
2121 };
22222323 propagatedBuildInputs = [ future ];
···11-22- makefile: correctly sed paths
33-44- The default Makefile for tlp makes a mess with catenating `DESTDIR` to
55- everything, but then not actualy using the catenated (_ prefixed)
66- variables to sed it's `.in` files.
77-88- This patch makes sure that it correctly sets the paths, taking `DESTDIR`
99- in account where it makes sense (e.g. /bin where we want $out/bin) but
1010- not where it doesn't (/etc/tlp.conf should be just that).
1111-1212- The reason DESTDIR is used at all, as opposed to the more appropriate
1313- PREFIX, is covered in the nix formula, and is (also) due to the Makefile
1414- being a bit "different."
1515-1616-diff --git a/Makefile b/Makefile
1717-index e9bbab4..6b66651 100644
1818---- a/Makefile
1919-+++ b/Makefile
2020-@@ -51,19 +51,19 @@ _TPACPIBAT = $(DESTDIR)$(TPACPIBAT)
2121-2222- SED = sed \
2323- -e "s|@TLPVER@|$(TLPVER)|g" \
2424-- -e "s|@TLP_SBIN@|$(TLP_SBIN)|g" \
2525-- -e "s|@TLP_TLIB@|$(TLP_TLIB)|g" \
2626-- -e "s|@TLP_FLIB@|$(TLP_FLIB)|g" \
2727-- -e "s|@TLP_ULIB@|$(TLP_ULIB)|g" \
2828-- -e "s|@TLP_BATD@|$(TLP_BATD)|g" \
2929-+ -e "s|@TLP_SBIN@|$(_SBIN)|g" \
3030-+ -e "s|@TLP_TLIB@|$(_TLIB)|g" \
3131-+ -e "s|@TLP_FLIB@|$(_FLIB)|g" \
3232-+ -e "s|@TLP_ULIB@|$(_ULIB)|g" \
3333-+ -e "s|@TLP_BATD@|$(_BATD)|g" \
3434- -e "s|@TLP_CONFUSR@|$(TLP_CONFUSR)|g" \
3535- -e "s|@TLP_CONFDIR@|$(TLP_CONFDIR)|g" \
3636-- -e "s|@TLP_CONFDEF@|$(TLP_CONFDEF)|g" \
3737-- -e "s|@TLP_CONFREN@|$(TLP_CONFREN)|g" \
3838-+ -e "s|@TLP_CONFDEF@|$(_CONFDEF)|g" \
3939-+ -e "s|@TLP_CONFREN@|$(_CONFREN)|g" \
4040- -e "s|@TLP_CONF@|$(TLP_CONF)|g" \
4141- -e "s|@TLP_RUN@|$(TLP_RUN)|g" \
4242- -e "s|@TLP_VAR@|$(TLP_VAR)|g" \
4343-- -e "s|@TPACPIBAT@|$(TPACPIBAT)|g"
4444-+ -e "s|@TPACPIBAT@|$(_TPACPIBAT)|g"
4545-4646- INFILES = \
4747- tlp \
···11-22- tlp-sleep.service: reintroduce
11+From a3506c9bc8929645b7b08859e47039b8cc830d22 Mon Sep 17 00:00:00 2001
22+From: Bernardo Meurer <bernardo@meurer.org>
33+Date: Fri, 15 Oct 2021 23:07:40 -0700
44+Subject: [PATCH 2/2] tlp-sleep.service: reintroduce
3544- This patch reintroduces tlp-sleep as a systemd unit as opposed to a
55- systemd system-sleep hook script. This is due to the recommendation by
66- systemd itself to not use the hook scripts. As per the manual:
66+This patch reintroduces tlp-sleep as a systemd unit as opposed to a
77+systemd system-sleep hook script. This is due to the recommendation by
88+systemd itself to not use the hook scripts. As per the manual:
7988- > Note that scripts or binaries dropped in /usr/lib/systemd/system-sleep/
99- > are intended for local use only and should be considered hacks. If
1010- > applications want to react to system suspend/hibernation and resume,
1111- > they should rather use the Inhibitor interface[1].
1010+> Note that scripts or binaries dropped in /usr/lib/systemd/system-sleep/
1111+> are intended for local use only and should be considered hacks. If
1212+> applications want to react to system suspend/hibernation and resume,
1313+> they should rather use the Inhibitor interface[1].
1414+---
1515+ Makefile | 6 +++---
1616+ tlp-sleep | 11 -----------
1717+ tlp-sleep.service.in | 19 +++++++++++++++++++
1818+ 3 files changed, 22 insertions(+), 14 deletions(-)
1919+ delete mode 100644 tlp-sleep
2020+ create mode 100644 tlp-sleep.service.in
12211322diff --git a/Makefile b/Makefile
1414-index e9bbab4..7d71e02 100644
2323+index ab05720..075b42f 100644
1524--- a/Makefile
1625+++ b/Makefile
1726@@ -76,6 +76,7 @@ INFILES = \
···3544 ifneq ($(TLP_WITH_SYSTEMD),0)
3645 install -D -m 644 tlp.service $(_SYSD)/tlp.service
3746- install -D -m 755 tlp-sleep $(_SDSL)/tlp
3838-+ install -D -m 644 tlp-sleep.service $(_SDSL)/tlp-sleep.service
4747++ install -D -m 644 tlp-sleep.service $(_SYSD)/tlp-sleep.service
3948 endif
4049 ifneq ($(TLP_WITH_ELOGIND),0)
4150 install -D -m 755 tlp-sleep.elogind $(_ELOD)/49-tlp-sleep
···4453 rm -f $(_SYSV)/tlp
4554 rm -f $(_SYSD)/tlp.service
4655- rm -f $(_SDSL)/tlp-sleep
4747-+ rm -f $(_SDSL)/tlp-sleep.service
5656++ rm -f $(_SYSD)/tlp-sleep.service
4857 rm -f $(_ELOD)/49-tlp-sleep
4958 rm -f $(_SHCPL)/tlp-stat
5059 rm -f $(_SHCPL)/bluetooth
···6776-esac
6877diff --git a/tlp-sleep.service.in b/tlp-sleep.service.in
6978new file mode 100644
7070-index 0000000..4ac17bd
7979+index 0000000..79c202c
7180--- /dev/null
7281+++ b/tlp-sleep.service.in
7382@@ -0,0 +1,19 @@
7483+# tlp - systemd suspend/resume service
7584+#
7676-+# Copyright (c) 2020 Thomas Koch <linrunner at gmx.net> and others.
8585++# Copyright (c) 2021 Thomas Koch <linrunner at gmx.net> and others.
7786+# This software is licensed under the GPL v2 or later.
7887+
7988+[Unit]
···9099+
91100+[Install]
92101+WantedBy=sleep.target
102102+--
103103+2.33.0
104104+
···616616 osquery = throw "osquery has been removed."; # added 2019-11-24
617617 osxfuse = macfuse-stubs; # added 2021-03-20
618618 otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # added 2020-02-02
619619+ OVMF-CSM = throw "OVMF-CSM has been removed in favor of OVMFFull"; # added 2021-10-16
620620+ OVMF-secureBoot = throw "OVMF-secureBoot has been removed in favor of OVMFFull"; # added 2021-10-16
619621 owncloudclient = owncloud-client; # added 2016-08
620622 ocz-ssd-guru = throw "ocz-ssd-guru has been removed due to there being no source available"; # added 2021-07-12
621623 p11_kit = p11-kit; # added 2018-02-25