From d7a3b9644063eb67a0ec267f51ccece0e1684e77 Mon Sep 17 00:00:00 2001 From: Kirill qsimpleq Babikhin Date: Sat, 18 Jun 2022 15:55:05 +0500 Subject: [PATCH] fpc: 3.2.0 -> 3.2.2 --- pkgs/development/compilers/fpc/binary.nix | 10 +++++----- pkgs/development/compilers/fpc/default.nix | 4 ++-- pkgs/development/compilers/fpc/mark-paths.patch | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/fpc/binary.nix b/pkgs/development/compilers/fpc/binary.nix index c7e3ec30b49f..e7afa7c7698a 100644 --- a/pkgs/development/compilers/fpc/binary.nix +++ b/pkgs/development/compilers/fpc/binary.nix @@ -2,23 +2,23 @@ stdenv.mkDerivation rec { pname = "fpc-binary"; - version = "3.2.0"; + version = "3.2.2"; src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl { url = "mirror://sourceforge/project/freepascal/Linux/${version}/fpc-${version}.i386-linux.tar"; - sha256 = "0y0510b2fbxbqz28967xx8b023k6q9fv5yclfrc1yc9mg8fyn411"; + sha256 = "f62980ac0b2861221f79fdbff67836aa6912a4256d4192cfa4dfa0ac5b419958"; } else if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "mirror://sourceforge/project/freepascal/Linux/${version}/fpc-${version}-x86_64-linux.tar"; - sha256 = "0gfbwjvjqlx0562ayyl08khagslrws758al2yhbi4bz5rzk554ni"; + url = "mirror://sourceforge/project/freepascal/Linux/${version}/fpc-${version}.x86_64-linux.tar"; + sha256 = "5adac308a5534b6a76446d8311fc340747cbb7edeaacfe6b651493ff3fe31e83"; } else if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "mirror://sourceforge/project/freepascal/Linux/${version}/fpc-${version}.aarch64-linux.tar"; - sha256 = "1h481ngg3m8nlsg9mw7rr1bn2c4sj4wzqny9bxyq3xvcral12r71"; + sha256 = "b39470f9b6b5b82f50fc8680a5da37d2834f2129c65c24c5628a80894d565451"; } else throw "Not supported on ${stdenv.hostPlatform.system}."; diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix index b2c09d806826..2b14e48ba4b4 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 = "3.2.0"; + version = "3.2.2"; pname = "fpc"; src = fetchurl { url = "mirror://sourceforge/freepascal/fpcbuild-${version}.tar.gz"; - sha256 = "0f38glyn3ffmqww432snhx2b8wyrq0yj1njkp4zh56lqrvm19fgr"; + sha256 = "85ef993043bb83f999e2212f1bca766eb71f6f973d362e2290475dbaaf50161f"; }; buildInputs = [ startFPC gawk ]; diff --git a/pkgs/development/compilers/fpc/mark-paths.patch b/pkgs/development/compilers/fpc/mark-paths.patch index 707c5352de7f..145339fe41ce 100644 --- a/pkgs/development/compilers/fpc/mark-paths.patch +++ b/pkgs/development/compilers/fpc/mark-paths.patch @@ -19,16 +19,16 @@ index a7398fb9..8e46fec0 100644 {$else powerpc64} LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib;=/usr/lib;=/usr/X11R6/lib',true); {$endif powerpc64} -@@ -164,7 +164,7 @@ begin - LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/i386-linux-gnu',true); +@@ -165,7 +165,7 @@ begin {$endif i386} {$ifdef aarch64} + LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib64',true); - LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/aarch64-linux-gnu',true); + LibrarySearchPath.AddLibraryPath(sysrootpath,'=@syslibpath@',true); {$endif aarch64} {$ifdef powerpc} LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/powerpc-linux-gnu',true); -@@ -185,53 +185,53 @@ begin +@@ -186,53 +186,53 @@ begin end; {$ifdef m68k} @@ -95,7 +95,7 @@ index a7398fb9..8e46fec0 100644 {$endif sparc64} -@@ -266,9 +266,9 @@ begin +@@ -267,9 +267,9 @@ begin libctype:=uclibc; end {$ifdef i386}