diff --git a/pkgs/development/compilers/open-watcom/bin.nix b/pkgs/development/compilers/open-watcom/bin.nix index 81d321c04620..daf7ea497693 100644 --- a/pkgs/development/compilers/open-watcom/bin.nix +++ b/pkgs/development/compilers/open-watcom/bin.nix @@ -85,9 +85,8 @@ let in stdenvNoCC.mkDerivation rec { - pname = "open-watcom-bin"; + pname = "${passthru.prettyName}-unwrapped"; version = "1.9"; - name = "${pname}-unwrapped-${version}"; src = fetchurl { url = "http://ftp.openwatcom.org/install/open-watcom-c-linux-${version}"; @@ -113,8 +112,11 @@ stdenvNoCC.mkDerivation rec { done ''; + passthru.prettyName = "open-watcom-bin"; + meta = with lib; { - description = "A C/C++ Compiler (binary distribution)"; + description = "A project to maintain and enhance the Watcom C, C++, and Fortran cross compilers and tools"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; homepage = "http://www.openwatcom.org/"; license = licenses.watcom; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/development/compilers/open-watcom/v2.nix b/pkgs/development/compilers/open-watcom/v2.nix index 751afe8556c5..bdef71006bd8 100644 --- a/pkgs/development/compilers/open-watcom/v2.nix +++ b/pkgs/development/compilers/open-watcom/v2.nix @@ -11,15 +11,14 @@ }: stdenv.mkDerivation rec { - pname = "open-watcom-v2"; - version = "unstable-2022-05-04"; - name = "${pname}-unwrapped-${version}"; + pname = "${passthru.prettyName}-unwrapped"; + version = "unstable-2022-08-02"; src = fetchFromGitHub { owner = "open-watcom"; repo = "open-watcom-v2"; - rev = "01662ab4eb50c0757969fa53bd4270dbbba45dc5"; - sha256 = "Nl5mcPDCr08XkVMWqkbbgTP/YjpfwMOo2GVu43FQQ3Y="; + rev = "4bdb73995b871982dd106838296903701ded29c2"; + sha256 = "sha256-Ay/f+gnj8EklN8T/uP0a+Zji6HEHAoPLdkrSTQaC9Rs="; }; postPatch = '' @@ -82,8 +81,11 @@ stdenv.mkDerivation rec { # Stripping breaks many tools dontStrip = true; - passthru.updateScript = unstableGitUpdater { - url = "https://github.com/open-watcom/open-watcom-v2.git"; + passthru = { + prettyName = "open-watcom-v2"; + updateScript = unstableGitUpdater { + url = "https://github.com/open-watcom/open-watcom-v2.git"; + }; }; meta = with lib; { diff --git a/pkgs/development/compilers/open-watcom/wrapper.nix b/pkgs/development/compilers/open-watcom/wrapper.nix index 94cca7ab34ce..113df520b4fc 100644 --- a/pkgs/development/compilers/open-watcom/wrapper.nix +++ b/pkgs/development/compilers/open-watcom/wrapper.nix @@ -29,7 +29,7 @@ let ++ lib.optional isWindows "h/nt" ++ lib.optional isLinux "lh"; listToDirs = list: lib.strings.concatMapStringsSep ":" (dir: "${placeholder "out"}/${dir}") list; - name = "${open-watcom.pname}-${open-watcom.version}"; + name = "${open-watcom.passthru.prettyName}-${open-watcom.version}"; in symlinkJoin { inherit name;