diff options
| author | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2005-09-17 23:39:03 +0000 |
|---|---|---|
| committer | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2005-09-17 23:39:03 +0000 |
| commit | a640e2a19a218dfa2242b0b22803d40c4780ced7 (patch) | |
| tree | 2a88710c379874a15a80a0028d8d5fc3e3cf1aee /pkgs/development/compilers | |
| parent | a4ba61647165edc1a1651cf0554ac8f31efa34d5 (diff) | |
| download | nixlib-a640e2a19a218dfa2242b0b22803d40c4780ced7.tar nixlib-a640e2a19a218dfa2242b0b22803d40c4780ced7.tar.gz nixlib-a640e2a19a218dfa2242b0b22803d40c4780ced7.tar.bz2 nixlib-a640e2a19a218dfa2242b0b22803d40c4780ced7.tar.lz nixlib-a640e2a19a218dfa2242b0b22803d40c4780ced7.tar.xz nixlib-a640e2a19a218dfa2242b0b22803d40c4780ced7.tar.zst nixlib-a640e2a19a218dfa2242b0b22803d40c4780ced7.zip | |
Naming conventions
svn path=/nixpkgs/trunk/; revision=3869
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/jdk/default-1.5.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/jdk/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/jdk/j2sdk-1.4.x-sun-linux.nix (renamed from pkgs/development/compilers/jdk/j2sdk-sun-linux.nix) | 0 | ||||
| -rw-r--r-- | pkgs/development/compilers/jdk/jdk1.5-sun-linux.nix (renamed from pkgs/development/compilers/jdk/j2sdk1.5-sun-linux.nix) | 0 |
4 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/jdk/default-1.5.nix b/pkgs/development/compilers/jdk/default-1.5.nix index c55b6b1830f7..15d54865c40a 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 d60a940245af..ccfd88bb92ae 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 index 846055ce523d..846055ce523d 100644 --- a/pkgs/development/compilers/jdk/j2sdk-sun-linux.nix +++ b/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 index 89fd6ab2a545..89fd6ab2a545 100644 --- a/pkgs/development/compilers/jdk/j2sdk1.5-sun-linux.nix +++ b/pkgs/development/compilers/jdk/jdk1.5-sun-linux.nix |