File tree Expand file tree Collapse file tree 4 files changed +25
-29
lines changed Expand file tree Collapse file tree 4 files changed +25
-29
lines changed Original file line number Diff line number Diff line change 62
62
self . composePythonOverlay ( pkgs' : pkgs : pypkgs' : pypkgs : let
63
63
callPythonPackage = lib . callPackageWith ( pkgs' // pypkgs' ) ;
64
64
in {
65
- cocotb = callPythonPackage ./nix/cocotb.nix { } ;
65
+ cocotb = callPythonPackage ./nix/cocotb.nix {
66
+ ghdl =
67
+ if ( lib . lists . any ( el : el == pkgs' . system ) pkgs' . ghdl-bin . meta . platforms )
68
+ then pkgs' . ghdl-bin
69
+ else pkgs' . ghdl-llvm ;
70
+ } ;
66
71
kfactory = pypkgs . kfactory . overrideAttrs ( attrs' : attrs : {
67
72
version = "1.9.3" ;
68
73
src = pypkgs' . fetchPypi {
Original file line number Diff line number Diff line change 1
1
# Copyright (c) 2025 nix-eda Contributors
2
2
#
3
+ # Adapted from nixpkgs
4
+ #
5
+ # Copyright (c) 2003-2025 Eelco Dolstra and the Nixpkgs/NixOS contributors
6
+ #
3
7
# Permission is hereby granted, free of charge, to any person obtaining
4
8
# a copy of this software and associated documentation files (the
5
9
# "Software"), to deal in the Software without restriction, including
30
34
swig ,
31
35
iverilog ,
32
36
ghdl ,
33
- stdenv ,
37
+ zlib ,
34
38
# Metadata
35
- version ? "1.9.2 " ,
36
- sha256 ? "sha256-7KCo7g2I1rfm8QDHRm3ZKloHwjDIICnJCF8KhaFdvqY =" ,
39
+ version ? "2.0.0 " ,
40
+ sha256 ? "sha256-BpshczKA83ZeytGDrHEg6IAbI5FxciAUnzwE10hgPC0 =" ,
37
41
} : let
38
42
self = buildPythonPackage {
39
43
pname = "cocotb" ;
48
52
inherit sha256 ;
49
53
} ;
50
54
51
- buildInputs = [ setuptools ] ;
55
+ buildInputs = [ setuptools zlib ] ;
52
56
propagatedBuildInputs = [ find-libpython ] ;
53
57
54
58
postPatch = ''
55
59
patchShebangs bin/*.py
56
60
'' ;
57
61
58
- disabledTests =
59
- [
60
- "test_cocotb_parallel"
61
- "test_cocotb"
62
- ]
63
- ++ ( lib . lists . optionals ( ! stdenv . isLinux ) [ "test_vhdl" ] ) ;
64
-
65
- nativeCheckInputs =
66
- [
67
- cocotb-bus
68
- pytestCheckHook
69
- swig
70
- iverilog
71
- ]
72
- ++ ( lib . lists . optionals stdenv . isLinux [ ghdl ] ) ;
73
-
74
- preCheck = ''
75
- export PATH=$out/bin:$PATH
76
- mv cocotb cocotb.hidden
77
- '' ;
62
+ nativeCheckInputs = [
63
+ cocotb-bus
64
+ pytestCheckHook
65
+ swig
66
+ iverilog
67
+ ghdl
68
+ ] ;
78
69
79
70
pythonImportsCheck = [ "cocotb" ] ;
80
71
Original file line number Diff line number Diff line change 45
45
cairo ,
46
46
python3 ,
47
47
gnused ,
48
- version ? "8.3.528 " ,
48
+ version ? "8.3.554 " ,
49
49
rev ? null ,
50
- sha256 ? "sha256-TcNzmWH3YAYmhU6E3Cru2bNjCazk+UAESrDjWvYBLfY =" ,
50
+ sha256 ? "sha256-5eGaQdLD3Z8GwnsC0esGldxcXLAW1vByldTPVFOf8a4 =" ,
51
51
} :
52
52
clangStdenv . mkDerivation {
53
53
pname = "magic-vlsi" ;
Original file line number Diff line number Diff line change 19
19
tk ,
20
20
m4 ,
21
21
python3 ,
22
- version ? "1.5.295 " ,
22
+ version ? "1.5.300 " ,
23
23
rev ? null ,
24
- sha256 ? "sha256-e/Vld5euQrm2oc9Ijs2CXWDmr3tfmnO3BTR8Co8la6E =" ,
24
+ sha256 ? "sha256-LM6u3ovhIwbHMWmQP/Ajde4f99mN0SHG+cuhrCAfQBs =" ,
25
25
} :
26
26
clangStdenv . mkDerivation {
27
27
pname = "netgen" ;
You can’t perform that action at this time.
0 commit comments