diff options
| author | Evils <evils.devils@protonmail.com> | 2020-11-06 01:33:48 +0100 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2020-11-07 16:29:52 +0100 |
| commit | a52e974cff8fb80c427e0d55c01b3b8c770ccec4 (patch) | |
| tree | 21b9a46e9c01dcd6cc54a2e2f0e205c19fbcd2ff /pkgs/applications/science | |
| parent | 905134a79f18255f547c04fd0f63ec353b4151c4 (diff) | |
kicad-unstable: 2020-10-09 -> 2020-11-07
patch for issue 72248 no longer applies
issue doesn't seem to occur without it anymore...
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/electronics/kicad/base.nix | 11 | ||||
| -rw-r--r-- | pkgs/applications/science/electronics/kicad/versions.nix | 12 |
2 files changed, 6 insertions, 17 deletions
diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index 3d83e905103b..7f11f483a9d0 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -55,17 +55,6 @@ stdenv.mkDerivation rec { src = kicadSrc; - # quick fix for #72248 - # should be removed if a a more permanent fix is published - patches = [ - ( - fetchpatch { - url = "https://github.com/johnbeard/kicad/commit/dfb1318a3989e3d6f9f2ac33c924ca5030ea273b.patch"; - sha256 = "00ifd3fas8lid8svzh1w67xc8kyx89qidp7gm633r014j3kjkgcd"; - } - ) - ]; - # tagged releases don't have "unknown" # kicad nightlies use git describe --dirty # nix removes .git, so its approximated here diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 0ba69e5a502e..beadd1724e10 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -27,17 +27,17 @@ }; "kicad-unstable" = { kicadVersion = { - version = "2020-10-09"; + version = "2020-11-07"; src = { - rev = "560428a70f0196fb4ade620042c5ddefc1685ebe"; - sha256 = "0rzn83bpl06v1d49lcvwfg93nirn684bqqq536zxhmjm0ayx29ka"; + rev = "9454f9df9245aea037d1ad5baf050c2d9101159c"; + sha256 = "03bd0dk234ihqnwrv4n40gi856xcjqgxplfwjzlwcq521gwykv30"; }; }; libVersion = { - version = "2020-10-09"; + version = "2020-11-07"; libSources = { - i18n.rev = "d24af2da8cab4ce1081c401909a4a880514e5549"; - i18n.sha256 = "0r0sv52k84sw4jxf10lrmzwmn58d2fv5h57fdrspnmvnh10q63xf"; + i18n.rev = "e89d9a89bec59199c1ade56ee2556591412ab7b0"; + i18n.sha256 = "04zaqyhj3qr4ymyd3k5vjpcna64j8klpsygcgjcv29s3rdi8glfl"; symbols.rev = "9c50f4333bafc5a1abf7786436db5ffb6a66758d"; symbols.sha256 = "06ic59svz0256isy93863i5ay4k8wshvp1kspnqrc776wmq03l3k"; templates.rev = "41eae4ccd3ac02fdb969e3aa272c07ab51dcf5af"; |