Merge branch 'nixpkgs-update' into master

11 files changed, 134 insertions, 22 deletions

diff --git a/pkgs/development/java-modules/build-maven-package.nix b/pkgs/development/java-modules/build-maven-package.nix
index a7196c6e031..432f972b0ff 100644
--- a/pkgs/development/java-modules/build-maven-package.nix
+++ b/pkgs/development/java-modules/build-maven-package.nix
@@ -1,11 +1,11 @@
-{ stdenv, maven, pkgs }:
+{ lib, stdenv, maven, pkgs }:
 { mavenDeps, src, name, meta, m2Path, skipTests ? true, quiet ? true, ... }:
 
 with builtins;
-with stdenv.lib;
+with lib;
 
 let
-  mavenMinimal = import ./maven-minimal.nix { inherit pkgs stdenv; };
+  mavenMinimal = import ./maven-minimal.nix { inherit lib pkgs ; };
 in stdenv.mkDerivation rec {
   inherit mavenDeps src name meta m2Path;
 
diff --git a/pkgs/development/java-modules/jogl/default.nix b/pkgs/development/java-modules/jogl/default.nix
index 574629d8efd..5f20adada23 100644
--- a/pkgs/development/java-modules/jogl/default.nix
+++ b/pkgs/development/java-modules/jogl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, ant, jdk, git, xorg, udev, libGL, libGLU }:
+{ lib, stdenv, fetchgit, ant, jdk8, git, xorg, udev, libGL, libGLU }:
 
 {
   jogl_2_3_2 =
@@ -28,7 +28,8 @@
           -exec sed -i 's@"libGLU.so"@"${libGLU}/lib/libGLU.so"@' {} \;
       '';
 
-      nativeBuildInputs = [ jdk ant git ];
+      # TODO: upgrade to jdk https://github.com/NixOS/nixpkgs/pull/89731
+      nativeBuildInputs = [ jdk8 ant git ];
       buildInputs = [ udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXt xorg.libXxf86vm xorg.libXrender ];
 
       buildPhase = ''
@@ -54,7 +55,7 @@
         cp $NIX_BUILD_TOP/jogl/build/jar/jogl-all{,-natives-linux-amd64}.jar  $out/share/java/
       '';
 
-      meta = with stdenv.lib; {
+      meta = with lib; {
         description = "Java libraries for 3D Graphics, Multimedia and Processing";
         homepage = "https://jogamp.org/";
         license = licenses.bsd3;
diff --git a/pkgs/development/java-modules/junit/default.nix b/pkgs/development/java-modules/junit/default.nix
index dbbce6b6262..79f73879e6b 100644
--- a/pkgs/development/java-modules/junit/default.nix
+++ b/pkgs/development/java-modules/junit/default.nix
@@ -1,12 +1,17 @@
-{ stdenv, pkgs, mavenbuild, fetchMaven }:
+{ lib, pkgs, mavenbuild, fetchMaven, maven, jdk8 }:
 
 with pkgs.javaPackages;
 
 let
   poms = import (../poms.nix) { inherit fetchMaven; };
   collections = import (../collections.nix) { inherit pkgs; };
+  mavenbuild-jdk8 = mavenbuild.override {
+    maven = maven.override {
+      jdk = jdk8;
+    };
+  };
 in rec {
-  junitGen = { mavenDeps, sha512, version }: mavenbuild {
+  junitGen = { mavenDeps, sha512, version }: mavenbuild-jdk8 {
     inherit mavenDeps sha512 version;
 
     name = "junit-${version}";
@@ -21,9 +26,9 @@ in rec {
     meta = {
       homepage = "https://junit.org/junit4/";
       description = "Simple framework to write repeatable tests. It is an instance of the xUnit architecture for unit testing frameworks";
-      license = stdenv.lib.licenses.epl10;
-      platforms = stdenv.lib.platforms.all;
-      maintainers = with stdenv.lib.maintainers;
+      license = lib.licenses.epl10;
+      platforms = lib.platforms.all;
+      maintainers = with lib.maintainers;
         [ nequissimus ];
     };
   };
diff --git a/pkgs/development/java-modules/maven-hello/default.nix b/pkgs/development/java-modules/maven-hello/default.nix
index b4639d9ee1d..96d0031270b 100644
--- a/pkgs/development/java-modules/maven-hello/default.nix
+++ b/pkgs/development/java-modules/maven-hello/default.nix
@@ -1,11 +1,21 @@
-{ stdenv, pkgs, mavenbuild }:
+{ lib
+, pkgs
+, mavenbuild
+, maven
+, jdk8
+}:
 
 with pkgs.javaPackages;
 
 let
   poms = import ../poms.nix { inherit fetchMaven; };
+  mavenbuild-jdk8 = mavenbuild.override {
+    maven = maven.override {
+      jdk = jdk8;
+    };
+  };
 in rec {
-  mavenHelloRec = { mavenDeps, sha512, version, skipTests ? true, quiet ? true }: mavenbuild {
+  mavenHelloRec = { mavenDeps, mavenbuild, sha512, version, skipTests ? true, quiet ? true }: mavenbuild {
     inherit mavenDeps sha512 version skipTests quiet;
 
     name = "maven-hello-${version}";
@@ -20,9 +30,9 @@ in rec {
     meta = {
       homepage = "https://github.com/NeQuissimus/maven-hello/";
       description = "Maven Hello World";
-      license = stdenv.lib.licenses.unlicense;
-      platforms = stdenv.lib.platforms.all;
-      maintainers = with stdenv.lib.maintainers;
+      license = lib.licenses.unlicense;
+      platforms = lib.platforms.all;
+      maintainers = with lib.maintainers;
         [ nequissimus ];
     };
   };
@@ -31,6 +41,7 @@ in rec {
     mavenDeps = [];
     sha512 = "3kv5z1i02wfb0l5x3phbsk3qb3wky05sqn4v3y4cx56slqfp9z8j76vnh8v45ydgskwl2vs9xjx6ai8991mzb5ikvl3vdgmrj1j17p2";
     version = "1.0";
+    mavenbuild = mavenbuild-jdk8;
   };
 
   mavenHello_1_1 = mavenHelloRec {
@@ -39,5 +50,6 @@ in rec {
     version = "1.1";
     skipTests = false;
     quiet = false;
+    mavenbuild = mavenbuild-jdk8;
   };
 }
diff --git a/pkgs/development/java-modules/maven-minimal.nix b/pkgs/development/java-modules/maven-minimal.nix
index c1fab1e9bc9..d966a75bb9d 100644
--- a/pkgs/development/java-modules/maven-minimal.nix
+++ b/pkgs/development/java-modules/maven-minimal.nix
@@ -1,6 +1,6 @@
-{ stdenv, pkgs }:
+{ lib, pkgs }:
 
-with stdenv.lib;
+with lib;
 with pkgs.javaPackages;
 
 let
@@ -83,6 +83,7 @@ in {
       apache_10
       apache_11
       apache_13
+      apache_14
       backportUtilConcurrent_3_1
       commonsParent_22
       doxia_1_0_alpha7
@@ -98,9 +99,11 @@ in {
       mavenParent_21
       mavenParent_22
       mavenParent_23
+      mavenParent_24
       mavenPlugins_22
       mavenPlugins_23
       mavenPlugins_24
+      mavenPlugins_25
       mavenPluginTools_3_1
       mavenReporting_2_0_6
       mavenReporting_2_0_9
@@ -121,7 +124,9 @@ in {
       plexus_3_3_1
       plexusCipher_1_4
       plexusCompiler_2_2
+      plexusCompiler_2_4
       plexusCompilers_2_2
+      plexusCompilers_2_4
       plexusComponents_1_1_7
       plexusComponents_1_1_14
       plexusComponents_1_1_15
diff --git a/pkgs/development/java-modules/maven/compiler-plugin.nix b/pkgs/development/java-modules/maven/compiler-plugin.nix
new file mode 100644
index 00000000000..b35b5660e80
--- /dev/null
+++ b/pkgs/development/java-modules/maven/compiler-plugin.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+{
+  mavenCompiler_3_2 = map (obj: fetchMaven {
+    version = "3.2";
+    artifactId = "maven-compiler-plugin";
+    groupId = "org.apache.maven.plugins";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "15lncacbgsbkp6m4fb1hv41nxn0w8lxgpjcpghw3znbh909d2y5h70q2nw3fyhd7kqsjwpvwpilkgyd5b35vi1smj5hhapmakqjk28r"; }
+    { type = "pom"; sha512 = "0a9pnb9rscsc32gpjr257k1pnydpskcs4jx8bs88vikxbdgc5sppllmqhi7k00i19azy2vjj59b3m9dcklcspmy9caxv2l7vjyr2lm0"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/plexus/compiler-api.nix b/pkgs/development/java-modules/plexus/compiler-api.nix
index a1c6556a769..f778e7cf29a 100644
--- a/pkgs/development/java-modules/plexus/compiler-api.nix
+++ b/pkgs/development/java-modules/plexus/compiler-api.nix
@@ -11,4 +11,15 @@
     { type = "jar"; sha512 = "3by7icjfiymp7g2v1ci5dqwml6ibzh2njyg2w43kvaz3ydcxkzmfg5s97wsdqjsii7vdgqyhr16ydsn6mr90wbjvsi6wasaq1rqa812"; }
     { type = "pom"; sha512 = "0pdl78hp921lgkfya54wl8hxgm1c5474j1p921q5ix1knx1rlr4klpjwx212wy2m7b6bxq0bkf8n66mqjr72rh2rh308qij00ymrga8"; }
   ];
+
+  plexusCompilerApi_2_4 = map (obj: fetchMaven {
+    version = "2.4";
+    artifactId = "plexus-compiler-api";
+    groupId = "org.codehaus.plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "1xm0lv43dbg33prr0vc7g3vv0r07qc7kxjjbpqkxyh60vryd9q2wj3r656z4x8fwwqjrpr9xb4lmn4nm0c1cn85xzhfpxiq13rnl8cr"; }
+    { type = "pom"; sha512 = "0mqghnfagrmws585bvdwbpf1c719jvbmhwb318vw661cjfzj1b55nvjxza49bx5y38kwnwk0cqk9f26pv323ng09iifyjxgzafqq479"; }
+  ];
 }
diff --git a/pkgs/development/java-modules/plexus/compiler-javac.nix b/pkgs/development/java-modules/plexus/compiler-javac.nix
index d86240b6d45..0e73caf5872 100644
--- a/pkgs/development/java-modules/plexus/compiler-javac.nix
+++ b/pkgs/development/java-modules/plexus/compiler-javac.nix
@@ -11,4 +11,15 @@
     { type = "jar"; sha512 = "12xsiaqd1q6mmmkcsxf4nr4wdjl8fa1nwz32yqwrrbj9cgakph0368cnk1apjzngsmnl6bws87nlxcz64sg0rb7i2vdzggplj0a41br"; }
     { type = "pom"; sha512 = "1fv2ij4h9xmzv3f5mvs0ilhkw7khkw5v8n1d97a2canfn254fipz7pd9nkmkqzjvy3cqwiczyh2nzibvcii624p8ggwl4s3yjw92jx4"; }
   ];
+
+  plexusCompilerJavac_2_4 = map (obj: fetchMaven {
+    version = "2.4";
+    artifactId = "plexus-compiler-javac";
+    groupId = "org.codehaus.plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "272iaf7mgmhjssj0k4a9r8rzb3c8pskb4aqypcdvj217l8hbih6rsqhh9nd2xmwrwa1ifvc336b8ihz6f419lj74gp4p1za6mp0nps3"; }
+    { type = "pom"; sha512 = "1g16i5w610nsh9h0yyhw25fpr2lx562c4v8y17lw53imi4rhm0m709ysrbrh71rhv6f8g4i5d6wgps77jmdb5kn2h5k1n4n644wrd12"; }
+  ];
 }
diff --git a/pkgs/development/java-modules/plexus/compiler-manager.nix b/pkgs/development/java-modules/plexus/compiler-manager.nix
index 3f27981b154..c639780ca0b 100644
--- a/pkgs/development/java-modules/plexus/compiler-manager.nix
+++ b/pkgs/development/java-modules/plexus/compiler-manager.nix
@@ -11,4 +11,15 @@
     { type = "jar"; sha512 = "1r1sdj784x4zcnkaz840vsz36jn1p2j98c21nia56kcdl1njydjn714bsmdy816l6sdinkz4s196mm3hshmxhq8mkmf16wgxx8jnq94"; }
     { type = "pom"; sha512 = "3cpfnbgil6g0bgq0cjbq2ysfjdpl05fh72d9l9cnwbilcsaxcmzn1hgmmkvam2ih222nl82dy7n5020is3y05kiv0i4n4lcs5m0ia48"; }
   ];
+
+  plexusCompilerManager_2_4 = map (obj: fetchMaven {
+    version = "2.4";
+    artifactId = "plexus-compiler-manager";
+    groupId = "org.codehaus.plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "2al10188nwrdmi9zk3bid4ijjfsa8ymh6m9hin5jsja7hx7anbvs3i2y7kall56h4qn7j1rj73f8499x3i2k6x53kszmksvd2a1pkd4"; }
+    { type = "pom"; sha512 = "2bb2yrvjxci7wx7ira5cnnzdmlzdx4fk59fddpnmvdgh06dmg7fbnjlyx73pn6b13ajjrjl7rgj26mqs2hid3c0p3ni6x1qsg9w3ip0"; }
+  ];
 }
diff --git a/pkgs/development/java-modules/poms.nix b/pkgs/development/java-modules/poms.nix
index d93edb7aa4f..4e314605b79 100644
--- a/pkgs/development/java-modules/poms.nix
+++ b/pkgs/development/java-modules/poms.nix
@@ -105,6 +105,14 @@
     type = "pom";
   };
 
+  apache_14 = fetchMaven {
+    version = "14";
+    artifactId = "apache";
+    groupId = "org.apache";
+    sha512 = "08y5k9lny2z171c78l4j70miylj2xy8w48amqwcghy3p9pc1p19qx6146s4mxc2z4wx4z9gpi9agham46m5hqa6k6v2s16v80phi7xi";
+    type = "pom";
+  };
+
   asmParent_4_0 = fetchMaven {
     version = "4.0";
     artifactId = "asm-parent";
@@ -345,6 +353,14 @@
     type = "pom";
   };
 
+  mavenParent_24 = fetchMaven {
+    version = "24";
+    artifactId = "maven-parent";
+    groupId = "org.apache.maven";
+    sha512 = "0w1v36qx53xv5m8kag6wakzy7rjrp4gzfp7zfmrp5kw13ik6k42fnfkknslqc2g2c5dyxra2vpbvz1z9bcqslyaljd4r1rj3qbh5vl7";
+    type = "pom";
+  };
+
   mavenPlugins_22 = fetchMaven {
     version = "22";
     artifactId = "maven-plugins";
@@ -369,6 +385,14 @@
     type = "pom";
   };
 
+  mavenPlugins_25 = fetchMaven {
+    version = "25";
+    artifactId = "maven-plugins";
+    groupId = "org.apache.maven.plugins";
+    sha512 = "38zx1im9qnblr5p9r4ln91d2280x48n9a11j4476skrgh97l3iqxs5ggqc22wis7r53g4j8ya4dvzqhxx6gymfbz3cn6a6hcmdqbng5";
+    type = "pom";
+  };
+
   mavenPluginTools_3_1 = fetchMaven {
     version = "3.1";
     artifactId = "maven-plugin-tools";
@@ -593,6 +617,14 @@
     type = "pom";
   };
 
+  plexusCompiler_2_4 = fetchMaven {
+    version = "2.4";
+    artifactId = "plexus-compiler";
+    groupId = "org.codehaus.plexus";
+    sha512 = "0v89a5kbgyphmvgmdf6kb7zi4fvq16l435cxsp7grc5jy4ir9d0dv5g7xwhsk9ajp1lcy9kp4l4bk2h93g4kvj3bhk548wv284y36bf";
+    type = "pom";
+  };
+
   plexusCompilers_2_2 = fetchMaven {
     version = "2.2";
     artifactId = "plexus-compilers";
@@ -601,6 +633,14 @@
     type = "pom";
   };
 
+  plexusCompilers_2_4 = fetchMaven {
+    version = "2.4";
+    artifactId = "plexus-compilers";
+    groupId = "org.codehaus.plexus";
+    sha512 = "1zalxaqycaykdn6q6pnxki6yvlpaf5qap1903hcylhbi1gcwmpqys39xg4pah9giy9iis350w2dmsab2prib9lihz4s9z6s6adqcss2";
+    type = "pom";
+  };
+
   plexusComponents_1_1_4 = fetchMaven {
     version = "1.1.4";
     artifactId = "plexus-components";
diff --git a/pkgs/development/java-modules/postgresql_jdbc/default.nix b/pkgs/development/java-modules/postgresql_jdbc/default.nix
index 01041d77539..524273e080f 100644
--- a/pkgs/development/java-modules/postgresql_jdbc/default.nix
+++ b/pkgs/development/java-modules/postgresql_jdbc/default.nix
@@ -1,23 +1,25 @@
-{ stdenv, fetchMavenArtifact }:
+{ lib, stdenv, fetchMavenArtifact }:
 
 stdenv.mkDerivation rec {
   pname = "postgresql-jdbc";
-  version = "42.2.5";
+  version = "42.2.20";
 
   src = fetchMavenArtifact {
     artifactId = "postgresql";
     groupId = "org.postgresql";
-    sha256 = "1p0cbb7ka41xxipzjy81hmcndkqynav22xyipkg7qdqrqvw4dykz";
+    sha256 = "0kjilsrz9shymfki48kg1q84la1870ixlh2lnfw347x8mqw2k2vh";
     inherit version;
   };
 
   phases = [ "installPhase" ];
 
   installPhase = ''
+    runHook preInstall
     install -m444 -D $src/share/java/*postgresql-${version}.jar $out/share/java/postgresql-jdbc.jar
+    runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://jdbc.postgresql.org/";
     description = "JDBC driver for PostgreSQL allowing Java programs to connect to a PostgreSQL database";
     license = licenses.bsd2;