diff options
author | xeji <36407913+xeji@users.noreply.github.com> | 2018-08-14 02:26:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-14 02:26:59 +0200 |
commit | a38a2ba7780b77aafaf994655f57fd59b3688a76 (patch) | |
tree | 9f0d35b57a2b651f6a1c7b666f446818608520d1 /pkgs/applications/networking | |
parent | abf21a27cbec56e5b6c22a3564246d6a33182615 (diff) | |
parent | 4cc594d483bb6ac531ef8502c43cc31b4b775d48 (diff) | |
download | nixlib-a38a2ba7780b77aafaf994655f57fd59b3688a76.tar nixlib-a38a2ba7780b77aafaf994655f57fd59b3688a76.tar.gz nixlib-a38a2ba7780b77aafaf994655f57fd59b3688a76.tar.bz2 nixlib-a38a2ba7780b77aafaf994655f57fd59b3688a76.tar.lz nixlib-a38a2ba7780b77aafaf994655f57fd59b3688a76.tar.xz nixlib-a38a2ba7780b77aafaf994655f57fd59b3688a76.tar.zst nixlib-a38a2ba7780b77aafaf994655f57fd59b3688a76.zip |
Merge pull request #44989 from volth/hadoop-up
hadoop_2_7: 2.7.6 -> 2.7.7; hadoop_3_1: 3.1.0 -> 3.1.1
Diffstat (limited to 'pkgs/applications/networking')
-rw-r--r-- | pkgs/applications/networking/cluster/hadoop/default.nix | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 6f4bc17f8b50..dfe6513bf0c1 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -11,10 +11,15 @@ let inherit sha256; }; + postUnpack = stdenv.lib.optionalString (tomcat != null) '' + install -D ${tomcat.src} $sourceRoot/hadoop-hdfs-project/hadoop-hdfs-httpfs/downloads/apache-tomcat-${tomcat.version}.tar.gz + install -D ${tomcat.src} $sourceRoot/hadoop-common-project/hadoop-kms/downloads/apache-tomcat-${tomcat.version}.tar.gz + ''; + # perform fake build to make a fixed-output derivation of dependencies downloaded from maven central (~100Mb in ~3000 files) fetched-maven-deps = stdenv.mkDerivation { name = "hadoop-${version}-maven-deps"; - inherit src nativeBuildInputs buildInputs configurePhase; + inherit src postUnpack nativeBuildInputs buildInputs configurePhase; buildPhase = '' while mvn package -Dmaven.repo.local=$out/.m2 ${mavenFlags} -Dmaven.wagon.rto=5000; [ $? = 1 ]; do echo "timeout, restart maven to continue downloading" @@ -48,11 +53,6 @@ let ''; configurePhase = "true"; # do not trigger cmake hook mavenFlags = "-Drequire.snappy -Drequire.bzip2 -DskipTests -Pdist,native -e"; - # prevent downloading tomcat during the build - preBuild = stdenv.lib.optionalString (tomcat != null) '' - install -D ${tomcat.src} hadoop-hdfs-project/hadoop-hdfs-httpfs/downloads/apache-tomcat-${tomcat.version}.tar.gz - install -D ${tomcat.src} hadoop-common-project/hadoop-kms/downloads/apache-tomcat-${tomcat.version}.tar.gz - ''; buildPhase = '' # 'maven.repo.local' must be writable mvn package --offline -Dmaven.repo.local=$(cp -dpR ${fetched-maven-deps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 ${mavenFlags} @@ -123,8 +123,8 @@ let in { hadoop_2_7 = common { - version = "2.7.6"; - sha256 = "0wmg0iy0qxrf43fzajzmx03gxp4yx197vxacqwkxaj45clqwl010"; + version = "2.7.7"; + sha256 = "1ahv67f3lwak3kbjvnk1gncq56z6dksbajj872iqd0awdsj3p5rf"; dependencies-sha256 = "1lsr9nvrynzspxqcamb10d596zlnmnfpxhkd884gdiva0frm0b1r"; tomcat = tomcat_6_0_48; }; @@ -147,9 +147,9 @@ in { tomcat = null; }; hadoop_3_1 = common { - version = "3.1.0"; - sha256 = "0lig25jkffkzc2bfgyrnm3wymapgyw9fkai8sk9fnmp7cljia314"; - dependencies-sha256 = "1ri6a7lrijh538vy7v0fzgvkw603pf8jkh3ldl1kl7l0dvszd70d"; + version = "3.1.1"; + sha256 = "04hhdbyd4x1hy0fpy537f8mi0864hww97zap29x7dk1smrffwabd"; + dependencies-sha256 = "1q63jsxg3d31x0p8hvhpvbly2b07almyzsbhwphbczl3fhlqgiwn"; tomcat = null; }; } |