commit 665f3f694bfc6c2f3a95a98b1abf71d2961879bb · pyrox.dev/nixpkgs

+1 -1

pkgs/development/interpreters/lua-5/interpreter.nix

···

       54
       54
        
         LuaCPathSearchPaths = luaPackages.luaLib.luaCPathList;

     

       55
       55
        
         setupHook = builtins.toFile "lua-setup-hook" ''

     

       56
       56
        
             source @out@/nix-support/utils.sh

     

       57
       57
       -
             addEnvHooks "$hostOffset" addToLuaPath

     

       57
       57
       +
             addEnvHooks "$hostOffset" luaEnvHook

     

       58
       58
        
             '';

     

       59
       59
        
       

     

       60
       60
        
         nativeBuildInputs = [ makeWrapper ];

+13

pkgs/development/interpreters/lua-5/tests/default.nix

···

       96
       96
        
       

     

       97
       97
        
             touch $out

     

       98
       98
        
           '');

     

       99
       99
       +
       

     

       100
       100
       +
       

     

       101
       101
       +
           /*

     

       102
       102
       +
           Check that a lua package's propagatedBuildInputs end up in LUA_PATH

     

       103
       103
       +
           */

     

       104
       104
       +
           checkPropagatedBuildInputs = pkgs.runCommandLocal "test-${lua.name}-setup-hook" ({

     

       105
       105
       +
             # lua-curl is a propagatedBuildInput of rest-nvim has

     

       106
       106
       +
             buildInputs = [ lua.pkgs.rest-nvim ];

     

       107
       107
       +
           }) (''

     

       108
       108
       +
             ${lua}/bin/lua -e "require'cURL'"

     

       109
       109
       +
             touch $out

     

       110
       110
       +
           '');

     

       111
       111
       +
       

     

       99
       112
        
       })

+82 -1

pkgs/development/interpreters/lua-5/utils.sh

···

       1
       1
       -
       #!/bin/sh

     

       1
       1
       +
       #!/bin/bash

     

       2
       2
       +
       

     

       3
       3
       +
       declare -gA luaPathsSeen=()

     

       4
       4
       +
       

     

       5
       5
       +
       # shellcheck disable=SC2164,SC2041

     

       2
       6
        
       nix_print() {

     

       3
       7
        
         if [ ${NIX_DEBUG:-0} -ge $1 ]; then

     

       4
       8
        
           echo "$2"

     
···

       33
       37
        
         shopt -u globstar

     

       34
       38
        
       }

     

       35
       39
        
       

     

       40
       40
       +
       # used in setup Hooks to load LUA_PATH and LUA_CPATH

     

       41
       41
       +
       # luaEnvHook

     

       42
       42
       +
       luaEnvHook() {

     

       43
       43
       +
           _addToLuaPath "$1"

     

       44
       44
       +
       }

     

       45
       45
       +
       

     

       36
       46
        
       addToLuaPath() {

     

       37
       47
        
         local dir="$1"

     

       38
       48
        
       

     

       49
       49
       +
         if [ ! -d "$dir" ]; then

     

       50
       50
       +
           nix_debug "$dir not a directory abort"

     

       51
       51
       +
           return 0

     

       52
       52
       +
         fi

     

       53
       53
       +
         cd "$dir"

     

       54
       54
       +
         for pattern in @luapathsearchpaths@; do

     

       55
       55
       +
           addToLuaSearchPathWithCustomDelimiter LUA_PATH "$PWD/$pattern"

     

       56
       56
       +
         done

     

       57
       57
       +
       

     

       58
       58
       +
         # LUA_CPATH

     

       59
       59
       +
         for pattern in @luacpathsearchpaths@; do

     

       60
       60
       +
           addToLuaSearchPathWithCustomDelimiter LUA_CPATH "$PWD/$pattern"

     

       61
       61
       +
         done

     

       62
       62
       +
         cd - >/dev/null

     

       63
       63
       +
       }

     

       64
       64
       +
       

     

       65
       65
       +
       

     

       66
       66
       +
       _addToLuaPath() {

     

       67
       67
       +
         local dir="$1"

     

       68
       68
       +
       

     

       69
       69
       +
         echo "_addToLuaPath called for dir $dir"

     

       70
       70
       +
       

     

       39
       71
        
         if [[ ! -d "$dir" ]]; then

     

       40
       72
        
           nix_debug "$dir not a directory abort"

     

       41
       73
        
           return 0

     

       42
       74
        
         fi

     

       75
       75
       +
       

     

       76
       76
       +
       # set -x

     

       77
       77
       +
         # if [ -n "${pythonPathsSeen[$dir]}" ]; then return; fi

     

       78
       78
       +
         if [[ -n "${luaPathsSeen[$dir]:-}" ]]; then

     

       79
       79
       +
         # if [ -n "${luaPathsSeen[$dir]}" ]; then

     

       80
       80
       +
           echo "$dir already parsed"

     

       81
       81
       +
           return

     

       82
       82
       +
         fi

     

       83
       83
       +
       

     

       84
       84
       +
         luaPathsSeen["$dir"]=true

     

       85
       85
       +
       

     

       86
       86
       +
         # shellcheck disable=SC2164

     

       43
       87
        
         cd "$dir"

     

       44
       88
        
         for pattern in @luapathsearchpaths@; do

     

       45
       89
        
           addToLuaSearchPathWithCustomDelimiter LUA_PATH "$PWD/$pattern"

     
···

       49
       93
        
         for pattern in @luacpathsearchpaths@; do

     

       50
       94
        
           addToLuaSearchPathWithCustomDelimiter LUA_CPATH "$PWD/$pattern"

     

       51
       95
        
         done

     

       96
       96
       +
       

     

       52
       97
        
         cd - >/dev/null

     

       98
       98
       +
       

     

       99
       99
       +
         addToSearchPath program_PATH "$dir"/bin

     

       100
       100
       +
       

     

       101
       101
       +
         # Inspect the propagated inputs (if they exist) and recur on them.

     

       102
       102
       +
         local prop="$dir/nix-support/propagated-build-inputs"

     

       103
       103
       +
         if [ -e "$prop" ]; then

     

       104
       104
       +
           local new_path

     

       105
       105
       +
           for new_path in $(cat $prop); do

     

       106
       106
       +
               echo "newpath: $new_path"

     

       107
       107
       +
               _addToLuaPath "$new_path"

     

       108
       108
       +
           done

     

       109
       109
       +
         fi

     

       110
       110
       +
       

     

       53
       111
        
       }

     

       54
       112
        
       

     

       113
       113
       +
       # Builds environment variables like LUA_PATH and PATH walking through closure

     

       114
       114
       +
       # of dependencies.

     

       115
       115
       +
       buildLuaPath() {

     

       116
       116
       +
         local luaPath="$1"

     

       117
       117
       +
         local path

     

       118
       118
       +
       

     

       119
       119
       +
         echo "BUILD_LUA_PATH"

     

       120
       120
       +
       

     

       121
       121
       +
       #   # set -x

     

       122
       122
       +
       #   # Create an empty table of paths (see doc on loadFromPropagatedInputs

     

       123
       123
       +
       #   # for how this is used). Build up the program_PATH and program_LUA_PATH

     

       124
       124
       +
       #   # variables.

     

       125
       125
       +
         # declare -gA luaPathsSeen=()

     

       126
       126
       +
       #   # shellcheck disable=SC2034

     

       127
       127
       +
         program_PATH=

     

       128
       128
       +
         luaPathsSeen["@lua@"]=1

     

       129
       129
       +
       #   addToSearchPath program_PATH @lua@/bin

     

       130
       130
       +
         for path in $luaPath; do

     

       131
       131
       +
           _addToLuaPath "$path"

     

       132
       132
       +
         done

     

       133
       133
       +
       }

     

       134
       134
       +
       

     

       135
       135
       +

-44

pkgs/development/interpreters/lua-5/wrap.sh

···

       9
       9
        
         wrapLuaProgramsIn "$out/bin" "$out $luaPath"

     

       10
       10
        
       }

     

       11
       11
        
       

     

       12
       12
       -
       # Builds environment variables like LUA_PATH and PATH walking through closure

     

       13
       13
       -
       # of dependencies.

     

       14
       14
       -
       buildLuaPath() {

     

       15
       15
       -
         local luaPath="$1"

     

       16
       16
       -
         local path

     

       17
       17
       -
       

     

       18
       18
       -
         # Create an empty table of paths (see doc on loadFromPropagatedInputs

     

       19
       19
       -
         # for how this is used). Build up the program_PATH and program_LUA_PATH

     

       20
       20
       -
         # variables.

     

       21
       21
       -
         declare -A luaPathsSeen=()

     

       22
       22
       -
         program_PATH=

     

       23
       23
       -
         luaPathsSeen["@lua@"]=1

     

       24
       24
       -
         addToSearchPath program_PATH @lua@/bin

     

       25
       25
       -
         for path in $luaPath; do

     

       26
       26
       -
           addToLuaPath "$path"

     

       27
       27
       -
         done

     

       28
       28
       -
       }

     

       29
       29
       -
       

     

       30
       12
        
       # with an executable shell script which will set some environment variables

     

       31
       13
        
       # and then call into the original binary (which has been given a .wrapped suffix).

     

       32
       14
        
       # luaPath is a list of directories

     
···

       47
       29
        
         # Find all regular files in the output directory that are executable.

     

       48
       30
        
         find "$dir" -type f -perm -0100 -print0 | while read -d "" f; do

     

       49
       31
        
           # Rewrite "#! .../env lua" to "#! /nix/store/.../lua".

     

       50
       50
       -
           # Strip suffix, like "3" or "2.7m" -- we don't have any choice on which

     

       51
       32
        
           # Lua to use besides one with this hook anyway.

     

       52
       33
        
           if head -n1 "$f" | grep -q '#!.*/env.*\(lua\)'; then

     

       53
       34
        
             sed -i "$f" -e "1 s^.*/env[ ]*\(lua\)[^ ]*^#! @executable@^"

     
···

       73
       54
        
       

     

       74
       55
        
         done

     

       75
       56
        
       }

     

       76
       76
       -
       

     

       77
       77
       -
       # Adds the lib and bin directories to the LUA_PATH and PATH variables,

     

       78
       78
       -
       # respectively. Recurses on any paths declared in

     

       79
       79
       -
       # `propagated-native-build-inputs`, while avoiding duplicating paths by

     

       80
       80
       -
       # flagging the directories it has visited in `luaPathsSeen`.

     

       81
       81
       -
       loadFromPropagatedInputs() {

     

       82
       82
       -
         local dir="$1"

     

       83
       83
       -
         # Stop if we've already visited here.

     

       84
       84
       -
         if [ -n "${luaPathsSeen[$dir]}" ]; then

     

       85
       85
       -
           return

     

       86
       86
       -
         fi

     

       87
       87
       -
         luaPathsSeen[$dir]=1

     

       88
       88
       -
       

     

       89
       89
       -
         addToLuaPath "$dir"

     

       90
       90
       -
         addToSearchPath program_PATH $dir/bin

     

       91
       91
       -
       

     

       92
       92
       -
         # Inspect the propagated inputs (if they exist) and recur on them.

     

       93
       93
       -
         local prop="$dir/nix-support/propagated-native-build-inputs"

     

       94
       94
       -
         if [ -e "$prop" ]; then

     

       95
       95
       -
           local new_path

     

       96
       96
       -
           for new_path in $(cat $prop); do

     

       97
       97
       -
             loadFromPropagatedInputs "$new_path"

     

       98
       98
       -
           done

     

       99
       99
       -
         fi

     

       100
       100
       -
       }

+1 -1

pkgs/development/interpreters/lua-5/wrapper.nix

···

       30
       30
        
             fi

     

       31
       31
        
             mkdir -p "$out/bin"

     

       32
       32
        
       

     

       33
       33
       -
             addToLuaPath "$out"

     

       33
       33
       +
             buildLuaPath "$out"

     

       34
       34
        
       

     

       35
       35
        
             # take every binary from lua packages and put them into the env

     

       36
       36
        
             for path in ${lib.concatStringsSep " " paths}; do

+1 -1

pkgs/development/interpreters/luajit/default.nix

···

       114
       114
        
       

     

       115
       115
        
         setupHook = builtins.toFile "lua-setup-hook" ''

     

       116
       116
        
             source @out@/nix-support/utils.sh

     

       117
       117
       -
             addEnvHooks "$hostOffset" addToLuaPath

     

       117
       117
       +
             addEnvHooks "$hostOffset" luaEnvHook

     

       118
       118
        
             '';

     

       119
       119
        
       

     

       120
       120
        
         # copied from python