diff options
Diffstat (limited to 'pkgs/tools/admin')
-rw-r--r-- | pkgs/tools/admin/certbot/default.nix | 10 | ||||
-rw-r--r-- | pkgs/tools/admin/tigervnc/default.nix | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/tools/admin/certbot/default.nix b/pkgs/tools/admin/certbot/default.nix index 80805666a3a4..998b8d2e13de 100644 --- a/pkgs/tools/admin/certbot/default.nix +++ b/pkgs/tools/admin/certbot/default.nix @@ -1,6 +1,8 @@ -{ stdenv, pythonPackages, fetchFromGitHub, dialog }: +{ stdenv, python2Packages, fetchFromGitHub, dialog }: -pythonPackages.buildPythonApplication rec { +# Latest version of certbot supports python3 and python3 version of pythondialog + +python2Packages.buildPythonApplication rec { name = "certbot-${version}"; version = "0.6.0"; @@ -11,7 +13,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "1x0prlldkgg0hxmya4m5h3k3c872wr0jylmzpr3m04mk339yiw0c"; }; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python2Packages; [ ConfigArgParse acme configobj @@ -26,7 +28,7 @@ pythonPackages.buildPythonApplication rec { zope_component zope_interface ]; - buildInputs = [ dialog ] ++ (with pythonPackages; [ nose mock gnureadline ]); + buildInputs = [ dialog ] ++ (with python2Packages; [ nose mock gnureadline ]); patchPhase = '' substituteInPlace certbot/notify.py --replace "/usr/sbin/sendmail" "/var/setuid-wrappers/sendmail" diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index eeefd4d99b5c..d0eb9e8fb15a 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "1.6.0"; + version = "1.7.0"; name = "tigervnc-${version}"; src = fetchgit { url = "https://github.com/TigerVNC/tigervnc/"; - sha256 = "1plljv1cxsax88kv52g02n8c1hzwgp6j1p8z1aqhskw36shg4pij"; - rev = "5a727f25990d05c9a1f85457b45d6aed66409cb3"; + sha256 = "1b6n2gq6078x8dwz471a68jrkgpcxmbiivmlsakr42vrndm7niz3"; + rev = "e25272fc74ef09987ccaa33b9bf1736397c76fdf"; }; inherit fontDirectories; |