commit b6dbef4759947451dd1ab3d6d64c16d4d5ab5810 · pyrox.dev/nixpkgs

+7 -9

pkgs/tools/admin/certbot/0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch

···

       22
       22
        
        1 file changed, 1 insertion(+), 14 deletions(-)

     

       23
       23
        
       

     

       24
       24
        
       diff --git a/certbot/setup.py b/certbot/setup.py

     

       25
       25
       -
       index c1bf914..7456bf2 100644

     

       25
       25
       +
       index d19327e5e..ac1524793 100644

     

       26
       26
        
       --- a/certbot/setup.py

     

       27
       27
        
       +++ b/certbot/setup.py

     

       28
       28
       -
       @@ -3,7 +3,6 @@ import os

     

       28
       28
       +
       @@ -1,5 +1,4 @@

     

       29
       29
       +
        import codecs

     

       30
       30
       +
       -from distutils.version import StrictVersion

     

       31
       31
       +
        import os

     

       29
       32
        
        import re

     

       30
       33
        
        import sys

     

       31
       31
       -
        

     

       32
       32
       -
       -from distutils.version import StrictVersion

     

       33
       33
       -
        from setuptools import find_packages, setup, __version__ as setuptools_version

     

       34
       34
       -
        from setuptools.command.test import test as TestCommand

     

       35
       35
       -
        

     

       36
       36
       -
       @@ -56,20 +55,8 @@ install_requires = [

     

       34
       34
       +
       @@ -58,20 +57,8 @@ install_requires = [

     

       37
       35
        
        

     

       38
       36
        
        # Add pywin32 on Windows platforms to handle low-level system calls.

     

       39
       37
        
        # This dependency needs to be added using environment markers to avoid its installation on Linux.

     
···

       54
       52
        
       +install_requires.append(pywin32_req + " ; sys_platform == 'win32'")

     

       55
       53
        
        

     

       56
       54
        
        dev_extras = [

     

       57
       57
       -
            'astroid==1.6.5',

     

       55
       55
       +
            'coverage',

     

       58
       56
        
       -- 

     

       59
       57
        
       2.24.1

     

       60
       58

+18 -18

pkgs/tools/admin/certbot/default.nix

···

       1
       1
       -
       { stdenv, python37Packages, fetchFromGitHub, fetchurl, dialog, autoPatchelfHook }:

     

       2
       2
       -
       

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonApplication

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , ConfigArgParse, acme, configobj, cryptography, distro, josepy, parsedatetime, pyRFC3339, pyopenssl, pytz, requests, six, zope_component, zope_interface

     

       5
       5
       +
       , dialog, mock, gnureadline

     

       6
       6
       +
       , pytest_xdist, pytest, dateutil

     

       7
       7
       +
       }:

     

       3
       8
        
       

     

       4
       4
       -
       python37Packages.buildPythonApplication rec {

     

       9
       9
       +
       buildPythonApplication rec {

     

       5
       10
        
         pname = "certbot";

     

       6
       6
       -
         version = "1.0.0";

     

       11
       11
       +
         version = "1.3.0";

     

       7
       12
        
       

     

       8
       13
        
         src = fetchFromGitHub {

     

       9
       14
        
           owner = pname;

     

       10
       15
        
           repo = pname;

     

       11
       16
        
           rev = "v${version}";

     

       12
       12
       -
           sha256 = "180x7gcpfbrzw8k654s7b5nxdy2yg61lq513dykyn3wz4gssw465";

     

       17
       17
       +
           sha256 = "1nzp1l63f64qqp89y1vyd4lgfhykfp5dkr6iwfiyf273y7sjwpsa";

     

       13
       18
        
         };

     

       14
       19
        
       

     

       15
       20
        
         patches = [

     

       16
       21
        
           ./0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch

     

       17
       22
        
         ];

     

       18
       23
        
       

     

       19
       19
       -
         propagatedBuildInputs = with python37Packages; [

     

       24
       24
       +
         propagatedBuildInputs = [

     

       20
       25
        
           ConfigArgParse

     

       21
       26
        
           acme

     

       22
       27
        
           configobj

     
···

       24
       29
        
           distro

     

       25
       30
        
           josepy

     

       26
       31
        
           parsedatetime

     

       27
       27
       -
           psutil

     

       28
       32
        
           pyRFC3339

     

       29
       33
        
           pyopenssl

     

       30
       34
        
           pytz

     

       35
       35
       +
           requests

     

       31
       36
        
           six

     

       32
       37
        
           zope_component

     

       33
       38
        
           zope_interface

     

       34
       39
        
         ];

     

       35
       40
        
       

     

       36
       36
       -
         buildInputs = [ dialog ] ++ (with python37Packages; [ mock gnureadline ]);

     

       41
       41
       +
         buildInputs = [ dialog mock gnureadline ];

     

       37
       42
        
       

     

       38
       38
       -
         checkInputs = with python37Packages; [

     

       39
       39
       -
           pytest_xdist

     

       40
       40
       -
           pytest

     

       41
       41
       -
           dateutil

     

       42
       42
       -
         ];

     

       43
       43
       +
         checkInputs = [ pytest_xdist pytest dateutil ];

     

       43
       44
        
       

     

       44
       44
       -
         postPatch = ''

     

       45
       45
       +
         preBuild = ''

     

       45
       46
        
           cd certbot

     

       46
       46
       -
           substituteInPlace certbot/_internal/notify.py --replace "/usr/sbin/sendmail" "/run/wrappers/bin/sendmail"

     

       47
       47
        
         '';

     

       48
       48
        
       

     

       49
       49
        
         postInstall = ''

     
···

       55
       55
        
       

     

       56
       56
        
         doCheck = true;

     

       57
       57
        
       

     

       58
       58
       -
         meta = with stdenv.lib; {

     

       58
       58
       +
         meta = with lib; {

     

       59
       59
        
           homepage = src.meta.homepage;

     

       60
       60
        
           description = "ACME client that can obtain certs and extensibly update server configurations";

     

       61
       61
        
           platforms = platforms.unix;

     

       62
       62
       -
           maintainers = [ maintainers.domenkozar ];

     

       63
       63
       -
           license = licenses.asl20;

     

       62
       62
       +
           maintainers = with maintainers; [ domenkozar ];

     

       63
       63
       +
           license = with licenses; [ asl20 ];

     

       64
       64
        
         };

     

       65
       65
        
       }

+1 -1

pkgs/top-level/all-packages.nix

···

       11236
       11236
        
           ogre = ogre1_10;

     

       11237
       11237
        
         };

     

       11238
       11238
        
       

     

       11239
       11239
       -
         certbot = callPackage ../tools/admin/certbot { };

     

       11239
       11239
       +
         certbot = python3Packages.callPackage ../tools/admin/certbot { };

     

       11240
       11240
        
       

     

       11241
       11241
        
         caf = callPackage ../development/libraries/caf {};

     

       11242
       11242