commit 6f79057e3acdb79e0cb76322a80a4e1c6572f0be · pyrox.dev/nixpkgs

+21 -10

pkgs/development/python-modules/setuptools-git/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         buildPythonPackage,

     

       4
       4
       -
         fetchPypi,

     

       5
       5
       -
         pkgs,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         gitMinimal,

     

       6
       6
       +
         replaceVars,

     

       7
       7
       +
         setuptools,

     

       6
       8
        
       }:

     

       7
       9
        
       

     

       8
       10
        
       buildPythonPackage rec {

     

       9
       11
        
         pname = "setuptools-git";

     

       10
       12
        
         version = "1.2";

     

       11
       11
       -
         format = "setuptools";

     

       13
       13
       +
         pyproject = true;

     

       12
       14
        
       

     

       13
       13
       -
         src = fetchPypi {

     

       14
       14
       -
           inherit pname version;

     

       15
       15
       -
           sha256 = "ff64136da01aabba76ae88b050e7197918d8b2139ccbf6144e14d472b9c40445";

     

       15
       15
       +
         src = fetchFromGitHub {

     

       16
       16
       +
           owner = "msabramo";

     

       17
       17
       +
           repo = "setuptools-git";

     

       18
       18
       +
           tag = version;

     

       19
       19
       +
           hash = "sha256-dbQ15y62nanuWgh2puLYSio391Ja3SF+HrafvTBVNbk=";

     

       16
       20
        
         };

     

       17
       21
        
       

     

       18
       18
       -
         propagatedBuildInputs = [ pkgs.git ];

     

       22
       22
       +
         patches = [

     

       23
       23
       +
           (replaceVars ./hardcode-git-path.patch {

     

       24
       24
       +
             git = lib.getExe gitMinimal;

     

       25
       25
       +
           })

     

       26
       26
       +
         ];

     

       27
       27
       +
       

     

       28
       28
       +
         build-system = [ setuptools ];

     

       29
       29
       +
       

     

       19
       30
        
         doCheck = false;

     

       20
       31
        
       

     

       21
       21
       -
         meta = with lib; {

     

       32
       32
       +
         meta = {

     

       22
       33
        
           description = "Setuptools revision control system plugin for Git";

     

       23
       23
       -
           homepage = "https://pypi.python.org/pypi/setuptools-git";

     

       24
       24
       -
           license = licenses.bsd3;

     

       34
       34
       +
           homepage = "https://github.com/msabramo/setuptools-git";

     

       35
       35
       +
           license = lib.licenses.bsd3;

     

       25
       36
        
         };

     

       26
       37
        
       }

+31

pkgs/development/python-modules/setuptools-git/hardcode-git-path.patch

···

       1
       1
       +
       diff --git a/setuptools_git/__init__.py b/setuptools_git/__init__.py

     

       2
       2
       +
       index 24c9b8c..a289aca 100644

     

       3
       3
       +
       --- a/setuptools_git/__init__.py

     

       4
       4
       +
       +++ b/setuptools_git/__init__.py

     

       5
       5
       +
       @@ -28,7 +28,7 @@ def version_calc(dist, attr, value):

     

       6
       6
       +
        

     

       7
       7
       +
        

     

       8
       8
       +
        def calculate_version():

     

       9
       9
       +
       -    return check_output(['git', 'describe', '--tags', '--dirty']).strip()

     

       10
       10
       +
       +    return check_output(['@git@', 'describe', '--tags', '--dirty']).strip()

     

       11
       11
       +
        

     

       12
       12
       +
        

     

       13
       13
       +
        def ntfsdecode(path):

     

       14
       14
       +
       @@ -64,7 +64,7 @@ def gitlsfiles(dirname=''):

     

       15
       15
       +
        

     

       16
       16
       +
            try:

     

       17
       17
       +
                topdir = check_output(

     

       18
       18
       +
       -            ['git', 'rev-parse', '--show-toplevel'], cwd=dirname or None,

     

       19
       19
       +
       +            ['@git@', 'rev-parse', '--show-toplevel'], cwd=dirname or None,

     

       20
       20
       +
                    stderr=PIPE).strip()

     

       21
       21
       +
        

     

       22
       22
       +
                if sys.platform == 'win32':

     

       23
       23
       +
       @@ -73,7 +73,7 @@ def gitlsfiles(dirname=''):

     

       24
       24
       +
                    cwd = topdir

     

       25
       25
       +
        

     

       26
       26
       +
                filenames = check_output(

     

       27
       27
       +
       -            ['git', 'ls-files', '-z'], cwd=cwd, stderr=PIPE)

     

       28
       28
       +
       +            ['@git@', 'ls-files', '-z'], cwd=cwd, stderr=PIPE)

     

       29
       29
       +
            except (CalledProcessError, OSError):

     

       30
       30
       +
                # Setuptools mandates we fail silently

     

       31
       31
       +
                return res