commit 77a0e5f36e758ec62354919bd4dcc28b9eeebe3c · pyrox.dev/nixpkgs

+6 -2

maintainers/scripts/update-luarocks-packages

···

       158
       158
        
           Our cache key associates "p.name-p.version" to its rockspec

     

       159
       159
        
           '''

     

       160
       160
        
           log.debug("Generating nix expression for %s", plug.name)

     

       161
       161
       -
           cmd = [ "luarocks", "nix"]

     

       161
       161
       +
           custom_env = os.environ.copy()

     

       162
       162
       +
           # TODO check

     

       163
       163
       +
           custom_env['LUAROCKS_CONFIG'] = LUAROCKS_CONFIG

     

       162
       164
        
       

     

       165
       165
       +
           cmd = [ "luarocks", "nix"]

     

       163
       166
        
       

     

       164
       167
        
           if plug.maintainers:

     

       165
       168
        
               cmd.append(f"--maintainers={plug.maintainers}")

     
···

       194
       197
        
                   cmd.append(f"--lua-dir={lua_drv_path}/bin")

     

       195
       198
        
       

     

       196
       199
        
           log.debug("running %s", ' '.join(cmd))

     

       197
       197
       -
           output = subprocess.check_output(cmd, text=True)

     

       200
       200
       +
       

     

       201
       201
       +
           output = subprocess.check_output(cmd, env=custom_env, text=True)

     

       198
       202
        
           output = "callPackage(" + output.strip() + ") {};\n\n"

     

       199
       203
        
           return (plug, output)

     

       200
       204

+9 -2

pkgs/development/tools/misc/luarocks/default.nix

···

       3
       3
        
       , lua

     

       4
       4
        
       # for 'luarocks pack'

     

       5
       5
        
       , zip

     

       6
       6
       +
       , nix-update-script

     

       6
       7
        
       # some packages need to be compiled with cmake

     

       7
       8
        
       , cmake

     

       8
       9
        
       , installShellFiles

     
···

       10
       11
        
       

     

       11
       12
        
       stdenv.mkDerivation rec {

     

       12
       13
        
         pname = "luarocks";

     

       13
       13
       -
         version = "3.8.0";

     

       14
       14
       +
         version = "3.9.0";

     

       14
       15
        
       

     

       15
       16
        
         src = fetchFromGitHub {

     

       16
       17
        
           owner = "luarocks";

     

       17
       18
        
           repo = "luarocks";

     

       18
       19
        
           rev = "v${version}";

     

       19
       19
       -
           sha256 = "sha256-tPSAtveOodF2w54d82hEyaTj91imtySJUTsk/gje2dQ=";

     

       20
       20
       +
           sha256 = "sha256-i0NmF268aK5lr4zjYyhk4TPUO7Zyz0Cl0fSW43Pmd1Q=";

     

       20
       21
        
         };

     

       21
       22
        
       

     

       22
       23
        
         patches = [ ./darwin-3.7.0.patch ];

     
···

       70
       71
        
           export PATH="src/bin:''${PATH:-}"

     

       71
       72
        
           export LUA_PATH="src/?.lua;''${LUA_PATH:-}"

     

       72
       73
        
         '';

     

       74
       74
       +
       

     

       75
       75
       +
         passthru = {

     

       76
       76
       +
           updateScript = nix-update-script {

     

       77
       77
       +
             attrPath = pname;

     

       78
       78
       +
           };

     

       79
       79
       +
         };

     

       73
       80
        
       

     

       74
       81
        
         meta = with lib; {

     

       75
       82
        
           description = "A package manager for Lua";

+10 -4

pkgs/development/tools/misc/luarocks/luarocks-nix.nix

···

       1
       1
       -
       { luarocks, fetchFromGitHub }:

     

       1
       1
       +
       { luarocks, fetchFromGitHub, nix-update-script }:

     

       2
       2
        
       luarocks.overrideAttrs(old: {

     

       3
       3
        
         pname = "luarocks-nix";

     

       4
       4
       -
         version = "2021-01-22";

     

       4
       4
       +
       

     

       5
       5
        
         src = fetchFromGitHub {

     

       6
       6
        
           owner = "nix-community";

     

       7
       7
        
           repo = "luarocks-nix";

     

       8
       8
       -
           rev = "6aa1d59e88eaef72d699477c3e7aa98b274ca405";

     

       9
       9
       -
           sha256 = "sha256-nQLl01RFYZYhpShz0gHxnhwFPvTgALpAbjFPIuTD2D0=";

     

       8
       8
       +
           rev = "b1ff9eeb64c7c1dc5fc177008d6f2be9191c6aa2";

     

       9
       9
       +
           sha256 = "sha256-mkzrf/6yMyLMIEDwsuCIxi1HJvg57ybyZPXVheFAAHE=";

     

       10
       10
        
         };

     

       11
       11
        
         patches = [];

     

       12
       12
       +
       

     

       13
       13
       +
         passthru = {

     

       14
       14
       +
           updateScript = nix-update-script {

     

       15
       15
       +
             attrPath = "luarocks-nix";

     

       16
       16
       +
           };

     

       17
       17
       +
         };

     

       12
       18
        
       

     

       13
       19
        
         meta.mainProgram = "luarocks";

     

       14
       20
        
       })