commit 47e013c67925590cb09b7a882225bb2fef4c8ba6 · pyrox.dev/nixpkgs

-10

lib/tests/check-eval.nix

···

       1
       1
       -
       # Throws an error if any of our lib tests fail.

     

       2
       2
       -
       

     

       3
       3
       -
       let

     

       4
       4
       -
         tests = [

     

       5
       5
       -
           "misc"

     

       6
       6
       -
           "systems"

     

       7
       7
       -
         ];

     

       8
       8
       -
         all = builtins.concatLists (map (f: import (./. + "/${f}.nix")) tests);

     

       9
       9
       -
       in

     

       10
       10
       -
       if all == [ ] then null else throw (builtins.toJSON all)

+9 -14

lib/tests/misc.nix

···

       145
       145
        
             inherit expected;

     

       146
       146
        
           };

     

       147
       147
        
       

     

       148
       148
       +
         dummyDerivation = derivation {

     

       149
       149
       +
           name = "name";

     

       150
       150
       +
           builder = "builder";

     

       151
       151
       +
           system = "system";

     

       152
       152
       +
         };

     

       148
       153
        
       in

     

       149
       154
        
       

     

       150
       155
        
       runTests {

     
···

       757
       762
        
         };

     

       758
       763
        
       

     

       759
       764
        
         testSplitStringsDerivation = {

     

       760
       760
       -
           expr = take 3 (

     

       761
       761
       -
             strings.splitString "/" (derivation {

     

       762
       762
       -
               name = "name";

     

       763
       763
       -
               builder = "builder";

     

       764
       764
       -
               system = "system";

     

       765
       765
       -
             })

     

       766
       766
       -
           );

     

       767
       767
       -
           expected = [

     

       768
       768
       -
             ""

     

       769
       769
       -
             "nix"

     

       770
       770
       -
             "store"

     

       771
       771
       -
           ];

     

       765
       765
       +
           expr = lib.dropEnd 1 (strings.splitString "/" dummyDerivation);

     

       766
       766
       +
           expected = strings.splitString "/" builtins.storeDir;

     

       772
       767
        
         };

     

       773
       768
        
       

     

       774
       769
        
         testSplitVersionSingle = {

     
···

       816
       811
        
             in

     

       817
       812
        
             {

     

       818
       813
        
               storePath = isStorePath goodPath;

     

       819
       819
       -
               storePathDerivation = isStorePath (import ../.. { system = "x86_64-linux"; }).hello;

     

       814
       814
       +
               storePathDerivation = isStorePath dummyDerivation;

     

       820
       815
        
               storePathAppendix = isStorePath "${goodPath}/bin/python";

     

       821
       816
        
               nonAbsolute = isStorePath (concatStrings (tail (stringToCharacters goodPath)));

     

       822
       817
        
               asPath = isStorePath (/. + goodPath);

     
···

       901
       896
        
         };

     

       902
       897
        
       

     

       903
       898
        
         testHasInfixDerivation = {

     

       904
       904
       -
           expr = hasInfix "hello" (import ../.. { system = "x86_64-linux"; }).hello;

     

       899
       899
       +
           expr = hasInfix "name" dummyDerivation;

     

       905
       900
        
           expected = true;

     

       906
       901
        
         };

     

       907
       902

+6 -2

lib/tests/test-with-nix.nix

···

       18
       18
        
       pkgs.runCommand "nixpkgs-lib-tests-nix-${nix.version}"

     

       19
       19
        
         {

     

       20
       20
        
           buildInputs = [

     

       21
       21
       -
             (import ./check-eval.nix)

     

       22
       22
       -
             (import ./fetchers.nix)

     

       23
       21
        
             (import ../path/tests {

     

       24
       22
        
               inherit pkgs;

     

       25
       23
        
             })

     
···

       70
       68
        
       

     

       71
       69
        
           echo "Running lib/tests/systems.nix"

     

       72
       70
        
           [[ $(nix-instantiate --eval --strict lib/tests/systems.nix | tee /dev/stderr) == '[ ]' ]];

     

       71
       71
       +
       

     

       72
       72
       +
           echo "Running lib/tests/misc.nix"

     

       73
       73
       +
           [[ $(nix-instantiate --eval --strict lib/tests/misc.nix | tee /dev/stderr) == '[ ]' ]];

     

       74
       74
       +
       

     

       75
       75
       +
           echo "Running lib/tests/fetchers.nix"

     

       76
       76
       +
           [[ $(nix-instantiate --eval --strict lib/tests/fetchers.nix | tee /dev/stderr) == '[ ]' ]];

     

       73
       77
        
       

     

       74
       78
        
           mkdir $out

     

       75
       79
        
           echo success > $out/${nix.version}