diff options
Diffstat (limited to 'pkgs/applications/science/electronics/kicad')
3 files changed, 24 insertions, 29 deletions
diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index 83d696ec52b1a..3833a5e72918b 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -34,6 +34,7 @@ , at-spi2-core , libXtst , pcre2 +, libdeflate , swig4 , python @@ -50,7 +51,6 @@ , withNgspice , withScripting , withI18n -, withPCM , debug , sanitizeAddress , sanitizeThreads @@ -87,6 +87,7 @@ stdenv.mkDerivation rec { # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ "-DCMAKE_SKIP_BUILD_RPATH=ON" "-DKICAD_USE_EGL=ON" + "-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;qa_eeschema'" # upstream issue 12491 ] ++ optionals (withScripting) [ "-DKICAD_SCRIPTING_WXPYTHON=ON" @@ -116,12 +117,6 @@ stdenv.mkDerivation rec { ] ++ optionals (withI18n) [ "-DKICAD_BUILD_I18N=ON" - ] - ++ optionals (!withPCM && stable) [ - "-DKICAD_PCM=OFF" - ] - ++ optionals (!stable) [ # upstream issue 12491 - "-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;qa_eeschema'" ]; nativeBuildInputs = [ @@ -166,8 +161,9 @@ stdenv.mkDerivation rec { boost swig4 python + unixODBC + libdeflate ] - ++ optional (!stable) unixODBC ++ optional (withScripting) wxPython ++ optional (withNgspice) libngspice ++ optional (withOCC) opencascade-occt diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 047484fd9fffa..c7eb9d69522c9 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -24,7 +24,6 @@ , sanitizeThreads ? false , with3d ? true , withI18n ? true -, withPCM ? true # Plugin and Content Manager , srcs ? { } }: @@ -118,7 +117,7 @@ stdenv.mkDerivation rec { inherit stable baseName; inherit kicadSrc kicadVersion; inherit wxGTK python wxPython; - inherit withOCC withNgspice withScripting withI18n withPCM; + inherit withOCC withNgspice withScripting withI18n; inherit debug sanitizeAddress sanitizeThreads; }; @@ -150,15 +149,15 @@ stdenv.mkDerivation rec { "--prefix GIO_EXTRA_MODULES : ${dconf}/lib/gio/modules" # required to open a bug report link in firefox-wayland "--set-default MOZ_DBUS_REMOTE 1" - "--set-default KICAD6_FOOTPRINT_DIR ${footprints}/share/kicad/footprints" - "--set-default KICAD6_SYMBOL_DIR ${symbols}/share/kicad/symbols" - "--set-default KICAD6_TEMPLATE_DIR ${templates}/share/kicad/template" - "--prefix KICAD6_TEMPLATE_DIR : ${symbols}/share/kicad/template" - "--prefix KICAD6_TEMPLATE_DIR : ${footprints}/share/kicad/template" + "--set-default KICAD7_FOOTPRINT_DIR ${footprints}/share/kicad/footprints" + "--set-default KICAD7_SYMBOL_DIR ${symbols}/share/kicad/symbols" + "--set-default KICAD7_TEMPLATE_DIR ${templates}/share/kicad/template" + "--prefix KICAD7_TEMPLATE_DIR : ${symbols}/share/kicad/template" + "--prefix KICAD7_TEMPLATE_DIR : ${footprints}/share/kicad/template" ] ++ optionals (with3d) [ - "--set-default KICAD6_3DMODEL_DIR ${packages3d}/share/kicad/3dmodels" + "--set-default KICAD7_3DMODEL_DIR ${packages3d}/share/kicad/3dmodels" ] ++ optionals (withNgspice) [ "--prefix LD_LIBRARY_PATH : ${libngspice}/lib" ] @@ -172,7 +171,7 @@ stdenv.mkDerivation rec { let bin = if stdenv.isDarwin then "*.app/Contents/MacOS" else "bin"; tools = [ "kicad" "pcbnew" "eeschema" "gerbview" "pcb_calculator" "pl_editor" "bitmap2component" ]; - utils = [ "dxf2idf" "idf2vrml" "idfcyl" "idfrect" "kicad2step" ]; + utils = [ "dxf2idf" "idf2vrml" "idfcyl" "idfrect" "kicad-cli" ]; in (concatStringsSep "\n" (flatten [ diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index cc567ae7114dd..eb5ff0fc97f41 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,23 +3,23 @@ { "kicad" = { kicadVersion = { - version = "6.0.11"; + version = "7.0.0"; src = { - rev = "2627ca5db025d40933329af642df28c4a2193dbf"; - sha256 = "1bhzmgs921wv1pc0mpyigmpp630086kmpifc3a91cbkv4xf0akkq"; + rev = "da2b9df05c3ccd5ec104cf8cd8ded34f5dd25216"; + sha256 = "1zgpj1rvf97qv36hg4dja46pbzyixlh2g04wlh7cizcrs16b9mzw"; }; }; libVersion = { - version = "6.0.11"; + version = "7.0.0"; libSources = { - symbols.rev = "c2277d1e39c5e9ba5e04ca5ef3eb252a74291375"; - symbols.sha256 = "1fwnr8x345jbifk71rhyd4b88c4ijp2rcw3pmivnwfb444hbr1lp"; - templates.rev = "049baf307d2fdf5e6138ebab40a8be720b4ae62e"; - templates.sha256 = "08zxh83fbygh1x2jhca8nrp3f9kihf7kmg65qmyp95wvps4p5h8v"; - footprints.rev = "72fb90dda096bd59295ccc2c8c0881ee02a1221c"; - footprints.sha256 = "1rs05n1wjb2w3x7xqkkijbdxyw3fj0fph8znvnsxp9bgwaaipd4h"; - packages3d.rev = "3fc9daed3ca80a1b6f3bbb1ef505f0dc79972d44"; - packages3d.sha256 = "0nmvfchp25i4bkx6yf7fz1rwy7w6whj2w7mlp02ag3w5v4f137vz"; + symbols.rev = "08a25991d07924b263cbf87c6e513feac2b2169f"; + symbols.sha256 = "1r87xr1453dpfglkg1m4p5d7kcv9gxls1anwk3vp2yppnwz24ydm"; + templates.rev = "66d76556d9e81f8a5be74457686d211c666ed200"; + templates.sha256 = "02i279269mhq7wjhb1yqk90820ncssxl9n7b20qr2r4fmm7jpvxv"; + footprints.rev = "a0388d07e4a37e8db13a716efb3ad4750c839f9c"; + footprints.sha256 = "1akhifnjm8jvqsvscn2rr1wpzrls73bpdc6sk40355r1in2djmry"; + packages3d.rev = "bbee2295519bcf469d97f5e06bcf7175cddd2037"; + packages3d.sha256 = "1qw5xm0wbhv6gqvd8mn0jp4abjbizrkx79r6y8f6911mkzi47r6n"; }; }; }; |