kicad: unite unstable.nix with default.nix

use latest libraries for unstable
move all revs and hashes to default.nix

thanks TQ for getting me through this blockage

1 files changed, 69 insertions, 11 deletions

diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix
index 9996a837e1a..7164442d19c 100644
--- a/pkgs/applications/science/electronics/kicad/default.nix
+++ b/pkgs/applications/science/electronics/kicad/default.nix
@@ -2,8 +2,9 @@
 , libX11, gettext, glew, glm, cairo, curl, openssl, boost, pkgconfig
 , doxygen, pcre, libpthreadstubs, libXdmcp, makeWrapper, gnome3
 , gsettings-desktop-schemas, librsvg, hicolor-icon-theme, cups
-, fetchpatch, kicad-libraries, lndir
+, fetchpatch, lndir, callPackages
 
+, pname ? "kicad"
 , oceSupport ? false, opencascade
 , withOCCT ? true, opencascade-occt
 , ngspiceSupport ? true, libngspice
@@ -16,21 +17,66 @@ assert ngspiceSupport -> libngspice != null;
 
 with lib;
 let
+  versions = {
+    "kicad" = {
+      kicadVersion = {
+        version = "5.1.5";
+        src.sha256 = "15h3rwisjss3fdc9bam9n2wq94slhacc3fbg14bnzf4n5agsnv5b";
+      };
+      libVersion = {
+        version = "5.1.5";
+        libSources = {
+          i18n.sha256 = "1rfpifl8vky1gba2angizlb2n7mwmsiai3r6ip6qma60wdj8sbd3";
+          symbols.sha256 = "048b07ffsaav1ssrchw2p870lvb4rsyb5vnniy670k7q9p16qq6h";
+          templates.sha256 = "0cs3bm3zb5ngw5ldn0lzw5bvqm4kvcidyrn76438alffwiz2b15g";
+          footprints.sha256 = "1c4whgn14qhz4yqkl46w13p6rpv1k0hsc9s9h9368fxfcz9knb2j";
+          packages3d.sha256 = "0cff2ms1bsw530kqb1fr1m2pjixyxzwa81mxgac3qpbcf8fnpvaz";
+        };
+      };
+    };
+    "kicad-unstable" = {
+      kicadVersion = {
+        version = "2019-12-14";
+        src = {
+          rev = "74caf3b7cb89f5bff86ad470bed67d200f445ba5";
+          sha256 = "083f79plfmxiwgbaldgqi1bqq01g2r153x3c4n7ipi2dn7m5f1lr";
+        };
+      };
+      libVersion = {
+        version = "unstable";
+        libSources = {
+          i18n.rev = "f1084526305005fa53e78000f7db2d67e8a0d423";
+          i18n.sha256 = "1yhc0m4psx0rz5msb1zqn5fz6l1ynwykrsk1443g4073lmjibv74";
+          symbols.rev = "6dd82f11e4b2e60946dd07459e579cee0d42ca75";
+          symbols.sha256 = "07mzaxn2isc6kj9zxl7syi013y4dfv5bvw9vlllbg8624mpwdibz";
+          templates.rev = "0c0490897f803ab8b7c3dad438b7eb1f80e0417c";
+          templates.sha256 = "0cs3bm3zb5ngw5ldn0lzw5bvqm4kvcidyrn76438alffwiz2b15g";
+          footprints.rev = "8cef00a34078c3dabe943a76f9cdf7d05ffc38fc";
+          footprints.sha256 = "0aplxxbcyb4vpj3kpcnj6lbnpk9zjql46js9i4iaqs388z93sb97";
+          packages3d.rev = "58d73640ebb764637eb7bba6290815b84a24b8ad";
+          packages3d.sha256 = "0cff2ms1bsw530kqb1fr1m2pjixyxzwa81mxgac3qpbcf8fnpvaz";
+        };
+      };
+    };
+  };
+  versionConfig = versions.${pname};
+
   # oce on aarch64 fails a test
-  withOCC = (stdenv.isAarch64 && (withOCCT || oceSupport)) || (!stdenv.isAarch64 && withOCCT);
+  withOCC = withOCCT || (stdenv.isAarch64 && oceSupport);
   withOCE = oceSupport && !stdenv.isAarch64 && !withOCC;
+  kicad-libraries = callPackages ./libraries.nix versionConfig.libVersion;
 in
 stdenv.mkDerivation rec {
-  pname = "kicad";
-  version = "5.1.5";
 
-  src = fetchFromGitLab {
+  inherit pname;
+  version = versions.${pname}.kicadVersion.version;
+
+  src = fetchFromGitLab ({
     group = "kicad";
     owner = "code";
     repo = "kicad";
     rev = version;
-    sha256 = "15h3rwisjss3fdc9bam9n2wq94slhacc3fbg14bnzf4n5agsnv5b";
-  };
+  } // versionConfig.kicadVersion.src);
 
   # quick fix for #72248
   # should be removed if a a more permanent fix is published
@@ -41,6 +87,14 @@ stdenv.mkDerivation rec {
     })
   ];
 
+  # tagged releases don't have "unknown"
+  postPatch = optional (pname == "kicad-unstable")
+  ''
+    substituteInPlace CMakeModules/KiCadVersion.cmake \
+      --replace "unknown" ${version}
+    echo "replaced \"unknown\" with \"${version}\" in version name"
+  '';
+
   makeFlags = optional (debug) [ "CFLAGS+=-Og" "CFLAGS+=-ggdb" ];
 
   cmakeFlags =
@@ -57,7 +111,8 @@ stdenv.mkDerivation rec {
       [ "-DKICAD_USE_OCE=ON" "-DOCE_DIR=${opencascade}" ]
     ++ optionals (withOCC) [
       "-DKICAD_USE_OCC=ON"
-      # this line is unneeded on unstable...
+      # this line is redundant on unstable...
+      # maybe may be removed on a later release
       "-DKICAD_USE_OCE=OFF"
       "-DOCC_INCLUDE_DIR=${opencascade-occt}/include/opencascade"
     ]
@@ -89,9 +144,10 @@ stdenv.mkDerivation rec {
   ++ optional (debug) valgrind
   ;
 
+  # debug builds fail all but the python test
   # 5.1.x fails the eeschema test
-  # doInstallCheck = (!debug);
-  # installCheckTarget = "test";
+  doInstallCheck = !debug && (pname == "kicad-unstable");
+  installCheckTarget = "test";
 
   dontStrip = debug;
 
@@ -151,7 +207,9 @@ stdenv.mkDerivation rec {
   ;
 
   meta = {
-    description = "Open Source Electronics Design Automation Suite";
+    description = if (pname != "kicad-unstable")
+      then "Open Source Electronics Design Automation Suite"
+      else "Open Source EDA Suite, Development Build";
     homepage = "https://www.kicad-pcb.org/";
     longDescription = ''
       KiCad is an open source software suite for Electronic Design Automation.