Merge pull request #213485 from dotlambda/opentsdb-2.4.1 (f402501c) · Commits · nix / nixpkgs

pkgs/build-support/fetchmavenartifact/default.nix

+4 −2

Original line number	Diff line number	Diff line
		@@ -43,13 +43,15 @@ let
		(lib.replaceStrings ["."] ["_"] artifactId) "-"
		version
		];
		suffix = if isNull classifier then "" else "-${classifier}";
		filename = "${artifactId}-${version}${suffix}.jar";
		mkJarUrl = repoUrl:
		lib.concatStringsSep "/" [
		(lib.removeSuffix "/" repoUrl)
		(lib.replaceStrings ["."] ["/"] groupId)
		artifactId
		version
		"${artifactId}-${version}${lib.optionalString (!isNull classifier) "-${classifier}"}.jar"
		filename
		];
		urls_ =
		if url != "" then [url]
		@@ -68,7 +70,7 @@ in
		# packages packages that mention this derivation in their buildInputs.
		installPhase = ''
		mkdir -p $out/share/java
		ln -s ${jar} $out/share/java/${artifactId}-${version}.jar
		ln -s ${jar} $out/share/java/${filename}
		'';
		# We also add a `jar` attribute that can be used to easily obtain the path
		# to the downloaded jar file.

pkgs/tools/misc/opentsdb/default.nix

+281 −16

Original line number	Diff line number	Diff line
		{ lib, stdenv, autoconf, automake, curl, fetchurl, fetchpatch, jdk8, makeWrapper, nettools
		, python3, git
		{ lib
		, stdenv
		, autoconf
		, automake
		, bash
		, curl
		, fetchFromGitHub
		, fetchMavenArtifact
		, fetchurl
		, git
		, jdk8
		, makeWrapper
		, nettools
		, python3
		}:

		let jdk = jdk8; jre = jdk8.jre; in

		stdenv.mkDerivation rec {
		let
		jdk = jdk8;
		jre = jdk8.jre;
		artifacts = {
		apache = [
		(fetchMavenArtifact {
		groupId = "org.apache.commons";
		artifactId = "commons-math3";
		version = "3.4.1";
		hash = "sha256-0QdbFKcQhwOLC/0Zjw992OSbWzUp2OLrqZ59nrhWXks=";
		})
		];
		guava = [
		(fetchMavenArtifact {
		groupId = "com.google.guava";
		artifactId = "guava";
		version = "18.0";
		hash = "sha256-1mT7/APS5c6cqypE+wHx0L+d/r7MwaRzsfnqMfefb5k=";
		})
		];
		gwt = [
		(fetchMavenArtifact {
		groupId = "com.google.gwt";
		artifactId = "gwt-dev";
		version = "2.6.0";
		hash = "sha256-4MLdI7q5fkftHTMoN7W3l5zsq1QB2R/8bF86vEqBI+A=";
		})
		(fetchMavenArtifact {
		groupId = "com.google.gwt";
		artifactId = "gwt-user";
		version = "2.6.0";
		hash = "sha256-HR5/aopn605inHeENNHBAqKrjkvIl9wPDM+nOwOpiEg=";
		})
		(fetchMavenArtifact {
		groupId = "net.opentsdb";
		artifactId = "opentsdb-gwt-theme";
		version = "1.0.0";
		hash = "sha256-JJsjcRlQmIrwpOtMweH12e/Ut5NG8R50VPiOAMMGEdc=";
		})
		];
		hamcrest = [
		(fetchMavenArtifact {
		url = "https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar";
		groupId = "org.hamcrest";
		artifactId = "hamcrest-core";
		version = "1.3";
		hash = "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=";
		})
		];
		hbase = [
		(fetchMavenArtifact {
		groupId = "org.hbase";
		artifactId = "asynchbase";
		version = "1.8.2";
		hash = "sha256-D7mKprHMW23dE0SzdNsagv3Hp2G5HUN7sKfs1nVzQF4=";
		})
		];
		jackson = [
		(fetchMavenArtifact {
		groupId = "com.fasterxml.jackson.core";
		artifactId = "jackson-annotations";
		version = "2.9.5";
		hash = "sha256-OKDkUASfZDVwrayZiIqjSA7C3jhXkKcJaQi/Q7/AhdY=";
		})
		(fetchMavenArtifact {
		groupId = "com.fasterxml.jackson.core";
		artifactId = "jackson-core";
		version = "2.9.5";
		hash = "sha256-or66oyWtJUVbAhScZ+YFI2en1/wc533gAO7ShKUhTqw=";
		})
		(fetchMavenArtifact {
		groupId = "com.fasterxml.jackson.core";
		artifactId = "jackson-databind";
		version = "2.9.5";
		hash = "sha256-D7TgecEY51LMlMFa0i5ngrDfxdwJFF9IE/s52C5oYEc=";
		})
		];
		javacc = [
		(fetchMavenArtifact {
		groupId = "net.java.dev.javacc";
		artifactId = "javacc";
		version = "6.1.2";
		hash = "sha256-7Qxclglhz+tDE4LPAVKCewEVZ0fbN5LRv5PoHjLCBKs=";
		})
		];
		javassist = [
		(fetchMavenArtifact {
		groupId = "org.javassist";
		artifactId = "javassist";
		version = "3.21.0-GA";
		hash = "sha256-eqWeAx+UGYSvB9rMbKhebcm9OkhemqJJTLwDTvoSJdA=";
		})
		];
		jexl = [
		(fetchMavenArtifact {
		groupId = "commons-logging";
		artifactId = "commons-logging";
		version = "1.1.1";
		hash = "sha256-zm+RPK0fDbOq1wGG1lxbx//Mmpnj/o4LE3MSgZ98Ni8=";
		})
		(fetchMavenArtifact {
		groupId = "org.apache.commons";
		artifactId = "commons-jexl";
		version = "2.1.1";
		hash = "sha256-A8mp+uXaeM5SwL8kRnzDc1W34jGW3/SDniwP8BigEwY=";
		})
		];
		jgrapht = [
		(fetchMavenArtifact {
		groupId = "org.jgrapht";
		artifactId = "jgrapht-core";
		version = "0.9.1";
		hash = "sha256-5u8cEVaJ7aCBQrhtUkYg2mQ7bp8BNAUletB/QtxcaXg=";
		})
		];
		junit = [
		(fetchMavenArtifact {
		groupId = "junit";
		artifactId = "junit";
		version = "4.11";
		hash = "sha256-kKjhYD7spI5+h586+8lWBxUyKYXzmidPb2BwtD+dBv4=";
		})
		];
		kryo = [
		(fetchMavenArtifact {
		groupId = "org.ow2.asm";
		artifactId = "asm";
		version = "4.0";
		hash = "sha256-+y3ekCCke7AkxD2d4KlOc6vveTvwjwE1TMl8stLiqVc=";
		})
		(fetchMavenArtifact {
		groupId = "com.esotericsoftware.kryo";
		artifactId = "kryo";
		version = "2.21.1";
		hash = "sha256-adEG73euU3sZBp9WUQNLZBN6Y3UAZXTAxjsuvDuy7q4=";
		})
		(fetchMavenArtifact {
		groupId = "com.esotericsoftware.minlog";
		artifactId = "minlog";
		version = "1.2";
		hash = "sha256-pnjLGqj10D2QHJksdXQYQdmKm8PVXa0C6E1lMVxOYPI=";
		})
		(fetchMavenArtifact {
		groupId = "com.esotericsoftware.reflectasm";
		artifactId = "reflectasm";
		version = "1.07";
		classifier = "shaded";
		hash = "sha256-CKcOrbSydO2u/BGUwfdXBiGlGwqaoDaqFdzbe5J+fHY=";
		})
		];
		logback = [
		(fetchMavenArtifact {
		groupId = "ch.qos.logback";
		artifactId = "logback-classic";
		version = "1.0.13";
		hash = "sha256-EsGTDKkWU0IqxJ/qM/zovhsfzS0iIM6jg8R5SXbHQY8=";
		})
		(fetchMavenArtifact {
		groupId = "ch.qos.logback";
		artifactId = "logback-core";
		version = "1.0.13";
		hash = "sha256-7NjyT5spQShOmPFU/zND5yDLMcj0e2dVSxRXRfWW87g=";
		})
		];
		mockito = [
		(fetchMavenArtifact {
		groupId = "org.mockito";
		artifactId = "mockito-core";
		version = "1.9.5";
		hash = "sha256-+XSDuglEufoTOqKWOHZN2+rbUew9vAIHTFj6LK7NB/o=";
		})
		];
		netty = [
		(fetchMavenArtifact {
		groupId = "io.netty";
		artifactId = "netty";
		version = "3.10.6.Final";
		hash = "sha256-h2ilD749k6iNjmAA6l1o4w9Q3JFbN2TDxYcPcMT7O0k=";
		})
		];
		objenesis = [
		(fetchMavenArtifact {
		groupId = "org.objenesis";
		artifactId = "objenesis";
		version = "1.3";
		hash = "sha256-3U7z0wkQY6T+xXjLsrvmwfkhwACRuimT3Nmv0l/5REo=";
		})
		];
		powermock = [
		(fetchMavenArtifact {
		groupId = "org.powermock";
		artifactId = "powermock-mockito-release-full";
		version = "1.5.4";
		classifier = "full";
		hash = "sha256-GWXaFG/ZtPlc7uKrghQHNAPzEu2k5VGYCYTXIlbylb4=";
		})
		];
		protobuf = [
		(fetchMavenArtifact {
		groupId = "com.google.protobuf";
		artifactId = "protobuf-java";
		version = "2.5.0";
		hash = "sha256-4MHGRXXABWAXJefGoCzr+eEoXoiPdWsqHXP/qNclzHQ=";
		})
		];
		slf4j = [
		(fetchMavenArtifact {
		groupId = "org.slf4j";
		artifactId = "log4j-over-slf4j";
		version = "1.7.7";
		hash = "sha256-LjcWxCtsAm/jzd2pK7oaVZsTZjjcexj7qKQSxBiVecI=";
		})
		(fetchMavenArtifact {
		groupId = "org.slf4j";
		artifactId = "slf4j-api";
		version = "1.7.7";
		hash = "sha256-aZgMA4yhsTGSZWFZFhfZwl+r/Hspgor5FZfKhXDPNf4=";
		})
		];
		suasync = [
		(fetchMavenArtifact {
		groupId = "com.stumbleupon";
		artifactId = "async";
		version = "1.4.0";
		hash = "sha256-FJ1HH68JOkjNtkShjLTJ8K4NO/A/qu88ap7J7SEndrM=";
		})
		];
		validation-api = [
		(fetchMavenArtifact {
		groupId = "javax.validation";
		artifactId = "validation-api";
		version = "1.0.0.GA";
		hash = "sha256-5FnzE+vG2ySD+M6q05rwcIY2G0dPqS5A9ELo3l2Yldw=";
		})
		(fetchMavenArtifact {
		groupId = "javax.validation";
		artifactId = "validation-api";
		version = "1.0.0.GA";
		classifier = "sources";
		hash = "sha256-o5TVKpt/4rsU8HGNKzyDCP/o836RGVYBI5jVXJ+fm1Q=";
		})
		];
		zookeeper = [
		(fetchMavenArtifact {
		groupId = "org.apache.zookeeper";
		artifactId = "zookeeper";
		version = "3.4.6";
		hash = "sha256-ijdaHvmMvA4fbp39DZbZFLdNN60AtL+Bvrd/qPNNM64=";
		})
		];
		};
		in stdenv.mkDerivation rec {
		pname = "opentsdb";
		version = "2.4.0";
		version = "2.4.1";

		src = fetchurl {
		url = "https://github.com/OpenTSDB/opentsdb/releases/download/v${version}/${pname}-${version}.tar.gz";
		sha256 = "0b0hilqmgz6n1q7irp17h48v8fjpxhjapgw1py8kyav1d51s7mm2";
		src = fetchFromGitHub {
		owner = "OpenTSDB";
		repo = "opentsdb";
		rev = "refs/tags/v${version}";
		hash = "sha256-899m1H0UCLsI/bnSrNFnnny4MxSw3XBzf7rgDuEajDs=";
		};

		patches = [
		(fetchpatch {
		name = "CVE-2020-35476.patch";
		url = "https://github.com/OpenTSDB/opentsdb/commit/b89fded4ee326dc064b9d7e471e9f29f7d1dede9.patch";
		sha256 = "1vb9m0a4fsjqcjagiypvkngzgsw4dil8jrlhn5xbz7rwx8x96wvb";
		})
		nativeBuildInputs = [
		autoconf
		automake
		makeWrapper
		];

		nativeBuildInputs = [ makeWrapper autoconf automake ];
		buildInputs = [ curl jdk nettools python3 git ];

		preConfigure = ''
		chmod +x build-aux/fetchdep.sh.in
		patchShebangs ./build-aux/
		./bootstrap
		'';

		preBuild = lib.concatStrings (lib.mapAttrsToList (dir: lib.concatMapStrings (artifact: ''
		ln -s ${artifact}/share/java/* third_party/${dir}
		'')) artifacts);

		postInstall = ''
		wrapProgram $out/bin/tsdb \
		--set JAVA_HOME "${jre}" \

Admin message