From a640e2a19a218dfa2242b0b22803d40c4780ced7 Mon Sep 17 00:00:00 2001 From: Martin Bravenboer Date: Sat, 17 Sep 2005 23:39:03 +0000 Subject: [PATCH] Naming conventions svn path=/nixpkgs/trunk/; revision=3869 --- pkgs/development/compilers/jdk/default-1.5.nix | 2 +- pkgs/development/compilers/jdk/default.nix | 2 +- .../jdk/{j2sdk-sun-linux.nix => j2sdk-1.4.x-sun-linux.nix} | 0 .../jdk/{j2sdk1.5-sun-linux.nix => jdk1.5-sun-linux.nix} | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/development/compilers/jdk/{j2sdk-sun-linux.nix => j2sdk-1.4.x-sun-linux.nix} (100%) rename pkgs/development/compilers/jdk/{j2sdk1.5-sun-linux.nix => jdk1.5-sun-linux.nix} (100%) diff --git a/pkgs/development/compilers/jdk/default-1.5.nix b/pkgs/development/compilers/jdk/default-1.5.nix index c55b6b1830f..15d54865c40 100644 --- 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; } diff --git a/pkgs/development/compilers/jdk/default.nix b/pkgs/development/compilers/jdk/default.nix index d60a940245a..ccfd88bb92a 100644 --- 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 diff --git a/pkgs/development/compilers/jdk/j2sdk-sun-linux.nix b/pkgs/development/compilers/jdk/j2sdk-1.4.x-sun-linux.nix similarity index 100% rename from pkgs/development/compilers/jdk/j2sdk-sun-linux.nix rename to pkgs/development/compilers/jdk/j2sdk-1.4.x-sun-linux.nix diff --git a/pkgs/development/compilers/jdk/j2sdk1.5-sun-linux.nix b/pkgs/development/compilers/jdk/jdk1.5-sun-linux.nix similarity index 100% rename from pkgs/development/compilers/jdk/j2sdk1.5-sun-linux.nix rename to pkgs/development/compilers/jdk/jdk1.5-sun-linux.nix