Updating FPC and Lazarus - works OK with new glib

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33367
This commit is contained in:
Michael Raskin 2012-03-23 05:55:13 +00:00
parent c4b9da5949
commit f5cc572d8b
2 changed files with 4 additions and 4 deletions

View File

@ -3,12 +3,12 @@
let startFPC = import ./binary.nix { inherit stdenv fetchurl; }; in let startFPC = import ./binary.nix { inherit stdenv fetchurl; }; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.4.4"; version = "2.6.0";
name = "fpc-${version}"; name = "fpc-${version}";
src = fetchurl { src = fetchurl {
url = "http://downloads.sourceforge.net/sourceforge/freepascal/Source/${version}/fpcbuild-${version}.tar.gz"; url = "http://downloads.sourceforge.net/sourceforge/freepascal/Source/${version}/fpcbuild-${version}.tar.gz";
sha256 = "ecdbc150eecc33f5734e62f1a3507421db8eba6d9074c0c5519a8fc8ffe46924"; sha256 = "1vxy2y8pm0ribhpdhqlwwz696ncnz4rk2dafbn1mjgipm97qb26p";
}; };
buildInputs = [ startFPC gawk ]; buildInputs = [ startFPC gawk ];

View File

@ -1,9 +1,9 @@
args : with args; args : with args;
rec { rec {
version = "0.9.30"; version = "0.9.30.4";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${version}/lazarus-${version}-src.tar.bz2"; url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${version}/lazarus-${version}-src.tar.bz2";
sha256 = "ee8ba358e996a6f436f70d15e64976789c2b8f28b2e2dbf1b737de593b4d23e3"; sha256 = "0kndg4xf32r6w5hb58d9qvzkyiphhysgnhs2rd9bmlc8sy8c7zmv";
}; };
buildInputs = [fpc gtk glib libXi inputproto buildInputs = [fpc gtk glib libXi inputproto