From aa30734c179fdba2efebfad79524d2c685b364cf Mon Sep 17 00:00:00 2001
From: OPNA2608 <christoph.neidahl@gmail.com>
Date: Wed, 3 Aug 2022 15:30:35 +0200
Subject: [PATCH 1/3] open-watcom-v2-unwrapped: unstable-2022-05-04 ->
 unstable-2022-08-02

---
 pkgs/development/compilers/open-watcom/v2.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/open-watcom/v2.nix b/pkgs/development/compilers/open-watcom/v2.nix
index 751afe8556c5..ea624ca70c20 100644
--- a/pkgs/development/compilers/open-watcom/v2.nix
+++ b/pkgs/development/compilers/open-watcom/v2.nix
@@ -12,14 +12,14 @@
 
 stdenv.mkDerivation rec {
   pname = "open-watcom-v2";
-  version = "unstable-2022-05-04";
+  version = "unstable-2022-08-02";
   name = "${pname}-unwrapped-${version}";
 
   src = fetchFromGitHub {
     owner = "open-watcom";
     repo = "open-watcom-v2";
-    rev = "01662ab4eb50c0757969fa53bd4270dbbba45dc5";
-    sha256 = "Nl5mcPDCr08XkVMWqkbbgTP/YjpfwMOo2GVu43FQQ3Y=";
+    rev = "4bdb73995b871982dd106838296903701ded29c2";
+    sha256 = "sha256-Ay/f+gnj8EklN8T/uP0a+Zji6HEHAoPLdkrSTQaC9Rs=";
   };
 
   postPatch = ''

From cf6b5e162421e8aa64ff2affd67e327a0187a318 Mon Sep 17 00:00:00 2001
From: OPNA2608 <christoph.neidahl@gmail.com>
Date: Wed, 3 Aug 2022 16:35:49 +0200
Subject: [PATCH 2/3] open-watcom-bin-unwrapped: improve meta

---
 pkgs/development/compilers/open-watcom/bin.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/open-watcom/bin.nix b/pkgs/development/compilers/open-watcom/bin.nix
index 81d321c04620..4bf3d956224b 100644
--- a/pkgs/development/compilers/open-watcom/bin.nix
+++ b/pkgs/development/compilers/open-watcom/bin.nix
@@ -114,7 +114,8 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   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" ];

From 16395a9797d82b633e228aab2c0d5170b16937b8 Mon Sep 17 00:00:00 2001
From: OPNA2608 <christoph.neidahl@gmail.com>
Date: Wed, 3 Aug 2022 16:35:12 +0200
Subject: [PATCH 3/3] wrapWatcom: use passthru.prettyName

---
 pkgs/development/compilers/open-watcom/bin.nix     |  5 +++--
 pkgs/development/compilers/open-watcom/v2.nix      | 10 ++++++----
 pkgs/development/compilers/open-watcom/wrapper.nix |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/open-watcom/bin.nix b/pkgs/development/compilers/open-watcom/bin.nix
index 4bf3d956224b..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,6 +112,8 @@ stdenvNoCC.mkDerivation rec {
     done
   '';
 
+  passthru.prettyName = "open-watcom-bin";
+
   meta = with lib; {
     description = "A project to maintain and enhance the Watcom C, C++, and Fortran cross compilers and tools";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/development/compilers/open-watcom/v2.nix b/pkgs/development/compilers/open-watcom/v2.nix
index ea624ca70c20..bdef71006bd8 100644
--- a/pkgs/development/compilers/open-watcom/v2.nix
+++ b/pkgs/development/compilers/open-watcom/v2.nix
@@ -11,9 +11,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  pname = "open-watcom-v2";
+  pname = "${passthru.prettyName}-unwrapped";
   version = "unstable-2022-08-02";
-  name = "${pname}-unwrapped-${version}";
 
   src = fetchFromGitHub {
     owner = "open-watcom";
@@ -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;