From 6a66c0822235c02da517ad849c9627e52d8fb3b8 Mon Sep 17 00:00:00 2001
From: Evils <evils.devils@protonmail.com>
Date: Sun, 29 May 2022 00:35:29 +0200
Subject: kicad-unstable: 2022-05-06 -> 2022-06-21

contains fix for upstream issue 9888 (intermittent test failure)
---
 .../science/electronics/kicad/base.nix             |  5 ++---
 .../science/electronics/kicad/versions.nix         | 24 +++++++++++-----------
 2 files changed, 14 insertions(+), 15 deletions(-)

(limited to 'pkgs/applications/science/electronics')

diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix
index 961519bad19bb..0fbd824008a56 100644
--- a/pkgs/applications/science/electronics/kicad/base.nix
+++ b/pkgs/applications/science/electronics/kicad/base.nix
@@ -157,9 +157,8 @@ stdenv.mkDerivation rec {
   ;
 
   # debug builds fail all but the python test
-  #doInstallCheck = !debug;
-  # temporarily disabled until upstream issue 9888 is resolved
-  doInstallCheck = false;
+  # stable release doesn't have the fix for upstream issue 9888 yet
+  doInstallCheck = !debug && !stable;
   installCheckTarget = "test";
 
   dontStrip = debug;
diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix
index 658223dc4ec66..1d93aaa74c0ea 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 =			"2022-05-06";
+      version =			"2022-06-21";
       src = {
-        rev =			"dfdedfa605f58711d286d6e24e4ae9b5f75444e6";
-        sha256 =		"1bs7s2x0zh3wbk2hawg47v1s3nidmcl0xaardbpiafrrnh1qprf2";
+        rev =			"b54bb909755d39dcce38ef277c715d7f31ab8e00";
+        sha256 =		"0nzgrkkvc66hgqdrwfmh5fjw4ffr8gc3bw3n44sa6zjkkz5s6p48";
       };
     };
     libVersion = {
-      version =			"2022-05-06";
+      version =			"2022-06-21";
       libSources = {
-        symbols.rev =		"e1d70243a68a721a9f94a7df1d04c9c6ebc056ef";
-        symbols.sha256 =	"0gbl22g73cms9jrk9f6dlgd3ksnhiik39aywfm15m98jfglnlbg8";
-        templates.rev =		"a27d83f0a20f0be0c1ab04b139a0c518da51a5d4";
-        templates.sha256 =	"13h9ly6amiwm7zkwa2fd9730kh295ls8j95fszlfjp9rczv2yyzm";
-        footprints.rev =	"25bb68c2d0e61d1e1e31375adfcf0b6ccdb33ff9";
-        footprints.sha256 =	"0sxzd4dr1g12ck8b2wsyg9r2s1j3472nksrjrwpzjdyfc8rqbjai";
-        packages3d.rev =	"ac7189ed55d5a3bf5eaa87d31fb97a3e7b5ad80e";
-        packages3d.sha256 =	"00i6mybg3pprzb283b26z5b2g7a8sbghlvc0fwk9gwrp3wz1yqzc";
+        symbols.rev =		"a003b00f6f1056d726e32e911cd65b32946f5503";
+        symbols.sha256 =	"02z3vqhz1rlf57zi8vyrlxvvdl1hpsh447p41qdgcpn5dyjycb9d";
+        templates.rev =		"ae2b46f8756d79379b90fec01d4fdde1ccfd73c1";
+        templates.sha256 =	"08zxh83fbygh1x2jhca8nrp3f9kihf7kmg65qmyp95wvps4p5h8v";
+        footprints.rev =	"5df530ec44892407d6382d933ff9ad42dd19df0e";
+        footprints.sha256 =	"1phynxisha2pq2knbx5l1hkdz1bmjm0qxl3lcb4ab82h8d35r37c";
+        packages3d.rev =	"6bfd8dfa3adc6ac316b9857977c87f22282c6e24";
+        packages3d.sha256 =	"0ci9gxbpfnfqwah95ki4qcwlca78s1z6s7hckisnp58a1cm9siya";
       };
     };
   };
-- 
cgit 1.4.1