diff options
| author | Evils <evils.devils@protonmail.com> | 2022-08-03 02:38:59 +0200 |
|---|---|---|
| committer | Evils <evils.devils@protonmail.com> | 2022-09-19 08:29:04 +0200 |
| commit | a62cbaddcaf8b52e5ef772ce003400bbe6714b67 (patch) | |
| tree | 7e131869222bcaa147709a6aa1144ff4e1eb8d20 | |
| parent | f677051b8dc0b5e2a9348941c99eea8c4b0ff28f (diff) | |
| download | nixpkgs-a62cbaddcaf8b52e5ef772ce003400bbe6714b67.tar nixpkgs-a62cbaddcaf8b52e5ef772ce003400bbe6714b67.tar.gz nixpkgs-a62cbaddcaf8b52e5ef772ce003400bbe6714b67.tar.bz2 nixpkgs-a62cbaddcaf8b52e5ef772ce003400bbe6714b67.tar.lz nixpkgs-a62cbaddcaf8b52e5ef772ce003400bbe6714b67.tar.xz nixpkgs-a62cbaddcaf8b52e5ef772ce003400bbe6714b67.tar.zst nixpkgs-a62cbaddcaf8b52e5ef772ce003400bbe6714b67.zip | |
kicad-unstable: 2022-06-21 -> 2022-09-18
| -rw-r--r-- | pkgs/applications/science/electronics/kicad/base.nix | 18 | ||||
| -rwxr-xr-x | pkgs/applications/science/electronics/kicad/update.sh | 6 | ||||
| -rw-r--r-- | pkgs/applications/science/electronics/kicad/versions.nix | 20 |
3 files changed, 27 insertions, 17 deletions
diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index aa5d9a7ade1..e2cc2bb7aeb 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -20,6 +20,7 @@ , libpthreadstubs , libXdmcp , lndir +, unixODBC , util-linux , libselinux @@ -32,7 +33,7 @@ , at-spi2-core , libXtst -, swig +, swig4 , python , wxPython , opencascade-occt @@ -68,10 +69,11 @@ stdenv.mkDerivation rec { # tagged releases don't have "unknown" # kicad nightlies use git describe --dirty # nix removes .git, so its approximated here - postPatch = '' - substituteInPlace CMakeModules/KiCadVersion.cmake \ - --replace "unknown" "${builtins.substring 0 10 src.rev}" \ - ''; + postPatch = if (!stable) then '' + substituteInPlace cmake/KiCadVersion.cmake \ + --replace "unknown" "${builtins.substring 0 10 src.rev}" + '' + else ""; makeFlags = optionals (debug) [ "CFLAGS+=-Og" "CFLAGS+=-ggdb" ]; @@ -151,15 +153,19 @@ stdenv.mkDerivation rec { curl openssl boost - swig + swig4 python ] + ++ optional (!stable) unixODBC ++ optional (withScripting) wxPython ++ optional (withNgspice) libngspice ++ optional (withOCC) opencascade-occt ++ optional (debug) valgrind ; + # started becoming necessary halfway into 2022, not sure what changed to break a test... + preInstallCheck = optionals (withNgspice) [ "export LD_LIBRARY_PATH=${libngspice}/lib" ]; + # debug builds fail all but the python test # stable release doesn't have the fix for upstream issue 9888 yet doInstallCheck = !debug && !stable; diff --git a/pkgs/applications/science/electronics/kicad/update.sh b/pkgs/applications/science/electronics/kicad/update.sh index c51d32d39ac..625b2962fa2 100755 --- a/pkgs/applications/science/electronics/kicad/update.sh +++ b/pkgs/applications/science/electronics/kicad/update.sh @@ -65,7 +65,11 @@ tmp="${here}/,versions.nix.${RANDOM}" libs=( symbols templates footprints packages3d ) get_rev() { - git ls-remote --tags "$@" + if [[ ${version} == "master" ]]; then + git ls-remote --heads "$@" + else + git ls-remote --tags "$@" + fi } gitlab="https://gitlab.com/kicad" diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index eb8a2fd6daf..b6d6def4fca 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-06-21"; + version = "2022-09-18"; src = { - rev = "b54bb909755d39dcce38ef277c715d7f31ab8e00"; - sha256 = "0nzgrkkvc66hgqdrwfmh5fjw4ffr8gc3bw3n44sa6zjkkz5s6p48"; + rev = "0efc1149afed2af5b81e4555de4623217ece650f"; + sha256 = "19fqy8yvvl45izg5ynhch9r4gl4ncx0bz9s6n1x98bgzxkdyc14q"; }; }; libVersion = { - version = "2022-06-21"; + version = "2022-09-18"; libSources = { - symbols.rev = "a003b00f6f1056d726e32e911cd65b32946f5503"; - symbols.sha256 = "02z3vqhz1rlf57zi8vyrlxvvdl1hpsh447p41qdgcpn5dyjycb9d"; + symbols.rev = "879023fba005d23f285b6d052d9e6bcba1d754aa"; + symbols.sha256 = "1nxz8r3h3j62fs3s77lj27333fsj5c4i01n05lv0gqx36h28hqxk"; templates.rev = "ae2b46f8756d79379b90fec01d4fdde1ccfd73c1"; templates.sha256 = "08zxh83fbygh1x2jhca8nrp3f9kihf7kmg65qmyp95wvps4p5h8v"; - footprints.rev = "5df530ec44892407d6382d933ff9ad42dd19df0e"; - footprints.sha256 = "1phynxisha2pq2knbx5l1hkdz1bmjm0qxl3lcb4ab82h8d35r37c"; - packages3d.rev = "6bfd8dfa3adc6ac316b9857977c87f22282c6e24"; - packages3d.sha256 = "0ci9gxbpfnfqwah95ki4qcwlca78s1z6s7hckisnp58a1cm9siya"; + footprints.rev = "b1dfe894de90b0063befc02b914dc9e2b47e3a62"; + footprints.sha256 = "06kn6c00wlnr33mks582xhadvkbbgmqhb4qc1wjfw264pavz7v7y"; + packages3d.rev = "45df600c5e3dd5113d62e6445115e7c37bdf362f"; + packages3d.sha256 = "0cnrg7mr3khpglviid1adk2ihs1qwj0r7l32z2vqsl8aidzbg9kr"; }; }; }; |