diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index 697c27842081..eb65b6881ae2 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -20,9 +20,7 @@ , pcre , libpthreadstubs , libXdmcp -, lndir , unixODBC -, fetchpatch , util-linux , libselinux @@ -48,7 +46,6 @@ , baseName , kicadSrc , kicadVersion -, withOCC , withNgspice , withScripting , withI18n @@ -72,19 +69,6 @@ stdenv.mkDerivation rec { patches = [ # upstream issue 12941 (attempted to upstream, but appreciably unacceptable) ./writable.patch - ] - ++ optionals (stable) # the 2 wxGTK ones should in the next stable point release - [ - (fetchpatch { # for wxGTK 3.2.2.1's .1 field - name = "support wxWidgets subrelease field"; - url = "https://gitlab.com/kicad/code/kicad/-/commit/b536580119c59fde78e38d8d6388f2540ecb6cf9.diff"; - hash = "sha256-F+J5oZO0BsT1VWKpx0KGA7ecn5/PBgCw8uiScihM+54="; - }) - (fetchpatch { # for wxGTK 3.2.2.1's .1 field, but for wxPython - name = "relax wxPython check to just major.minor"; - url = "https://gitlab.com/kicad/code/kicad/-/commit/1e8cc6855d6a8fc1f9dfc933224c3a10fb759f9c.diff"; - hash = "sha256-CGNgxZ7QiVLkaauNl7Pmcl152lwyDZqA/HSyFdOswwU="; - }) ]; # tagged releases don't have "unknown" @@ -97,40 +81,42 @@ stdenv.mkDerivation rec { makeFlags = optionals (debug) [ "CFLAGS+=-Og" "CFLAGS+=-ggdb" ]; + # some ngspice tests attempt to write to $HOME/.cache/ + XDG_CACHE_HOME = "$TMP"; + # failing tests still attempt to create $HOME though + cmakeFlags = [ - # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ - "-DCMAKE_SKIP_BUILD_RPATH=ON" "-DKICAD_USE_EGL=ON" - "-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;qa_eeschema'" # upstream issue 12491 + "-DOCC_INCLUDE_DIR=${opencascade-occt}/include/opencascade" ] - ++ optionals (withScripting) [ - "-DKICAD_SCRIPTING_WXPYTHON=ON" + ++ optionals (stable) [ + # https://gitlab.com/kicad/code/kicad/-/issues/12491 + # should be resolved in the next release + "-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" ++ optionals (!withScripting) [ "-DKICAD_SCRIPTING_WXPYTHON=OFF" ] - ++ optional (!withNgspice) "-DKICAD_SPICE=OFF" - ++ optional (!withOCC) "-DKICAD_USE_OCC=OFF" - ++ optionals (withOCC) [ - "-DKICAD_USE_OCC=ON" - "-DOCC_INCLUDE_DIR=${opencascade-occt}/include/opencascade" + ++ optionals (withI18n) [ + "-DKICAD_BUILD_I18N=ON" + ] + ++ optionals (!doInstallCheck) [ + "-DKICAD_BUILD_QA_TESTS=OFF" ] ++ optionals (debug) [ "-DCMAKE_BUILD_TYPE=Debug" "-DKICAD_STDLIB_DEBUG=ON" "-DKICAD_USE_VALGRIND=ON" ] - ++ optionals (!doInstallCheck) [ - "-DKICAD_BUILD_QA_TESTS=OFF" - ] ++ optionals (sanitizeAddress) [ "-DKICAD_SANITIZE_ADDRESS=ON" ] ++ optionals (sanitizeThreads) [ "-DKICAD_SANITIZE_THREADS=ON" - ] - ++ optionals (withI18n) [ - "-DKICAD_BUILD_I18N=ON" ]; nativeBuildInputs = [ @@ -138,7 +124,6 @@ stdenv.mkDerivation rec { doxygen graphviz pkg-config - lndir ] # wanted by configuration on linux, doesn't seem to affect performance # no effect on closure size @@ -177,10 +162,10 @@ stdenv.mkDerivation rec { python unixODBC libdeflate + opencascade-occt ] ++ optional (withScripting) wxPython ++ optional (withNgspice) libngspice - ++ optional (withOCC) opencascade-occt ++ optional (debug) valgrind; # debug builds fail all but the python test diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index c7eb9d69522c..50628a3e1f01 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -14,7 +14,6 @@ , pname ? "kicad" , stable ? true -, withOCC ? true , withNgspice ? !stdenv.isDarwin , libngspice , withScripting ? true @@ -117,7 +116,7 @@ stdenv.mkDerivation rec { inherit stable baseName; inherit kicadSrc kicadVersion; inherit wxGTK python wxPython; - inherit withOCC withNgspice withScripting withI18n; + inherit withNgspice withScripting withI18n; inherit debug sanitizeAddress sanitizeThreads; }; @@ -131,7 +130,7 @@ stdenv.mkDerivation rec { dontFixup = true; pythonPath = optionals (withScripting) - [ wxPython python.pkgs.six ]; + [ wxPython python.pkgs.six python.pkgs.requests ]; nativeBuildInputs = [ makeWrapper ] ++ optionals (withScripting) diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 4562e8447624..b102da24a3d4 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,45 +3,45 @@ { "kicad" = { kicadVersion = { - version = "7.0.0"; + version = "7.0.1"; src = { - rev = "da2b9df05c3ccd5ec104cf8cd8ded34f5dd25216"; - sha256 = "1zgpj1rvf97qv36hg4dja46pbzyixlh2g04wlh7cizcrs16b9mzw"; + rev = "3b83917a115be1ce2f33a73039f59f8784b5c2e7"; + sha256 = "021safxvyq9qzs08jy3jvpazmhvix4kyl05s9y9hwmyzdmdl2smn"; }; }; libVersion = { - version = "7.0.0"; + version = "7.0.1"; libSources = { - symbols.rev = "08a25991d07924b263cbf87c6e513feac2b2169f"; - symbols.sha256 = "1r87xr1453dpfglkg1m4p5d7kcv9gxls1anwk3vp2yppnwz24ydm"; + symbols.rev = "adfe3c06b5750d81580ed44e669b578f49c205eb"; + symbols.sha256 = "14c5gci13m30xv0cmic5jxsmfx9lq3fnd8hyq3mmgkrw7443zy30"; templates.rev = "66d76556d9e81f8a5be74457686d211c666ed200"; templates.sha256 = "02i279269mhq7wjhb1yqk90820ncssxl9n7b20qr2r4fmm7jpvxv"; - footprints.rev = "a0388d07e4a37e8db13a716efb3ad4750c839f9c"; - footprints.sha256 = "1akhifnjm8jvqsvscn2rr1wpzrls73bpdc6sk40355r1in2djmry"; - packages3d.rev = "bbee2295519bcf469d97f5e06bcf7175cddd2037"; - packages3d.sha256 = "1qw5xm0wbhv6gqvd8mn0jp4abjbizrkx79r6y8f6911mkzi47r6n"; + footprints.rev = "1cf5a1d979cffebd62464c1bb0d7b09c5ee3b8c3"; + footprints.sha256 = "0k0z40wmaq665hjxb6kp1yl3v7clxz49r6ki0chyphsxv1cnixmy"; + packages3d.rev = "e54b5b6368d03f396098448bcce37f2e432dac33"; + packages3d.sha256 = "0nzi7ijfb3rjm98kaa9va2mkh0nfzpq4vfhxkq8j18qhx24h5c8v"; }; }; }; "kicad-unstable" = { kicadVersion = { - version = "2023-02-14"; + version = "2023-03-29"; src = { - rev = "29c4482bc898f627cebcd5f64e063e8a813a5445"; - sha256 = "1hs1p79skmrn2k7qrpnkynzkk2g8ry20lqivzfqg87c56rd1522y"; + rev = "d5bc223ff2cd1fbf4e923e23b5bb442bb54faa95"; + sha256 = "0pbzmv9vh4bzhsxj46gjkgh7kk6a0v8gijvkmb56fy5i8xv2ixkn"; }; }; libVersion = { - version = "2023-02-14"; + version = "2023-03-29"; libSources = { - symbols.rev = "3ad8b98287ddf528ce8ff07bbe70aed85cb4410a"; - symbols.sha256 = "1p0wa3bhw2qgdvb5vzwvrbhkb6sqpc93d754rbcs2xh79d75l9nn"; + symbols.rev = "36fc1c88921bf32ebf667e027dfe63cca649fd95"; + symbols.sha256 = "177mqvjf3knldnl7pf1abv4pmlgi5cg02ggfwbc655jq4x6x8fkz"; templates.rev = "867eef383a0f61015cb69677d5c632d78a2ea01a"; templates.sha256 = "1qi20mrsfn4fxmr1fyphmil2i9p2nzmwk5rlfchc5aq2194nj3lq"; - footprints.rev = "a168dd18ea63c2df948c2de3026dc19730cb70cf"; - footprints.sha256 = "0y3cl9fcyi8z4yrn0kfgfy28gn9ngrdvnpgbpwykbbp8fpx401nk"; - packages3d.rev = "a0919e5e805157bccd65af313806de3833c1673e"; - packages3d.sha256 = "1yizw9g3skz7i9x9iwbnn3gk3lnh10krf6xg32plb2plxfynz3cw"; + footprints.rev = "dc4574eb65136d95a7775d09412d5159f8d7832c"; + footprints.sha256 = "1iz4wyiysdii378c3pjgkgwh1cssxbh5jkbhvj7rmi2vmgngl6nc"; + packages3d.rev = "e54b5b6368d03f396098448bcce37f2e432dac33"; + packages3d.sha256 = "0nzi7ijfb3rjm98kaa9va2mkh0nfzpq4vfhxkq8j18qhx24h5c8v"; }; }; };