From 8706bd4591adb649c4f974c7d67b9786ef25b2d4 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 14 Jan 2010 08:00:50 +0000 Subject: [PATCH] Update FPC svn path=/nixpkgs/trunk/; revision=19420 --- pkgs/development/compilers/fpc/binary.nix | 17 ++++++++++++----- pkgs/development/compilers/fpc/default.nix | 4 ++-- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/fpc/binary.nix b/pkgs/development/compilers/fpc/binary.nix index eb931b959cb..fadc73c051e 100644 --- a/pkgs/development/compilers/fpc/binary.nix +++ b/pkgs/development/compilers/fpc/binary.nix @@ -1,12 +1,19 @@ args: with args; stdenv.mkDerivation { - name = "fpc-2.2.2-binary"; + name = "fpc-2.4.0-binary"; - src = fetchurl { - url = ftp://ftp.chg.ru/pub/lang/pascal/fpc/dist/i386-linux-2.2.2/fpc-2.2.2.i386-linux.tar; - sha256 = "8c18f63b36a76eee673f96ca254c49c5a42bcf3e36279abe8774f961792449a5"; - }; + src = if stdenv.system == "i686-linux" then + fetchurl { + url = "ftp://ftp.chg.ru/pub/lang/pascal/fpc/dist/2.4.0/i386-linux/fpc-2.4.0.i386-linux.tar"; + sha256 = "1zas9kp0b36zxqvb9i4idh2l0nb6qpmgah038l77w6las7ghh0dv"; + } + else if stdenv.system == "x86_64-linux" then + fetchurl { + url = "ftp://ftp.chg.ru/pub/lang/pascal/fpc/dist/2.4.0/x86_64-linux/fpc-2.4.0.x86_64-linux.tar"; + sha256 = "111d11g5ra55hjywx64ldwwflpimsy8zryvap68v0309nyd23f0z"; + } + else null; builder = ./binary-builder.sh; diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix index bf849960cdf..2d6cadf07fd 100644 --- a/pkgs/development/compilers/fpc/default.nix +++ b/pkgs/development/compilers/fpc/default.nix @@ -5,12 +5,12 @@ if args ? startFPC && args.startFPC != null then with args; stdenv.mkDerivation rec { - version = "2.2.4"; + version = "2.4.0"; name = "fpc-${version}"; src = fetchurl { url = "http://downloads.sourceforge.net/sourceforge/freepascal/fpcbuild-${version}.tar.gz"; - sha256 = "1kxljnivww4riqff8vxann7s135cv634ly3i61rfs1wzwc4lz9bp"; + sha256 = "1m2g2bafjixbwl5b9lna5h7r56y1rcayfnbp8kyjfd1c1ymbxaxk"; }; buildInputs = [startFPC gawk];