Unverified Commit f7617f47 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #326566 from SuperSandro2000/maven-nox

parents 2d1e08a2 ea0bc322

pkgs/applications/science/misc/gephi/default.nix

+2 −6
Original line number Diff line number Diff line 
{ lib, fetchFromGitHub, jdk11, maven, jogl }:



let

  mavenJdk11 = maven.override {

    jdk = jdk11;

  };

in

mavenJdk11.buildMavenPackage rec {

maven.buildMavenPackage rec {

  pname = "gephi";

  version = "0.10.1";
@@ -16,6 +11,7 @@ mavenJdk11.buildMavenPackage rec { 
    hash = "sha256-ZNSEaiD32zFfF2ISKa1CmcT9Nq6r5i2rNHooQAcVbn4=";

  };



  mvnJdk = jdk11;

  mvnHash = "sha256-/2/Yb26Ry0NHQQ3j0LXnjwC0wQqJiztvTgWixyMJqvg=";



  nativeBuildInputs = [ jdk11 ];

pkgs/applications/science/misc/openrefine/default.nix

+3 −6
Original line number Diff line number Diff line
@@ -7,14 +7,9 @@ 
, jq

, makeWrapper

, maven

, writeText

}:



let

  maven' = maven.override {

    inherit jdk;

  };



  version = "3.8.1";

  src = fetchFromGitHub {

    owner = "openrefine";
@@ -47,7 +42,7 @@ let 
    '';

  };



in maven'.buildMavenPackage {

in maven.buildMavenPackage {

  inherit src version;



  pname = "openrefine";
@@ -55,6 +50,8 @@ in maven'.buildMavenPackage { 
  postPatch = ''

    cp -r ${npmPkg} main/webapp/modules/core/3rdparty

  '';



  mvnJdk = jdk;

  mvnParameters = "-pl !packaging";

  mvnHash = "sha256-FD4g0Mshz39N1h8MDAk907PhF5TguWTZ7AXKECHuhzQ=";

pkgs/by-name/ma/maven/build-maven-package.nix

+6 −0
Original line number Diff line number Diff line 
{ lib

, stdenv

, jdk

, maven

}:
@@ -10,6 +11,7 @@ 
, patches ? [ ]

, pname

, version

, mvnJdk ? jdk

, mvnHash ? ""

, mvnFetchExtraArgs ? { }

, mvnDepsParameters ? ""
@@ -32,6 +34,8 @@ let 
      maven

    ] ++ args.nativeBuildInputs or [ ];



    JAVA_HOME = mvnJdk;



    buildPhase = ''

      runHook preBuild

    '' + lib.optionalString buildOffline ''
@@ -83,6 +87,8 @@ stdenv.mkDerivation (builtins.removeAttrs args [ "mvnFetchExtraArgs" ] // { 
    maven

  ];



  JAVA_HOME = mvnJdk;



  buildPhase = ''

    runHook preBuild

pkgs/by-name/ma/maven/package.nix

+5 −5
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ 
  lib,

  callPackage,

  fetchurl,

  jdk,

  jdk_headless,

  makeWrapper,

  stdenvNoCC,

}:



stdenvNoCC.mkDerivation (finalAttrs: {

  pname = "apache-maven";

  pname = "maven";

  version = "3.9.8";



  src = fetchurl {
@@ -27,9 +27,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { 
    cp -r apache-maven-${finalAttrs.version}/* $out/maven



    makeWrapper $out/maven/bin/mvn $out/bin/mvn \

      --set-default JAVA_HOME "${jdk}"

      --set-default JAVA_HOME "${jdk_headless}"

    makeWrapper $out/maven/bin/mvnDebug $out/bin/mvnDebug \

      --set-default JAVA_HOME "${jdk}"

      --set-default JAVA_HOME "${jdk_headless}"



    runHook postInstall

  '';
@@ -55,6 +55,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { 
    license = lib.licenses.asl20;

    mainProgram = "mvn";

    maintainers = with lib.maintainers; [ ];

    inherit (jdk.meta) platforms;

    inherit (jdk_headless.meta) platforms;

  };

})

pkgs/by-name/pr/protege/package.nix

+2 −4
Original line number Diff line number Diff line
@@ -8,10 +8,7 @@ 
, maven

}:



let

  mvn = maven.override { jdk = jdk11; };

in

mvn.buildMavenPackage rec {

maven.buildMavenPackage rec {

  pname = "protege";

  version = "5.6.4";
@@ -22,6 +19,7 @@ mvn.buildMavenPackage rec { 
    hash = "sha256-Q3MHa7nCeF31n7JPltcemFBc/sJwGA9Ev0ymjQhY/U0=";

  };



  mvnJdk = jdk11;

  mvnHash = "sha256-kemP2gDv1CYuaoK0fwzBxdLTusarPasf2jCDQj/HPYE=";



  patches = [