nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-30 02:42:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #191887 from evils/kicad-unstable

Browse Source 
kicad-unstable: 2022-06-21 -> 2022-09-18
This commit is contained in:
superherointj 2022-09-23 11:04:23 -03:00 committed by GitHub
commit 82f2e31ac0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/applications/science/electronics/kicad/base.nix
View File

@ -20,6 +20,7 @@
, libpthreadstubs , libpthreadstubs
, libXdmcp , libXdmcp
, lndir , lndir
, unixODBC
, util-linux , util-linux
, libselinux , libselinux
@ -32,7 +33,7 @@
, at-spi2-core , at-spi2-core
, libXtst , libXtst
, swig , swig4
, python , python
, wxPython , wxPython
, opencascade-occt , opencascade-occt
@ -68,16 +69,18 @@ stdenv.mkDerivation rec {
# tagged releases don't have "unknown" # tagged releases don't have "unknown"
# kicad nightlies use git describe --dirty # kicad nightlies use git describe --dirty
# nix removes .git, so its approximated here # nix removes .git, so its approximated here
postPatch = '' postPatch = if (!stable) then ''
substituteInPlace CMakeModules/KiCadVersion.cmake \ substituteInPlace cmake/KiCadVersion.cmake \
--replace "unknown" "${builtins.substring 0 10 src.rev}" \ --replace "unknown" "${builtins.substring 0 10 src.rev}"
''; ''
else "";
makeFlags = optionals (debug) [ "CFLAGS+=-Og" "CFLAGS+=-ggdb" ]; makeFlags = optionals (debug) [ "CFLAGS+=-Og" "CFLAGS+=-ggdb" ];
cmakeFlags = [ cmakeFlags = [
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
"-DCMAKE_SKIP_BUILD_RPATH=ON" "-DCMAKE_SKIP_BUILD_RPATH=ON"
"-DKICAD_USE_EGL=ON"
] ]
++ optionals (withScripting) [ ++ optionals (withScripting) [
"-DKICAD_SCRIPTING_WXPYTHON=ON" "-DKICAD_SCRIPTING_WXPYTHON=ON"
@ -151,15 +154,19 @@ stdenv.mkDerivation rec {
curl curl
openssl openssl
boost boost
swig swig4
python python
] ]
++ optional (!stable) unixODBC
++ optional (withScripting) wxPython ++ optional (withScripting) wxPython
++ optional (withNgspice) libngspice ++ optional (withNgspice) libngspice
++ optional (withOCC) opencascade-occt ++ optional (withOCC) opencascade-occt
++ optional (debug) valgrind ++ 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 # debug builds fail all but the python test
# stable release doesn't have the fix for upstream issue 9888 yet # stable release doesn't have the fix for upstream issue 9888 yet
doInstallCheck = !debug && !stable; doInstallCheck = !debug && !stable;

6
pkgs/applications/science/electronics/kicad/update.sh
View File

@ -65,7 +65,11 @@ tmp="${here}/,versions.nix.${RANDOM}"
libs=( symbols templates footprints packages3d ) libs=( symbols templates footprints packages3d )
get_rev() { 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" gitlab="https://gitlab.com/kicad"

20
pkgs/applications/science/electronics/kicad/versions.nix
View File

@ -25,23 +25,23 @@
}; };
"kicad-unstable" = { "kicad-unstable" = {
kicadVersion = { kicadVersion = {
version = "2022-06-21"; version = "2022-09-18";
src = { src = {
rev = "b54bb909755d39dcce38ef277c715d7f31ab8e00"; rev = "0efc1149afed2af5b81e4555de4623217ece650f";
sha256 = "0nzgrkkvc66hgqdrwfmh5fjw4ffr8gc3bw3n44sa6zjkkz5s6p48"; sha256 = "19fqy8yvvl45izg5ynhch9r4gl4ncx0bz9s6n1x98bgzxkdyc14q";
}; };
}; };
libVersion = { libVersion = {
version = "2022-06-21"; version = "2022-09-18";
libSources = { libSources = {
symbols.rev = "a003b00f6f1056d726e32e911cd65b32946f5503"; symbols.rev = "879023fba005d23f285b6d052d9e6bcba1d754aa";
symbols.sha256 = "02z3vqhz1rlf57zi8vyrlxvvdl1hpsh447p41qdgcpn5dyjycb9d"; symbols.sha256 = "1nxz8r3h3j62fs3s77lj27333fsj5c4i01n05lv0gqx36h28hqxk";
templates.rev = "ae2b46f8756d79379b90fec01d4fdde1ccfd73c1"; templates.rev = "ae2b46f8756d79379b90fec01d4fdde1ccfd73c1";
templates.sha256 = "08zxh83fbygh1x2jhca8nrp3f9kihf7kmg65qmyp95wvps4p5h8v"; templates.sha256 = "08zxh83fbygh1x2jhca8nrp3f9kihf7kmg65qmyp95wvps4p5h8v";
footprints.rev = "5df530ec44892407d6382d933ff9ad42dd19df0e"; footprints.rev = "b1dfe894de90b0063befc02b914dc9e2b47e3a62";
footprints.sha256 = "1phynxisha2pq2knbx5l1hkdz1bmjm0qxl3lcb4ab82h8d35r37c"; footprints.sha256 = "06kn6c00wlnr33mks582xhadvkbbgmqhb4qc1wjfw264pavz7v7y";
packages3d.rev = "6bfd8dfa3adc6ac316b9857977c87f22282c6e24"; packages3d.rev = "45df600c5e3dd5113d62e6445115e7c37bdf362f";
packages3d.sha256 = "0ci9gxbpfnfqwah95ki4qcwlca78s1z6s7hckisnp58a1cm9siya"; packages3d.sha256 = "0cnrg7mr3khpglviid1adk2ihs1qwj0r7l32z2vqsl8aidzbg9kr";
}; };
}; };
}; };