From cce076bd2437e95c06d3b56f4fa174a2e3c0fcbf Mon Sep 17 00:00:00 2001 From: Evils Date: Sat, 15 Apr 2023 00:56:13 +0200 Subject: [PATCH] kicad-unstable: 2023-03-29 -> 2023-04-14 workaround for upstream issue 14346 no longer needed --- .../science/electronics/kicad/base.nix | 3 --- .../science/electronics/kicad/versions.nix | 20 +++++++++---------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index eb65b6881ae2..1b0bdc3ae49c 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -94,9 +94,6 @@ stdenv.mkDerivation rec { # 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" diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index bafdf1c3583b..2c8161188819 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-03-29"; + version = "2023-04-14"; src = { - rev = "d5bc223ff2cd1fbf4e923e23b5bb442bb54faa95"; - sha256 = "0pbzmv9vh4bzhsxj46gjkgh7kk6a0v8gijvkmb56fy5i8xv2ixkn"; + rev = "4a3f77cd9dac9dc5921eb9beaa63d0d3c9c051e5"; + sha256 = "06dsiyvr7zn3cp13w0y63d1qmjlhzsqlvajkximg3pw5mmiljxrr"; }; }; libVersion = { - version = "2023-03-29"; + version = "2023-04-14"; libSources = { - symbols.rev = "36fc1c88921bf32ebf667e027dfe63cca649fd95"; - symbols.sha256 = "177mqvjf3knldnl7pf1abv4pmlgi5cg02ggfwbc655jq4x6x8fkz"; + symbols.rev = "38d4e7e1ab6a9b5d9eee85f687e60467753b2135"; + symbols.sha256 = "0df6fx9b19v6sxrfyggbisw72y66kiwqi05k8mldsgiw6q55gbkc"; templates.rev = "867eef383a0f61015cb69677d5c632d78a2ea01a"; templates.sha256 = "1qi20mrsfn4fxmr1fyphmil2i9p2nzmwk5rlfchc5aq2194nj3lq"; - footprints.rev = "dc4574eb65136d95a7775d09412d5159f8d7832c"; - footprints.sha256 = "1iz4wyiysdii378c3pjgkgwh1cssxbh5jkbhvj7rmi2vmgngl6nc"; - packages3d.rev = "e54b5b6368d03f396098448bcce37f2e432dac33"; - packages3d.sha256 = "0nzi7ijfb3rjm98kaa9va2mkh0nfzpq4vfhxkq8j18qhx24h5c8v"; + footprints.rev = "4da055a2d572ff87e7ecea97cf358ed8c1d46dfc"; + footprints.sha256 = "1xb84284dmcb7mbvzlrxb4v4km3ih7gq856h8cglf9jn8wzlnvrk"; + packages3d.rev = "0f43a0962437feb53bd2083e9f39efffb5a5dd90"; + packages3d.sha256 = "1nkk4325jh89vh52ykfnf9pz1k3jk5017gz6r2cia2v4b3jadi31"; }; }; };