nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-01 23:22:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

arduino-core: align attrname with package name

Browse Source 
arduino_core => arduino-core. Retain copy of old attrname for backward
compatibility.
This commit is contained in:
Bjørn Forsman 2015-02-01 22:50:34 +01:00
parent ef64865ea9
commit 83e3f38593
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, buildPythonPackage, pythonPackages, picocom
, avrdude, arduino_core, avrgcclibc }:
, avrdude, arduino-core, avrgcclibc }:
buildPythonPackage rec {
name = "ino-0.3.6";
@ -12,12 +12,12 @@ buildPythonPackage rec {
# TODO: add avrgcclibc, it must be rebuild with C++ support
propagatedBuildInputs =
[ arduino_core avrdude picocom pythonPackages.configobj
[ arduino-core avrdude picocom pythonPackages.configobj
pythonPackages.jinja2 pythonPackages.pyserial pythonPackages.six ];
patchPhase = ''
echo "Patching Arduino distribution path"
sed -i 's@/usr/local/share/arduino@${arduino_core}/share/arduino@g' \
sed -i 's@/usr/local/share/arduino@${arduino-core}/share/arduino@g' \
ino/environment.py
sed -i -e 's@argparse@@' -e 's@ordereddict@@' \
requirements.txt

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

@ -499,7 +499,7 @@ let
arcanist = callPackage ../development/tools/misc/arcanist {};
arduino_core = callPackage ../development/arduino/arduino-core {
arduino-core = callPackage ../development/arduino/arduino-core {
jdk = jdk;
jre = jdk;
};
@ -13399,6 +13399,7 @@ let
# Attributes for backward compatibility.
adobeReader = adobe-reader;
arduino_core = arduino-core; # added 2015-02-04
asciidocFull = asciidoc-full; # added 2014-06-22
lttngTools = lttng-tools; # added 2014-07-31
lttngUst = lttng-ust; # added 2014-07-31