Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d6fc52b8caec
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 253de2cb223e
Choose a head ref
  • 4 commits
  • 3 files changed
  • 2 contributors

Commits on Oct 18, 2019

  1. Copy the full SHA
    2c53f0f View commit details
  2. Copy the full SHA
    6407a35 View commit details

Commits on Oct 25, 2019

  1. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    Copy the full SHA
    2924904 View commit details
  2. Merge pull request #71288 from matthuszagh/cocotb

    cocotb: init at 1.2.0
    marsam authored Oct 25, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    253de2c View commit details
Showing with 54 additions and 0 deletions.
  1. +6 −0 maintainers/maintainer-list.nix
  2. +46 −0 pkgs/development/python-modules/cocotb/default.nix
  3. +2 −0 pkgs/top-level/python-packages.nix
6 changes: 6 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
@@ -4069,6 +4069,12 @@
githubId = 427866;
name = "Matthias Beyer";
};
matthuszagh = {
email = "huszaghmatt@gmail.com";
github = "matthuszagh";
githubId = 7377393;
name = "Matt Huszagh";
};
matti-kariluoma = {
email = "matti@kariluo.ma";
github = "matti-kariluoma";
46 changes: 46 additions & 0 deletions pkgs/development/python-modules/cocotb/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, setuptools, swig, verilog }:

buildPythonPackage rec {
pname = "cocotb";
version = "1.2.0";

src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "091q63jcm87xggqgqi44lw2vjxhl1v4yl0mv2c76hgavb29w4w5y";
};

propagatedBuildInputs = [
setuptools
];

postPatch = ''
patchShebangs bin/*.py
# POSIX portability (TODO: upstream this)
for f in \
cocotb/share/makefiles/Makefile.* \
cocotb/share/makefiles/simulators/Makefile.*
do
substituteInPlace $f --replace 'shell which' 'shell command -v'
# replace hardcoded gcc. Remove once https://github.com/cocotb/cocotb/pull/1137 gets merged
substituteInPlace $f --replace 'gcc' '$(CC)'
substituteInPlace $f --replace 'g++' '$(CXX)'
done
'';

checkInputs = [ swig verilog ];

checkPhase = ''
export PATH=$out/bin:$PATH
make test
'';

meta = with stdenv.lib; {
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 ];
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
@@ -489,6 +489,8 @@ in {

cnvkit = callPackage ../development/python-modules/cnvkit { };

cocotb = callPackage ../development/python-modules/cocotb { };

connexion = callPackage ../development/python-modules/connexion { };

cozy = callPackage ../development/python-modules/cozy { };