From cf03c27fb7ba7dc3ee709f4b483306afc4f9256a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 14 Jul 2009 09:08:05 +0000
Subject: [PATCH] Update FPC and Lazarus

svn path=/nixpkgs/trunk/; revision=16343
---
 pkgs/development/compilers/fpc/default.nix | 11 ++++++-----
 pkgs/development/compilers/fpc/lazarus.nix |  7 ++++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix
index 6fa0f132787..dc45f299656 100644
--- a/pkgs/development/compilers/fpc/default.nix
+++ b/pkgs/development/compilers/fpc/default.nix
@@ -4,12 +4,13 @@ if args ? startFPC && args.startFPC != null then
 
 with args;
 
-stdenv.mkDerivation {
-  name = "fpc-2.2.2";
+stdenv.mkDerivation rec {
+  version = "2.2.4";
+  name = "fpc-${version}";
 
   src = fetchurl {
-    url = ftp://freepascal.stack.nl/pub/fpc/dist/source-2.2.2/fpcbuild-2.2.2.tar.gz;
-    sha256 = "0d73b119e029382052fc6615034c4b5ee3ec66fa6cc45648f1f07cfb2c1058f1";
+    url = "http://downloads.sourceforge.net/sourceforge/freepascal/fpcbuild-${version}.tar.gz";
+    sha256 = "1kxljnivww4riqff8vxann7s135cv634ly3i61rfs1wzwc4lz9bp";
   };
 
   buildInputs = [startFPC gawk];
@@ -26,7 +27,7 @@ stdenv.mkDerivation {
   postInstall = ''
     ln -fs $out/lib/fpc/*/ppc386 $out/bin
     mkdir -p $out/lib/fpc/etc/
-    $out/lib/fpc/*/samplecfg $out/lib/fpc/2.2.0 $out/lib/fpc/etc/
+    $out/lib/fpc/*/samplecfg $out/lib/fpc/${version} $out/lib/fpc/etc/
   '';
 
   meta = {
diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix
index 8846a82bc7b..06bca387f7d 100644
--- a/pkgs/development/compilers/fpc/lazarus.nix
+++ b/pkgs/development/compilers/fpc/lazarus.nix
@@ -1,8 +1,9 @@
 args : with args; 
 rec {
+  version = "0.9.26.2-0";
   src = fetchurl {
-    url = http://downloads.sourceforge.net/lazarus/lazarus-0.9.26-0.tgz;
-    sha256 = "1pb6h35axdmg552pvazgi7jclkx93vssy08cbpa4jw3rij7drhnl";
+    url = "http://downloads.sourceforge.net/lazarus/lazarus-${version}.tgz";
+    sha256 = "5b582685c0447034580fe17c60b8fc84a8b097b6f31ff9b4583cf0eb741297cc";
   };
 
   buildInputs = [fpc gtk glib libXi inputproto 
@@ -31,7 +32,7 @@ rec {
     wrapProgram $out/bin/startlazarus --prefix NIX_LDFLAGS ' ' "'$NIX_LDFLAGS'"
   '') ["doMakeInstall" "minInit" "defEnsureDir"];
 
-  name = "lazarus-0.9.26-0";
+  name = "lazarus-${version}";
   meta = {
     description = "Lazarus graphical IDE for FreePascal language";
     homepage = http://www.lazarus.freepascal.org ;