diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-02-24 01:09:00 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-02-24 01:09:00 +0000 |
| commit | 072c01a28f865e9487df09aed7ddff328252fb36 (patch) | |
| tree | 6df6e652915940255f294ed8998cce1c4c7c2d40 /nixpkgs/pkgs/tools/admin | |
| parent | 024b46ff20027c15322e5d868ecec42632556d4b (diff) | |
| parent | 969cff2691a02b3d7e5468beda26c482d8986644 (diff) | |
| download | nixlib-072c01a28f865e9487df09aed7ddff328252fb36.tar nixlib-072c01a28f865e9487df09aed7ddff328252fb36.tar.gz nixlib-072c01a28f865e9487df09aed7ddff328252fb36.tar.bz2 nixlib-072c01a28f865e9487df09aed7ddff328252fb36.tar.lz nixlib-072c01a28f865e9487df09aed7ddff328252fb36.tar.xz nixlib-072c01a28f865e9487df09aed7ddff328252fb36.tar.zst nixlib-072c01a28f865e9487df09aed7ddff328252fb36.zip | |
Merge commit '969cff2691a02b3d7e5468beda26c482d8986644'
Diffstat (limited to 'nixpkgs/pkgs/tools/admin')
| -rw-r--r-- | nixpkgs/pkgs/tools/admin/certbot/default.nix | 22 | ||||
| -rw-r--r-- | nixpkgs/pkgs/tools/admin/nxproxy/default.nix | 30 |
2 files changed, 10 insertions, 42 deletions
diff --git a/nixpkgs/pkgs/tools/admin/certbot/default.nix b/nixpkgs/pkgs/tools/admin/certbot/default.nix index 353abe9c8bca..782af149ed6a 100644 --- a/nixpkgs/pkgs/tools/admin/certbot/default.nix +++ b/nixpkgs/pkgs/tools/admin/certbot/default.nix @@ -1,34 +1,32 @@ -{ stdenv, pythonPackages, fetchFromGitHub, dialog }: +{ stdenv, python3Packages, fetchFromGitHub, dialog }: -# Latest version of certbot supports python3 and python3 version of pythondialog - -pythonPackages.buildPythonApplication rec { - name = "certbot-${version}"; - version = "0.24.0"; +python3Packages.buildPythonApplication rec { + pname = "certbot"; + version = "0.31.0"; src = fetchFromGitHub { - owner = "certbot"; - repo = "certbot"; + owner = pname; + repo = pname; rev = "v${version}"; - sha256 = "0gsq4si0bqwzd7ywf87y7bbprqg1m72qdj11h64qmwb5zl4vh444"; + sha256 = "0rwjxmkpicyc9a5janvj1lfi430nq6ha94nyfgp11ds9fyydbh1s"; }; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python3Packages; [ ConfigArgParse acme configobj cryptography + josepy parsedatetime psutil pyRFC3339 pyopenssl - python2-pythondialog pytz six zope_component zope_interface ]; - buildInputs = [ dialog ] ++ (with pythonPackages; [ nose mock gnureadline ]); + buildInputs = [ dialog ] ++ (with python3Packages; [ mock gnureadline ]); patchPhase = '' substituteInPlace certbot/notify.py --replace "/usr/sbin/sendmail" "/run/wrappers/bin/sendmail" diff --git a/nixpkgs/pkgs/tools/admin/nxproxy/default.nix b/nixpkgs/pkgs/tools/admin/nxproxy/default.nix deleted file mode 100644 index 45ec8bb72e3b..000000000000 --- a/nixpkgs/pkgs/tools/admin/nxproxy/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, libxcomp }: - -stdenv.mkDerivation rec { - name = "nxproxy-${version}"; - version = "3.5.99.17-1"; - - src = fetchurl { - sha256 = "18a7cvjnaf50lf1cc5axx9jmi8n9g75d2i5y4s6q9r3phpwyp918"; - url = "https://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz"; - }; - - buildInputs = [ libxcomp ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - - preAutoreconf = '' - cd nxproxy/ - sed -i 's|-L\$(top_srcdir)/../nxcomp/src/.libs ||' src/Makefile.am - ''; - - makeFlags = [ "exec_prefix=$(out)" ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "NX compression proxy"; - homepage = http://wiki.x2go.org/doku.php/wiki:libs:nx-libs; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} |