commit 054c5f0e106d8a0169582fed4c1b2ba86647f73d · pyrox.dev/nixpkgs

+1 -1

pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh

···

       16
       16
        
       }

     

       17
       17
        
       

     

       18
       18
        
       echo "Using neovimRequireCheckHook"

     

       19
       19
       -
       preDistPhases+=" neovimRequireCheckHook"

     

       19
       19
       +
       appendToVar preDistPhases neovimRequireCheckHook

     

       20
       20
        
       

     

       21
       21

+1 -1

pkgs/applications/editors/vim/plugins/vim-command-check-hook.sh

···

       21
       21
        
       }

     

       22
       22
        
       

     

       23
       23
        
       echo "Using vimCommandCheckHook"

     

       24
       24
       -
       preDistPhases+=" vimCommandCheckHook"

     

       24
       24
       +
       appendToVar preDistPhases vimCommandCheckHook

     

       25
       25

+1 -1

pkgs/build-support/make-darwin-bundle/default.nix

···

       22
       22
        
           ${writeDarwinBundle}/bin/write-darwin-bundle "''${!outputBin}" "${name}" "${exec}"

     

       23
       23
        
         }

     

       24
       24
        
       

     

       25
       25
       -
         preDistPhases+=" makeDarwinBundlePhase"

     

       25
       25
       +
         appendToVar preDistPhases makeDarwinBundlePhase

     

       26
       26
        
       '')

+1 -1

pkgs/development/interpreters/octave/hooks/octave-write-required-octave-packages-hook.sh

···

       13
       13
        
       # Yes its a bit long...

     

       14
       14
        
       if [ -z "${dontWriteRequiredOctavePackagesPhase-}" ]; then

     

       15
       15
        
           echo "Using octaveWriteRequiredOctavePackagesPhase"

     

       16
       16
       -
           preDistPhases+=" octaveWriteRequiredOctavePackagesPhase"

     

       16
       16
       +
           appendToVar preDistPhases octaveWriteRequiredOctavePackagesPhase

     

       17
       17
        
       fi

+1 -1

pkgs/development/interpreters/octave/hooks/write-required-octave-packages-hook.sh

···

       13
       13
        
       # Yes its a bit long...

     

       14
       14
        
       if [ -z "${dontWriteRequiredOctavePackagesPhase-}" ]; then

     

       15
       15
        
           echo "Using writeRequiredOctavePackagesPhase"

     

       16
       16
       -
           preDistPhases+=" writeRequiredOctavePackagesPhase"

     

       16
       16
       +
           appendToVar preDistPhases writeRequiredOctavePackagesPhase

     

       17
       17
        
       fi

+1 -1

pkgs/development/interpreters/python/hooks/pytest-check-hook.sh

···

       58
       58
        
       

     

       59
       59
        
       if [ -z "${dontUsePytestCheck-}" ] && [ -z "${installCheckPhase-}" ]; then

     

       60
       60
        
           echo "Using pytestCheckPhase"

     

       61
       61
       -
           preDistPhases+=" pytestCheckPhase"

     

       61
       61
       +
           appendToVar preDistPhases pytestCheckPhase

     

       62
       62
        
       fi

+1 -1

pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh

···

       6
       6
        
       }

     

       7
       7
        
       

     

       8
       8
        
       if [ -z "${dontUsePythonCatchConflicts-}" ]; then

     

       9
       9
       -
           preDistPhases+=" pythonCatchConflictsPhase"

     

       9
       9
       +
           appendToVar preDistPhases pythonCatchConflictsPhase

     

       10
       10
        
       fi

+1 -1

pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh

···

       18
       18
        
       

     

       19
       19
        
       if [ -z "${dontUsePythonImportsCheck-}" ]; then

     

       20
       20
        
           echo "Using pythonImportsCheckPhase"

     

       21
       21
       -
           preDistPhases+=" pythonImportsCheckPhase"

     

       21
       21
       +
           appendToVar preDistPhases pythonImportsCheckPhase

     

       22
       22
        
       fi

+1 -1

pkgs/development/interpreters/python/hooks/python-remove-bin-bytecode-hook.sh

···

       13
       13
        
       }

     

       14
       14
        
       

     

       15
       15
        
       if [ -z "${dontUsePythonRemoveBinBytecode-}" ]; then

     

       16
       16
       -
           preDistPhases+=" pythonRemoveBinBytecodePhase"

     

       16
       16
       +
           appendToVar preDistPhases pythonRemoveBinBytecodePhase

     

       17
       17
        
       fi

+1 -1

pkgs/development/interpreters/python/hooks/sphinx-hook.sh

···

       69
       69
        
           runHook postInstallSphinx

     

       70
       70
        
       }

     

       71
       71
        
       

     

       72
       72
       -
       preDistPhases+=" buildSphinxPhase installSphinxPhase"

     

       72
       72
       +
       appendToVar preDistPhases buildSphinxPhase installSphinxPhase

+1 -1

pkgs/development/interpreters/python/hooks/unittest-check-hook.sh

···

       13
       13
        
       

     

       14
       14
        
       if [ -z "${dontUseUnittestCheck-}" ] && [ -z "${installCheckPhase-}" ]; then

     

       15
       15
        
           echo "Using unittestCheckPhase"

     

       16
       16
       -
           preDistPhases+=" unittestCheckPhase"

     

       16
       16
       +
           appendToVar preDistPhases unittestCheckPhase

     

       17
       17
        
       fi

+11 -4

pkgs/development/python-modules/pytest-forked/setup-hook.sh

···

       16
       16
        
       # until we have dependency mechanism in generic builder, we need to use this ugly hack.

     

       17
       17
        
       

     

       18
       18
        
       if [ -z "${dontUsePytestForked-}" ] && [ -z "${dontUsePytestCheck-}" ]; then

     

       19
       19
       -
           if [[ " ${preDistPhases:-} " =~ " pytestCheckPhase " ]]; then

     

       20
       20
       -
               preDistPhases+=" "

     

       21
       21
       -
               preDistPhases="${preDistPhases/ pytestCheckPhase / pytestForkedHook pytestCheckPhase }"

     

       19
       19
       +
           if [[ " ${preDistPhases[*]:-} " =~ " pytestCheckPhase " ]]; then

     

       20
       20
       +
               _preDistPhases="${preDistPhases[*]} "

     

       21
       21
       +
               _preDistPhases="${_preDistPhases/ pytestCheckPhase / pytestForkedHook pytestCheckPhase }"

     

       22
       22
       +
               if [[ -n "${__structuredAttrs-}" ]]; then

     

       23
       23
       +
                   preDistPhases=()

     

       24
       24
       +
               else

     

       25
       25
       +
                   preDistPhases=""

     

       26
       26
       +
               fi

     

       27
       27
       +
               appendToVar preDistPhases $_preDistPhases

     

       28
       28
       +
               unset _preDistPhases

     

       22
       29
        
           else

     

       23
       23
       -
               preDistPhases+=" pytestForkedHook"

     

       30
       30
       +
               appendToVar preDistPhases pytestForkedHook

     

       24
       31
        
           fi

     

       25
       32
        
       fi

+11 -4

pkgs/development/python-modules/pytest-xdist/setup-hook.sh

···

       8
       8
        
       # until we have dependency mechanism in generic builder, we need to use this ugly hack.

     

       9
       9
        
       

     

       10
       10
        
       if [ -z "${dontUsePytestXdist-}" ] && [ -z "${dontUsePytestCheck-}" ]; then

     

       11
       11
       -
           if [[ " ${preDistPhases:-} " =~ " pytestCheckPhase " ]]; then

     

       12
       12
       -
               preDistPhases+=" "

     

       13
       13
       -
               preDistPhases="${preDistPhases/ pytestCheckPhase / pytestXdistHook pytestCheckPhase }"

     

       11
       11
       +
           if [[ " ${preDistPhases[*]:-} " =~ " pytestCheckPhase " ]]; then

     

       12
       12
       +
               _preDistPhases="${preDistPhases[*]} "

     

       13
       13
       +
               _preDistPhases="${_preDistPhases/ pytestCheckPhase / pytestXdistHook pytestCheckPhase }"

     

       14
       14
       +
               if [[ -n "${__structuredAttrs-}" ]]; then

     

       15
       15
       +
                   preDistPhases=()

     

       16
       16
       +
               else

     

       17
       17
       +
                   preDistPhases=""

     

       18
       18
       +
               fi

     

       19
       19
       +
               appendToVar preDistPhases $_preDistPhases

     

       20
       20
       +
               unset _preDistPhases

     

       14
       21
        
           else

     

       15
       15
       -
               preDistPhases+=" pytestXdistHook"

     

       22
       22
       +
               appendToVar preDistPhases pytestXdistHook

     

       16
       23
        
           fi

     

       17
       24
        
       fi

+2 -2

pkgs/development/python-modules/pytest/7.nix

···

       87
       87
        
             pytestcachePhase() {

     

       88
       88
        
                 find $out -name .pytest_cache -type d -exec rm -rf {} +

     

       89
       89
        
             }

     

       90
       90
       -
             preDistPhases+=" pytestcachePhase"

     

       90
       90
       +
             appendToVar preDistPhases pytestcachePhase

     

       91
       91
        
       

     

       92
       92
        
             # pytest generates it's own bytecode files to improve assertion messages.

     

       93
       93
        
             # These files similar to cpython's bytecode files but are never laoded

     
···

       100
       100
        
                 #    https://github.com/pytest-dev/pytest/blob/7.2.1/src/_pytest/assertion/rewrite.py#L51-L53

     

       101
       101
        
                 find $out -name "*-pytest-*.py[co]" -delete

     

       102
       102
        
             }

     

       103
       103
       -
             preDistPhases+=" pytestRemoveBytecodePhase"

     

       103
       103
       +
             appendToVar preDistPhases pytestRemoveBytecodePhase

     

       104
       104
        
           '';

     

       105
       105
        
       

     

       106
       106
        
           pythonImportsCheck = [ "pytest" ];

+2 -2

pkgs/development/python-modules/pytest/default.nix

···

       84
       84
        
           pytestcachePhase() {

     

       85
       85
        
               find $out -name .pytest_cache -type d -exec rm -rf {} +

     

       86
       86
        
           }

     

       87
       87
       -
           preDistPhases+=" pytestcachePhase"

     

       87
       87
       +
           appendToVar preDistPhases pytestcachePhase

     

       88
       88
        
       

     

       89
       89
        
           # pytest generates it's own bytecode files to improve assertion messages.

     

       90
       90
        
           # These files similar to cpython's bytecode files but are never laoded

     
···

       97
       97
        
               #    https://github.com/pytest-dev/pytest/blob/7.2.1/src/_pytest/assertion/rewrite.py#L51-L53

     

       98
       98
        
               find $out -name "*-pytest-*.py[co]" -delete

     

       99
       99
        
           }

     

       100
       100
       -
           preDistPhases+=" pytestRemoveBytecodePhase"

     

       100
       100
       +
           appendToVar preDistPhases pytestRemoveBytecodePhase

     

       101
       101
        
         '';

     

       102
       102
        
       

     

       103
       103
        
         pythonImportsCheck = [ "pytest" ];

+2 -2

pkgs/development/python2-modules/pytest/default.nix

···

       42
       42
        
               find $out -name .pytest_cache -type d -exec rm -rf {} +

     

       43
       43
        
           }

     

       44
       44
        
       

     

       45
       45
       -
           preDistPhases+=" pytestcachePhase"

     

       45
       45
       +
           appendToVar preDistPhases pytestcachePhase

     

       46
       46
        
       

     

       47
       47
        
           # pytest generates it's own bytecode files to improve assertion messages.

     

       48
       48
        
           # These files similar to cpython's bytecode files but are never laoded

     
···

       55
       55
        
               #    https://github.com/pytest-dev/pytest/blob/4.6.11/src/_pytest/assertion/rewrite.py#L32-L47

     

       56
       56
        
               find $out -name "*-PYTEST.py[co]" -delete

     

       57
       57
        
           }

     

       58
       58
       -
           preDistPhases+=" pytestRemoveBytecodePhase"

     

       58
       58
       +
           appendToVar preDistPhases pytestRemoveBytecodePhase

     

       59
       59
        
         '';

     

       60
       60
        
       

     

       61
       61
        
         meta = with lib; {

+1 -1

pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.sh

···

       21
       21
        
       

     

       22
       22
        
       if [ -z "${dontCheckManifest-}" ] && [ -z "${installCheckPhase-}" ]; then

     

       23
       23
        
           echo "Using manifestCheckPhase"

     

       24
       24
       -
           preDistPhases+=" manifestCheckPhase"

     

       24
       24
       +
           appendToVar preDistPhases manifestCheckPhase

     

       25
       25
        
       fi