about summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2023-09-25 18:01:06 +0000
committerGitHub <noreply@github.com>2023-09-25 18:01:06 +0000
commitfc1f757bf69f0d3594c4d507907e2fd7d618564b (patch)
tree2a72cc9726b7364a0d86fe25eb6dc10bde0cd8cd /pkgs/tools
parent3e52e5929d1e96662acc0805ec08fca38f25ef94 (diff)
parent99eb0f3469482c7a26b925e96d2a47914731193e (diff)
downloadnixlib-fc1f757bf69f0d3594c4d507907e2fd7d618564b.tar
nixlib-fc1f757bf69f0d3594c4d507907e2fd7d618564b.tar.gz
nixlib-fc1f757bf69f0d3594c4d507907e2fd7d618564b.tar.bz2
nixlib-fc1f757bf69f0d3594c4d507907e2fd7d618564b.tar.lz
nixlib-fc1f757bf69f0d3594c4d507907e2fd7d618564b.tar.xz
nixlib-fc1f757bf69f0d3594c4d507907e2fd7d618564b.tar.zst
nixlib-fc1f757bf69f0d3594c4d507907e2fd7d618564b.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/misc/tlp/default.nix4
-rw-r--r--pkgs/tools/wayland/wayland-proxy-virtwl/default.nix1
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix
index 023028879245..51f10640ccbb 100644
--- a/pkgs/tools/misc/tlp/default.nix
+++ b/pkgs/tools/misc/tlp/default.nix
@@ -24,13 +24,13 @@
 , networkmanager
 }: stdenv.mkDerivation rec {
   pname = "tlp";
-  version = "1.6.0";
+  version = "1.6.1";
 
   src = fetchFromGitHub {
     owner = "linrunner";
     repo = "TLP";
     rev = version;
-    hash = "sha256-XAyko2MxFyo5RyioaexhoFAR3E+I3t/8vD2K3WYNmsI=";
+    hash = "sha256-CxO1KU7F6sT5D8vjKOmntjDxcieoRSHTvuSqXfplcHk=";
   };
 
   # XXX: See patch files for relevant explanations.
diff --git a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix
index 74e6c5359ed4..25123ec9b244 100644
--- a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix
+++ b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix
@@ -42,6 +42,7 @@ ocamlPackages.buildDunePackage rec {
     homepage = "https://github.com/talex5/wayland-virtwl-proxy";
     description = "Proxy Wayland connections across a VM boundary";
     license = licenses.asl20;
+    mainProgram = "wayland-proxy-virtwl";
     maintainers = [ maintainers.qyliss maintainers.sternenseemann ];
     platforms = platforms.linux;
   };