Skip to content

Commit 758864a

Browse files
gazallybjornfor
gazally
authored and
bjornfor
committedJun 1, 2017
arduino: 1.6.12 -> 1.8.2
1 parent 3a4d03d commit 758864a

File tree

2 files changed

+94
-62
lines changed

2 files changed

+94
-62
lines changed
 

‎pkgs/development/arduino/arduino-core/default.nix

+11-7
Original file line numberDiff line numberDiff line change
@@ -54,25 +54,25 @@ let
5454
+ stdenv.lib.optionalString (!withGui) "-core";
5555
in
5656
stdenv.mkDerivation rec {
57-
version = "1.6.12";
57+
version = "1.8.2";
5858
name = "${flavor}-${version}";
5959

6060
src = fetchFromGitHub {
6161
owner = "arduino";
6262
repo = "Arduino";
6363
rev = "${version}";
64-
sha256 = "0rz8dv1mncwx2wkafakxqdi2y0rq3f72fr57cg0z5hgdgdm89lkh";
64+
sha256 = "1ssznjmzmahayslj2xnci9b5wpsl53nyg85say54akng93qipmfb";
6565
};
6666

6767
teensyduino_src = fetchurl {
68-
url = "http://www.pjrc.com/teensy/td_131/TeensyduinoInstall.${teensy_architecture}";
68+
url = "https://www.pjrc.com/teensy/td_136/TeensyduinoInstall.${teensy_architecture}";
6969
sha256 =
7070
lib.optionalString ("${teensy_architecture}" == "linux64")
71-
"1q4wv6s0900hyv9z1mjq33fr2isscps4q3bsy0h12wi3l7ir94g9"
71+
"0qvb5z9y6nsqy0kzib9fvvbn8dakl50vib6r3nm6bnpvyxzwjl2r"
7272
+ lib.optionalString ("${teensy_architecture}" == "linux32")
73-
"06fl951f44avqyqim5qmy73siylbqcnsmz55zmj2dzhgf4sflkvc"
73+
"14ca62vq7cpx269vfd92shi80qj8spf0dzli8gfcb39ss2zc4jf1"
7474
+ lib.optionalString ("${teensy_architecture}" == "linuxarm")
75-
"0ldf33w8wkqwklcj8fn4p22f23ibpwpf7873dc6i2jfmmbx0yvxn";
75+
"122z1gxcgkmwjb8wdklb2w8c3qkj5rc1ap5n4a8fi3kjz29va9rx";
7676
};
7777

7878
buildInputs = [ jdk ant libusb libusb1 unzip zlib ncurses5 readline
@@ -93,6 +93,10 @@ stdenv.mkDerivation rec {
9393
cp -v $file_src $file_dst
9494
done
9595
96+
# Deliberately break build.xml's download statement in order to cause
97+
# an error if anything needed is missing from download.nix.
98+
substituteInPlace build/build.xml --replace "get src" "get error"
99+
96100
cd ./arduino-core && ant
97101
cd ../build && ant
98102
cd ..
@@ -208,7 +212,7 @@ stdenv.mkDerivation rec {
208212
meta = with stdenv.lib; {
209213
description = "Open-source electronics prototyping platform";
210214
homepage = http://arduino.cc/;
211-
license = stdenv.lib.licenses.gpl2;
215+
license = if withTeensyduino then licenses.unfreeRedistributable else licenses.gpl2;
212216
platforms = platforms.linux;
213217
maintainers = with maintainers; [ antono auntie robberer bjornfor ];
214218
};

‎pkgs/development/arduino/arduino-core/downloads.nix

+83-55
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,28 @@
22

33
{
44
"build/shared/reference-1.6.6-3.zip" = fetchurl {
5-
url = "http://downloads.arduino.cc/reference-1.6.6-3.zip";
5+
url = "https://downloads.arduino.cc/reference-1.6.6-3.zip";
66
sha256 = "119nj1idz85l71fy6a6wwsx0mcd8y0ib1wy0l6j9kz88nkwvggy3";
77
};
88
"build/shared/Galileo_help_files-1.6.2.zip" = fetchurl {
9-
url = "http://downloads.arduino.cc/Galileo_help_files-1.6.2.zip";
9+
url = "https://downloads.arduino.cc/Galileo_help_files-1.6.2.zip";
1010
sha256 = "0qda0xml353sfhjmx9my4mlcyzbf531k40dcr1cnsa438xp2fw0w";
1111
};
1212
"build/shared/Edison_help_files-1.6.2.zip" = fetchurl {
13-
url = "http://downloads.arduino.cc/Edison_help_files-1.6.2.zip";
13+
url = "https://downloads.arduino.cc/Edison_help_files-1.6.2.zip";
1414
sha256 = "1x25rivmh0zpa6lr8dafyxvim34wl3wnz3r9msfxg45hnbjqqwan";
1515
};
16-
"build/Firmata-2.5.3.zip" = fetchurl {
17-
url = "https://github.com/arduino-libraries/Firmata/archive/2.5.3.zip";
18-
sha256 = "1ims6bdmwv8lgcvd4ri4i39vqm1q5jbwirmki35bybqqb1sl171v";
16+
"build/Firmata-2.5.6.zip" = fetchurl {
17+
url = "https://github.com/arduino-libraries/Firmata/archive/2.5.6.zip";
18+
sha256 = "117dd4pdlgv60gdlgm2ckjfq89i0dg1q8vszg6hxywdf701c1fk4";
1919
};
2020
"build/Bridge-1.6.3.zip" = fetchurl {
2121
url = "https://github.com/arduino-libraries/Bridge/archive/1.6.3.zip";
2222
sha256 = "1lha5wkzz63bgcn7bhx4rmgsh9ywa47lffycpyz6qjnl1pvm5mmj";
2323
};
24-
"build/Robot_Control-1.0.2.zip" = fetchurl {
25-
url = "https://github.com/arduino-libraries/Robot_Control/archive/1.0.2.zip";
26-
sha256 = "1wdpz3ilnza3lfd5a628dryic46j72h4a89y8vp0qkbscvifcvdk";
24+
"build/Robot_Control-1.0.3.zip" = fetchurl {
25+
url = "https://github.com/arduino-libraries/Robot_Control/archive/1.0.3.zip";
26+
sha256 = "1pc3b8skbpx7j32jnxa67mfqhnsmfz3876pc9mdyzpsad4mmcn62";
2727
};
2828
"build/Robot_Motor-1.0.2.zip" = fetchurl {
2929
url = "https://github.com/arduino-libraries/Robot_Motor/archive/1.0.2.zip";
@@ -37,9 +37,9 @@
3737
url = "https://github.com/arduino-libraries/SpacebrewYun/archive/1.0.1.zip";
3838
sha256 = "1zs6ymlzw66bglrm0x6d3cvr52q85c8rlm525x0wags111xx3s90";
3939
};
40-
"build/Temboo-1.1.7.zip" = fetchurl {
41-
url = "https://github.com/arduino-libraries/Temboo/archive/1.1.7.zip";
42-
sha256 = "0fq2q6qs0qp15njsl9dif8dkpxgb4cgg8jk3s5y0fcz9lb8m2j50";
40+
"build/Temboo-1.2.1.zip" = fetchurl {
41+
url = "https://github.com/arduino-libraries/Temboo/archive/1.2.1.zip";
42+
sha256 = "1fyzfihsbcjpjasqbmbbfcall2zl48nzrp4xk9pslppal31mvl8x";
4343
};
4444
"build/Esplora-1.0.4.zip" = fetchurl {
4545
url = "https://github.com/arduino-libraries/Esplora/archive/1.0.4.zip";
@@ -53,72 +53,100 @@
5353
url = "https://github.com/arduino-libraries/Keyboard/archive/1.0.1.zip";
5454
sha256 = "1spv73zhjbrb0vgpzjnh6wr3bddlbyzv78d21dbn8z2l0aqv2sac";
5555
};
56+
"build/SD-1.1.1.zip" = fetchurl {
57+
url = "https://github.com/arduino-libraries/SD/archive/1.1.1.zip";
58+
sha256 = "0nackcf7yx5np1s24wnsrcjl8j0nlmqqir6316vqqkfayvb1247n";
59+
};
60+
"build/Servo-1.1.2.zip" = fetchurl {
61+
url = "https://github.com/arduino-libraries/Servo/archive/1.1.2.zip";
62+
sha256 = "14k1883qrx425wnm0r8kszzq32yvvs3jwxf3g7ybp7v0ga0q47l7";
63+
};
64+
"build/Adafruit_CircuitPlayground-1.6.4.zip" = fetchurl {
65+
url = "https://github.com/Adafruit/Adafruit_CircuitPlayground/archive/1.6.4.zip";
66+
sha256 = "1ph7m0l1sfx9db56n2h6vi78pn3zyah813lfhqiqghncx34amrhj";
67+
};
5668
"build/libastylej-2.05.1-3.zip" = fetchurl {
57-
url = "http://downloads.arduino.cc/libastylej-2.05.1-3.zip";
69+
url = "https://downloads.arduino.cc/libastylej-2.05.1-3.zip";
5870
sha256 = "0a1xy2cdl0xls5r21vy5d2j1dapn1jsdw0vbimlwnzfx7r84mxa6";
5971
};
60-
"build/liblistSerials-1.1.4.zip" = fetchurl {
61-
url = "http://downloads.arduino.cc/liblistSerials/liblistSerials-1.1.4.zip";
62-
sha256 = "1w0zs155hs5b87i5wj049hfj2jsnf9jk30qq93wz1mxab01261v0";
72+
"build/liblistSerials-1.4.0.zip" = fetchurl {
73+
url = "https://downloads.arduino.cc/liblistSerials/liblistSerials-1.4.0.zip";
74+
sha256 = "129mfbyx7snq3znzhkfbdjiifdr85cwk6wjn8l9ia0wynszs5zyv";
6375
};
64-
"build/shared/WiFi101-Updater-ArduinoIDE-Plugin-0.8.0.zip" = fetchurl {
65-
url = "https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.8.0/WiFi101-Updater-ArduinoIDE-Plugin-0.8.0.zip";
66-
sha256 = "0fp4mb1qa3w02hrwd51wf261l8ywcl36mi9wipsrgx2y29pk759z";
76+
"build/shared/WiFi101-Updater-ArduinoIDE-Plugin-0.9.0.zip" = fetchurl {
77+
url = "https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.9.0/WiFi101-Updater-ArduinoIDE-Plugin-0.9.0.zip";
78+
sha256 = "1nkk87q2l3bs9y387hdxzgqllm0lqpmc5kdmr6my4hjz5lcpgbza";
6779
};
6880
}
6981
// optionalAttrs (system == "x86_64-linux") {
70-
"build/arduino-builder-linux64-1.3.21_r1.tar.bz2" = fetchurl {
71-
url = "http://downloads.arduino.cc/tools/arduino-builder-linux64-1.3.21_r1.tar.bz2";
72-
sha256 = "1cqx5smzm4dhbj2ah191vbbxi0l7xj95c5gcdbgqm9283hrpfrn7";
82+
"build/arduino-builder-linux64-1.3.25.tar.bz2" = fetchurl {
83+
url = "https://downloads.arduino.cc/tools/arduino-builder-linux64-1.3.25.tar.bz2";
84+
sha256 = "15y80p255w2rg028vc8dq4hpqsmf770qigv3hgf78npb4qrjnqqf";
85+
};
86+
"build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-x86_64-pc-linux-gnu.tar.bz2" = fetchurl {
87+
url = "https://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-x86_64-pc-linux-gnu.tar.bz2";
88+
sha256 = "132qm8l6h50z4s9h0i5mfv6bp0iia0pp9kc3gd37hkajy4bh4j0r";
7389
};
74-
"build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino2-x86_64-pc-linux-gnu.tar.bz2" = fetchurl {
75-
url = "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-x86_64-pc-linux-gnu.tar.bz2";
76-
sha256 = "124icbjh28cax6pgg6bzrfdi27shsn9mjjshgrr93pczpg8sc0rr";
90+
"build/linux/avrdude-6.3.0-arduino9-x86_64-pc-linux-gnu.tar.bz2" = fetchurl {
91+
url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-x86_64-pc-linux-gnu.tar.bz2";
92+
sha256 = "0shz5ymnlsrbnaqcb13fwbd73hz9k45adw14gf1ywjgywa2cpk68";
7793
};
78-
"build/linux/avrdude-6.3.0-arduino6-x86_64-pc-linux-gnu.tar.bz2" = fetchurl {
79-
url = "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino6-x86_64-pc-linux-gnu.tar.bz2";
80-
sha256 = "08b6dbllnvzv1aqx0v037zks4r3vqcx6yxxv040wf431mmf8gd4p";
94+
"build/linux/arduinoOTA-1.1.1-linux_amd64.tar.bz2" = fetchurl {
95+
url = "https://downloads.arduino.cc/tools/arduinoOTA-1.1.1-linux_amd64.tar.bz2";
96+
sha256 = "0xy25srvpz6d0yfnz8b17mkmary3k51lb1cvgw7n2zyxayjd0npb";
8197
};
8298
}
8399
// optionalAttrs (system == "i686-linux") {
84-
"build/arduino-builder-linux32-1.3.21_r1.tar.bz2" = fetchurl {
85-
url = "http://downloads.arduino.cc/tools/arduino-builder-linux32-1.3.21_r1.tar.bz2";
86-
sha256 = "1prfwb5scprvd74gihd78ibsdy3806b0fsjhgyj9in4w1q8s3dxj";
100+
"build/arduino-builder-linux32-1.3.25.tar.bz2" = fetchurl {
101+
url = "https://downloads.arduino.cc/tools/arduino-builder-linux32-1.3.25.tar.bz2";
102+
sha256 = "0hjiqbf7xspdcr7lganqnl68qcmndc9pz06dghkrwzbzc5ki72qr";
87103
};
88-
"build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-pc-linux-gnu.tar.bz2" = fetchurl {
89-
url = "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-pc-linux-gnu.tar.bz2";
90-
sha256 = "0s7chsp1jyk477zvfaraf0yacvlzahkwqxpws4k0kjadghg9a27i";
104+
"build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-pc-linux-gnu.tar.bz2" = fetchurl {
105+
url = "https://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-pc-linux-gnu.tar.bz2";
106+
sha256 = "1d81z5m4cklv29hgb5ywrmyq64ymlwmjx2plm1gzs1mcpg7d9ab3";
91107
};
92-
"build/linux/avrdude-6.3.0-arduino6-i686-pc-linux-gnu.tar.bz2" = fetchurl {
93-
url = "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino6-i686-pc-linux-gnu.tar.bz2";
94-
sha256 = "1yyn016b5162j94nmqcznfabi5y2ly27z2whr77387bvjnqc8jsz";
108+
"build/linux/avrdude-6.3.0-arduino9-i686-pc-linux-gnu.tar.bz2" = fetchurl {
109+
url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-i686-pc-linux-gnu.tar.bz2";
110+
sha256 = "12r1drjafxwzrvf1y1glxd46rv870mhz1ifn0g328ciwivas4da2";
111+
};
112+
"build/linux/arduinoOTA-1.1.1-linux_386.tar.bz2" = fetchurl {
113+
url = "https://downloads.arduino.cc/tools/arduinoOTA-1.1.1-linux_386.tar.bz2";
114+
sha256 = "1vvilbbbvv68svxzyhjspacbavcqakph5glhnz7c0mxkspqixjbs";
95115
};
96116
}
97117
// optionalAttrs (system == "x86_64-darwin") {
98-
"build/arduino-builder-macosx-1.3.21_r1.tar.bz2" = fetchurl {
99-
url = "http://downloads.arduino.cc/tools/arduino-builder-macosx-1.3.21_r1.tar.bz2";
100-
sha256 = "06y5j1z9jjnqa7v6nl9dflm1qqpf3ar1jc53zxgdgsrb9c473d8l";
118+
"build/arduino-builder-macosx-1.3.25.tar.bz2" = fetchurl {
119+
url = "https://downloads.arduino.cc/tools/arduino-builder-macosx-1.3.25.tar.bz2";
120+
sha256 = "0inkxjzdplb8b17j7lyam6v9gca25rxmsinrkgqnx3xxgkaxz2k0";
121+
};
122+
"build/macosx/avr-gcc-4.9.2-atmel3.5.4-arduino2-i386-apple-darwin11.tar.bz2" = fetchurl {
123+
url = "https://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-i386-apple-darwin11.tar.bz2";
124+
sha256 = "0c27i3y4f5biinxjdpp43wbj00lz7dvl08pnqr7hpkzaalsyvcv7";
101125
};
102-
"build/linux/avr-gcc-4.9.2-arduino5-i386-apple-darwin11.tar.bz2" = fetchurl {
103-
url = "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-i386-apple-darwin11.tar.bz2";
104-
sha256 = "12r4a1q7mh1gbasy7lqn0p4acg699lglw7il9d5f5vwd32pmh4ii";
126+
"build/macosx/avrdude-6.3.0-arduino9-i386-apple-darwin11.tar.bz2" = fetchurl {
127+
url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-i386-apple-darwin11.tar.bz2";
128+
sha256 = "0rc4x8mcsva4v6j7ssfj8rdyg14l2pd9ivgdm39m5wnz8b06p85z11703f0r82aq3mmkiy7vwa4jfjhs9826qpp724hbng9dx74kk86r";
105129
};
106-
"build/linux/avrdude-6.3.0-arduino6-i386-apple-darwin11.tar.bz2" = fetchurl {
107-
url = "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino6-i386-apple-darwin11.tar.bz2";
108-
sha256 = "11703f0r82aq3mmkiy7vwa4jfjhs9826qpp724hbng9dx74kk86r";
130+
"build/macosx/appbundler/appbundler-1.0ea-arduino4.jar.zip" = fetchurl {
131+
url = "https://downloads.arduino.cc/appbundler-1.0ea-arduino4.jar.zip";
132+
sha256 = "1vz0g98ancfqdf7yx5m3zrxmzb3fwp18zh5lkh2nyl5xlr9m368z";
109133
};
110134
}
111135
// optionalAttrs (system == "armv6l-linux") {
112-
"build/arduino-builder-arm-1.3.21_r1.tar.bz2" = fetchurl {
113-
url = "http://downloads.arduino.cc/tools/arduino-builder-arm-1.3.21_r1.tar.bz2";
114-
sha256 = "1ik6r5n6g20x4pb0vbxbkqxgzj39f13n995ki9xgpsrq22x6g1n4";
136+
"build/arduino-builder-linuxarm-1.3.25.tar.bz2" = fetchurl {
137+
url = "https://downloads.arduino.cc/tools/arduino-builder-linuxarm-1.3.25.tar.bz2";
138+
sha256 = "1jvlihpcbdv1sgq1wjdwp7dhznk7nd88zin6yj40kr80gcd2ykry";
139+
};
140+
"build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-armhf-pc-linux-gnu.tar.bz2" = fetchurl {
141+
url = "https://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-armhf-pc-linux-gnu.tar.bz2";
142+
sha256 = "033jb1vmspcxsv0w9pk73xv195xnbnmckjsiccgqs8xx36g00dpf";
115143
};
116-
"build/linux/avr-gcc-4.9.2-arduino5-armhf-pc-linux-gnu.tar.bz2" = fetchurl {
117-
url = "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-armhf-pc-linux-gnu.tar.bz2";
118-
sha256 = "08b8z7ca0wcgzxmjz6q5ihjrm3i10frnrcqpvwjrlsxw37ah1wvp";
144+
"build/linux/avrdude-6.3.0-arduino9-armhf-pc-linux-gnu.tar.bz2" = fetchurl {
145+
url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-armhf-pc-linux-gnu.tar.bz2";
146+
sha256 = "1kp1xry97385zbrs94j285h1gqlzyyhkchh26z7zq6c0wi5879i5";
119147
};
120-
"build/linux/avrdude-6.3.0-arduino6-armhf-pc-linux-gnu.tar.bz2" = fetchurl {
121-
url = "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino6-armhf-pc-linux-gnu.tar.bz2";
122-
sha256 = "1rybp4hgk0mm7dydr3rj7yx59jzi30s4kyadzkjv13nm4ds209i4";
148+
"build/linux/arduinoOTA-1.1.1-linux_arm.tar.bz2" = fetchurl {
149+
url = "https://downloads.arduino.cc/tools/arduinoOTA-1.1.1-linux_arm.tar.bz2";
150+
sha256 = "0k1pib8lmvk6c0y3m038fj3mc18ax1hy3kbvgd5nygrxvy1hv274";
123151
};
124152
}

0 commit comments

Comments
 (0)
Please sign in to comment.