commit b3cf9ce0f9d01b9c1dc4b7e04fb8b28f79ee68c4 · pyrox.dev/nixpkgs

+22

lib/tests/modules.sh

···

       550
       550
        
       checkConfigOutput '^10$' config.free.xxx.foo ./freeform-submodules.nix

     

       551
       551
        
       checkConfigOutput '^10$' config.free.yyy.bar ./freeform-submodules.nix

     

       552
       552
        
       

     

       553
       553
       +
       # Regression of either, due to freeform not beeing checked previously

     

       554
       554
       +
       checkConfigOutput '^"foo"$' config.either.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong.nix

     

       555
       555
       +
       NIX_ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.either.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong.nix

     

       556
       556
       +
       checkConfigOutput '^"foo"$' config.eitherBehindNullor.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong.nix

     

       557
       557
       +
       NIX_ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.eitherBehindNullor.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong.nix

     

       558
       558
       +
       checkConfigOutput '^"foo"$' config.oneOf.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong.nix

     

       559
       559
       +
       NIX_ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.oneOf.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong.nix

     

       560
       560
       +
       checkConfigOutput '^"foo"$' config.number.str ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong.nix

     

       561
       561
       +
       NIX_ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.number.str ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong.nix

     

       562
       562
       +
       

     

       563
       563
       +
       checkConfigOutput '^42$' config.either.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong2.nix

     

       564
       564
       +
       NIX_ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.either.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong2.nix

     

       565
       565
       +
       checkConfigOutput '^42$' config.eitherBehindNullor.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong2.nix

     

       566
       566
       +
       NIX_ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.eitherBehindNullor.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong2.nix

     

       567
       567
       +
       checkConfigOutput '^42$' config.oneOf.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong2.nix

     

       568
       568
       +
       NIX_ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.oneOf.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong2.nix

     

       569
       569
       +
       checkConfigOutput '^42$' config.number.str ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong2.nix

     

       570
       570
       +
       NIX_ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.number.str ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong2.nix

     

       571
       571
       +
       # Value OK: Fail if a warning is emitted

     

       572
       572
       +
       NIX_ABORT_ON_WARN=1 checkConfigOutput "^42$" config.number.int ./freeform-attrsof-either.nix

     

       573
       573
       +
       

     

       574
       574
       +
       

     

       553
       575
        
       ## types.anything

     

       554
       576
        
       # Check that attribute sets are merged recursively

     

       555
       577
        
       checkConfigOutput '^null$' config.value.foo ./types-anything/nested-attrs.nix

+14

lib/tests/modules/freeform-attrsof-either.nix

···

       1
       1
       +
       { lib, ... }:

     

       2
       2
       +
       let

     

       3
       3
       +
         inherit (lib) types mkOption;

     

       4
       4
       +
       in

     

       5
       5
       +
       {

     

       6
       6
       +
         options.number = mkOption {

     

       7
       7
       +
           type = types.submodule ({

     

       8
       8
       +
             freeformType = types.attrsOf (types.either types.int types.int);

     

       9
       9
       +
           });

     

       10
       10
       +
           default = {

     

       11
       11
       +
             int = 42;

     

       12
       12
       +
           }; # should not emit a warning

     

       13
       13
       +
         };

     

       14
       14
       +
       }

+18

lib/tests/modules/freeform-deprecated-malicous-wrong.nix

···

       1
       1
       +
       # Obviously wrong typed

     

       2
       2
       +
       {

     

       3
       3
       +
         config.either = {

     

       4
       4
       +
           int = "foo";

     

       5
       5
       +
         };

     

       6
       6
       +
       

     

       7
       7
       +
         config.eitherBehindNullor = {

     

       8
       8
       +
           int = "foo";

     

       9
       9
       +
         };

     

       10
       10
       +
       

     

       11
       11
       +
         config.oneOf = {

     

       12
       12
       +
           int = "foo";

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         config.number = {

     

       16
       16
       +
           str = "foo";

     

       17
       17
       +
         };

     

       18
       18
       +
       }

+19

lib/tests/modules/freeform-deprecated-malicous-wrong2.nix

···

       1
       1
       +
       # freeeformType should have been (attrsOf either)

     

       2
       2
       +
       # This should also print the warning

     

       3
       3
       +
       {

     

       4
       4
       +
         config.either = {

     

       5
       5
       +
           int = 42;

     

       6
       6
       +
         };

     

       7
       7
       +
       

     

       8
       8
       +
         config.eitherBehindNullor = {

     

       9
       9
       +
           int = 42;

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         config.oneOf = {

     

       13
       13
       +
           int = 42;

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         config.number = {

     

       17
       17
       +
           str = 42;

     

       18
       18
       +
         };

     

       19
       19
       +
       }

+34

lib/tests/modules/freeform-deprecated-malicous.nix

···

       1
       1
       +
       { lib, ... }:

     

       2
       2
       +
       let

     

       3
       3
       +
         inherit (lib) types mkOption;

     

       4
       4
       +
       in

     

       5
       5
       +
       {

     

       6
       6
       +
         options.either = mkOption {

     

       7
       7
       +
           type = types.submodule ({

     

       8
       8
       +
             freeformType = (types.either types.int types.int);

     

       9
       9
       +
           });

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         options.eitherBehindNullor = mkOption {

     

       13
       13
       +
           type = types.submodule ({

     

       14
       14
       +
             freeformType = types.nullOr (types.either types.int types.int);

     

       15
       15
       +
           });

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
         options.oneOf = mkOption {

     

       19
       19
       +
           type = types.submodule ({

     

       20
       20
       +
             freeformType = (

     

       21
       21
       +
               types.oneOf [

     

       22
       22
       +
                 types.int

     

       23
       23
       +
                 types.int

     

       24
       24
       +
               ]

     

       25
       25
       +
             );

     

       26
       26
       +
           });

     

       27
       27
       +
         };

     

       28
       28
       +
       

     

       29
       29
       +
         options.number = mkOption {

     

       30
       30
       +
           type = types.submodule ({

     

       31
       31
       +
             freeformType = (types.number); # either int float

     

       32
       32
       +
           });

     

       33
       33
       +
         };

     

       34
       34
       +
       }