public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merging from trunk

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24804
This commit is contained in:
Michael Raskin
2010-11-22 11:39:42 +00:00
parent 7715dc2beb e8320167d2
commit 6af8a1debd
21 changed files with 225 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/ghc/7.0.1.nix
View File

@@ -1,7 +1,7 @@
{stdenv, fetchurl, ghc, perl, gmp, ncurses}:
stdenv.mkDerivation rec {
version = "7.0.1-rc2";
version = "7.0.1";
name = "ghc-${version}";
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
homepage = "http://haskell.org/ghc";
src = fetchurl {
url = "http://new-www.haskell.org/ghc/dist/${version}/ghc-7.0.0.20101028-src.tar.bz2";
sha256 = "6048eb94163c96b99094960fe2e5ddd1053594323ba80548dabf50c62c1b7b71";
url = "http://new-www.haskell.org/ghc/dist/${version}/${name}-src.tar.bz2";
sha256 = "1iciljngxmqy465cw3pkl6jp0ydiils4bfz6ixfaxk7aqv7r7xsi";
};
buildInputs = [ghc perl gmp ncurses];

2
pkgs/development/compilers/jdk/default-5.nix
View File

@@ -2,7 +2,7 @@
if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"
then
(import ./jdk5-sun-linux.nix) {
(import ./jdk5-oracle-linux.nix) {
inherit stdenv fetchurl unzip;
}
else

26
pkgs/development/compilers/jdk/jdk5-oracle-linux.nix Normal file
View File

@@ -0,0 +1,26 @@
/**
* This Nix expression requires the user to download the Java 5.0 JDK
* distribution to /tmp. Please obtain jdk-1_5_0_22-linux-i586.bin for
* 32-bit systems or jdk-1_5_0_22-linux-amd64.bin for 64-bit systems
* from java.sun.com (look for archived software downloads)
* by hand and place it in /tmp. Blame Oracle, not me.
*
* Note that this is not necessary if someone has already pushed a
* binary.
*/
{stdenv, fetchurl, unzip}:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
let name = "jdk-1_5_0_22"; in
stdenv.mkDerivation {
inherit name;
filename = "jdk-1_5_0_22";
dirname = "jdk1.5.0_22";
builder = ./builder.sh;
pathname = if stdenv.system == "x86_64-linux" then "/tmp/${name}-linux-amd64.bin" else "/tmp/${name}-linux-i586.bin";
md5 = if stdenv.system == "x86_64-linux" then "b62abcaf9ea8617c50fa213bbc88824a" else "df5dae6d50d2abeafb472dde6d9a17f3";
stdenv = stdenv;
inherit unzip;
}

24
pkgs/development/compilers/jdk/jdk5-sun-linux.nix
View File

@@ -1,24 +0,0 @@
/**
* This Nix expression requires the user to download the j2sdk
* distribution to /tmp. Please obtain jdk-1_5_0_14-linux-i586.bin
* from java.sun.com by hand and place it in /tmp. Blame Sun, not me.
*
* Note that this is not necessary if someone has already pushed a
* binary.
*/
{stdenv, fetchurl, unzip}:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
let name = "jdk-1_5_0_19"; in
stdenv.mkDerivation {
inherit name;
filename = "jdk-1_5_0_19";
dirname = "jdk1.5.0_19";
builder = ./builder.sh;
pathname = if stdenv.system == "x86_64-linux" then "/tmp/${name}-linux-amd64.bin" else "/tmp/${name}-linux-i586.bin";
md5 = if stdenv.system == "x86_64-linux" then "28095941e14669d5025f66260e7b61e7" else "0d082a0c9f5a79b0895b3317c9590ec5";
stdenv = stdenv;
inherit unzip;
}