about summary refs log tree commit diff
path: root/pkgs/development/compilers
diff options
context:
space:
mode:
authorMartin Bravenboer <martin.bravenboer@logicblox.com>2005-09-17 23:40:23 +0000
committerMartin Bravenboer <martin.bravenboer@logicblox.com>2005-09-17 23:40:23 +0000
commit3919e7593ae7feef27c91842a2c49a7539ee7a01 (patch)
tree11d837297631ad711fa913c62855017125310148 /pkgs/development/compilers
parenta640e2a19a218dfa2242b0b22803d40c4780ced7 (diff)
downloadnixlib-3919e7593ae7feef27c91842a2c49a7539ee7a01.tar
nixlib-3919e7593ae7feef27c91842a2c49a7539ee7a01.tar.gz
nixlib-3919e7593ae7feef27c91842a2c49a7539ee7a01.tar.bz2
nixlib-3919e7593ae7feef27c91842a2c49a7539ee7a01.tar.lz
nixlib-3919e7593ae7feef27c91842a2c49a7539ee7a01.tar.xz
nixlib-3919e7593ae7feef27c91842a2c49a7539ee7a01.tar.zst
nixlib-3919e7593ae7feef27c91842a2c49a7539ee7a01.zip
Naming conventions
svn path=/nixpkgs/trunk/; revision=3870
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r--pkgs/development/compilers/jdk/default-1.5.nix10
-rw-r--r--pkgs/development/compilers/jdk/jdk5-sun-linux.nix (renamed from pkgs/development/compilers/jdk/jdk1.5-sun-linux.nix)0
2 files changed, 0 insertions, 10 deletions
diff --git a/pkgs/development/compilers/jdk/default-1.5.nix b/pkgs/development/compilers/jdk/default-1.5.nix
deleted file mode 100644
index 15d54865c40a..000000000000
--- a/pkgs/development/compilers/jdk/default-1.5.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{stdenv, fetchurl}: 
-
-if stdenv.system == "i686-linux"
-  then
-    (import ./jdk1.5-sun-linux.nix) {
-      stdenv   = stdenv;
-      fetchurl = fetchurl;
-    }
-  else
-    false
diff --git a/pkgs/development/compilers/jdk/jdk1.5-sun-linux.nix b/pkgs/development/compilers/jdk/jdk5-sun-linux.nix
index 89fd6ab2a545..89fd6ab2a545 100644
--- a/pkgs/development/compilers/jdk/jdk1.5-sun-linux.nix
+++ b/pkgs/development/compilers/jdk/jdk5-sun-linux.nix