kicad-unstable: 2023-03-29 -> 2023-04-14

workaround for upstream issue 14346 no longer needed
This commit is contained in:
Evils 2023-04-15 00:56:13 +02:00 committed by Bjørn Forsman
parent 534f790a75
commit cce076bd24
2 changed files with 10 additions and 13 deletions

View file

@ -94,9 +94,6 @@ stdenv.mkDerivation rec {
# should be resolved in the next release # should be resolved in the next release
"-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;qa_eeschema'" "-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;qa_eeschema'"
] ]
++ optionals (!stable) [ # workaround for https://gitlab.com/kicad/code/kicad/-/issues/14346
"-DPYTHON_SITE_PACKAGE_PATH=${placeholder "out"}/${python.sitePackages}/"
]
++ optional (stable && !withNgspice) "-DKICAD_SPICE=OFF" ++ optional (stable && !withNgspice) "-DKICAD_SPICE=OFF"
++ optionals (!withScripting) [ ++ optionals (!withScripting) [
"-DKICAD_SCRIPTING_WXPYTHON=OFF" "-DKICAD_SCRIPTING_WXPYTHON=OFF"

View file

@ -25,23 +25,23 @@
}; };
"kicad-unstable" = { "kicad-unstable" = {
kicadVersion = { kicadVersion = {
version = "2023-03-29"; version = "2023-04-14";
src = { src = {
rev = "d5bc223ff2cd1fbf4e923e23b5bb442bb54faa95"; rev = "4a3f77cd9dac9dc5921eb9beaa63d0d3c9c051e5";
sha256 = "0pbzmv9vh4bzhsxj46gjkgh7kk6a0v8gijvkmb56fy5i8xv2ixkn"; sha256 = "06dsiyvr7zn3cp13w0y63d1qmjlhzsqlvajkximg3pw5mmiljxrr";
}; };
}; };
libVersion = { libVersion = {
version = "2023-03-29"; version = "2023-04-14";
libSources = { libSources = {
symbols.rev = "36fc1c88921bf32ebf667e027dfe63cca649fd95"; symbols.rev = "38d4e7e1ab6a9b5d9eee85f687e60467753b2135";
symbols.sha256 = "177mqvjf3knldnl7pf1abv4pmlgi5cg02ggfwbc655jq4x6x8fkz"; symbols.sha256 = "0df6fx9b19v6sxrfyggbisw72y66kiwqi05k8mldsgiw6q55gbkc";
templates.rev = "867eef383a0f61015cb69677d5c632d78a2ea01a"; templates.rev = "867eef383a0f61015cb69677d5c632d78a2ea01a";
templates.sha256 = "1qi20mrsfn4fxmr1fyphmil2i9p2nzmwk5rlfchc5aq2194nj3lq"; templates.sha256 = "1qi20mrsfn4fxmr1fyphmil2i9p2nzmwk5rlfchc5aq2194nj3lq";
footprints.rev = "dc4574eb65136d95a7775d09412d5159f8d7832c"; footprints.rev = "4da055a2d572ff87e7ecea97cf358ed8c1d46dfc";
footprints.sha256 = "1iz4wyiysdii378c3pjgkgwh1cssxbh5jkbhvj7rmi2vmgngl6nc"; footprints.sha256 = "1xb84284dmcb7mbvzlrxb4v4km3ih7gq856h8cglf9jn8wzlnvrk";
packages3d.rev = "e54b5b6368d03f396098448bcce37f2e432dac33"; packages3d.rev = "0f43a0962437feb53bd2083e9f39efffb5a5dd90";
packages3d.sha256 = "0nzi7ijfb3rjm98kaa9va2mkh0nfzpq4vfhxkq8j18qhx24h5c8v"; packages3d.sha256 = "1nkk4325jh89vh52ykfnf9pz1k3jk5017gz6r2cia2v4b3jadi31";
}; };
}; };
}; };