diff options
author | volth <volth@volth.com> | 2019-08-13 21:52:01 +0000 |
---|---|---|
committer | volth <volth@volth.com> | 2019-08-28 11:07:32 +0000 |
commit | 08f68313a47a2093dc0f408a706b2c125bc59c95 (patch) | |
tree | bb48188c0bf9fac152c038426146df518ef8c562 /pkgs/development/java-modules | |
parent | 5061fe0c2c7743370e1d379d6fa60eed26ff1470 (diff) |
treewide: remove redundant rec
Diffstat (limited to 'pkgs/development/java-modules')
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 e6a2b0cae99d8..e5f4d5f6ee0f0 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 b4a6aa68f4487..5de82b1703b31 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 050d511b0a106..5cb25a0f379ee 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 70ce940ccf177..28bb9d381f9eb 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 a2d71e9db0c8c..501da6d204d0e 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 63f68b925430a..3bbbe9d2e39af 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 47750abe46232..befb2003d01c2 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 f0614ec99e365..8f7c35b716f9a 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 41756bb80d507..783fdc8679cc7 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 f8bbc07f10256..3561c0b6e5e1a 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 39b274b5030ae..83f7a95af81d1 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 60aac560b9b2b..6ebca58c44e52 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 2e842410aafbf..7816ab49d6121 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 ec874c73e365e..b5b4551dd97b9 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 bab9e1b115d0f..73c27c4af8b17 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 3842b8c5afa06..4145191fdd91a 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 abb549110a87c..d179fb531789f 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 a7bfa545908ab..6f86cede51200 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 a8b1ea9f02175..e95c0847aacc6 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 7ebe655580e50..3a289c9c9c4ae 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 = fetchurl rec { + src = fetchurl { inherit sha512; url = "mirror://maven/${m2Path}/${m2File}"; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { inherit name m2Path m2File src; installPhase = '' diff --git a/pkgs/development/java-modules/maven-hello/default.nix b/pkgs/development/java-modules/maven-hello/default.nix index f3d5fb3e9342e..b8e128ac728cd 100644 --- a/pkgs/development/java-modules/maven-hello/default.nix +++ b/pkgs/development/java-modules/maven-hello/default.nix @@ -5,7 +5,7 @@ with pkgs.javaPackages; let poms = import ../poms.nix { inherit fetchMaven; }; in rec { - mavenHelloRec = { mavenDeps, sha512, version, skipTests ? true, quiet ? true }: mavenbuild rec { + mavenHelloRec = { mavenDeps, sha512, version, skipTests ? true, quiet ? true }: mavenbuild { inherit mavenDeps sha512 version skipTests quiet; name = "maven-hello-${version}"; diff --git a/pkgs/development/java-modules/maven-minimal.nix b/pkgs/development/java-modules/maven-minimal.nix index f63c91cd360a8..c1fab1e9bc970 100644 --- a/pkgs/development/java-modules/maven-minimal.nix +++ b/pkgs/development/java-modules/maven-minimal.nix @@ -8,7 +8,7 @@ let fetchMaven = pkgs.callPackage ./m2install.nix { }; plugins = import ./mavenPlugins.nix { inherit pkgs; }; poms = import ./poms.nix { inherit fetchMaven; }; -in rec { +in { # Maven needs all of these to function mavenMinimal = flatten collections.mavenLibs_2_0_6 diff --git a/pkgs/development/java-modules/maven/archiver.nix b/pkgs/development/java-modules/maven/archiver.nix index 14c5a99d42ff0..9965f86f72bd2 100644 --- a/pkgs/development/java-modules/maven/archiver.nix +++ b/pkgs/development/java-modules/maven/archiver.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenArchiver_2_5 = map (obj: fetchMaven { version = "2.5"; artifactId = "maven-archiver"; diff --git a/pkgs/development/java-modules/maven/artifact-manager.nix b/pkgs/development/java-modules/maven/artifact-manager.nix index 0796d0665103b..5bf3ef01bc65d 100644 --- a/pkgs/development/java-modules/maven/artifact-manager.nix +++ b/pkgs/development/java-modules/maven/artifact-manager.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenArtifactManager_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-artifact-manager"; diff --git a/pkgs/development/java-modules/maven/artifact.nix b/pkgs/development/java-modules/maven/artifact.nix index bb0e578d5d638..80e3392abd2f6 100644 --- a/pkgs/development/java-modules/maven/artifact.nix +++ b/pkgs/development/java-modules/maven/artifact.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenArtifact_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-artifact"; diff --git a/pkgs/development/java-modules/maven/common-artifact-filters.nix b/pkgs/development/java-modules/maven/common-artifact-filters.nix index 948dbc3baf6c7..8c3886679919a 100644 --- a/pkgs/development/java-modules/maven/common-artifact-filters.nix +++ b/pkgs/development/java-modules/maven/common-artifact-filters.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenCommonArtifactFilters_1_2 = map (obj: fetchMaven { version = "1.2"; artifactId = "maven-common-artifact-filters"; diff --git a/pkgs/development/java-modules/maven/core.nix b/pkgs/development/java-modules/maven/core.nix index 5b45f89e9d54a..a1ea9292a513c 100644 --- a/pkgs/development/java-modules/maven/core.nix +++ b/pkgs/development/java-modules/maven/core.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenCore_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-core"; diff --git a/pkgs/development/java-modules/maven/dependency-tree.nix b/pkgs/development/java-modules/maven/dependency-tree.nix index 00d089ea249bb..aa3a93849c257 100644 --- a/pkgs/development/java-modules/maven/dependency-tree.nix +++ b/pkgs/development/java-modules/maven/dependency-tree.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenDependencyTree_2_1 = map (obj: fetchMaven { version = "2.1"; artifactId = "maven-dependency-tree"; diff --git a/pkgs/development/java-modules/maven/doxia-sink-api.nix b/pkgs/development/java-modules/maven/doxia-sink-api.nix index 9fa1051cd80ba..8314abe4924fc 100644 --- a/pkgs/development/java-modules/maven/doxia-sink-api.nix +++ b/pkgs/development/java-modules/maven/doxia-sink-api.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenDoxiaSinkApi_1_0_alpha6 = map (obj: fetchMaven { version = "1.0-alpha-6"; artifactId = "doxia-sink-api"; diff --git a/pkgs/development/java-modules/maven/enforcer.nix b/pkgs/development/java-modules/maven/enforcer.nix index 014f678bc1491..c7a1d212e0e5f 100644 --- a/pkgs/development/java-modules/maven/enforcer.nix +++ b/pkgs/development/java-modules/maven/enforcer.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenEnforcerApi_1_3_1 = map (obj: fetchMaven { version = "1.3.1"; artifactId = "enforcer-api"; diff --git a/pkgs/development/java-modules/maven/error-diagnostics.nix b/pkgs/development/java-modules/maven/error-diagnostics.nix index 80cbf993a60de..f16f10462ff25 100644 --- a/pkgs/development/java-modules/maven/error-diagnostics.nix +++ b/pkgs/development/java-modules/maven/error-diagnostics.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenErrorDiagnostics_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-error-diagnostics"; diff --git a/pkgs/development/java-modules/maven/filtering.nix b/pkgs/development/java-modules/maven/filtering.nix index 963d6c6b646dc..f1e2e551cee2e 100644 --- a/pkgs/development/java-modules/maven/filtering.nix +++ b/pkgs/development/java-modules/maven/filtering.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenFiltering_1_1 = map (obj: fetchMaven { version = "1.1"; artifactId = "maven-filtering"; diff --git a/pkgs/development/java-modules/maven/model.nix b/pkgs/development/java-modules/maven/model.nix index 2ae3bfe6034c7..147b15b6e400e 100644 --- a/pkgs/development/java-modules/maven/model.nix +++ b/pkgs/development/java-modules/maven/model.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenModel_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-model"; diff --git a/pkgs/development/java-modules/maven/monitor.nix b/pkgs/development/java-modules/maven/monitor.nix index ce6c7c1769411..609745e94229f 100644 --- a/pkgs/development/java-modules/maven/monitor.nix +++ b/pkgs/development/java-modules/maven/monitor.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenMonitor_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-monitor"; diff --git a/pkgs/development/java-modules/maven/plugin-annotations.nix b/pkgs/development/java-modules/maven/plugin-annotations.nix index f852cc957a56b..bf8d608488e87 100644 --- a/pkgs/development/java-modules/maven/plugin-annotations.nix +++ b/pkgs/development/java-modules/maven/plugin-annotations.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenPluginAnnotations_3_1 = map (obj: fetchMaven { version = "3.1"; artifactId = "maven-plugin-annotations"; diff --git a/pkgs/development/java-modules/maven/plugin-api.nix b/pkgs/development/java-modules/maven/plugin-api.nix index be9642b0e2069..55fb0d2c5ddf4 100644 --- a/pkgs/development/java-modules/maven/plugin-api.nix +++ b/pkgs/development/java-modules/maven/plugin-api.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenPluginApi_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-plugin-api"; diff --git a/pkgs/development/java-modules/maven/plugin-descriptor.nix b/pkgs/development/java-modules/maven/plugin-descriptor.nix index dbdc09a46734f..7f5c22fe3b3a6 100644 --- a/pkgs/development/java-modules/maven/plugin-descriptor.nix +++ b/pkgs/development/java-modules/maven/plugin-descriptor.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenPluginDescriptor_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-plugin-descriptor"; diff --git a/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix b/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix index 9e11c0f408294..4ff07574dc925 100644 --- a/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix +++ b/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenPluginParameterDocumenter_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-plugin-parameter-documenter"; diff --git a/pkgs/development/java-modules/maven/plugin-registry.nix b/pkgs/development/java-modules/maven/plugin-registry.nix index f0074ef816ed7..a7bb92e645d35 100644 --- a/pkgs/development/java-modules/maven/plugin-registry.nix +++ b/pkgs/development/java-modules/maven/plugin-registry.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenPluginRegistry_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-plugin-registry"; diff --git a/pkgs/development/java-modules/maven/plugin-testing-harness.nix b/pkgs/development/java-modules/maven/plugin-testing-harness.nix index a65f19620485e..4cd32d508f331 100644 --- a/pkgs/development/java-modules/maven/plugin-testing-harness.nix +++ b/pkgs/development/java-modules/maven/plugin-testing-harness.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenPluginTestingHarness_1_1 = map (obj: fetchMaven { version = "1.1"; artifactId = "maven-plugin-testing-harness"; diff --git a/pkgs/development/java-modules/maven/profile.nix b/pkgs/development/java-modules/maven/profile.nix index 6940fafae8219..c40f87f1c45d8 100644 --- a/pkgs/development/java-modules/maven/profile.nix +++ b/pkgs/development/java-modules/maven/profile.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenProfile_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-profile"; diff --git a/pkgs/development/java-modules/maven/project.nix b/pkgs/development/java-modules/maven/project.nix index 0b07d8b8679bb..fad53a0250b36 100644 --- a/pkgs/development/java-modules/maven/project.nix +++ b/pkgs/development/java-modules/maven/project.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenProject_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-project"; diff --git a/pkgs/development/java-modules/maven/reporting-api.nix b/pkgs/development/java-modules/maven/reporting-api.nix index 8a508cf150532..87999d452fc4f 100644 --- a/pkgs/development/java-modules/maven/reporting-api.nix +++ b/pkgs/development/java-modules/maven/reporting-api.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenReportingApi_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-reporting-api"; diff --git a/pkgs/development/java-modules/maven/repository-metadata.nix b/pkgs/development/java-modules/maven/repository-metadata.nix index 443a1acd4513d..0d8f55737b771 100644 --- a/pkgs/development/java-modules/maven/repository-metadata.nix +++ b/pkgs/development/java-modules/maven/repository-metadata.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenRepositoryMetadata_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-repository-metadata"; diff --git a/pkgs/development/java-modules/maven/settings.nix b/pkgs/development/java-modules/maven/settings.nix index 6b42082cfd8a9..09e0170945d5e 100644 --- a/pkgs/development/java-modules/maven/settings.nix +++ b/pkgs/development/java-modules/maven/settings.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenSettings_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-settings"; diff --git a/pkgs/development/java-modules/maven/shared-incremental.nix b/pkgs/development/java-modules/maven/shared-incremental.nix index 67c44986d0a02..9fa74f8bfe773 100644 --- a/pkgs/development/java-modules/maven/shared-incremental.nix +++ b/pkgs/development/java-modules/maven/shared-incremental.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenSharedIncremental_1_1 = map (obj: fetchMaven { version = "1.1"; artifactId = "maven-shared-incremental"; diff --git a/pkgs/development/java-modules/maven/shared-utils.nix b/pkgs/development/java-modules/maven/shared-utils.nix index b3cfc92809145..38addcfe8aa9d 100644 --- a/pkgs/development/java-modules/maven/shared-utils.nix +++ b/pkgs/development/java-modules/maven/shared-utils.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenSharedUtils_0_1 = map (obj: fetchMaven { version = "0.1"; artifactId = "maven-shared-utils"; diff --git a/pkgs/development/java-modules/maven/surefire-api.nix b/pkgs/development/java-modules/maven/surefire-api.nix index c1f7fcc3f76c1..9ad284365d95d 100644 --- a/pkgs/development/java-modules/maven/surefire-api.nix +++ b/pkgs/development/java-modules/maven/surefire-api.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenSurefireApi_2_12_4 = map (obj: fetchMaven { version = "2.12.4"; artifactId = "surefire-api"; diff --git a/pkgs/development/java-modules/maven/surefire-booter.nix b/pkgs/development/java-modules/maven/surefire-booter.nix index b62aa86bf45c3..41f9848d5cd9b 100644 --- a/pkgs/development/java-modules/maven/surefire-booter.nix +++ b/pkgs/development/java-modules/maven/surefire-booter.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenSurefireBooter_2_12_4 = map (obj: fetchMaven { version = "2.12.4"; artifactId = "surefire-booter"; diff --git a/pkgs/development/java-modules/maven/surefire-common.nix b/pkgs/development/java-modules/maven/surefire-common.nix index bc0573f6b7066..2f4617eff8c09 100644 --- a/pkgs/development/java-modules/maven/surefire-common.nix +++ b/pkgs/development/java-modules/maven/surefire-common.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenSurefireCommon_2_12_4 = map (obj: fetchMaven { version = "2.12.4"; artifactId = "maven-surefire-common"; diff --git a/pkgs/development/java-modules/maven/surefire-junit4.nix b/pkgs/development/java-modules/maven/surefire-junit4.nix index 1374080d0874e..d67177d80d23c 100644 --- a/pkgs/development/java-modules/maven/surefire-junit4.nix +++ b/pkgs/development/java-modules/maven/surefire-junit4.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenSurefireJunit4_2_12_4 = map (obj: fetchMaven { version = "2.12.4"; artifactId = "surefire-junit4"; diff --git a/pkgs/development/java-modules/maven/toolchain.nix b/pkgs/development/java-modules/maven/toolchain.nix index 864d3b98f7ba1..91f8fdb77a419 100644 --- a/pkgs/development/java-modules/maven/toolchain.nix +++ b/pkgs/development/java-modules/maven/toolchain.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenToolchain_1_0 = map (obj: fetchMaven { version = "1.0"; artifactId = "maven-toolchain"; diff --git a/pkgs/development/java-modules/mavenPlugins.nix b/pkgs/development/java-modules/mavenPlugins.nix index 8cc79dc1d228a..e481f5d250a34 100644 --- a/pkgs/development/java-modules/mavenPlugins.nix +++ b/pkgs/development/java-modules/mavenPlugins.nix @@ -5,7 +5,7 @@ with pkgs.javaPackages; let fetchMaven = pkgs.callPackage ./m2install.nix { }; -in rec { +in { inherit fetchMaven; animalSniffer_1_11 = map (obj: fetchMaven { @@ -19,7 +19,7 @@ in rec { { type = "jar"; sha512 = "24dih4wp7p1rddvxcznlz42yxhqlln5ljdbvwnp75rsyf3ng25zv881ixk5qx8canr1lxx4kh22kwkaahz3qnw54fqn7w5z58m5768n"; } ]; - mavenClean_2_5 = map (obj: fetchMaven rec { + mavenClean_2_5 = map (obj: fetchMaven { version = "2.5"; artifactId = "maven-clean-plugin"; groupId = "org.apache.maven.plugins"; @@ -30,7 +30,7 @@ in rec { { type = "jar"; sha512 = "2fprppwpmzyvaynadm6slk382khlpf5s8sbi5x249qcaw2vkg5n77q79lgq981v9kjlr5wighjzpjqv8gdig45m2p37mcfwsy3jsv89"; } ]; - mavenCompiler_3_1 = map (obj: fetchMaven rec { + mavenCompiler_3_1 = map (obj: fetchMaven { version = "3.1"; artifactId = "maven-compiler-plugin"; groupId = "org.apache.maven.plugins"; @@ -41,7 +41,7 @@ in rec { { type = "jar"; sha512 = "1dvq13yc8yacxr66pkvwwd4cvx0jln8dv9fh5gmd5vir05h8l5j4y324r1bklnzpx0ancs5ad8z944zgmpaq3w195kfsarmndp0gv2y"; } ]; - mavenEnforcer_1_3_1 = map (obj: fetchMaven rec { + mavenEnforcer_1_3_1 = map (obj: fetchMaven { version = "1.3.1"; artifactId = "maven-enforcer-plugin"; groupId = "org.apache.maven.plugins"; @@ -52,7 +52,7 @@ in rec { { type = "jar"; sha512 = "15sb9qmxgbq82nzc9x66152va121vf33nn0ah2g4z169cv6jnjq05gk1472k59imypvwsh9hd3hqi9q6g8d0sawgk5l1ax900cx7n25"; } ]; - mavenInstall_2_4 = map (obj: fetchMaven rec { + mavenInstall_2_4 = map (obj: fetchMaven { version = "2.4"; artifactId = "maven-install-plugin"; groupId = "org.apache.maven.plugins"; @@ -63,7 +63,7 @@ in rec { { type = "jar"; sha512 = "35hbj5hbz085y1dxfmza6m207kn68q2g1k5a9mc75i9pj8fww7xm7xzcdv81xyxjm3r4qbqf1izlg16l99b93rfii9rg8kqz8mxqmb6"; } ]; - mavenJar_2_4 = map (obj: fetchMaven rec { + mavenJar_2_4 = map (obj: fetchMaven { version = "2.4"; artifactId = "maven-jar-plugin"; groupId = "org.apache.maven.plugins"; @@ -74,7 +74,7 @@ in rec { { type = "jar"; sha512 = "0frbikq8jm5pynlmv51k349kiaipd9jsrh6970313s0g6n4i0ws9vi232wc1mjrc3d27k63xqmb97jzgbbc6q337ypv5vil1ql9wh0d"; } ]; - mavenReplacer_1_5_3 = map (obj: fetchMaven rec { + mavenReplacer_1_5_3 = map (obj: fetchMaven { version = "1.5.3"; artifactId = "replacer"; groupId = "com.google.code.maven-replacer-plugin"; @@ -85,7 +85,7 @@ in rec { { type = "jar"; sha512 = "0f2rngcxpll0iigv115132fld5n6shjfn7m981sg7mdzlj75q2h5knd4x1ip33w60cm1j0rmqaxp1y6qn76ykvhprdyy9smiy667l9x"; } ]; - mavenResources_2_6 = map (obj: fetchMaven rec { + mavenResources_2_6 = map (obj: fetchMaven { version = "2.6"; artifactId = "maven-resources-plugin"; groupId = "org.apache.maven.plugins"; @@ -96,7 +96,7 @@ in rec { { type = "jar"; sha512 = "3j8smsx6wk085iic5qhknrszixxna6szmvk2rn9zkn75ffjr7ham72hw9cmxf5160j73n8f2cmcbw1x462fqy12fqqpmzx08i1sbwcv"; } ]; - mavenSurefire_2_12_4 = map (obj: fetchMaven rec { + mavenSurefire_2_12_4 = map (obj: fetchMaven { version = "2.12.4"; artifactId = "maven-surefire-plugin"; groupId = "org.apache.maven.plugins"; @@ -107,7 +107,7 @@ in rec { { type = "jar"; sha512 = "2sjq2l8i97h3ay8wwrsi75cfs9d1im5ar2sn2zv4q6xsv4v3hh5y481l9xwc5dnbcfdjs38ald0z60pxpcyiqrng6h69s2ws8fhb0mm"; } ]; - mavenSurefire_2_17 = map (obj: fetchMaven rec { + mavenSurefire_2_17 = map (obj: fetchMaven { version = "2.17"; artifactId = "maven-surefire-plugin"; groupId = "org.apache.maven.plugins"; diff --git a/pkgs/development/java-modules/mojo/animal-sniffer.nix b/pkgs/development/java-modules/mojo/animal-sniffer.nix index dd9b1d1b0aa52..221e59f766b9e 100644 --- a/pkgs/development/java-modules/mojo/animal-sniffer.nix +++ b/pkgs/development/java-modules/mojo/animal-sniffer.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mojoAnimalSniffer_1_11 = map (obj: fetchMaven { version = "1.11"; artifactId = "animal-sniffer"; diff --git a/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix b/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix index 245daa5fdb900..f6f7e490c7cf3 100644 --- a/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix +++ b/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mojoJavaBootClasspathDetector_1_11 = map (obj: fetchMaven { version = "1.11"; artifactId = "java-boot-classpath-detector"; diff --git a/pkgs/development/java-modules/ow2/asm-all.nix b/pkgs/development/java-modules/ow2/asm-all.nix index 08d18745ed7fb..92418d8c61941 100644 --- a/pkgs/development/java-modules/ow2/asm-all.nix +++ b/pkgs/development/java-modules/ow2/asm-all.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ ow2AsmAll_4_0 = map (obj: fetchMaven { version = "4.0"; artifactId = "asm-all"; diff --git a/pkgs/development/java-modules/plexus/archiver.nix b/pkgs/development/java-modules/plexus/archiver.nix index 384b92859762e..41a334007e8f4 100644 --- a/pkgs/development/java-modules/plexus/archiver.nix +++ b/pkgs/development/java-modules/plexus/archiver.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusArchiver_1_0_alpha7 = map (obj: fetchMaven { version = "1.0-alpha-7"; artifactId = "plexus-archiver"; diff --git a/pkgs/development/java-modules/plexus/build-api.nix b/pkgs/development/java-modules/plexus/build-api.nix index c417c955b69ba..b362f905091e2 100644 --- a/pkgs/development/java-modules/plexus/build-api.nix +++ b/pkgs/development/java-modules/plexus/build-api.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusBuildApi_0_0_4 = map (obj: fetchMaven { version = "0.0.4"; artifactId = "plexus-build-api"; diff --git a/pkgs/development/java-modules/plexus/classworlds.nix b/pkgs/development/java-modules/plexus/classworlds.nix index 6ff1755e8f536..7cb6c3dbf558e 100644 --- a/pkgs/development/java-modules/plexus/classworlds.nix +++ b/pkgs/development/java-modules/plexus/classworlds.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusClassworlds_2_2_2 = map (obj: fetchMaven { version = "2.2.2"; artifactId = "plexus-classworlds"; diff --git a/pkgs/development/java-modules/plexus/compiler-api.nix b/pkgs/development/java-modules/plexus/compiler-api.nix index 11baab0950d05..a1c6556a76998 100644 --- a/pkgs/development/java-modules/plexus/compiler-api.nix +++ b/pkgs/development/java-modules/plexus/compiler-api.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusCompilerApi_2_2 = map (obj: fetchMaven { version = "2.2"; artifactId = "plexus-compiler-api"; diff --git a/pkgs/development/java-modules/plexus/compiler-javac.nix b/pkgs/development/java-modules/plexus/compiler-javac.nix index a42064a0e9e80..d86240b6d45b8 100644 --- a/pkgs/development/java-modules/plexus/compiler-javac.nix +++ b/pkgs/development/java-modules/plexus/compiler-javac.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusCompilerJavac_2_2 = map (obj: fetchMaven { version = "2.2"; artifactId = "plexus-compiler-javac"; diff --git a/pkgs/development/java-modules/plexus/compiler-manager.nix b/pkgs/development/java-modules/plexus/compiler-manager.nix index f7221a96627fb..3f27981b15405 100644 --- a/pkgs/development/java-modules/plexus/compiler-manager.nix +++ b/pkgs/development/java-modules/plexus/compiler-manager.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusCompilerManager_2_2 = map (obj: fetchMaven { version = "2.2"; artifactId = "plexus-compiler-manager"; diff --git a/pkgs/development/java-modules/plexus/component-annotations.nix b/pkgs/development/java-modules/plexus/component-annotations.nix index fd3fc80e7e05a..89ae778e762fa 100644 --- a/pkgs/development/java-modules/plexus/component-annotations.nix +++ b/pkgs/development/java-modules/plexus/component-annotations.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusComponentAnnotations_1_5_5 = map (obj: fetchMaven { version = "1.5.5"; artifactId = "plexus-component-annotations"; diff --git a/pkgs/development/java-modules/plexus/container-default.nix b/pkgs/development/java-modules/plexus/container-default.nix index 375a1913afcda..79d8ac1087b45 100644 --- a/pkgs/development/java-modules/plexus/container-default.nix +++ b/pkgs/development/java-modules/plexus/container-default.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusContainerDefault_1_0_alpha9 = map (obj: fetchMaven { version = "1.0-alpha-9"; artifactId = "plexus-container-default"; diff --git a/pkgs/development/java-modules/plexus/digest.nix b/pkgs/development/java-modules/plexus/digest.nix index be2013a267608..a9c80c146c9b5 100644 --- a/pkgs/development/java-modules/plexus/digest.nix +++ b/pkgs/development/java-modules/plexus/digest.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusDigest_1_0 = map (obj: fetchMaven { version = "1.0"; artifactId = "plexus-digest"; diff --git a/pkgs/development/java-modules/plexus/i18n.nix b/pkgs/development/java-modules/plexus/i18n.nix index 5b34cde0503c2..0b016a7bd493f 100644 --- a/pkgs/development/java-modules/plexus/i18n.nix +++ b/pkgs/development/java-modules/plexus/i18n.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusI18n_1_0_beta6 = map (obj: fetchMaven { version = "1.0-beta-6"; artifactId = "plexus-i18n"; diff --git a/pkgs/development/java-modules/plexus/interactivity-api.nix b/pkgs/development/java-modules/plexus/interactivity-api.nix index 8ada106f48fdd..378fa76d8c62a 100644 --- a/pkgs/development/java-modules/plexus/interactivity-api.nix +++ b/pkgs/development/java-modules/plexus/interactivity-api.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusInteractivityApi_1_0_alpha4 = map (obj: fetchMaven { version = "1.0-alpha-4"; artifactId = "plexus-interactivity-api"; diff --git a/pkgs/development/java-modules/plexus/interpolation.nix b/pkgs/development/java-modules/plexus/interpolation.nix index 90ff3de6a3fec..f2813e103f5c6 100644 --- a/pkgs/development/java-modules/plexus/interpolation.nix +++ b/pkgs/development/java-modules/plexus/interpolation.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusInterpolation_1_11 = map (obj: fetchMaven { version = "1.11"; artifactId = "plexus-interpolation"; diff --git a/pkgs/development/java-modules/plexus/io.nix b/pkgs/development/java-modules/plexus/io.nix index eee41f5ed2fda..e2cfd4b5882d0 100644 --- a/pkgs/development/java-modules/plexus/io.nix +++ b/pkgs/development/java-modules/plexus/io.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusIo_2_0_2 = map (obj: fetchMaven { version = "2.0.2"; artifactId = "plexus-io"; diff --git a/pkgs/development/java-modules/plexus/utils.nix b/pkgs/development/java-modules/plexus/utils.nix index ce0537cea7d82..c52425342b0e7 100644 --- a/pkgs/development/java-modules/plexus/utils.nix +++ b/pkgs/development/java-modules/plexus/utils.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusUtils_1_0_4 = map (obj: fetchMaven { version = "1.0.4"; artifactId = "plexus-utils"; diff --git a/pkgs/development/java-modules/poms.nix b/pkgs/development/java-modules/poms.nix index 610f98a7e466a..d93edb7aa4fd3 100644 --- a/pkgs/development/java-modules/poms.nix +++ b/pkgs/development/java-modules/poms.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ aether_0_9_0_M2 = fetchMaven { version = "0.9.0.M2"; artifactId = "aether"; diff --git a/pkgs/development/java-modules/sisu/guice.nix b/pkgs/development/java-modules/sisu/guice.nix index 51a004ed5451d..e4d0e1f98d4a1 100644 --- a/pkgs/development/java-modules/sisu/guice.nix +++ b/pkgs/development/java-modules/sisu/guice.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ sisuGuice_2_9_4 = map (obj: fetchMaven { version = "2.9.4"; artifactId = "sisu-guice"; diff --git a/pkgs/development/java-modules/sisu/inject-bean.nix b/pkgs/development/java-modules/sisu/inject-bean.nix index bca16ccd114ca..22d3582608a32 100644 --- a/pkgs/development/java-modules/sisu/inject-bean.nix +++ b/pkgs/development/java-modules/sisu/inject-bean.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ sisuInjectBean_2_1_1 = map (obj: fetchMaven { version = "2.1.1"; artifactId = "sisu-inject-bean"; diff --git a/pkgs/development/java-modules/sisu/inject-plexus.nix b/pkgs/development/java-modules/sisu/inject-plexus.nix index 0a181dc1a1ecf..aee624c551c99 100644 --- a/pkgs/development/java-modules/sisu/inject-plexus.nix +++ b/pkgs/development/java-modules/sisu/inject-plexus.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ sisuInjectPlexus_2_1_1 = map (obj: fetchMaven { version = "2.1.1"; artifactId = "sisu-inject-plexus"; diff --git a/pkgs/development/java-modules/xerces/impl.nix b/pkgs/development/java-modules/xerces/impl.nix index 11295b3128fdd..2ea05581d0d3f 100644 --- a/pkgs/development/java-modules/xerces/impl.nix +++ b/pkgs/development/java-modules/xerces/impl.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ xercesImpl_2_8_0 = map (obj: fetchMaven { version = "2.8.0"; artifactId = "xercesImpl"; diff --git a/pkgs/development/java-modules/xml-apis/default.nix b/pkgs/development/java-modules/xml-apis/default.nix index a96e3670b4012..871629dbf3c2f 100644 --- a/pkgs/development/java-modules/xml-apis/default.nix +++ b/pkgs/development/java-modules/xml-apis/default.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ xmlApis_1_3_03 = map (obj: fetchMaven { version = "1.3.03"; artifactId = "xml-apis"; |