Naming conventions

svn path=/nixpkgs/trunk/; revision=3869
2005-09-17 23:39:03 +00:00 · 2005-09-17 23:39:03 +00:00 · a640e2a19a
commit a640e2a19a
parent a4ba616471
4 changed files with 2 additions and 2 deletions
--- a/pkgs/development/compilers/jdk/default-1.5.nix
+++ b/pkgs/development/compilers/jdk/default-1.5.nix
@ -2,7 +2,7 @@

 if stdenv.system == "i686-linux"
  then
-    (import ./j2sdk1.5-sun-linux.nix) {
+    (import ./jdk1.5-sun-linux.nix) {
      stdenv   = stdenv;
      fetchurl = fetchurl;
    }
--- a/pkgs/development/compilers/jdk/default.nix
+++ b/pkgs/development/compilers/jdk/default.nix
@ -2,7 +2,7 @@

 if stdenv.system == "i686-linux"
  then
-    (import ./j2sdk-sun-linux.nix) {
+    (import ./jdk5-sun-linux.nix) {
      inherit stdenv fetchurl;
    }
  else
--- a/pkgs/development/compilers/jdk/j2sdk-1.4.x-sun-linux.nix
+++ b/pkgs/development/compilers/jdk/j2sdk-1.4.x-sun-linux.nix
--- a/pkgs/development/compilers/jdk/j2sdk1.5-sun-linux.nix
+++ b/pkgs/development/compilers/jdk/j2sdk1.5-sun-linux.nix