colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kicad: 7.0.11 -> 8.0.0 

switch to KICAD8 env vars

make the previously unstable dependencies stable
reenable the qa_eeschema test
and disable qa_spice

also bump testing and unstable
This commit is contained in:
Evils 2024-02-24 03:18:00 +01:00
parent b18493e3f2
commit 55e0055e12
4 changed files with 50 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/applications/science/electronics/kicad/base.nix
View File

@ -96,14 +96,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DKICAD_USE_EGL=ON"
"-DOCC_INCLUDE_DIR=${opencascade-occt}/include/opencascade"
]
++ 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'"
]
++ optionals (!stable) [
# 8 failures, not finding files, some wrong calculations; but upstream runs the tests...
# https://gitlab.com/kicad/code/kicad/-/issues/17133
"-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;qa_spice'"
]
++ optional (stable && !withNgspice) "-DKICAD_SPICE=OFF"
@ -134,8 +127,6 @@ stdenv.mkDerivation rec {
doxygen
graphviz
pkg-config
]
++ optionals (!stable) [
libgit2
libsecret
libgcrypt
@ -194,13 +185,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;

10
pkgs/applications/science/electronics/kicad/default.nix
View File

@ -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" ]

2
pkgs/applications/science/electronics/kicad/runtime_stock_data_path.patch
View File

@ -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;
+ }
+

70
pkgs/applications/science/electronics/kicad/versions.nix
View File

@ -3,67 +3,67 @@
{
"kicad" = {
kicadVersion = {
version = "7.0.11";
version = "8.0.0";
src = {
rev = "8b7c6b9db0de4f39131845aa8a1a66693c4a93a4";
sha256 = "0gwf6yb05cm3f9sz4jp96imskir3rf0a7kaqaszzrjxr3zcigwjv";
rev = "ef34436d7d4bb488a9559d7fae32dc956d37c669";
sha256 = "060j6f7k4p2bbx2z8iy482w9qgzf0wqxzrsv1kv19pmsi5cx1zp3";
};
};
libVersion = {
version = "7.0.11";
version = "8.0.0";
libSources = {
symbols.rev = "b1ecf3147604884cde9c44daad99e8e13a15e021";
symbols.sha256 = "057zmhf4h3p3p4y6jqxch9cj1wqf129k6kmvx2gshb9lgda0kjr8";
templates.rev = "45dd19e76ec8d75fd932e462a164239baf253dfc";
templates.sha256 = "0mykfwwik7472i4r0isc5szj3dnmvd0538p0vlmzh4rcgj3pj3vm";
footprints.rev = "6b91a79be61f214b7d69eb574b12e8120b2179ae";
footprints.sha256 = "1r9v8v41n0yrgwsqaksskmdgb9vyw1sb92xh81bwrv2ag3p5vdg7";
packages3d.rev = "778443c8880b21bea6be5fccbd4a03bfdb8625a8";
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-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 = "2024-02-07";
version = "2024-02-23";
src = {
rev = "8efd90e6e89b7fdc6702ad49c2f4fc7cef68a0c9";
sha256 = "0ypsk8r8lk0711qp7wid7y48kb44m0sxzrs991ipxm1j5hmvla6d";
rev = "b7b64d959f37f00bb0d14b007c3b3908196e1024";
sha256 = "1gl7mjqpmqq4m55z6crwb77983g00gi2161ichsc7hsfhs4c8grh";
};
};
libVersion = {
version = "2024-02-07";
version = "2024-02-23";
libSources = {
symbols.rev = "f33b7bae11538dbcec1b4d5d2c8c2b7816eabab2";
symbols.sha256 = "1vg7cdnnf632gca8dwv8zazqnh04dplvmkf4g1db1dc0bdpnylan";
templates.rev = "ff6e3193e6ff6029f65e7cce8ab39fafeafecdd6";
templates.sha256 = "0mykfwwik7472i4r0isc5szj3dnmvd0538p0vlmzh4rcgj3pj3vm";
footprints.rev = "7ba15cf3f64c245c751adee5751cb6621bfa1900";
footprints.sha256 = "1a2nw989qi5c4zwa5z6dfsxq6nfvrzjdim0lgqhvspqi0kiqbl0a";
packages3d.rev = "7005c85cded7a5d59fd3413eb5912d46301e6d12";
packages3d.sha256 = "04r54zwfyz17w1j7v2hk4dylvvazhivlwkpl0xki1d4vn3w66d9m";
symbols.rev = "8b0c343d8694fe0a968e5c4af69fd161bacf7da1";
symbols.sha256 = "049h2a7yn6ks8sybppixa872dbvyd0rwf9r6nixvdg6d13fl6rwf";
templates.rev = "0a6c4f798a68a5c639d54b4d3093460ab9267816";
templates.sha256 = "0m9bggz3cm27kqpjjwxy19mqzk0c69bywcjkqcni7kafr21c6k4z";
footprints.rev = "ded6b053460faae5783c538a38e91e2b4bddcf2e";
footprints.sha256 = "035bf37n4vrihaj4zfdncisdx9fly1vya7lhkxhlsbv5blpi4a5y";
packages3d.rev = "984667325076d4e50dab14e755aeacf97f42194c";
packages3d.sha256 = "0lkaxv02h4sxrnm8zr17wl9d07mazlisad78r35gry741i362cdg";
};
};
};