3 files changed, 47 insertions, 25 deletions
diff --git a/pkgs/tools/X11/keynav/default.nix b/pkgs/tools/X11/keynav/default.nix
index 077e41b10be..847d13315f8 100644
--- a/pkgs/tools/X11/keynav/default.nix
+++ b/pkgs/tools/X11/keynav/default.nix
@@ -1,5 +1,18 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, libX11, xorgproto, libXtst, libXi, libXext
-, libXinerama, libXrandr, glib, cairo, xdotool }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, pkg-config
+, libX11
+, xorgproto
+, libXtst
+, libXi
+, libXext
+, libXinerama
+, libXrandr
+, glib
+, cairo
+, xdotool
+}:
 
 let release = "20180821"; in
 stdenv.mkDerivation {
@@ -14,21 +27,30 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ libX11 xorgproto libXtst libXi libXext libXinerama libXrandr
-                  glib cairo xdotool ];
+  buildInputs = [
+    libX11
+    xorgproto
+    libXtst
+    libXi
+    libXext
+    libXinerama
+    libXrandr
+    glib
+    cairo
+    xdotool
+  ];
 
-  patchPhase = ''
+  postPatch = ''
     echo >>VERSION MAJOR=0
     echo >>VERSION RELEASE=${release}
     echo >>VERSION REVISION=0
   '';
 
-  installPhase =
-    ''
-      mkdir -p $out/bin $out/share/keynav/doc
-      cp keynav $out/bin
-      cp keynavrc $out/share/keynav/doc
-    '';
+  installPhase = ''
+    mkdir -p $out/bin $out/share/keynav/doc
+    cp keynav $out/bin
+    cp keynavrc $out/share/keynav/doc
+  '';
 
   meta = with lib; {
     description = "Generate X11 mouse clicks from keyboard";
diff --git a/pkgs/tools/networking/ghostunnel/default.nix b/pkgs/tools/networking/ghostunnel/default.nix
index c5b7d3db0f1..43cfe481290 100644
--- a/pkgs/tools/networking/ghostunnel/default.nix
+++ b/pkgs/tools/networking/ghostunnel/default.nix
@@ -1,8 +1,7 @@
-{
-  buildGoModule,
-  fetchFromGitHub,
-  lib,
-  nixosTests,
+{ buildGoModule
+, fetchFromGitHub
+, lib
+, nixosTests
 }:
 
 buildGoModule rec {
@@ -27,13 +26,15 @@ buildGoModule rec {
     mv $sourceRoot/certstore $sourceRoot/vendor/ghostunnel/
   '';
 
+  passthru.tests = {
+    nixos = nixosTests.ghostunnel;
+    podman = nixosTests.podman-tls-ghostunnel;
+  };
+
   meta = with lib; {
     description = "A simple TLS proxy with mutual authentication support for securing non-TLS backend applications";
     homepage = "https://github.com/ghostunnel/ghostunnel#readme";
     license = licenses.asl20;
     maintainers = with maintainers; [ roberth ];
   };
-
-  passthru.tests.nixos = nixosTests.ghostunnel;
-  passthru.tests.podman = nixosTests.podman-tls-ghostunnel;
 }
diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
index 9f3ba60af84..b0f4cd1f788 100644
--- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
+++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
@@ -6,9 +6,8 @@
 # some loss of functionality because of it.
 
 python3Packages.buildPythonApplication rec {
-  version = "2021-07-09";
   pname = "tahoe-lafs";
-  namePrefix = "";
+  version = "unstable-2021-07-09";
 
   src = fetchFromGitHub {
     owner = "tahoe-lafs";
@@ -84,7 +83,7 @@ python3Packages.buildPythonApplication rec {
     trial --rterrors allmydata
   '';
 
-  meta = {
+  meta = with lib; {
     description = "Tahoe-LAFS, a decentralized, fault-tolerant, distributed storage system";
     longDescription = ''
       Tahoe-LAFS is a secure, decentralized, fault-tolerant filesystem.
@@ -92,9 +91,9 @@ python3Packages.buildPythonApplication rec {
       such a way that it remains available even when some of the peers
       are unavailable, malfunctioning, or malicious.
     '';
-    homepage = "http://tahoe-lafs.org/";
-    license = [ lib.licenses.gpl2Plus /* or */ "TGPPLv1+" ];
+    homepage = "https://tahoe-lafs.org/";
+    license = [ licenses.gpl2Plus /* or */ "TGPPLv1+" ];
     maintainers = with lib.maintainers; [ MostAwesomeDude ];
-    platforms = lib.platforms.gnu ++ lib.platforms.linux;
+    platforms = platforms.gnu ++ platforms.linux;
   };
 }