commit 2bed9f34cb902b21333476cc24fe6d226a8fa709 · pyrox.dev/nixpkgs

+31 -18
pkgs/development/python-modules/conda/0001-conda_exe.patch
···

       1
       1
       -
       diff --git a/conda/base/context.py b/conda/base/context.py

     

       2
       2
       -
       index 34a5e6495..ac017f48b 100644

     

       3
       3
       -
       --- a/conda/base/context.py

     

       4
       4
       -
       +++ b/conda/base/context.py

     

       5
       5
       -
       @@ -826,7 +826,7 @@ class Context(Configuration):

     

       1
       1
       +
       diff --git i/conda/base/context.py w/conda/base/context.py

     

       2
       2
       +
       index adf6d6e89..82f2c77f9 100644

     

       3
       3
       +
       --- i/conda/base/context.py

     

       4
       4
       +
       +++ w/conda/base/context.py

     

       5
       5
       +
       @@ -832,7 +832,7 @@ class Context(Configuration):

     

       6
       6
        
        

     

       7
       7
        
            @property

     

       8
       8
        
            def conda_prefix(self) -> PathType:

     
···

       11
       11
        
        

     

       12
       12
        
            @property

     

       13
       13
        
            @deprecated(

     

       14
       14
       -
       @@ -858,25 +858,17 @@ class Context(Configuration):

     

       14
       14
       +
       @@ -864,35 +864,20 @@ class Context(Configuration):

     

       15
       15
        
                The vars can refer to each other if necessary since the dict is ordered.

     

       16
       16
        
                None means unset it.

     

       17
       17
        
                """

     

       18
       18
        
       -        if context.dev:

     

       19
       19
       +
       -            if pythonpath := os.environ.get("PYTHONPATH", ""):

     

       20
       20
       +
       -                pythonpath = os.pathsep.join((CONDA_SOURCE_ROOT, pythonpath))

     

       21
       21
       +
       -            else:

     

       22
       22
       +
       -                pythonpath = CONDA_SOURCE_ROOT

     

       19
       23
        
       -            return {

     

       20
       24
        
       -                "CONDA_EXE": sys.executable,

     

       25
       25
       +
       -                "_CONDA_EXE": sys.executable,

     

       21
       26
        
       -                # do not confuse with os.path.join, we are joining paths with ; or : delimiters

     

       22
       22
       -
       -                "PYTHONPATH": os.pathsep.join(

     

       23
       23
       -
       -                    (CONDA_SOURCE_ROOT, os.environ.get("PYTHONPATH", ""))

     

       24
       24
       -
       -                ),

     

       27
       27
       +
       -                "PYTHONPATH": pythonpath,

     

       25
       28
        
       -                "_CE_M": "-m",

     

       26
       29
        
       -                "_CE_CONDA": "conda",

     

       27
       30
        
       -                "CONDA_PYTHON_EXE": sys.executable,

     

       31
       31
       +
       -                "_CONDA_ROOT": self.conda_prefix,

     

       28
       32
        
       -            }

     

       29
       33
        
       -        else:

     

       30
       30
       -
       -            exe = "conda.exe" if on_win else "conda"

     

       34
       34
       +
       -            exe = os.path.join(

     

       35
       35
       +
       -                self.conda_prefix,

     

       36
       36
       +
       -                BIN_DIRECTORY,

     

       37
       37
       +
       -                "conda.exe" if on_win else "conda",

     

       38
       38
       +
       -            )

     

       31
       39
        
       -            return {

     

       32
       32
       -
       -                "CONDA_EXE": os.path.join(sys.prefix, BIN_DIRECTORY, exe),

     

       40
       40
       +
       -                "CONDA_EXE": exe,

     

       41
       41
       +
       -                "_CONDA_EXE": exe,

     

       33
       42
        
       -                "_CE_M": None,

     

       34
       43
        
       -                "_CE_CONDA": None,

     

       35
       44
        
       -                "CONDA_PYTHON_EXE": sys.executable,

     

       45
       45
       +
       -                "_CONDA_ROOT": self.conda_prefix,

     

       36
       46
        
       -            }

     

       37
       47
        
       +        import sys

     

       38
       48
        
       +        return {

     

       39
       49
        
       +            "CONDA_EXE": sys.executable,

     

       40
       40
       -
       +            # do not confuse with os.path.join, we are joining paths with ; or : delimiters

     

       41
       41
       -
       +            "PYTHONPATH": os.pathsep.join(

     

       42
       42
       -
       +                [CONDA_SOURCE_ROOT, os.environ.get("PYTHONPATH", "")] + [path for path in sys.path if "site-packages" in path]

     

       43
       43
       -
       +            ),

     

       44
       44
       -
       +            "_CE_M": "-m",

     

       45
       45
       -
       +            "_CE_CONDA": "conda",

     

       46
       46
       -
       +            "CONDA_PYTHON_EXE": sys.executable,

     

       50
       50
       +
       +            "_CONDA_EXE": sys.executable,

     

       51
       51
       +
       +             # do not confuse with os.path.join, we are joining paths with ; or : delimiters

     

       52
       52
       +
       +             "PYTHONPATH": os.pathsep.join(

     

       53
       53
       +
       +                 [CONDA_SOURCE_ROOT, os.environ.get("PYTHONPATH", "")] + [path for path in sys.path if "site-packages" in path]

     

       54
       54
       +
       +             ),

     

       55
       55
       +
       +

     

       56
       56
       +
       +              "_CE_M": "-m",

     

       57
       57
       +
       +              "_CE_CONDA": "conda",

     

       58
       58
       +
       +              "CONDA_PYTHON_EXE": sys.executable,

     

       59
       59
       +
       +              "_CONDA_ROOT": self.conda_prefix,

     

       47
       60
        
       +        }

     

       48
       61
        
        

     

       49
       62
        
            @memoizedproperty