kicad: upgrade to stable version 20130325, libraries to r220

- changed to require wxWidgets 2.9 -- seems to satisfy requirement for
libgtkprint, even with gtk2
This commit is contained in:
Michael Ashton 2013-03-31 19:11:21 -07:00
parent 8c63762d64
commit 7b01680d87
2 changed files with 10 additions and 8 deletions

View File

@ -1,18 +1,18 @@
{stdenv, fetchurl, fetchbzr, unzip, cmake, mesa, wxGTK, zlib, libX11, { stdenv, fetchurl, fetchbzr, unzip, cmake, mesa, gtk, wxGTK, zlib, libX11,
gettext}: gettext, cups } :
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "kicad-20110708"; name = "kicad-20130325";
src = fetchurl { src = fetchurl {
url = ftp://iut-tice.ujf-grenoble.fr/cao/sources/kicad_sources-2011-07-08-BZR3044.zip; url = "http://iut-tice.ujf-grenoble.fr/cao/kicad-sources-stable_2013-03-25_BZR4005.zip";
sha256 = "1gr75zcf55p3xpbg1gdkdpbh5x11bawc9rcff4fskwjyc3vfiv6a"; sha256 = "0hg2aiis14am7mmpimcxnxvhy7c7fr5rgzlk6rjv44d9m0f9957m";
}; };
srcLibrary = fetchbzr { srcLibrary = fetchbzr {
url = "http://bazaar.launchpad.net/~kicad-lib-committers/kicad/library"; url = "http://bazaar.launchpad.net/~kicad-lib-committers/kicad/library";
revision = 112; revision = 220;
sha256 = "49fa9ad90759cfaf522c2a62665f033688b9d84d02f31c6b2505c08a217ad312"; sha256 = "0l2lblgnm51n2w1p4ifpwdvq04rxgq73zrfxlhqa9zdlyh4rcddb";
}; };
cmakeFlags = "-DKICAD_TESTING_VERSION=ON"; cmakeFlags = "-DKICAD_TESTING_VERSION=ON";

View File

@ -8758,7 +8758,9 @@ let
gtkwave = callPackage ../applications/science/electronics/gtkwave { }; gtkwave = callPackage ../applications/science/electronics/gtkwave { };
kicad = callPackage ../applications/science/electronics/kicad { }; kicad = callPackage ../applications/science/electronics/kicad {
wxGTK = wxGTK29;
};
ngspice = callPackage ../applications/science/electronics/ngspice { }; ngspice = callPackage ../applications/science/electronics/ngspice { };