Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP arduino core upgrade. #87479

Closed
wants to merge 3 commits into from
Closed

WIP arduino core upgrade. #87479

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b6d67ae
WIP arduino core upgrade.
dasj19 May 10, 2020
f9499ce
WIP updates.
dasj19 May 10, 2020
113aaba
WIP upgraded arduino-builder for different platforms.
dasj19 May 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions pkgs/development/arduino/arduino-core/default.nix
View file
Open in desktop
Expand Up @@ -25,8 +25,8 @@ let
};
# Some .so-files are later copied from .jar-s to $HOME, so patch them beforehand
patchelfInJars =
lib.optional (stdenv.hostPlatform.system == "x86_64-linux") {jar = "share/arduino/lib/jssc-2.8.0-arduino3.jar"; file = "libs/linux/libjSSC-2.8_x86_64.so";}
++ lib.optional (stdenv.hostPlatform.system == "i686-linux") {jar = "share/arduino/lib/jssc-2.8.0-arduino3.jar"; file = "libs/linux/libjSSC-2.8_x86.so";}
lib.optional (stdenv.hostPlatform.system == "x86_64-linux") {jar = "share/arduino/lib/jssc-2.9.1.jar"; file = "libs/linux/libjSSC-2.9.1_x86_64.so";}
++ lib.optional (stdenv.hostPlatform.system == "i686-linux") {jar = "share/arduino/lib/jssc-2.8.9.1.jar"; file = "libs/linux/libjSSC-2.9.1_x86.so";}
;
# abiVersion 6 is default, but we need 5 for `avrdude_bin` executable
ncurses5 = ncurses.override { abiVersion = "5"; };
Expand Down Expand Up @@ -62,14 +62,14 @@ let
+ stdenv.lib.optionalString (!withGui) "-core";
in
stdenv.mkDerivation rec {
version = "1.8.9";
version = "1.8.12";
name = "${flavor}-${version}";

src = fetchFromGitHub {
owner = "arduino";
repo = "Arduino";
rev = version;
sha256 = "0kblq0bqap2zzkflrj6rmdi8dvqxa28fcwwrc3lfmbz2893ni3w4";
sha256 = "0lxkyvsh55biz2q20ba4qabraind5cpxznl41zfq027vl22j6kd2";
};

teensyduino_version = "147";
Expand Down
46 changes: 24 additions & 22 deletions pkgs/development/arduino/arduino-core/downloads.nix
View file
Open in desktop
Expand Up @@ -56,9 +56,9 @@
url = "https://github.com/arduino-libraries/RobotIRremote/archive/2.0.0.zip";
sha256 = "0j5smap74j8p3wc6k0h73b1skj4gkr7r25jbjh1j1cg052dxri86";
};
"build/SpacebrewYun-1.0.1.zip" = fetchurl {
url = "https://github.com/arduino-libraries/SpacebrewYun/archive/1.0.1.zip";
sha256 = "1zs6ymlzw66bglrm0x6d3cvr52q85c8rlm525x0wags111xx3s90";
"build/SpacebrewYun-1.0.2.zip" = fetchurl {
url = "https://github.com/arduino-libraries/SpacebrewYun/archive/1.0.2.zip";
sha256 = "1d8smmsx12qhf2ldvmi93h48cvdyz4id5gd68cvf076wfyv6dks8";
};
"build/Temboo-1.2.1.zip" = fetchurl {
url = "https://github.com/arduino-libraries/Temboo/archive/1.2.1.zip";
Expand All @@ -76,35 +76,36 @@
url = "https://github.com/arduino-libraries/Keyboard/archive/1.0.2.zip";
sha256 = "17yfj95r1i7fb87q4krmxmaq07b4x2xf8cjngrj5imj68wgjck53";
};
"build/SD-1.2.3.zip" = fetchurl {
url = "https://github.com/arduino-libraries/SD/archive/1.2.3.zip";
sha256 = "0i5hb5hmrsrhfgxx8w7zzrfrkc751vs63vhxrj6qvwazhfcdpjw2";
"build/SD-1.2.4.zip" = fetchurl {
url = "https://github.com/arduino-libraries/SD/archive/1.2.4.zip";
sha256 = "123g9px9nqcrsx696wqwzjd5s4hr55nxgfz95b7ws3v007i1f3fz";
};
"build/Servo-1.1.3.zip" = fetchurl {
url = "https://github.com/arduino-libraries/Servo/archive/1.1.3.zip";
sha256 = "1m019a75cdn1fg0cwlzbahmaqvg8sgzr6v1812rd7rjh8ismiah6";
"build/Servo-1.1.6.zip" = fetchurl {
url = "https://github.com/arduino-libraries/Servo/archive/1.1.6.zip";
sha256 = "1z9k9lxzj5d3f8h9hy86f4k5wgfr2a9zcvjh76qmpvv6clcv3js3";
};
"build/LiquidCrystal-1.0.7.zip" = fetchurl {
url = "https://github.com/arduino-libraries/LiquidCrystal/archive/1.0.7.zip";
sha256 = "1wrxrqz3n4yrj9j1a2b7pdd7a1rlyi974ra7crv5amjng8817x9n";
};
"build/Adafruit_Circuit_Playground-1.8.1.zip" = fetchurl {
url = "https://github.com/Adafruit/Adafruit_CircuitPlayground/archive/1.8.1.zip";
sha256 = "1fl24px4c42f6shpb3livwsxgpj866yy285274qrj4m1zl07f18q";
};
"build/libastylej-2.05.1-4.zip" = fetchurl {
url = "https://downloads.arduino.cc/libastylej-2.05.1-4.zip";
sha256 = "0q307b85xba7izjh344kqby3qahg3f5zy18gg52sjk1lbkl9i39s";
"build/Adafruit_Circuit_Playground-1.10.4.zip" = fetchurl {
url = "https://github.com/adafruit/Adafruit_CircuitPlayground/archive/1.10.4.zip";
sha256 = "194az5pxxzs0wg4ng7w0zqrdw93qdyv02y0q2yy57dr4kwfrm6nl";
};
"build/liblistSerials-1.4.2.zip" = fetchurl {
url = "https://downloads.arduino.cc/liblistSerials/liblistSerials-1.4.2.zip";
sha256 = "1p58b421k92rbgwfgbihy0d04mby7kfssghpmjb4gk9yix09za3m";
};
"build/shared/WiFi101-Updater-ArduinoIDE-Plugin-0.10.6.zip" = fetchurl {
dasj19 marked this conversation as resolved.
Show resolved Hide resolved
url = "https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.10.6/WiFi101-Updater-ArduinoIDE-Plugin-0.10.6.zip";
sha256 = "1k23xyr5dmr60y8hb9x24wrgd4mfgvrzky621p6fvawn5xbdq8a3";
"build/WiFi101-Updater-ArduinoIDE-Plugin-0.10.10.zip" = fetchurl {
url = "https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/archive/v0.10.10.zip";
sha256 = "1j6xy7ffrapk0brcfknaj72pvmzrf19sks8pm900ad7w897mksmv";
};
"build/libastylej-2.05.1-4.zip" = fetchurl {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was moved from its original location for no good reason. Move it back where it was - just before "build/liblistSerials"

Also update to libastylej-2.05.1-5 - you missed this update.

Copy link
Contributor Author

@dasj19 dasj19 May 11, 2020 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I updated the build package for the others archs.... I have to admit that I am a bit lost as to how I would continue... Idk how to browse downloads.arduino.cc FTP style... so I would not have to hunt down package names and version numbers

url = "https://downloads.arduino.cc/libastylej-2.05.1-4.zip";
sha256 = "0q307b85xba7izjh344kqby3qahg3f5zy18gg52sjk1lbkl9i39s";
};
}

// optionalAttrs (system == "x86_64-linux") {
"build/arduino-builder-linux64-1.4.4.tar.bz2" = fetchurl {
url = "https://downloads.arduino.cc/tools/arduino-builder-linux64-1.4.4.tar.bz2";
Expand All @@ -122,11 +123,12 @@
url = "https://downloads.arduino.cc/tools/arduinoOTA-1.2.1-linux_amd64.tar.bz2";
sha256 = "1ya834p2cqjj8k1ad3yxcnzd4bcgrlqsqsli9brq1138ac6k30jv";
};
"build/avr-1.6.23.tar.bz2" = fetchurl {
url = "https://downloads.arduino.cc/cores/avr-1.6.23.tar.bz2";
sha256 = "1al449r8hcdck7f4y295g7q388qvbn6qhk2zqdvws9kg4mzqsq8q";
"build/avr-1.8.2.tar.bz2" = fetchurl {
url = "https://downloads.arduino.cc/cores/avr-1.8.2.tar.bz2";
sha256 = "06zl8fwphknd0qdx87fcr1003gid1yqsazaj674mm9widqfd84v2";
};
}

// optionalAttrs (system == "i686-linux") {
"build/arduino-builder-linux32-1.4.4.tar.bz2" = fetchurl {
url = "https://downloads.arduino.cc/tools/arduino-builder-linux32-1.4.4.tar.bz2";
Expand Down