public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #427 from mpashton/mpa

Browse Source 
Upgrade kicad to stable 20130325
This commit is contained in:
viric 2013-04-01 11:05:51 -07:00
commit 7c56d001b2
4 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/science/electronics/kicad/default.nix
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";

2
pkgs/build-support/fetchbzr/builder.sh
View File

@ -4,6 +4,6 @@ header "exporting \`$url' (revision $revision) into \`$out'"
# Perform a lightweight checkout so that we don't end up importing # Perform a lightweight checkout so that we don't end up importing
# all the repository's history. # all the repository's history.
bzr checkout --lightweight "$url" -r "$revision" "$out" bzr -Ossl.cert_reqs=none export -r "$revision" --format=dir "$out" "$url"
stopNest stopNest

7
pkgs/build-support/fetchbzr/nix-prefetch-bzr
View File

@ -50,12 +50,7 @@ if test -z "$finalPath"; then
trap "rm -rf $tmpPath" EXIT trap "rm -rf $tmpPath" EXIT
# Perform the checkout. # Perform the checkout.
if test "$NIX_PREFETCH_BZR_LEAVE_DOT_BZR" != 1 bzr -Ossl.cert_reqs=none export $revarg --format=dir "$tmpFile" "$url"
then
bzr export $revarg "$tmpFile" "$url" >&2
else
bzr checkout --lightweight $revarg "$url" "$tmpFile" >&2
fi
# Compute the hash. # Compute the hash.
hash=$(nix-hash --type $hashType $hashFormat $tmpFile) hash=$(nix-hash --type $hashType $hashFormat $tmpFile)

4
pkgs/top-level/all-packages.nix
View File

@ -8766,7 +8766,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 { };