diff options
Diffstat (limited to 'pkgs/applications/science/electronics')
30 files changed, 114 insertions, 65 deletions
diff --git a/pkgs/applications/science/electronics/appcsxcad/default.nix b/pkgs/applications/science/electronics/appcsxcad/default.nix index 2e882aff361d..c401e150f35e 100644 --- a/pkgs/applications/science/electronics/appcsxcad/default.nix +++ b/pkgs/applications/science/electronics/appcsxcad/default.nix @@ -46,6 +46,7 @@ mkDerivation { meta = with lib; { description = "Minimal Application using the QCSXCAD library"; + mainProgram = "AppCSXCAD"; homepage = "https://github.com/thliebig/AppCSXCAD"; license = licenses.gpl3; maintainers = with maintainers; [ matthuszagh ]; diff --git a/pkgs/applications/science/electronics/archimedes/default.nix b/pkgs/applications/science/electronics/archimedes/default.nix index 631f44e80633..9d9498df00da 100644 --- a/pkgs/applications/science/electronics/archimedes/default.nix +++ b/pkgs/applications/science/electronics/archimedes/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU package for semiconductor device simulations"; + mainProgram = "archimedes"; homepage = "https://www.gnu.org/software/archimedes"; license = lib.licenses.gpl2Plus; platforms = with lib.platforms; linux; diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix index 1adac4832a13..4a4cf61c7f65 100644 --- a/pkgs/applications/science/electronics/caneda/default.nix +++ b/pkgs/applications/science/electronics/caneda/default.nix @@ -16,6 +16,7 @@ mkDerivation rec { meta = { description = "Open source EDA software focused on easy of use and portability"; + mainProgram = "caneda"; homepage = "http://caneda.org"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [viric]; diff --git a/pkgs/applications/science/electronics/dataexplorer/default.nix b/pkgs/applications/science/electronics/dataexplorer/default.nix index 8fd9dcc5eaa8..aa471d2bfcaf 100644 --- a/pkgs/applications/science/electronics/dataexplorer/default.nix +++ b/pkgs/applications/science/electronics/dataexplorer/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "dataexplorer"; - version = "3.8.3"; + version = "3.8.5"; src = fetchurl { url = "mirror://savannah/dataexplorer/dataexplorer-${version}-src.tar.gz"; - sha256 = "sha256-vU9klb6Mweg8yxnClsIdelG4uW92if64SJ7UHumYYbs="; + sha256 = "sha256-b68xIZNbzHdPyZwLngcnjcoBtI6AeTdrblz/qx/HbGQ="; }; nativeBuildInputs = [ ant makeWrapper ]; diff --git a/pkgs/applications/science/electronics/degate/default.nix b/pkgs/applications/science/electronics/degate/default.nix index 2aa20aec6503..30ded5d1354f 100644 --- a/pkgs/applications/science/electronics/degate/default.nix +++ b/pkgs/applications/science/electronics/degate/default.nix @@ -67,6 +67,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "A modern and open-source cross-platform software for chips reverse engineering"; + mainProgram = "Degate"; homepage = "https://degate.readthedocs.io/"; license = licenses.gpl3; platforms = platforms.unix; diff --git a/pkgs/applications/science/electronics/digital/default.nix b/pkgs/applications/science/electronics/digital/default.nix index ed90b03dbc3e..41deecbb6224 100644 --- a/pkgs/applications/science/electronics/digital/default.nix +++ b/pkgs/applications/science/electronics/digital/default.nix @@ -60,6 +60,7 @@ maven.buildMavenPackage rec { meta = with lib; { homepage = "https://github.com/hneemann/Digital"; description = pkgDescription; + mainProgram = "digital"; license = licenses.gpl3Only; platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ Dettorer ]; diff --git a/pkgs/applications/science/electronics/diylc/default.nix b/pkgs/applications/science/electronics/diylc/default.nix index 8530e6927fe9..ced8c72d2155 100644 --- a/pkgs/applications/science/electronics/diylc/default.nix +++ b/pkgs/applications/science/electronics/diylc/default.nix @@ -67,6 +67,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Multi platform circuit layout and schematic drawing tool"; + mainProgram = "diylc"; homepage = "https://bancika.github.io/diy-layout-creator/"; changelog = "https://github.com/bancika/diy-layout-creator/releases"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/pkgs/applications/science/electronics/dsview/default.nix index ec53e976aec5..3c8e7ad19064 100644 --- a/pkgs/applications/science/electronics/dsview/default.nix +++ b/pkgs/applications/science/electronics/dsview/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A GUI program for supporting various instruments from DreamSourceLab, including logic analyzer, oscilloscope, etc"; + mainProgram = "DSView"; homepage = "https://www.dreamsourcelab.com/"; license = licenses.gpl3Plus; platforms = platforms.unix; diff --git a/pkgs/applications/science/electronics/dwfv/default.nix b/pkgs/applications/science/electronics/dwfv/default.nix index ed340271f262..2d88e2647dfd 100644 --- a/pkgs/applications/science/electronics/dwfv/default.nix +++ b/pkgs/applications/science/electronics/dwfv/default.nix @@ -13,6 +13,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A simple digital waveform viewer with vi-like key bindings"; + mainProgram = "dwfv"; homepage = "https://github.com/psurply/dwfv"; license = licenses.mit; maintainers = with maintainers; [ newam ]; diff --git a/pkgs/applications/science/electronics/fped/default.nix b/pkgs/applications/science/electronics/fped/default.nix index 138d45c787cd..6d10426b298a 100644 --- a/pkgs/applications/science/electronics/fped/default.nix +++ b/pkgs/applications/science/electronics/fped/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation { meta = { description = "An editor that allows the interactive creation of footprints electronic components"; + mainProgram = "fped"; homepage = "http://projects.qi-hardware.com/index.php/p/fped/"; license = licenses.gpl2; maintainers = with maintainers; [ expipiplus1 ]; diff --git a/pkgs/applications/science/electronics/gaw/default.nix b/pkgs/applications/science/electronics/gaw/default.nix index a54602de13f3..5dec368f454c 100644 --- a/pkgs/applications/science/electronics/gaw/default.nix +++ b/pkgs/applications/science/electronics/gaw/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Gtk Analog Wave viewer"; + mainProgram = "gaw"; longDescription = '' Gaw is a software tool for displaying analog waveforms from sampled datas, for example from the output of simulators or diff --git a/pkgs/applications/science/electronics/gerbv/default.nix b/pkgs/applications/science/electronics/gerbv/default.nix index 652a96617cbc..5f178e08280a 100644 --- a/pkgs/applications/science/electronics/gerbv/default.nix +++ b/pkgs/applications/science/electronics/gerbv/default.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A Gerber (RS-274X) viewer"; + mainProgram = "gerbv"; homepage = "https://gerbv.github.io/"; changelog = "https://github.com/gerbv/gerbv/releases/tag/v${version}"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix index 6bdc197269cc..4c3692266a5c 100644 --- a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix +++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix @@ -144,6 +144,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "A comprehensive reverse engineering and manipulation framework for gate-level netlists"; + mainProgram = "hal"; homepage = "https://github.com/emsec/hal"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/applications/science/electronics/hyp2mat/default.nix b/pkgs/applications/science/electronics/hyp2mat/default.nix index 799af4c43086..71da4a259d54 100644 --- a/pkgs/applications/science/electronics/hyp2mat/default.nix +++ b/pkgs/applications/science/electronics/hyp2mat/default.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Import Hyperlynx Boardsim files to openEMS, an open source 3D full-wave electromagnetic field solver"; + mainProgram = "hyp2mat"; homepage = "https://github.com/koendv/hyp2mat"; license = licenses.gpl3Plus; maintainers = with maintainers; [ matthuszagh ]; diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index bff63f3b2d7e..d884a60c984f 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -21,6 +21,10 @@ , libpthreadstubs , libXdmcp , unixODBC +, libgit2 +, libsecret +, libgcrypt +, libgpg-error , util-linux , libselinux @@ -92,12 +96,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DKICAD_USE_EGL=ON" "-DOCC_INCLUDE_DIR=${opencascade-occt}/include/opencascade" + # https://gitlab.com/kicad/code/kicad/-/issues/17133 + "-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;qa_spice'" ] - ++ optionals (stable) [ - # https://gitlab.com/kicad/code/kicad/-/issues/12491 - # should be resolved in the next major? release - "-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;qa_eeschema'" - ] + ++ optional (stdenv.hostPlatform.system == "aarch64-linux") + "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;'qa_spice|qa_cli'" ++ optional (stable && !withNgspice) "-DKICAD_SPICE=OFF" ++ optionals (!withScripting) [ "-DKICAD_SCRIPTING_WXPYTHON=OFF" @@ -126,6 +129,10 @@ stdenv.mkDerivation rec { doxygen graphviz pkg-config + libgit2 + libsecret + libgcrypt + libgpg-error ] # wanted by configuration on linux, doesn't seem to affect performance # no effect on closure size @@ -180,13 +187,14 @@ stdenv.mkDerivation rec { doInstallCheck = !(debug); installCheckTarget = "test"; - pythonForTests = python.withPackages(ps: with ps; [ - numpy - pytest - cairosvg - pytest-image-diff - ]); - nativeInstallCheckInputs = optional (!stable) pythonForTests; + nativeInstallCheckInputs = [ + (python.withPackages(ps: with ps; [ + numpy + pytest + cairosvg + pytest-image-diff + ])) + ]; dontStrip = debug; @@ -196,7 +204,7 @@ stdenv.mkDerivation rec { Just the build products, the libraries are passed via an env var in the wrapper, default.nix ''; homepage = "https://www.kicad.org/"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Plus; platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index fa0c7ae7a75e..99670eee8a46 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -205,9 +205,9 @@ stdenv.mkDerivation rec { "--prefix GIO_EXTRA_MODULES : ${dconf}/lib/gio/modules" # required to open a bug report link in firefox-wayland "--set-default MOZ_DBUS_REMOTE 1" - "--set-default KICAD7_FOOTPRINT_DIR ${footprints}/share/kicad/footprints" - "--set-default KICAD7_SYMBOL_DIR ${symbols}/share/kicad/symbols" - "--set-default KICAD7_TEMPLATE_DIR ${template_dir}" + "--set-default KICAD8_FOOTPRINT_DIR ${footprints}/share/kicad/footprints" + "--set-default KICAD8_SYMBOL_DIR ${symbols}/share/kicad/symbols" + "--set-default KICAD8_TEMPLATE_DIR ${template_dir}" ] ++ optionals (addons != [ ]) ( let stockDataPath = symlinkJoin { @@ -218,11 +218,11 @@ stdenv.mkDerivation rec { ]; }; in - [ "--set-default NIX_KICAD7_STOCK_DATA_PATH ${stockDataPath}" ] + [ "--set-default NIX_KICAD8_STOCK_DATA_PATH ${stockDataPath}" ] ) ++ optionals (with3d) [ - "--set-default KICAD7_3DMODEL_DIR ${packages3d}/share/kicad/3dmodels" + "--set-default KICAD8_3DMODEL_DIR ${packages3d}/share/kicad/3dmodels" ] ++ optionals (withNgspice) [ "--prefix LD_LIBRARY_PATH : ${libngspice}/lib" ] diff --git a/pkgs/applications/science/electronics/kicad/runtime_stock_data_path.patch b/pkgs/applications/science/electronics/kicad/runtime_stock_data_path.patch index 16f7e493c623..43e99a531cf5 100644 --- a/pkgs/applications/science/electronics/kicad/runtime_stock_data_path.patch +++ b/pkgs/applications/science/electronics/kicad/runtime_stock_data_path.patch @@ -6,7 +6,7 @@ index a74cdd9..790cc58 100644 { wxString path; -+ if( wxGetEnv( wxT( "NIX_KICAD7_STOCK_DATA_PATH" ), &path ) ) { ++ if( wxGetEnv( wxT( "NIX_KICAD8_STOCK_DATA_PATH" ), &path ) ) { + return path; + } + diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 11837638e1ab..36114fff73a3 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,67 +3,67 @@ { "kicad" = { kicadVersion = { - version = "7.0.10"; + version = "8.0.1"; src = { - rev = "7daac78752749fc919e932be6156914aa83c926f"; - sha256 = "0z459yi0s02mwdgbr3xxw43gn9yjhvfkjnsxmns5mksgzsr5nmhh"; + rev = "20421d65e5a7ede894345d337ab47b469f5ba154"; + sha256 = "096kvmm96ccxir1rspgzzjkp6y2j80l3w2vphg9iv3drxmjp7qjv"; }; }; libVersion = { - version = "7.0.10"; + version = "8.0.1"; libSources = { - symbols.rev = "eedf6c9ddac2816023e817d4dc91032f9d7390b9"; - symbols.sha256 = "0nlgmxf9z1vf4g350dfkxql1dawgmw275wqxkgszsfxmhdfpmi9v"; - templates.rev = "9ce98cc45f3778e05c404edebf0f98de5c247ffe"; - templates.sha256 = "0mykfwwik7472i4r0isc5szj3dnmvd0538p0vlmzh4rcgj3pj3vm"; - footprints.rev = "7061fc9847ecc1b838e60dc6826db534028494f6"; - footprints.sha256 = "1az6fzh1lma71mj12bc4bblnmzjayrxhkb8w9rjvlhvvgv33cdmy"; - packages3d.rev = "d7345b34daaa23acf0d4506ed937fb424b5b18cd"; - packages3d.sha256 = "0xzyi4mgyifwc6dppdzh6jq294mkj0a71cwkqw2ymz1kfbksw626"; + symbols.rev = "d6aff3948edfca2bacf36900ff080f6b3f65fe4c"; + symbols.sha256 = "00xnvikmqd1zkg9p1f89kvryvkybl5f20baij6babqyc29nbzkwy"; + templates.rev = "0a6c4f798a68a5c639d54b4d3093460ab9267816"; + templates.sha256 = "0m9bggz3cm27kqpjjwxy19mqzk0c69bywcjkqcni7kafr21c6k4z"; + footprints.rev = "226b4f3d5c10a4126d88b895188bdab629fe60b0"; + footprints.sha256 = "1bb3mb2a7vkridgmqqm9ib3hv2m4zx1i14mglb11sribypy0ma5p"; + packages3d.rev = "49c1cd4017499b8a7f6dedbe7ede834d1713eb28"; + packages3d.sha256 = "0b5jwr5bbd0kzb75nj3028knjrv0872dk54sbsnxaz669q8zaxap"; }; }; }; "kicad-testing" = { kicadVersion = { - version = "7.0-2024-01-27"; + version = "8.0-2024-02-23"; src = { - rev = "13fcb571f7e5bf4bf142d151651fc577aca32053"; - sha256 = "0wvk3wx5lm2jvyip6b96ja464hdzp9klb7b7ng5i3mdldabh0jba"; + rev = "14d71c8ca6b48d2eb956bb069acf05a37b1b2652"; + sha256 = "0xqd0xbpnvsvba75526nwgzr8l2cfxy99sjmg13sjxfx7rq16kqi"; }; }; libVersion = { - version = "7.0-2024-01-27"; + version = "8.0-2024-02-23"; libSources = { - symbols.rev = "eedf6c9ddac2816023e817d4dc91032f9d7390b9"; - symbols.sha256 = "0nlgmxf9z1vf4g350dfkxql1dawgmw275wqxkgszsfxmhdfpmi9v"; - templates.rev = "9ce98cc45f3778e05c404edebf0f98de5c247ffe"; - templates.sha256 = "0mykfwwik7472i4r0isc5szj3dnmvd0538p0vlmzh4rcgj3pj3vm"; - footprints.rev = "7061fc9847ecc1b838e60dc6826db534028494f6"; - footprints.sha256 = "1az6fzh1lma71mj12bc4bblnmzjayrxhkb8w9rjvlhvvgv33cdmy"; - packages3d.rev = "d7345b34daaa23acf0d4506ed937fb424b5b18cd"; - packages3d.sha256 = "0xzyi4mgyifwc6dppdzh6jq294mkj0a71cwkqw2ymz1kfbksw626"; + symbols.rev = "e228d4e8b295364e90e36c57f4023d8285ba88cd"; + symbols.sha256 = "049h2a7yn6ks8sybppixa872dbvyd0rwf9r6nixvdg6d13fl6rwf"; + templates.rev = "2e00c233b67e35323f90d04c190bf70237a252f2"; + templates.sha256 = "0m9bggz3cm27kqpjjwxy19mqzk0c69bywcjkqcni7kafr21c6k4z"; + footprints.rev = "6e5329a6d4aaa81290e23af3eba88f505c2f61b0"; + footprints.sha256 = "0ypjlbmzmcl3pha3q2361va70c988b1drxy8320gm66jkzfc21a1"; + packages3d.rev = "d1e521228d9f5888836b1a6a35fb05fb925456fa"; + packages3d.sha256 = "0lcy1av7ixg1f7arflk50jllpc1749sfvf3h62hkxsz97wkr97xj"; }; }; }; "kicad-unstable" = { kicadVersion = { - version = "2023-08-15"; + version = "2024-02-23"; src = { - rev = "e0d4cf2d5b023a7e5b70d854452376aa3510acd8"; - sha256 = "0666j4q3vz24smcjw9m4ib3ca2dqiqgx2amhv7ys4rzqb6v2pvn2"; + rev = "b7b64d959f37f00bb0d14b007c3b3908196e1024"; + sha256 = "1gl7mjqpmqq4m55z6crwb77983g00gi2161ichsc7hsfhs4c8grh"; }; }; libVersion = { - version = "2023-08-15"; + version = "2024-02-23"; libSources = { - symbols.rev = "06d20a4b9f7e5375329194d141b096dcdcb7518a"; - symbols.sha256 = "1wr754m4ykidds3i14gqhvyrj3mbkchp2hkfnr0rjsdaqf4zmqdf"; - templates.rev = "867eef383a0f61015cb69677d5c632d78a2ea01a"; - templates.sha256 = "1qi20mrsfn4fxmr1fyphmil2i9p2nzmwk5rlfchc5aq2194nj3lq"; - footprints.rev = "5d2ac73ae72bfe8b8ee9eeb081a7851b2ca84c24"; - footprints.sha256 = "1qg016ysf0ddm3bd5bkjawlrc0z4r3zhmdjkqkwaaaydnpwp23qz"; - packages3d.rev = "f1dae9f95e59216f3b974f585e5b420db853da9e"; - packages3d.sha256 = "0ciri6lhnh0w9i00z167snj5acnjndi1rgmyls08p45zj4rma8y2"; + symbols.rev = "8b0c343d8694fe0a968e5c4af69fd161bacf7da1"; + symbols.sha256 = "049h2a7yn6ks8sybppixa872dbvyd0rwf9r6nixvdg6d13fl6rwf"; + templates.rev = "0a6c4f798a68a5c639d54b4d3093460ab9267816"; + templates.sha256 = "0m9bggz3cm27kqpjjwxy19mqzk0c69bywcjkqcni7kafr21c6k4z"; + footprints.rev = "ded6b053460faae5783c538a38e91e2b4bddcf2e"; + footprints.sha256 = "035bf37n4vrihaj4zfdncisdx9fly1vya7lhkxhlsbv5blpi4a5y"; + packages3d.rev = "984667325076d4e50dab14e755aeacf97f42194c"; + packages3d.sha256 = "0lkaxv02h4sxrnm8zr17wl9d07mazlisad78r35gry741i362cdg"; }; }; }; diff --git a/pkgs/applications/science/electronics/magic-vlsi/default.nix b/pkgs/applications/science/electronics/magic-vlsi/default.nix index 50be90716e09..5fc4b0036f9f 100644 --- a/pkgs/applications/science/electronics/magic-vlsi/default.nix +++ b/pkgs/applications/science/electronics/magic-vlsi/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "magic-vlsi"; - version = "8.3.464"; + version = "8.3.465"; src = fetchurl { url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz"; - sha256 = "sha256-ICXFskoB/mqKPgjWeIoJ81H2eg4dPSj0bHY7S5/A858="; + sha256 = "sha256-cb9A8rpjD3x3fJo+xexlyzn+/3M5iUJmSoBraom9zd8="; }; nativeBuildInputs = [ python3 ]; diff --git a/pkgs/applications/science/electronics/nanovna-saver/default.nix b/pkgs/applications/science/electronics/nanovna-saver/default.nix index 61788938e40a..d1b38d8b8e07 100644 --- a/pkgs/applications/science/electronics/nanovna-saver/default.nix +++ b/pkgs/applications/science/electronics/nanovna-saver/default.nix @@ -47,6 +47,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/NanoVNA-Saver/nanovna-saver"; description = "A tool for reading, displaying and saving data from the NanoVNA"; + mainProgram = "NanoVNASaver"; longDescription = '' A multiplatform tool to save Touchstone files from the NanoVNA, sweep frequency spans in segments to gain more than 101 data points, and diff --git a/pkgs/applications/science/electronics/nvc/default.nix b/pkgs/applications/science/electronics/nvc/default.nix index 378daf9c498c..48c9b17816e9 100644 --- a/pkgs/applications/science/electronics/nvc/default.nix +++ b/pkgs/applications/science/electronics/nvc/default.nix @@ -57,6 +57,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "VHDL compiler and simulator"; + mainProgram = "nvc"; homepage = "https://www.nickg.me.uk/nvc/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ wegank ]; diff --git a/pkgs/applications/science/electronics/openboardview/default.nix b/pkgs/applications/science/electronics/openboardview/default.nix index 9e498881d2e2..4eaf29133a44 100644 --- a/pkgs/applications/science/electronics/openboardview/default.nix +++ b/pkgs/applications/science/electronics/openboardview/default.nix @@ -67,6 +67,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Linux SDL/ImGui edition software for viewing .brd files"; + mainProgram = "openboardview"; homepage = "https://github.com/OpenBoardView/OpenBoardView"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/applications/science/electronics/openhantek6022/default.nix b/pkgs/applications/science/electronics/openhantek6022/default.nix index b6e5d89a3e97..ca0c651fad27 100644 --- a/pkgs/applications/science/electronics/openhantek6022/default.nix +++ b/pkgs/applications/science/electronics/openhantek6022/default.nix @@ -23,6 +23,7 @@ mkDerivation rec { meta = with lib; { description = "Free software for Hantek and compatible (Voltcraft/Darkwire/Protek/Acetech) USB digital signal oscilloscopes"; + mainProgram = "OpenHantek"; homepage = "https://github.com/OpenHantek/OpenHantek6022"; license = licenses.gpl3; maintainers = with maintainers; [ baracoder ]; diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix index cab42731c336..52685f1df254 100644 --- a/pkgs/applications/science/electronics/pulseview/default.nix +++ b/pkgs/applications/science/electronics/pulseview/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Qt-based LA/scope/MSO GUI for sigrok (a signal analysis software suite)"; + mainProgram = "pulseview"; homepage = "https://sigrok.org/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ bjornfor vifino ]; diff --git a/pkgs/applications/science/electronics/systemc/default.nix b/pkgs/applications/science/electronics/systemc/default.nix index dc6186841f47..4e14d08e63bf 100644 --- a/pkgs/applications/science/electronics/systemc/default.nix +++ b/pkgs/applications/science/electronics/systemc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "systemc"; @@ -11,16 +11,21 @@ stdenv.mkDerivation rec { sha256 = "0sj8wlkp68cjhmkd9c9lvm3lk3sckczpz7w9vby64inc1f9fnf0b"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ cmake ]; - configureFlags = [ "--with-unix-layout" ]; + cmakeFlags = [ + # Undefined reference to the sc_core::sc_api_version_2_3_4_XXX + # https://github.com/accellera-official/systemc/issues/21 + "-DCMAKE_CXX_STANDARD=17" + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; meta = with lib; { description = "The language for System-level design, modeling and verification"; homepage = "https://systemc.org/"; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ victormignot amiloradovsky ]; }; } diff --git a/pkgs/applications/science/electronics/tkgate/1.x.nix b/pkgs/applications/science/electronics/tkgate/1.x.nix index f8741cd8d180..f20ce5e0acd0 100644 --- a/pkgs/applications/science/electronics/tkgate/1.x.nix +++ b/pkgs/applications/science/electronics/tkgate/1.x.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "Event driven digital circuit simulator with a TCL/TK-based graphical editor"; + mainProgram = "gmac"; homepage = "http://www.tkgate.org/"; license = lib.licenses.gpl2Plus; hydraPlatforms = lib.platforms.linux; diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 062ba93ca420..92f8fa52b91f 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, perl, flex, bison, python3, autoconf, +{ lib, stdenv, fetchFromGitHub, fetchpatch, perl, flex, bison, python3, autoconf, which, cmake, ccache, help2man, makeWrapper, glibcLocales, systemc, git, numactl }: @@ -13,6 +13,15 @@ stdenv.mkDerivation rec { hash = "sha256-Ya3lqK8BfvMVLZUrD2Et6OmptteWXp5VmZb2x2G/V/E="; }; + patches = [ + (fetchpatch { + # Fix try-lock spuriously fail in V3ThreadPool destructor + # https://github.com/verilator/verilator/pull/4938 + url = "https://github.com/verilator/verilator/commit/4b9cce4369c78423779238e585ed693c456d464e.patch"; + hash = "sha256-sGrk/pxqZqUcmJdzQoPlzXMmYqHCOmd9Y2n6ieVNg1U="; + }) + ]; + enableParallelBuilding = true; buildInputs = [ perl python3 systemc ]; # ccache nativeBuildInputs = [ makeWrapper flex bison autoconf help2man git ]; @@ -37,6 +46,11 @@ stdenv.mkDerivation rec { done ''; + env = { + SYSTEMC_INCLUDE = "${lib.getDev systemc}/include"; + SYSTEMC_LIBDIR = "${lib.getLib systemc}/lib"; + }; + meta = with lib; { description = "Fast and robust (System)Verilog simulator/compiler and linter"; homepage = "https://www.veripool.org/verilator"; diff --git a/pkgs/applications/science/electronics/vhd2vl/default.nix b/pkgs/applications/science/electronics/vhd2vl/default.nix index 0ec14d282b4a..d56a8aa6ce84 100644 --- a/pkgs/applications/science/electronics/vhd2vl/default.nix +++ b/pkgs/applications/science/electronics/vhd2vl/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "VHDL to Verilog converter"; + mainProgram = "vhd2vl"; homepage = "https://github.com/ldoolitt/vhd2vl"; license = licenses.gpl2Plus; maintainers = with maintainers; [ matthuszagh ]; diff --git a/pkgs/applications/science/electronics/xcircuit/default.nix b/pkgs/applications/science/electronics/xcircuit/default.nix index 61b63ff1d7a4..c51156d2c1ab 100644 --- a/pkgs/applications/science/electronics/xcircuit/default.nix +++ b/pkgs/applications/science/electronics/xcircuit/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Generic drawing program tailored to circuit diagrams"; + mainProgram = "xcircuit"; homepage = "http://opencircuitdesign.com/xcircuit"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/science/electronics/xoscope/default.nix b/pkgs/applications/science/electronics/xoscope/default.nix index 9f9224b5543c..0fa0c1bc79bf 100644 --- a/pkgs/applications/science/electronics/xoscope/default.nix +++ b/pkgs/applications/science/electronics/xoscope/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Oscilloscope through the sound card"; + mainProgram = "xoscope"; homepage = "https://xoscope.sourceforge.net"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [viric]; |