diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2014-08-31 22:47:45 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2014-08-31 22:47:55 +0400 |
| commit | 2406a892196695a5faf15fb4c27745a9cf53f962 (patch) | |
| tree | e18c49cdc06c64ee5dbd26c35a9d4145075c2e05 | |
| parent | 6b962e6e9e47f20f9dc4d3b2dc456aa8e82d8b6b (diff) | |
| download | nixlib-2406a892196695a5faf15fb4c27745a9cf53f962.tar nixlib-2406a892196695a5faf15fb4c27745a9cf53f962.tar.gz nixlib-2406a892196695a5faf15fb4c27745a9cf53f962.tar.bz2 nixlib-2406a892196695a5faf15fb4c27745a9cf53f962.tar.lz nixlib-2406a892196695a5faf15fb4c27745a9cf53f962.tar.xz nixlib-2406a892196695a5faf15fb4c27745a9cf53f962.tar.zst nixlib-2406a892196695a5faf15fb4c27745a9cf53f962.zip | |
Update FPC to 2.6.4
| -rw-r--r-- | pkgs/development/compilers/fpc/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/development/compilers/fpc/default.upstream | 6 |
2 files changed, 14 insertions, 3 deletions
diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix index 6be976783bcd..b34b5e8a4465 100644 --- a/pkgs/development/compilers/fpc/default.nix +++ b/pkgs/development/compilers/fpc/default.nix @@ -3,12 +3,12 @@ let startFPC = import ./binary.nix { inherit stdenv fetchurl; }; in stdenv.mkDerivation rec { - version = "2.6.0"; + version = "2.6.4"; name = "fpc-${version}"; src = fetchurl { url = "mirror://sourceforge/freepascal/fpcbuild-${version}.tar.gz"; - sha256 = "1vxy2y8pm0ribhpdhqlwwz696ncnz4rk2dafbn1mjgipm97qb26p"; + sha256 = "1akdlp4n9ai1gnn4yq236i5rx03rs5sjfgk60myb7nb9lk7kp74d"; }; buildInputs = [ startFPC gawk ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sed -e "s@'/lib64/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas '' else ""; - makeFlags = "NOGDB=1"; + makeFlags = "NOGDB=1 FPC=${startFPC}/bin/fpc"; installFlags = "INSTALL_PREFIX=\${out}"; @@ -31,9 +31,14 @@ stdenv.mkDerivation rec { $out/lib/fpc/*/samplecfg $out/lib/fpc/${version} $out/lib/fpc/etc/ ''; + passthru = { + bootstrap = startFPC; + }; + meta = { description = "Free Pascal Compiler from a source distribution"; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; + inherit version; }; } diff --git a/pkgs/development/compilers/fpc/default.upstream b/pkgs/development/compilers/fpc/default.upstream new file mode 100644 index 000000000000..7c11fb4761e1 --- /dev/null +++ b/pkgs/development/compilers/fpc/default.upstream @@ -0,0 +1,6 @@ +url http://sourceforge.net/projects/freepascal/files/Source/ +SF_version_dir +version_link 'fpcbuild-[0-9.]+[.]tar[.]gz/download$' +SF_redirect +version '.*-([0-9.]+)[.]tar[.]gz' '\1' +do_overwrite () { do_overwrite_just_version; } |