commit 23a5f54ee50ae2d67649f33efdcaf1665aef83bb · pyrox.dev/nixpkgs

+3 -3

pkgs/applications/networking/cluster/spark/default.nix

···

       10
       10
        
                       hadoopVersion = "cdh4";

     

       11
       11
        
                       sparkSha256 = "00il083cjb9xqzsma2ifphq9ggichwndrj6skh2z5z9jk3z0lgyn";

     

       12
       12
        
                     };

     

       13
       13
       -
           "2.1.0" = {

     

       14
       14
       -
                       hadoopVersion = "hadoop2.4";

     

       15
       15
       -
                       sparkSha256 = "0pbsmbjwijsfgbnm56kgwnmnlqkz3w010ma0d7vzlkdklj40vqn2";

     

       13
       13
       +
           "2.2.0" = {

     

       14
       14
       +
                       hadoopVersion = "hadoop2.7";

     

       15
       15
       +
                       sparkSha256 = "0wjjn2pgalrcji8avhj5d48kl1mf7rhrdxhzf29dbiszq4fkx0s6";

     

       16
       16
        
                     };

     

       17
       17
        
         };

     

       18
       18
        
       in

+2 -2

pkgs/top-level/all-packages.nix

···

       6761
       6761
        
       

     

       6762
       6762
        
         self = callPackage_i686 ../development/interpreters/self { };

     

       6763
       6763
        
       

     

       6764
       6764
       -
         spark = spark_21;

     

       6764
       6764
       +
         spark = spark_22;

     

       6765
       6765
        
         spark_16 = callPackage ../applications/networking/cluster/spark { version = "1.6.3"; };

     

       6766
       6766
       -
         spark_21 = callPackage ../applications/networking/cluster/spark { version = "2.1.0"; };

     

       6766
       6766
       +
         spark_22 = callPackage ../applications/networking/cluster/spark { version = "2.2.0"; };

     

       6767
       6767
        
       

     

       6768
       6768
        
         spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { };

     

       6769
       6769
        
         spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.nix { };