diff options
| author | Evils <evils.devils@protonmail.com> | 2023-03-21 09:11:13 +0100 |
|---|---|---|
| committer | Evils <evils.devils@protonmail.com> | 2023-03-30 09:22:08 +0200 |
| commit | 4f0de9463ab4e87eca136e8320480dcf10031acf (patch) | |
| tree | bfb04ae2177a2e0200d9f49c32ad4d6140f51659 /pkgs/applications/science/electronics | |
| parent | 7f3a08710a6b50ea53ddaa1fe77cefcc894fc793 (diff) | |
| download | nixlib-4f0de9463ab4e87eca136e8320480dcf10031acf.tar nixlib-4f0de9463ab4e87eca136e8320480dcf10031acf.tar.gz nixlib-4f0de9463ab4e87eca136e8320480dcf10031acf.tar.bz2 nixlib-4f0de9463ab4e87eca136e8320480dcf10031acf.tar.lz nixlib-4f0de9463ab4e87eca136e8320480dcf10031acf.tar.xz nixlib-4f0de9463ab4e87eca136e8320480dcf10031acf.tar.zst nixlib-4f0de9463ab4e87eca136e8320480dcf10031acf.zip | |
kicad-unstable: 2023-02-14 -> 2023-03-29
includes a fix for upstream issue 14346 (attempting to installing pcbnew.py outside of $out)
Diffstat (limited to 'pkgs/applications/science/electronics')
| -rw-r--r-- | pkgs/applications/science/electronics/kicad/base.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/science/electronics/kicad/versions.nix | 20 |
2 files changed, 13 insertions, 10 deletions
diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index decbd8acb03c..40fdc5b30d91 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -86,6 +86,9 @@ stdenv.mkDerivation rec { "-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;qa_eeschema'" # upstream issue 12491 "-DOCC_INCLUDE_DIR=${opencascade-occt}/include/opencascade" ] + ++ optionals (!stable) [ # workaround for https://gitlab.com/kicad/code/kicad/-/issues/14346 + "-DPYTHON_SITE_PACKAGE_PATH=${placeholder "out"}/lib/python${lib.versions.majorMinor python.version}/site-packages" + ] ++ optionals (!withScripting) [ "-DKICAD_SCRIPTING_WXPYTHON=OFF" ] diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index f686dc3ed1fc..b102da24a3d4 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -25,23 +25,23 @@ }; "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"; }; }; }; |