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

Update inotool and fix `ino upload'.

Browse Source 
0.3.5 is just a patch-release (no code changes). More important is the
patch to the upload-command. It now uses the nix-supplied avrdude
instead of some random avrdude it finds (in the arduino distribution
or wherever).

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
This commit is contained in:
Moritz Ulrich 2013-08-15 23:14:36 +02:00
parent 3a008f7a1d
commit cf24550e91
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/arduino/ino/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, buildPythonPackage, pythonPackages, minicom { stdenv, fetchurl, buildPythonPackage, pythonPackages, minicom
, avrdude, arduino_core, avrgcclibc }: , avrdude, arduino_core, avrgcclibc }:
buildPythonPackage { buildPythonPackage rec {
name = "ino-0.3.4"; name = "ino-0.3.5";
namePrefix = ""; namePrefix = "";
src = fetchurl { src = fetchurl {
url = "http://pypi.python.org/packages/source/i/ino/ino-0.3.4.tar.gz"; url = "http://pypi.python.org/packages/source/i/ino/${name}.tar.gz";
sha256 = "1v7z3da31cv212k28aci269qkg92p377fm7i76rymjjpjra7payv"; sha256 = "1v7z3da31cv212k28aci269qkg92p377fm7i76rymjjpjra7payv";
}; };
@ -23,12 +23,17 @@ buildPythonPackage {
requirements.txt requirements.txt
sed -i -e 's@from ordereddict@from collections@' \ sed -i -e 's@from ordereddict@from collections@' \
ino/environment.py ino/utils.py ino/environment.py ino/utils.py
# Patch the upload command so it uses the correct avrdude
substituteInPlace ino/commands/upload.py \
--replace "self.e['avrdude']" "'${avrdude}/bin/avrdude'" \
--replace "'-C', self.e['avrdude.conf']," ""
''; '';
meta = { meta = {
description = "Command line toolkit for working with Arduino hardware"; description = "Command line toolkit for working with Arduino hardware";
homepage = http://inotool.org/; homepage = http://inotool.org/;
license = "MIT"; license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.antono ]; maintainers = with stdenv.lib.maintainers; [ antono the-kenny ];
}; };
} }