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

Merged with trunk again

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10295
This commit is contained in:
Yury G. Kudryashov
2008-01-25 14:16:25 +00:00
parent 16dbde8987
commit 9b2659eec7
16 changed files with 169 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -8,16 +8,16 @@
*/
{stdenv, fetchurl, unzip}:
assert stdenv.system == "i686-linux";
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
stdenv.mkDerivation {
name = "jdk-1.5.0_14";
filename = "jdk-1_5_0_14";
dirname = "jdk1.5.0_14";
builder = ./builder.sh;
pathname = "/tmp/jdk-1_5_0_14-linux-i586.bin";
md5 = "32df8f2be09c3a0f39da1b3869164b55";
stdenv = stdenv;
pathname = if stdenv.system == "x86_64-linux" then "/tmp/jdk-1_5_0_14-linux-amd64.bin" else "/tmp/jdk-1_5_0_14-linux-i586.bin";
md5 = if stdenv.system == "x86_64-linux" then "9dc74d939dd42988280f2c22ab9521bf" else "32df8f2be09c3a0f39da1b3869164b55";
stdenv = stdenv;
inherit unzip;
}

10
pkgs/development/libraries/haskell/HDBC/HDBC-1.1.4.nix Normal file
View File

@@ -0,0 +1,10 @@
{cabal}:
cabal.mkDerivation (self : {
pname = "HDBC";
version = "1.1.4";
sha256 = "de03020874b532f7aa734f093caf0709e7d33d0d64c59ce0a003b2269fc85597";
meta = {
description = "HDBC provides an abstraction layer between Haskell programs and SQL relational databases";
};
})

12
pkgs/development/libraries/haskell/HDBC/HDBC-postgresql-1.1.4.0.nix Normal file
View File

@@ -0,0 +1,12 @@
{cabal, HDBC, postgresql}:
cabal.mkDerivation (self : {
pname = "HDBC-postgresql";
version = "1.1.4.0";
sha256 = "039eae03693330fee0e4083e22d502f94865969b243744a939786f598aec34ad";
meta = {
description = "This package provides a PostgreSQL driver for HDBC";
};
propagatedBuildInputs = [HDBC postgresql];
})

12
pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3-1.1.4.0.nix Normal file
View File

@@ -0,0 +1,12 @@
{cabal, HDBC, sqlite}:
cabal.mkDerivation (self : {
pname = "HDBC-sqlite3";
version = "1.1.4.0";
sha256 = "328fed8d4cdba4311efd50d9d60591a81481317ddba10c58fbaa2ec7f418f788";
meta = {
description = "This is the Sqlite v3 driver for HDBC, the generic database access system for Haskell";
};
propagatedBuildInputs = [HDBC sqlite];
})

2
pkgs/development/libraries/haskell/cabal/cabal.nix
View File

@@ -49,7 +49,7 @@ attrs :
for i in ${toString self.patchLibFiles}; do
echo "patching $i"
test -f $i && sed -i '/extra-libraries/ { s|\( *\)extra-libraries.*|&\n\1extra-lib-dirs: ${toString self.extraLibDirs}| }' $i
test -f $i && sed -i '/[eE]xtra-[lL]ibraries/ { s|\( *\)[eE]xtra-[lL]ibraries.*|&\n\1extra-lib-dirs: ${toString self.extraLibDirs}| }' $i
done
for i in Setup.hs Setup.lhs; do
test -f $i && ghc --make $i

14
pkgs/development/libraries/haskell/gtk2hs/default.nix
View File

@@ -1,18 +1,20 @@
{stdenv, fetchurl, pkgconfig, ghc, gtk, cairo, GConf, libglade
, glib, libgtkhtml, gtkhtml}:
stdenv.mkDerivation {
name = "gtk2hs-0.9.12.1";
stdenv.mkDerivation (rec {
pname = "gtk2hs";
version = "0.9.12.1";
fname = "${pname}-${version}";
name = "haskell-${fname}";
src = fetchurl {
url = mirror://sourceforge/gtk2hs/gtk2hs-0.9.12.1.tar.gz;
url = "mirror://sourceforge/${pname}/${fname}.tar.gz";
sha256 = "110z6v9gzhg6nzlz5gs8aafmipbva6rc50b8z1jgq0k2g25hfy22";
};
buildInputs = [pkgconfig ghc gtk glib cairo GConf libglade libgtkhtml gtkhtml];
configureFlags = [
configureFlags = [
"--enable-cairo"
];
}
})