diff options
| author | NeQuissimus <steinbach.tim@googlemail.com> | 2016-11-14 19:23:08 -0500 |
|---|---|---|
| committer | NeQuissimus <steinbach.tim@googlemail.com> | 2016-11-14 19:23:08 -0500 |
| commit | 0e10bfa24646637e7054eb8235b260e02c6953a0 (patch) | |
| tree | 2aff3b49cb6727ca430bf10cd1466a35014a0e6f /pkgs | |
| parent | 5d54cfd7a4474c952faccd24dba10844f8348778 (diff) | |
| download | nixpkgs-0e10bfa24646637e7054eb8235b260e02c6953a0.tar nixpkgs-0e10bfa24646637e7054eb8235b260e02c6953a0.tar.gz nixpkgs-0e10bfa24646637e7054eb8235b260e02c6953a0.tar.bz2 nixpkgs-0e10bfa24646637e7054eb8235b260e02c6953a0.tar.lz nixpkgs-0e10bfa24646637e7054eb8235b260e02c6953a0.tar.xz nixpkgs-0e10bfa24646637e7054eb8235b260e02c6953a0.tar.zst nixpkgs-0e10bfa24646637e7054eb8235b260e02c6953a0.zip | |
maven_hello: Add 1.1, add ability to choose skipping tests
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/java-modules/build-maven-package.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/java-modules/maven-hello/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/java-packages.nix | 3 |
3 files changed, 13 insertions, 5 deletions
diff --git a/pkgs/development/java-modules/build-maven-package.nix b/pkgs/development/java-modules/build-maven-package.nix index 203fa88aa00..10dabadb50c 100644 --- a/pkgs/development/java-modules/build-maven-package.nix +++ b/pkgs/development/java-modules/build-maven-package.nix @@ -1,5 +1,5 @@ { stdenv, maven, pkgs }: -{ mavenDeps, src, name, meta, m2Path, ... }: +{ mavenDeps, src, name, meta, m2Path, skipTests ? true, ... }: with builtins; with stdenv.lib; @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { echo "<settings><mirrors>\ <mirror><id>tmpm2</id><url>file://$out/m2</url><mirrorOf>*</mirrorOf></mirror></mirrors>\ <localRepository>$out/m2</localRepository></settings>" >> $out/m2/settings.xml - ${maven}/bin/mvn clean package -Dmaven.test.skip=true -Danimal.sniffer.skip=true -gs $out/m2/settings.xml + ${maven}/bin/mvn clean package -Dmaven.test.skip=${if skipTests then "true" else "false"} -Danimal.sniffer.skip=true -gs $out/m2/settings.xml cp -v ./target/*.jar $out/target/ ''; } diff --git a/pkgs/development/java-modules/maven-hello/default.nix b/pkgs/development/java-modules/maven-hello/default.nix index feb3146ffd6..a1a6cfce6b4 100644 --- a/pkgs/development/java-modules/maven-hello/default.nix +++ b/pkgs/development/java-modules/maven-hello/default.nix @@ -3,8 +3,8 @@ with pkgs.javaPackages; rec { - mavenHelloRec = { mavenDeps, sha512, version }: mavenbuild rec { - inherit mavenDeps sha512 version; + mavenHelloRec = { mavenDeps, sha512, version, skipTests }: mavenbuild rec { + inherit mavenDeps sha512 version skipTests; name = "maven-hello-${version}"; src = pkgs.fetchFromGitHub { @@ -30,4 +30,11 @@ rec { sha512 = "3kv5z1i02wfb0l5x3phbsk3qb3wky05sqn4v3y4cx56slqfp9z8j76vnh8v45ydgskwl2vs9xjx6ai8991mzb5ikvl3vdgmrj1j17p2"; version = "1.0"; }; + + mavenHello_1_1 = mavenHelloRec { + mavenDeps = [ junit_4_12 ]; + sha512 = "3dhgl5z3nzqskjjcggrjyz37r20b0m5vhfzbx382qyqcy4d2jdhkl7v1ajhcg8vkz0qdzq85k09w5is81hybv8sd09h3hgb3rrigdaq"; + version = "1.1"; + skipTests = false; + }; } diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index 2865418eb92..488f4cb59db 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -104,7 +104,8 @@ in { mavenFiltering_1_1; inherit (callPackage ../development/java-modules/maven-hello { inherit mavenbuild; }) - mavenHello_1_0; + mavenHello_1_0 + mavenHello_1_1; inherit (callPackage ../development/java-modules/maven/model.nix { inherit fetchMaven; }) mavenModel_2_0_6 |