From fe128c93a88acc8c55d7d6700cc8cd8ad935b640 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 24 May 2023 11:54:54 +0200 Subject: [PATCH] fbc: 1.09.0 -> 1.10.0 --- pkgs/development/compilers/fbc/default.nix | 32 ++-------------------- 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/pkgs/development/compilers/fbc/default.nix b/pkgs/development/compilers/fbc/default.nix index e2d67474ea93..8609c841b22a 100644 --- a/pkgs/development/compilers/fbc/default.nix +++ b/pkgs/development/compilers/fbc/default.nix @@ -2,7 +2,6 @@ , buildPackages , lib , fetchzip -, fetchpatch , gpm , libffi , libGL @@ -15,43 +14,16 @@ stdenv.mkDerivation rec { pname = "fbc"; - version = "1.09.0"; + version = "1.10.0"; src = fetchzip { # Bootstrap tarball has sources pretranslated from FreeBASIC to C url = "https://github.com/freebasic/fbc/releases/download/${version}/FreeBASIC-${version}-source-bootstrap.tar.xz"; - sha256 = "1q1gxp5kjz4vkcs9jl0x01v8qm1q2j789lgvxvikzd591ay0xini"; + hash = "sha256-7FmyEfykOAgHaL2AG8zIgftzOszhwVzNKEqskiLGpfk="; }; - patches = [ - # Fixes fbc_tests.udt_wstring_.midstmt ascii getting stuck due to stack corruption - # Remove when >1.09.0 - (fetchpatch { - name = "fbc-tests-Fix-stack-corruption.patch"; - url = "https://github.com/freebasic/fbc/commit/42f4f6dfdaafdd5302a647152f16cda78e4ec904.patch"; - excludes = [ "changelog.txt" ]; - sha256 = "sha256-Bn+mnTIkM2/uM2k/b9+Up4HJ7SJWwfD3bWLJsSycFRE="; - }) - # Respect SOURCE_DATE_EPOCH when set - # Remove when >1.09.0 - (fetchpatch { - name = "fbc-SOURCE_DATE_EPOCH-support.patch"; - url = "https://github.com/freebasic/fbc/commit/74ea6efdcfe9a90d1c860f64d11ab4a6cd607269.patch"; - excludes = [ "changelog.txt" ]; - sha256 = "sha256-v5FTi4vKOvSV03kigZDiOH8SEGEphhzkBL6p1hd+NtU="; - }) - ]; - postPatch = '' patchShebangs tests/warnings/test.sh - - # Some tests lack proper dependency on libstdc++ - for missingStdcpp in tests/cpp/{class,call2}-fbc.bas; do - sed -i -e "/'"' TEST_MODE : /a #inclib "stdc++"' $missingStdcpp - done - - # Help compiler find libstdc++ with gcc backend - sed -i -e '/fbcAddLibPathFor( "libgcc.a" )/a fbcAddLibPathFor( "libstdc++.so" )' src/compiler/fbc.bas ''; dontConfigure = true;