open-watcom-v2-unwrapped: 0-unstable-2024-10-13 -> 0-unstable-2025-05-07 (#405240)

authored by Cosima Neidahl and committed by GitHub e9ccaa65 be58fd03

+18 -13
+8 -8
pkgs/development/compilers/open-watcom/v2.nix
··· 14 14 stdenv.mkDerivation rec { 15 15 pname = "${passthru.prettyName}-unwrapped"; 16 16 # nixpkgs-update: no auto update 17 - version = "0-unstable-2024-10-13"; 17 + version = "0-unstable-2025-05-07"; 18 18 19 19 src = fetchFromGitHub { 20 20 owner = "open-watcom"; 21 21 repo = "open-watcom-v2"; 22 - rev = "f0a6465832643ba08b7f94fb814c552804fb395b"; 23 - hash = "sha256-rT3z0KrkCZ78SbsK2CEHfvJa1TEnRH2kwhzZhi8fZDo="; 22 + rev = "b168de07a7c32ad82b77dd56671b6a51a11dab70"; 23 + hash = "sha256-9NNJcDHxOo+NKZraGqsHqK5whO3nL0QTeh+imzhThTg="; 24 24 }; 25 25 26 26 postPatch = ··· 29 29 30 30 for dateSource in bld/wipfc/configure; do 31 31 substituteInPlace $dateSource \ 32 - --replace '`date ' '`date -ud "@$SOURCE_DATE_EPOCH" ' 32 + --replace-fail '`date ' '`date -ud "@$SOURCE_DATE_EPOCH" ' 33 33 done 34 34 35 35 substituteInPlace bld/watcom/h/banner.h \ 36 - --replace '__DATE__' "\"$(date -ud "@$SOURCE_DATE_EPOCH" +'%b %d %Y')\"" \ 37 - --replace '__TIME__' "\"$(date -ud "@$SOURCE_DATE_EPOCH" +'%T')\"" 36 + --replace-fail '__DATE__' "\"$(date -ud "@$SOURCE_DATE_EPOCH" +'%b %d %Y')\"" \ 37 + --replace-fail '__TIME__' "\"$(date -ud "@$SOURCE_DATE_EPOCH" +'%T')\"" 38 38 39 39 substituteInPlace build/makeinit \ 40 - --replace '$+$(%__CYEAR__)$-' "$(date -ud "@$SOURCE_DATE_EPOCH" +'%Y')" 40 + --replace-fail '$+$(%__CYEAR__)$-' "$(date -ud "@$SOURCE_DATE_EPOCH" +'%Y')" 41 41 '' 42 42 + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' 43 43 substituteInPlace build/mif/local.mif \ 44 - --replace '-static' "" 44 + --replace-fail '-static' "" 45 45 ''; 46 46 47 47 nativeBuildInputs =
+10 -5
pkgs/development/compilers/open-watcom/wrapper.nix
··· 150 150 wcl -bcl=dos -fe=dos test.c 151 151 152 152 echo "Test file format" 153 - file ./linux | grep "32-bit" | grep "Linux" 154 - file ./nt.exe | grep "PE32" | grep "Windows" 155 - file ./dos4g.exe | grep "MS-DOS" | grep "LE executable" 156 - file ./windows.exe | grep "MS-DOS" | grep "Windows 3.x" 157 - file ./dos.exe | grep "MS-DOS" | grep -v "LE" | grep -v "Windows 3.x" 153 + file ./linux 154 + file ./linux | grep "32-bit" | grep -q "Linux" 155 + file ./nt.exe 156 + file ./nt.exe | grep "PE32" | grep -q "Windows" 157 + file ./dos4g.exe 158 + file ./dos4g.exe | grep "MS-DOS" | grep -q "executable, LE" 159 + file ./windows.exe 160 + file ./windows.exe | grep "MS-DOS" | grep -q "Windows 3.00" 161 + file ./dos.exe 162 + file ./dos.exe | grep "MS-DOS" | grep -v "LE" | grep -qv "Windows 3." 158 163 touch $out 159 164 ''; 160 165 };