summaryrefslogtreecommitdiffstats
path: root/pkgs/development/java-modules
diff options
context:
space:
mode:
authorvolth <volth@volth.com>2019-08-13 21:52:01 +0000
committervolth <volth@volth.com>2019-08-28 11:07:32 +0000
commit08f68313a47a2093dc0f408a706b2c125bc59c95 (patch)
treebb48188c0bf9fac152c038426146df518ef8c562 /pkgs/development/java-modules
parent5061fe0c2c7743370e1d379d6fa60eed26ff1470 (diff)
treewide: remove redundant rec
Diffstat (limited to 'pkgs/development/java-modules')
-rw-r--r--pkgs/development/java-modules/apache/ant-launcher.nix2
-rw-r--r--pkgs/development/java-modules/apache/ant.nix2
-rw-r--r--pkgs/development/java-modules/apache/commons-cli.nix2
-rw-r--r--pkgs/development/java-modules/apache/commons-io.nix2
-rw-r--r--pkgs/development/java-modules/apache/commons-lang.nix2
-rw-r--r--pkgs/development/java-modules/apache/commons-lang3.nix2
-rw-r--r--pkgs/development/java-modules/apache/commons-logging-api.nix2
-rw-r--r--pkgs/development/java-modules/apache/xbean-reflect.nix2
-rw-r--r--pkgs/development/java-modules/beanshell/bsh.nix2
-rw-r--r--pkgs/development/java-modules/classworlds/classworlds.nix2
-rw-r--r--pkgs/development/java-modules/collections.nix2
-rw-r--r--pkgs/development/java-modules/eclipse/aether-util.nix2
-rw-r--r--pkgs/development/java-modules/findbugs/jsr305.nix2
-rw-r--r--pkgs/development/java-modules/google/collections.nix2
-rw-r--r--pkgs/development/java-modules/hamcrest/all.nix2
-rw-r--r--pkgs/development/java-modules/hamcrest/core.nix2
-rw-r--r--pkgs/development/java-modules/jogl/default.nix2
-rw-r--r--pkgs/development/java-modules/junit/default.nix2
-rw-r--r--pkgs/development/java-modules/log4j/default.nix2
-rw-r--r--pkgs/development/java-modules/m2install.nix4
-rw-r--r--pkgs/development/java-modules/maven-hello/default.nix2
-rw-r--r--pkgs/development/java-modules/maven-minimal.nix2
-rw-r--r--pkgs/development/java-modules/maven/archiver.nix2
-rw-r--r--pkgs/development/java-modules/maven/artifact-manager.nix2
-rw-r--r--pkgs/development/java-modules/maven/artifact.nix2
-rw-r--r--pkgs/development/java-modules/maven/common-artifact-filters.nix2
-rw-r--r--pkgs/development/java-modules/maven/core.nix2
-rw-r--r--pkgs/development/java-modules/maven/dependency-tree.nix2
-rw-r--r--pkgs/development/java-modules/maven/doxia-sink-api.nix2
-rw-r--r--pkgs/development/java-modules/maven/enforcer.nix2
-rw-r--r--pkgs/development/java-modules/maven/error-diagnostics.nix2
-rw-r--r--pkgs/development/java-modules/maven/filtering.nix2
-rw-r--r--pkgs/development/java-modules/maven/model.nix2
-rw-r--r--pkgs/development/java-modules/maven/monitor.nix2
-rw-r--r--pkgs/development/java-modules/maven/plugin-annotations.nix2
-rw-r--r--pkgs/development/java-modules/maven/plugin-api.nix2
-rw-r--r--pkgs/development/java-modules/maven/plugin-descriptor.nix2
-rw-r--r--pkgs/development/java-modules/maven/plugin-parameter-documenter.nix2
-rw-r--r--pkgs/development/java-modules/maven/plugin-registry.nix2
-rw-r--r--pkgs/development/java-modules/maven/plugin-testing-harness.nix2
-rw-r--r--pkgs/development/java-modules/maven/profile.nix2
-rw-r--r--pkgs/development/java-modules/maven/project.nix2
-rw-r--r--pkgs/development/java-modules/maven/reporting-api.nix2
-rw-r--r--pkgs/development/java-modules/maven/repository-metadata.nix2
-rw-r--r--pkgs/development/java-modules/maven/settings.nix2
-rw-r--r--pkgs/development/java-modules/maven/shared-incremental.nix2
-rw-r--r--pkgs/development/java-modules/maven/shared-utils.nix2
-rw-r--r--pkgs/development/java-modules/maven/surefire-api.nix2
-rw-r--r--pkgs/development/java-modules/maven/surefire-booter.nix2
-rw-r--r--pkgs/development/java-modules/maven/surefire-common.nix2
-rw-r--r--pkgs/development/java-modules/maven/surefire-junit4.nix2
-rw-r--r--pkgs/development/java-modules/maven/toolchain.nix2
-rw-r--r--pkgs/development/java-modules/mavenPlugins.nix20
-rw-r--r--pkgs/development/java-modules/mojo/animal-sniffer.nix2
-rw-r--r--pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix2
-rw-r--r--pkgs/development/java-modules/ow2/asm-all.nix2
-rw-r--r--pkgs/development/java-modules/plexus/archiver.nix2
-rw-r--r--pkgs/development/java-modules/plexus/build-api.nix2
-rw-r--r--pkgs/development/java-modules/plexus/classworlds.nix2
-rw-r--r--pkgs/development/java-modules/plexus/compiler-api.nix2
-rw-r--r--pkgs/development/java-modules/plexus/compiler-javac.nix2
-rw-r--r--pkgs/development/java-modules/plexus/compiler-manager.nix2
-rw-r--r--pkgs/development/java-modules/plexus/component-annotations.nix2
-rw-r--r--pkgs/development/java-modules/plexus/container-default.nix2
-rw-r--r--pkgs/development/java-modules/plexus/digest.nix2
-rw-r--r--pkgs/development/java-modules/plexus/i18n.nix2
-rw-r--r--pkgs/development/java-modules/plexus/interactivity-api.nix2
-rw-r--r--pkgs/development/java-modules/plexus/interpolation.nix2
-rw-r--r--pkgs/development/java-modules/plexus/io.nix2
-rw-r--r--pkgs/development/java-modules/plexus/utils.nix2
-rw-r--r--pkgs/development/java-modules/poms.nix2
-rw-r--r--pkgs/development/java-modules/sisu/guice.nix2
-rw-r--r--pkgs/development/java-modules/sisu/inject-bean.nix2
-rw-r--r--pkgs/development/java-modules/sisu/inject-plexus.nix2
-rw-r--r--pkgs/development/java-modules/xerces/impl.nix2
-rw-r--r--pkgs/development/java-modules/xml-apis/default.nix2
76 files changed, 86 insertions, 86 deletions
diff --git a/pkgs/development/java-modules/apache/ant-launcher.nix b/pkgs/development/java-modules/apache/ant-launcher.nix
index e6a2b0cae99d..e5f4d5f6ee0f 100644
--- a/pkgs/development/java-modules/apache/ant-launcher.nix
+++ b/pkgs/development/java-modules/apache/ant-launcher.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
antLauncher_1_8_2 = map (obj: fetchMaven {
version = "1.8.2";
artifactId = "ant-launcher";
diff --git a/pkgs/development/java-modules/apache/ant.nix b/pkgs/development/java-modules/apache/ant.nix
index b4a6aa68f448..5de82b1703b3 100644
--- a/pkgs/development/java-modules/apache/ant.nix
+++ b/pkgs/development/java-modules/apache/ant.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
ant_1_8_2 = map (obj: fetchMaven {
version = "1.8.2";
artifactId = "ant";
diff --git a/pkgs/development/java-modules/apache/commons-cli.nix b/pkgs/development/java-modules/apache/commons-cli.nix
index 050d511b0a10..5cb25a0f379e 100644
--- a/pkgs/development/java-modules/apache/commons-cli.nix
+++ b/pkgs/development/java-modules/apache/commons-cli.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
commonsCli_1_0 = map (obj: fetchMaven {
version = "1.0";
artifactId = "commons-cli";
diff --git a/pkgs/development/java-modules/apache/commons-io.nix b/pkgs/development/java-modules/apache/commons-io.nix
index 70ce940ccf17..28bb9d381f9e 100644
--- a/pkgs/development/java-modules/apache/commons-io.nix
+++ b/pkgs/development/java-modules/apache/commons-io.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
commonsIo_2_1 = map (obj: fetchMaven {
version = "2.1";
artifactId = "commons-io";
diff --git a/pkgs/development/java-modules/apache/commons-lang.nix b/pkgs/development/java-modules/apache/commons-lang.nix
index a2d71e9db0c8..501da6d204d0 100644
--- a/pkgs/development/java-modules/apache/commons-lang.nix
+++ b/pkgs/development/java-modules/apache/commons-lang.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
commonsLang_2_1 = map (obj: fetchMaven {
version = "2.1";
artifactId = "commons-lang";
diff --git a/pkgs/development/java-modules/apache/commons-lang3.nix b/pkgs/development/java-modules/apache/commons-lang3.nix
index 63f68b925430..3bbbe9d2e39a 100644
--- a/pkgs/development/java-modules/apache/commons-lang3.nix
+++ b/pkgs/development/java-modules/apache/commons-lang3.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
commonsLang3_3_1 = map (obj: fetchMaven {
version = "3.1";
artifactId = "commons-lang3";
diff --git a/pkgs/development/java-modules/apache/commons-logging-api.nix b/pkgs/development/java-modules/apache/commons-logging-api.nix
index 47750abe4623..befb2003d01c 100644
--- a/pkgs/development/java-modules/apache/commons-logging-api.nix
+++ b/pkgs/development/java-modules/apache/commons-logging-api.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
commonsLoggingApi_1_1 = map (obj: fetchMaven {
version = "1.1";
artifactId = "commons-logging-api";
diff --git a/pkgs/development/java-modules/apache/xbean-reflect.nix b/pkgs/development/java-modules/apache/xbean-reflect.nix
index f0614ec99e36..8f7c35b716f9 100644
--- a/pkgs/development/java-modules/apache/xbean-reflect.nix
+++ b/pkgs/development/java-modules/apache/xbean-reflect.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
xbeanReflect_3_4 = map (obj: fetchMaven {
version = "3.4";
artifactId = "xbean-reflect";
diff --git a/pkgs/development/java-modules/beanshell/bsh.nix b/pkgs/development/java-modules/beanshell/bsh.nix
index 41756bb80d50..783fdc8679cc 100644
--- a/pkgs/development/java-modules/beanshell/bsh.nix
+++ b/pkgs/development/java-modules/beanshell/bsh.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
bsh_2_0_b4 = map (obj: fetchMaven {
version = "2.0b4";
artifactId = "bsh";
diff --git a/pkgs/development/java-modules/classworlds/classworlds.nix b/pkgs/development/java-modules/classworlds/classworlds.nix
index f8bbc07f1025..3561c0b6e5e1 100644
--- a/pkgs/development/java-modules/classworlds/classworlds.nix
+++ b/pkgs/development/java-modules/classworlds/classworlds.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
classworlds_1_1_alpha2 = map (obj: fetchMaven {
version = "1.1-alpha-2";
artifactId = "classworlds";
diff --git a/pkgs/development/java-modules/collections.nix b/pkgs/development/java-modules/collections.nix
index 39b274b5030a..83f7a95af81d 100644
--- a/pkgs/development/java-modules/collections.nix
+++ b/pkgs/development/java-modules/collections.nix
@@ -2,7 +2,7 @@
with pkgs.javaPackages;
-rec {
+{
mavenLibs_2_0_1 = [
mavenArtifact_2_0_1
mavenArtifactManager_2_0_1
diff --git a/pkgs/development/java-modules/eclipse/aether-util.nix b/pkgs/development/java-modules/eclipse/aether-util.nix
index 60aac560b9b2..6ebca58c44e5 100644
--- a/pkgs/development/java-modules/eclipse/aether-util.nix
+++ b/pkgs/development/java-modules/eclipse/aether-util.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
aetherUtil_0_9_0_M2 = map (obj: fetchMaven {
version = "0.9.0.M2";
artifactId = "aether-util";
diff --git a/pkgs/development/java-modules/findbugs/jsr305.nix b/pkgs/development/java-modules/findbugs/jsr305.nix
index 2e842410aafb..7816ab49d612 100644
--- a/pkgs/development/java-modules/findbugs/jsr305.nix
+++ b/pkgs/development/java-modules/findbugs/jsr305.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
findbugsJsr305_2_0_1 = map (obj: fetchMaven {
version = "2.0.1";
artifactId = "jsr305";
diff --git a/pkgs/development/java-modules/google/collections.nix b/pkgs/development/java-modules/google/collections.nix
index ec874c73e365..b5b4551dd97b 100644
--- a/pkgs/development/java-modules/google/collections.nix
+++ b/pkgs/development/java-modules/google/collections.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
googleCollections_1_0 = map (obj: fetchMaven {
version = "1.0";
artifactId = "google-collections";
diff --git a/pkgs/development/java-modules/hamcrest/all.nix b/pkgs/development/java-modules/hamcrest/all.nix
index bab9e1b115d0..73c27c4af8b1 100644
--- a/pkgs/development/java-modules/hamcrest/all.nix
+++ b/pkgs/development/java-modules/hamcrest/all.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
hamcrestAll_1_3 = map (obj: fetchMaven {
version = "1.3";
artifactId = "hamcrest-all";
diff --git a/pkgs/development/java-modules/hamcrest/core.nix b/pkgs/development/java-modules/hamcrest/core.nix
index 3842b8c5afa0..4145191fdd91 100644
--- a/pkgs/development/java-modules/hamcrest/core.nix
+++ b/pkgs/development/java-modules/hamcrest/core.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
hamcrestCore_1_3 = map (obj: fetchMaven {
version = "1.3";
artifactId = "hamcrest-core";
diff --git a/pkgs/development/java-modules/jogl/default.nix b/pkgs/development/java-modules/jogl/default.nix
index abb549110a87..d179fb531789 100644
--- a/pkgs/development/java-modules/jogl/default.nix
+++ b/pkgs/development/java-modules/jogl/default.nix
@@ -15,7 +15,7 @@ in
sha256 = "00hybisjwqs88p24dds652bzrwbbmhn2dpx56kp4j6xpadkp33d0";
fetchSubmodules = true;
};
- in stdenv.mkDerivation rec {
+ in stdenv.mkDerivation {
pname = "jogl";
inherit version;
diff --git a/pkgs/development/java-modules/junit/default.nix b/pkgs/development/java-modules/junit/default.nix
index a7bfa545908a..6f86cede5120 100644
--- a/pkgs/development/java-modules/junit/default.nix
+++ b/pkgs/development/java-modules/junit/default.nix
@@ -6,7 +6,7 @@ let
poms = import (../poms.nix) { inherit fetchMaven; };
collections = import (../collections.nix) { inherit pkgs; };
in rec {
- junitGen = { mavenDeps, sha512, version }: mavenbuild rec {
+ junitGen = { mavenDeps, sha512, version }: mavenbuild {
inherit mavenDeps sha512 version;
name = "junit-${version}";
diff --git a/pkgs/development/java-modules/log4j/default.nix b/pkgs/development/java-modules/log4j/default.nix
index a8b1ea9f0217..e95c0847aacc 100644
--- a/pkgs/development/java-modules/log4j/default.nix
+++ b/pkgs/development/java-modules/log4j/default.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
log4j_1_2_12 = map (obj: fetchMaven {
version = "1.2.12";
artifactId = "log4j";
diff --git a/pkgs/development/java-modules/m2install.nix b/pkgs/development/java-modules/m2install.nix
index 7ebe655580e5..3a289c9c9c4a 100644
--- a/pkgs/development/java-modules/m2install.nix
+++ b/pkgs/development/java-modules/m2install.nix
@@ -5,11 +5,11 @@ let
name = "${artifactId}-${version}";
m2Path = "${builtins.replaceStrings ["."] ["/"] groupId}/${artifactId}/${version}";
m2File = "${name}${suffix}.${type}";
- src = fetch