Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix

1 files changed, 17 insertions, 3 deletions

diff --git a/nixpkgs/pkgs/tools/security/sshuttle/default.nix b/nixpkgs/pkgs/tools/security/sshuttle/default.nix
index 6263a33f7062..8a92dbceb184 100644
--- a/nixpkgs/pkgs/tools/security/sshuttle/default.nix
+++ b/nixpkgs/pkgs/tools/security/sshuttle/default.nix
@@ -2,7 +2,9 @@
 , stdenv
 , python3Packages
 , fetchPypi
+, installShellFiles
 , makeWrapper
+, sphinx
 , coreutils
 , iptables
 , nettools
@@ -26,24 +28,36 @@ python3Packages.buildPythonApplication rec {
       --replace '--cov=sshuttle --cov-branch --cov-report=term-missing' ""
   '';
 
-  nativeBuildInputs = [ makeWrapper python3Packages.setuptools-scm ];
+  nativeBuildInputs = [
+    installShellFiles
+    makeWrapper
+    python3Packages.setuptools-scm
+    sphinx
+  ];
 
   nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
 
+  postBuild = ''
+    make man -C docs
+  '';
+
   postInstall = ''
+    installManPage docs/_build/man/*
+
     wrapProgram $out/bin/sshuttle \
       --prefix PATH : "${lib.makeBinPath ([ coreutils openssh procps ] ++ lib.optionals stdenv.isLinux [ iptables nettools ])}" \
   '';
 
   meta = with lib; {
-    homepage = "https://github.com/sshuttle/sshuttle/";
     description = "Transparent proxy server that works as a poor man's VPN";
     longDescription = ''
       Forward connections over SSH, without requiring administrator access to the
       target network (though it does require Python 2.7, Python 3.5 or later at both ends).
       Works with Linux and Mac OS and supports DNS tunneling.
     '';
-    license = licenses.lgpl21;
+    homepage = "https://github.com/sshuttle/sshuttle";
+    changelog = "https://github.com/sshuttle/sshuttle/blob/v${version}/CHANGES.rst";
+    license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ domenkozar carlosdagos ];
   };
 }