public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove old maven versions, aliased maven to maven3. Updated maven 3 to 3.0.4

This commit is contained in:
Rob Vermaas 2012-08-25 19:43:54 +02:00
parent d1d5c6d983
commit 77948b7204
4 changed files with 5 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/misc/maven/3.0.nix
View File

@ -1,15 +0,0 @@
{stdenv, fetchurl, jdk, makeWrapper}:
assert jdk != null;
stdenv.mkDerivation {
name = "apache-maven-3.0.3";
builder = ./builder.sh;
src = fetchurl {
url = mirror://apache/maven/binaries/apache-maven-3.0.3-bin.tar.gz;
sha256 = "b845479bd5d6d821210d3530c65da628a118abedd176492741e1d9bc5e400e2a";
};
buildInputs = [makeWrapper];
inherit jdk;
}

6
pkgs/misc/maven/default.nix
View File

@ -3,11 +3,11 @@
assert jdk != null; assert jdk != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "apache-maven-2.2.1"; name = "apache-maven-3.0.4";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = mirror://apache/maven/binaries/apache-maven-2.2.1-bin.tar.gz; url = mirror://apache/maven/binaries/apache-maven-3.0.4-bin.tar.gz;
sha256 = "0xnk08ndf1jx458sr5dfr8rh7wi92kyn887vqyzjm1ka91cnb8xr"; sha256 = "0bxa7x8ifm8590nxifhsh3sxzm6aicbczyx21vibg3606ih8fnnk";
}; };
buildInputs = [makeWrapper]; buildInputs = [makeWrapper];

16
pkgs/misc/maven/maven-1.0.nix
View File

@ -1,16 +0,0 @@
{stdenv, fetchurl, jdk}:
assert jdk != null;
stdenv.mkDerivation {
name = "maven-1.0.2";
mavenBinary = "maven";
builder = ./builder.sh;
src = fetchurl {
url = http://apache.cs.uu.nl/dist/maven/binaries/maven-1.0.2.tar.bz2;
md5 = "81a6b4393e550635efe19e95cea38718";
};
makeWrapper = ../../build-support/make-wrapper/make-wrapper.sh;
inherit jdk;
}

5
pkgs/top-level/all-packages.nix
View File

@ -8662,9 +8662,8 @@ let
martyr = callPackage ../development/libraries/martyr { }; martyr = callPackage ../development/libraries/martyr { };
maven = callPackage ../misc/maven/maven-1.0.nix { }; maven = maven3;
maven2 = callPackage ../misc/maven { }; maven3 = callPackage ../misc/maven { jdk = openjdk; };
maven3 = callPackage ../misc/maven/3.0.nix { };
mess = callPackage ../misc/emulators/mess { mess = callPackage ../misc/emulators/mess {
inherit (pkgs.gnome) GConf; inherit (pkgs.gnome) GConf;