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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Rommel M. Martinez 2013-04-02 11:40:29 +08:00
commit 8eeca92e92
7 changed files with 17 additions and 25 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/development/libraries/haskell/xml/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "xml"; pname = "xml";
version = "1.3.12"; version = "1.3.13";
sha256 = "1lmqnzna0zy297y4q6qviv7a4966zz9mhfhk6anrp66cz890whai"; sha256 = "04xq2ma2if5gqz16bjrxwigh4vzw6m8i2zk11s5qg3d4z370fdn3";
buildDepends = [ text ]; buildDepends = [ text ];
meta = { meta = {
homepage = "http://code.galois.com"; homepage = "http://code.galois.com";

9
pkgs/tools/misc/tmux/default.nix
View File

@ -2,21 +2,16 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tmux"; pname = "tmux";
version = "1.7"; version = "1.8";
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/${pname}/${name}.tar.gz"; url = "mirror://sourceforge/${pname}/${name}.tar.gz";
sha256 = "0ywy1x2g905hmhkdz418ik42lcvnhnwr8fv63rcqczfg27d6nd38"; sha256 = "f265401ca890f8223e09149fcea5abcd6dfe75d597ab106e172b01e9d0c9cd44";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
# There's a bug in tmux's configure script, --disable-static actually enables it
# Fixed upstream in revision ThomasAdam/tmux@e964ff70e696f30f0301d11deb45c8ada54e0c55
# Remove on next update
dontDisableStatic = true;
buildInputs = [ ncurses libevent ]; buildInputs = [ ncurses libevent ];
meta = { meta = {

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 { };

2
pkgs/top-level/python-packages.nix
View File

@ -1485,7 +1485,7 @@ pythonPackages = python.modules // rec {
}; };
buildInputs = [ nose ]; buildInputs = [ nose ];
propagatedBuildInputs = [ beautifulsoup4 pyrss2gen feedparser pynzb html5lib dateutil beautifulsoup flask jinja2 requests sqlalchemy pyyaml cherrypy progressbar ]; propagatedBuildInputs = [ beautifulsoup4 pyrss2gen feedparser pynzb html5lib dateutil beautifulsoup flask jinja2 requests sqlalchemy pyyaml cherrypy progressbar deluge ];
meta = { meta = {
homepage = http://flexget.com/; homepage = http://flexget.com/;