Unverified Commit e9ccaa65 authored by Cosima Neidahl's avatar Cosima Neidahl Committed by GitHub
Browse files

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

parents be58fd03 0de0388b

pkgs/development/compilers/open-watcom/v2.nix

+8 −8
Original line number Diff line number Diff line
@@ -14,13 +14,13 @@ 
stdenv.mkDerivation rec {

  pname = "${passthru.prettyName}-unwrapped";

  # nixpkgs-update: no auto update

  version = "0-unstable-2024-10-13";

  version = "0-unstable-2025-05-07";



  src = fetchFromGitHub {

    owner = "open-watcom";

    repo = "open-watcom-v2";

    rev = "f0a6465832643ba08b7f94fb814c552804fb395b";

    hash = "sha256-rT3z0KrkCZ78SbsK2CEHfvJa1TEnRH2kwhzZhi8fZDo=";

    rev = "b168de07a7c32ad82b77dd56671b6a51a11dab70";

    hash = "sha256-9NNJcDHxOo+NKZraGqsHqK5whO3nL0QTeh+imzhThTg=";

  };



  postPatch =
@@ -29,19 +29,19 @@ stdenv.mkDerivation rec { 


      for dateSource in bld/wipfc/configure; do

        substituteInPlace $dateSource \

          --replace '`date ' '`date -ud "@$SOURCE_DATE_EPOCH" '

          --replace-fail '`date ' '`date -ud "@$SOURCE_DATE_EPOCH" '

      done



      substituteInPlace bld/watcom/h/banner.h \

        --replace '__DATE__' "\"$(date -ud "@$SOURCE_DATE_EPOCH" +'%b %d %Y')\"" \

        --replace '__TIME__' "\"$(date -ud "@$SOURCE_DATE_EPOCH" +'%T')\""

        --replace-fail '__DATE__' "\"$(date -ud "@$SOURCE_DATE_EPOCH" +'%b %d %Y')\"" \

        --replace-fail '__TIME__' "\"$(date -ud "@$SOURCE_DATE_EPOCH" +'%T')\""



      substituteInPlace build/makeinit \

        --replace '$+$(%__CYEAR__)$-' "$(date -ud "@$SOURCE_DATE_EPOCH" +'%Y')"

        --replace-fail '$+$(%__CYEAR__)$-' "$(date -ud "@$SOURCE_DATE_EPOCH" +'%Y')"

    ''

    + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''

      substituteInPlace build/mif/local.mif \

        --replace '-static' ""

        --replace-fail '-static' ""

    '';



  nativeBuildInputs =

pkgs/development/compilers/open-watcom/wrapper.nix

+10 −5
Original line number Diff line number Diff line
@@ -150,11 +150,16 @@ let 
                  wcl -bcl=dos -fe=dos test.c



                  echo "Test file format"

                  file ./linux | grep "32-bit" | grep "Linux"

                  file ./nt.exe | grep "PE32" | grep "Windows"

                  file ./dos4g.exe | grep "MS-DOS" | grep "LE executable"

                  file ./windows.exe | grep "MS-DOS" | grep "Windows 3.x"

                  file ./dos.exe | grep "MS-DOS" | grep -v "LE" | grep -v "Windows 3.x"

                  file ./linux

                  file ./linux | grep "32-bit" | grep -q "Linux"

                  file ./nt.exe

                  file ./nt.exe | grep "PE32" | grep -q "Windows"

                  file ./dos4g.exe

                  file ./dos4g.exe | grep "MS-DOS" | grep -q "executable, LE"

                  file ./windows.exe

                  file ./windows.exe | grep "MS-DOS" | grep -q "Windows 3.00"

                  file ./dos.exe

                  file ./dos.exe | grep "MS-DOS" | grep -v "LE" | grep -qv "Windows 3."

                  touch $out

                '';

          };