commit a958a4aa009e371d38936ef86a327cb9e6fb154a · pyrox.dev/nixpkgs

+1

nixos/lib/testing-python.nix

···

       177
        
           ./testing/name.nix

     

       178
        
           ./testing/network.nix

     

       179
        
           ./testing/nodes.nix

     

       0
        
       
     

       180
        
           ./testing/run.nix

     

       181
        
           ./testing/testScript.nix

     

       182
        
           {

···

       177
        
           ./testing/name.nix

     

       178
        
           ./testing/network.nix

     

       179
        
           ./testing/nodes.nix

     

       180
       +
           ./testing/pkgs.nix

     

       181
        
           ./testing/run.nix

     

       182
        
           ./testing/testScript.nix

     

       183
        
           {

+11

nixos/lib/testing/pkgs.nix

···

       1
       +
       { config, lib, hostPkgs, ... }:

     

       2
       +
       {

     

       3
       +
         config = {

     

       4
       +
           # default pkgs for use in VMs

     

       5
       +
           _module.args.pkgs = hostPkgs;

     

       6
       +
       

     

       7
       +
           defaults = {

     

       8
       +
             # TODO: a module to set a shared pkgs, if options.nixpkgs.* is untouched by user (highestPrio) */

     

       9
       +
           };

     

       10
       +
         };

     

       11
       +
       }

+2 -2

nixos/tests/3proxy.nix

···

       1
       -
       import ./make-test-python.nix ({ pkgs, ...} : {

     

       2
        
         name = "3proxy";

     

       3
        
         meta = with pkgs.lib.maintainers; {

     

       4
        
           maintainers = [ misuzu ];

     
···

       186
        
               "${pkgs.wget}/bin/wget -e use_proxy=yes -e http_proxy=http://192.168.0.4:3128 -S -O /dev/null http://127.0.0.1:9999"

     

       187
        
           )

     

       188
        
         '';

     

       189
       -
       })

···

       1
       +
       { lib, pkgs, ... }: {

     

       2
        
         name = "3proxy";

     

       3
        
         meta = with pkgs.lib.maintainers; {

     

       4
        
           maintainers = [ misuzu ];

     
···

       186
        
               "${pkgs.wget}/bin/wget -e use_proxy=yes -e http_proxy=http://192.168.0.4:3128 -S -O /dev/null http://127.0.0.1:9999"

     

       187
        
           )

     

       188
        
         '';

     

       189
       +
       }

+1 -1

nixos/tests/all-tests.nix

···

       44
        
           ;

     

       45
        
       

     

       46
        
       in {

     

       47
       -
         _3proxy = handleTest ./3proxy.nix {};

     

       48
        
         acme = handleTest ./acme.nix {};

     

       49
        
         adguardhome = handleTest ./adguardhome.nix {};

     

       50
        
         aesmd = handleTest ./aesmd.nix {};

···

       44
        
           ;

     

       45
        
       

     

       46
        
       in {

     

       47
       +
         _3proxy = runTest ./3proxy.nix;

     

       48
        
         acme = handleTest ./acme.nix {};

     

       49
        
         adguardhome = handleTest ./adguardhome.nix {};

     

       50
        
         aesmd = handleTest ./aesmd.nix {};