diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index 2f4fd63574b0..961519bad19b 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -68,7 +68,6 @@ stdenv.mkDerivation rec { # tagged releases don't have "unknown" # kicad nightlies use git describe --dirty # nix removes .git, so its approximated here - # "6.99.0" doesn't have "-unknown", yet; so leaving this in case it returns postPatch = '' substituteInPlace CMakeModules/KiCadVersion.cmake \ --replace "unknown" "${builtins.substring 0 10 src.rev}" \ @@ -105,7 +104,7 @@ stdenv.mkDerivation rec { ++ optionals (withI18n) [ "-DKICAD_BUILD_I18N=ON" ] - ++ optionals (!withPCM) [ + ++ optionals (!withPCM && stable) [ "-DKICAD_PCM=OFF" ]; diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 5fed12b0027b..91e82772a7de 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 = "2021-12-23"; + version = "2022-01-13"; src = { - rev = "21eb92821866d558acd9e737b643b300a8b18202"; - sha256 = "01hg0byp60xzgz0xxfwvyq1hbvbllsys6lx9yfj27d3qjc3bdk42"; + rev = "33a4c9b08e040a17daefae9069fdf834063555b4"; + sha256 = "1ma0i0vgvdsjrmlfzdi34byly7n1vsaynwp9f1hny4s1m53nirha"; }; }; libVersion = { - version = "2021-12-25"; + version = "2022-01-13"; libSources = { - symbols.rev = "125a2e736504e776e4c6fb7f5131efad75edf245"; - symbols.sha256 = "0wjk464l60xknvgc9d870901lqnx296dw7amlh3wg0wf78izarfr"; - templates.rev = "8c9ff3dadb9c75cf2932f11c09a46c0c9d84784b"; - templates.sha256 = "0vbjy1v5923942ma0rqcp1dhylhxk1m4vyfxjxw13sizkrpmlwr1"; - footprints.rev = "ac8de318d8ef7b3eb64c78c6c2650b7b085f3271"; - footprints.sha256 = "0jv2plwzhhkfx7a2zankkjkbfzjxv43ab8rqpxzqfq2fnx83q6r5"; - packages3d.rev = "1080b6e565e56bae9be46db2278a1542092d7a2d"; - packages3d.sha256 = "0vwcbzq42hzjl4f0zjaswmiff1x59hv64g5n00mx1gl0gwngnyla"; + symbols.rev = "e3b198d827817b79fb8a6df07f0cfc1cb9140edf"; + symbols.sha256 = "1azjx1bmxaz8bniyw75lq60mc8hvay00jn9qdc2zp7isy3c9ibp0"; + templates.rev = "a27d83f0a20f0be0c1ab04b139a0c518da51a5d4"; + templates.sha256 = "13h9ly6amiwm7zkwa2fd9730kh295ls8j95fszlfjp9rczv2yyzm"; + footprints.rev = "a939c691f1c515d6830e54cf035a420de3e5a92c"; + footprints.sha256 = "13g6y1l95znz6ixc4dpqsxp3icrzs951xpabnzr5znw42577gm9j"; + packages3d.rev = "196a26294d8e501b0e8b06c1df1abae0ebe23051"; + packages3d.sha256 = "0ywlk00dfwv7hc494finmazdh3g1yx0ir7bvnd8zp6cq4ql0nwl4"; }; }; };