treewide: remove redundant rec

2019-08-13 21:52:01 +00:00
parent 5061fe0c2c
commit 08f68313a4
1875 changed files with 2591 additions and 2596 deletions
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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;

--- 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}";
--- 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";
--- 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 = ''
--- 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}";
--- 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
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";