From 77948b72045bbd155098ef6ce59fdc00581c82d0 Mon Sep 17 00:00:00 2001 From: Rob Vermaas <rob.vermaas@gmail.com> Date: Sat, 25 Aug 2012 19:43:54 +0200 Subject: [PATCH] Remove old maven versions, aliased maven to maven3. Updated maven 3 to 3.0.4 --- pkgs/misc/maven/3.0.nix | 15 --------------- pkgs/misc/maven/default.nix | 6 +++--- pkgs/misc/maven/maven-1.0.nix | 16 ---------------- pkgs/top-level/all-packages.nix | 5 ++--- 4 files changed, 5 insertions(+), 37 deletions(-) delete mode 100644 pkgs/misc/maven/3.0.nix delete mode 100644 pkgs/misc/maven/maven-1.0.nix diff --git a/pkgs/misc/maven/3.0.nix b/pkgs/misc/maven/3.0.nix deleted file mode 100644 index 3d14a064a94f..000000000000 --- a/pkgs/misc/maven/3.0.nix +++ /dev/null @@ -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; -} diff --git a/pkgs/misc/maven/default.nix b/pkgs/misc/maven/default.nix index 857949016504..ec2b57e222a0 100644 --- a/pkgs/misc/maven/default.nix +++ b/pkgs/misc/maven/default.nix @@ -3,11 +3,11 @@ assert jdk != null; stdenv.mkDerivation { - name = "apache-maven-2.2.1"; + name = "apache-maven-3.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://apache/maven/binaries/apache-maven-2.2.1-bin.tar.gz; - sha256 = "0xnk08ndf1jx458sr5dfr8rh7wi92kyn887vqyzjm1ka91cnb8xr"; + url = mirror://apache/maven/binaries/apache-maven-3.0.4-bin.tar.gz; + sha256 = "0bxa7x8ifm8590nxifhsh3sxzm6aicbczyx21vibg3606ih8fnnk"; }; buildInputs = [makeWrapper]; diff --git a/pkgs/misc/maven/maven-1.0.nix b/pkgs/misc/maven/maven-1.0.nix deleted file mode 100644 index 2c84b6f006cb..000000000000 --- a/pkgs/misc/maven/maven-1.0.nix +++ /dev/null @@ -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; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa88a26c7a73..36ec708e8ca6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8662,9 +8662,8 @@ let martyr = callPackage ../development/libraries/martyr { }; - maven = callPackage ../misc/maven/maven-1.0.nix { }; - maven2 = callPackage ../misc/maven { }; - maven3 = callPackage ../misc/maven/3.0.nix { }; + maven = maven3; + maven3 = callPackage ../misc/maven { jdk = openjdk; }; mess = callPackage ../misc/emulators/mess { inherit (pkgs.gnome) GConf;