From 84935de73ed64fdd258f0791e993e8e71af1e25f Mon Sep 17 00:00:00 2001
From: Jack Leightcap <jack@leightcap.com>
Date: Fri, 4 Aug 2023 22:55:58 -0400
Subject: [PATCH 1/2] python3Packages.cocotb: 1.7.2 -> 1.8.0

Signed-off-by: Jack Leightcap <jack@leightcap.com>
---
 .../python-modules/cocotb/default.nix         | 22 ++++++-------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix
index cc2493bb4e63..10034b052d55 100644
--- a/pkgs/development/python-modules/cocotb/default.nix
+++ b/pkgs/development/python-modules/cocotb/default.nix
@@ -1,19 +1,9 @@
-{ lib
-, stdenv
-, buildPythonPackage
-, fetchFromGitHub
-, setuptools
-, setuptools-scm
-, cocotb-bus
-, find-libpython
-, pytestCheckHook
-, swig
-, verilog
-}:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, setuptools, setuptools-scm
+, cocotb-bus, find-libpython, pytestCheckHook, swig, verilog }:
 
 buildPythonPackage rec {
   pname = "cocotb";
-  version = "1.7.2";
+  version = "1.8.0";
 
   # pypi source doesn't include tests
   src = fetchFromGitHub {
@@ -25,7 +15,8 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ setuptools-scm ];
 
-  buildInputs = [ setuptools find-libpython ];
+  buildInputs = [ setuptools ];
+  propagatedBuildInputs = [ find-libpython ];
 
   postPatch = ''
     patchShebangs bin/*.py
@@ -60,7 +51,8 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "cocotb" ];
 
   meta = with lib; {
-    description = "Coroutine based cosimulation library for writing VHDL and Verilog testbenches in Python";
+    description =
+      "Coroutine based cosimulation library for writing VHDL and Verilog testbenches in Python";
     homepage = "https://github.com/cocotb/cocotb";
     license = licenses.bsd3;
     maintainers = with maintainers; [ matthuszagh ];

From eb2222a132e3d533825d855594ee7f0d8f84bc31 Mon Sep 17 00:00:00 2001
From: Jack Leightcap <jack@leightcap.com>
Date: Fri, 4 Aug 2023 23:06:35 -0400
Subject: [PATCH 2/2] fixup! python3Packages.cocotb: 1.7.2 -> 1.8.0

Signed-off-by: Jack Leightcap <jack@leightcap.com>
---
 .../python-modules/cocotb/default.nix         | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix
index 10034b052d55..cd9c3b035819 100644
--- a/pkgs/development/python-modules/cocotb/default.nix
+++ b/pkgs/development/python-modules/cocotb/default.nix
@@ -1,5 +1,16 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, setuptools, setuptools-scm
-, cocotb-bus, find-libpython, pytestCheckHook, swig, verilog }:
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, setuptools
+, setuptools-scm
+, cocotb-bus
+, find-libpython
+, pytestCheckHook
+, swig
+, verilog
+, ghdl
+}:
 
 buildPythonPackage rec {
   pname = "cocotb";
@@ -10,7 +21,7 @@ buildPythonPackage rec {
     owner = "cocotb";
     repo = "cocotb";
     rev = "refs/tags/v${version}";
-    hash = "sha256-gLOYwljqnYkGsdbny7+f93QgroLBaLLnDBRpoCe8uEg=";
+    hash = "sha256-k3VizQ9iyDawfDCeE3Zup/KkyD54tFBLdQvRKsbKDLY=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];
@@ -42,7 +53,7 @@ buildPythonPackage rec {
     ./0001-Patch-LDCXXSHARED-for-macOS-along-with-LDSHARED.patch
   ];
 
-  nativeCheckInputs = [ cocotb-bus pytestCheckHook swig verilog ];
+  nativeCheckInputs = [ cocotb-bus pytestCheckHook swig verilog ghdl ];
   preCheck = ''
     export PATH=$out/bin:$PATH
     mv cocotb cocotb.hidden
@@ -51,10 +62,10 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "cocotb" ];
 
   meta = with lib; {
-    description =
-      "Coroutine based cosimulation library for writing VHDL and Verilog testbenches in Python";
+    changelog = "https://github.com/cocotb/cocotb/releases/tag/v${version}";
+    description = "Coroutine based cosimulation library for writing VHDL and Verilog testbenches in Python";
     homepage = "https://github.com/cocotb/cocotb";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ matthuszagh ];
+    maintainers = with maintainers; [ matthuszagh jleightcap ];
   };
 }