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

* Added wxHaskell.

Browse Source 
* Added GNU MP, use it in pycrypto.

svn path=/nixpkgs/trunk/; revision=7343
This commit is contained in:
Eelco Dolstra 2006-12-13 22:29:40 +00:00
parent a6ca6b0612
commit fb73ce99f2
4 changed files with 57 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/gmp/default.nix Normal file
View File

@ -0,0 +1,11 @@
{stdenv, fetchurl, m4}:
stdenv.mkDerivation {
name = "gmp-4.2.1";
src = fetchurl {
url = http://ftp.sunet.se/pub/gnu/gmp/gmp-4.2.1.tar.bz2;
md5 = "091c56e0e1cca6b09b17b69d47ef18e3";
};
buildInputs = [m4];
doCheck = true;
}

13
pkgs/development/libraries/haskell/wxHaskell/default.nix Normal file
View File

@ -0,0 +1,13 @@
{stdenv, fetchurl, unzip, ghc, wxGTK}:
stdenv.mkDerivation {
name = "wxHaskell-0.9.4-1";
src = fetchurl {
url = http://mesh.dl.sourceforge.net/sourceforge/wxhaskell/wxhaskell-src-0.9.4-1.zip;
md5 = "69c3876e1c8ed810cef9db7ed442cb89";
};
#builder = ./builder.sh;
buildInputs = [unzip ghc wxGTK];
installCommand = "make install-files";
# inherit ghc;
}

9
pkgs/development/python-modules/pycrypto/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, python}:
{stdenv, fetchurl, python, gmp}:
stdenv.mkDerivation {
name = "pycrypto-2.0.1";
@ -6,7 +6,10 @@ stdenv.mkDerivation {
url = http://www.amk.ca/files/python/crypto/pycrypto-2.0.1.tar.gz;
md5 = "4d5674f3898a573691ffb335e8d749cd";
};
buildInputs = [python];
buildInputs = [python gmp];
buildPhase = "true";
installPhase = "python ./setup.py install --prefix=$out";
installPhase = "
python ./setup.py build_ext --library-dirs=${gmp}/lib
python ./setup.py install --prefix=$out
";
}

46
pkgs/top-level/all-packages.nix
View File

@ -682,10 +682,9 @@ rec {
});
ghc = import ../development/compilers/ghc {
inherit fetchurl stdenv perl ncurses readline;
inherit fetchurl stdenv perl ncurses readline m4;
gcc = stdenv.gcc;
ghc = ghcboot;
m4 = gnum4;
};
ghcboot = import ../development/compilers/ghc/boot.nix {
@ -954,13 +953,11 @@ rec {
autoconf = autoconf259;
autoconf259 = import ../development/tools/misc/autoconf {
inherit fetchurl stdenv perl;
m4 = gnum4;
inherit fetchurl stdenv perl m4;
};
autoconf260 = import ../development/tools/misc/autoconf-2.60 {
inherit fetchurl stdenv perl;
m4 = gnum4;
inherit fetchurl stdenv perl m4;
};
automake = automake19x;
@ -996,13 +993,11 @@ rec {
bison = bison1875;
bison1875 = import ../development/tools/parsing/bison/bison-1.875.nix {
inherit fetchurl stdenv;
m4 = gnum4;
inherit fetchurl stdenv m4;
};
bison23 = import ../development/tools/parsing/bison/bison-2.3.nix {
inherit fetchurl stdenv;
m4 = gnum4;
inherit fetchurl stdenv m4;
};
ctags = import ../development/tools/misc/ctags {
@ -1012,14 +1007,15 @@ rec {
flex = flex254a;
flex2533 = import ../development/tools/parsing/flex/flex-2.5.33.nix {
inherit fetchurl stdenv yacc;
m4 = gnum4;
inherit fetchurl stdenv yacc m4;
};
flex254a = import ../development/tools/parsing/flex/flex-2.5.4a.nix {
inherit fetchurl stdenv yacc;
};
m4 = gnum4;
gnum4 = import ../development/tools/misc/gnum4 {
inherit fetchurl stdenv;
};
@ -1060,8 +1056,7 @@ rec {
};
libtool = import ../development/tools/misc/libtool {
inherit fetchurl stdenv perl;
m4 = gnum4;
inherit fetchurl stdenv perl m4;
};
mk = import ../development/tools/build-managers/mk {
@ -1192,8 +1187,7 @@ rec {
};
beecrypt = import ../development/libraries/beecrypt {
inherit fetchurl stdenv;
m4 = gnum4;
inherit fetchurl stdenv m4;
};
boehmgc = import ../development/libraries/boehm-gc {
@ -1287,6 +1281,10 @@ rec {
inherit (gtkLibs) glib;
};
gmp = import ../development/libraries/gmp {
inherit fetchurl stdenv m4;
};
gnet = import ../development/libraries/gnet {
inherit fetchurl stdenv pkgconfig;
inherit (gtkLibs) glib;
@ -1789,6 +1787,17 @@ rec {
inherit stdenv fetchurl ghc;
};
wxHaskell = import ../development/libraries/haskell/wxHaskell {
inherit fetchurl unzip ghc;
stdenv = stdenvNew;
wxGTK = import ../development/libraries/wxGTK-2.6 {
inherit fetchurl stdenv pkgconfig;
inherit (gtkLibs) gtk;
inherit (xlibs) libXinerama;
unicode = false; # not supported by GHC/wxHaskell yet
};
};
### DEVELOPMENT / PERL MODULES
@ -1958,7 +1967,7 @@ rec {
pycrypto = import ../development/python-modules/pycrypto {
inherit fetchurl stdenv python;
inherit fetchurl stdenv python gmp;
};
pygtk = import ../development/python-modules/pygtk {
@ -2954,8 +2963,7 @@ rec {
};
uml = import ../misc/uml {
inherit fetchurl stdenv perl modutils;
m4 = gnum4;
inherit fetchurl stdenv perl modutils m4;
gcc = gcc33;
};