pyrox.dev / nixpkgs
lol
fork atom

arduino-core: align attrname with package name

arduino_core => arduino-core. Retain copy of old attrname for backward
compatibility.

Bjørn Forsman 83e3f385 ef64865e

+5 -4
+3 -3
pkgs/development/arduino/ino/default.nix
··· 1 1 { stdenv, fetchurl, buildPythonPackage, pythonPackages, picocom 2 - , avrdude, arduino_core, avrgcclibc }: 2 + , avrdude, arduino-core, avrgcclibc }: 3 3 4 4 buildPythonPackage rec { 5 5 name = "ino-0.3.6"; ··· 12 12 13 13 # TODO: add avrgcclibc, it must be rebuild with C++ support 14 14 propagatedBuildInputs = 15 - [ arduino_core avrdude picocom pythonPackages.configobj 15 + [ arduino-core avrdude picocom pythonPackages.configobj 16 16 pythonPackages.jinja2 pythonPackages.pyserial pythonPackages.six ]; 17 17 18 18 patchPhase = '' 19 19 echo "Patching Arduino distribution path" 20 - sed -i 's@/usr/local/share/arduino@${arduino_core}/share/arduino@g' \ 20 + sed -i 's@/usr/local/share/arduino@${arduino-core}/share/arduino@g' \ 21 21 ino/environment.py 22 22 sed -i -e 's@argparse@@' -e 's@ordereddict@@' \ 23 23 requirements.txt
+2 -1
pkgs/top-level/all-packages.nix
··· 499 499 500 500 arcanist = callPackage ../development/tools/misc/arcanist {}; 501 501 502 - arduino_core = callPackage ../development/arduino/arduino-core { 502 + arduino-core = callPackage ../development/arduino/arduino-core { 503 503 jdk = jdk; 504 504 jre = jdk; 505 505 }; ··· 13399 13399 13400 13400 # Attributes for backward compatibility. 13401 13401 adobeReader = adobe-reader; 13402 + arduino_core = arduino-core; # added 2015-02-04 13402 13403 asciidocFull = asciidoc-full; # added 2014-06-22 13403 13404 lttngTools = lttng-tools; # added 2014-07-31 13404 13405 lttngUst = lttng-ust; # added 2014-07-31