Unverified Commit 4b97ce3b authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #322095 from illustris/hadoop_3_4 

hadoop: init 3.4, drop 3.2
parents af3e8fe5 e761e8a9

nixos/tests/all-tests.nix

+1 −1
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ in { 
  guix = handleTest ./guix {};

  gvisor = handleTest ./gvisor.nix {};

  hadoop = import ./hadoop { inherit handleTestOn; package=pkgs.hadoop; };

  hadoop_3_2 = import ./hadoop { inherit handleTestOn; package=pkgs.hadoop_3_2; };

  hadoop_3_3 = import ./hadoop { inherit handleTestOn; package=pkgs.hadoop_3_3; };

  hadoop2 = import ./hadoop { inherit handleTestOn; package=pkgs.hadoop2; };

  haka = handleTest ./haka.nix {};

  haste-server = handleTest ./haste-server.nix {};

nixos/tests/hadoop/hadoop.nix

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ import ../make-test-python.nix ({ package, ... }: { 
      };



      dn1 = { ... }: {

        virtualisation.diskSize = 4096;

        services.hadoop = {

          inherit package coreSite hdfsSite;

          hdfs.datanode = {

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

+19 −11
Original line number Diff line number Diff line
@@ -125,6 +125,24 @@ in 
{

  # Different version of hadoop support different java runtime versions

  # https://cwiki.apache.org/confluence/display/HADOOP/Hadoop+Java+Versions

  hadoop_3_4 = common rec {

    pname = "hadoop";

    platformAttrs = rec {

      x86_64-linux = {

        version = "3.4.0";

        hash = "sha256-4xGnhIBBQDD57GNUml1oXmnibyBxA9mr8hpIud0DyGw=";

        srcHash = "sha256-viDF3LdRCZHqFycOYfN7nUQBPHiMCIjmu7jgIAaaK9E=";

      };

      x86_64-darwin = x86_64-linux;

      aarch64-linux = x86_64-linux // {

        hash = "sha256-QWxzKtNyw/AzcHMv0v7kj91pw1HO7VAN9MHO84caFk8=";

      };

      aarch64-darwin = aarch64-linux;

    };

    jdk = jdk11_headless;

    # TODO: Package and add Intel Storage Acceleration Library

    tests = nixosTests.hadoop;

  };

  hadoop_3_3 = common rec {

    pname = "hadoop";

    platformAttrs = rec {
@@ -141,17 +159,7 @@ in 
    };

    jdk = jdk11_headless;

    # TODO: Package and add Intel Storage Acceleration Library

    tests = nixosTests.hadoop;

  };

  hadoop_3_2 = common {

    pname = "hadoop";

    platformAttrs.x86_64-linux = {

      version = "3.2.4";

      hash = "sha256-qt2gpMr+NHuiVR+/zFRzRyRKG725/ZNBIM69z9J9wNw=";

      srcHash = "sha256-F9nGD3mZZ1eJf3Ec3AJGE9YBcL/HiagskcdKQhCn/sw=";

    };

    jdk = jdk8_headless;

    tests = nixosTests.hadoop_3_2;

    tests = nixosTests.hadoop_3_3;

  };

  hadoop2 = common rec {

    pname = "hadoop";

pkgs/top-level/all-packages.nix

+2 −2
Original line number Diff line number Diff line
@@ -16969,10 +16969,10 @@ with pkgs; 
  groovy = callPackage ../development/interpreters/groovy { };















  inherit (callPackages ../applications/networking/cluster/hadoop {})













    hadoop_3_4















    hadoop_3_3













    hadoop_3_2















    hadoop2;













  hadoop3 = hadoop_3_3;













  hadoop3 = hadoop_3_4;















  hadoop = hadoop3;





























  hashlink = callPackage ../development/interpreters/hashlink { };