lol

arduino: 1.6.9 -> 1.6.12 (#19335)

authored by

Christine Koppelt and committed by
Robin Gloster
6c9cc199 aeec1bc5

+58 -75
+3 -8
pkgs/development/arduino/arduino-core/default.nix
··· 16 16 ncurses5 = ncurses.override { abiVersion = "5"; }; 17 17 in 18 18 stdenv.mkDerivation rec { 19 - version = "1.6.9"; 19 + version = "1.6.12"; 20 20 name = "arduino${stdenv.lib.optionalString (withGui == false) "-core"}-${version}"; 21 21 22 22 src = fetchFromGitHub { 23 23 owner = "arduino"; 24 24 repo = "Arduino"; 25 25 rev = "${version}"; 26 - sha256 = "0ksd6mkcf41114n0h37q80y1bz3a2q3z8kg6m9i11c3wrj8n80np"; 26 + sha256 = "0rz8dv1mncwx2wkafakxqdi2y0rq3f72fr57cg0z5hgdgdm89lkh"; 27 27 }; 28 28 29 29 buildInputs = [ jdk ant libusb libusb1 unzip zlib ncurses5 readline ]; ··· 43 43 cp -v $file_src $file_dst 44 44 done 45 45 46 - # Loop above creates library_index.json.gz, package_index.json.gz and package_index.json.sig in 47 - # current directory. And now we can inject them into build process. 48 - library_index_url=file://$(pwd)/library_index.json 49 - package_index_url=file://$(pwd)/package_index.json 50 - 51 46 cd ./arduino-core && ant 52 - cd ../build && ant -Dlibrary_index_url=$library_index_url -Dpackage_index_url=$package_index_url 47 + cd ../build && ant 53 48 cd .. 54 49 ''; 55 50
+55 -67
pkgs/development/arduino/arduino-core/downloads.nix
··· 1 1 {fetchurl, optionalAttrs, system}: 2 2 3 3 { 4 - # Following 3 files are snapshots of files that were downloaded from http://download.arduino.cc/ 5 - # Because original URLs update daily. https://github.com/binarin/arduino-indexes also contains script 6 - # for updating those snapshots. 7 - "package_index.json.gz" = fetchurl { 8 - url = "https://github.com/binarin/arduino-indexes/raw/snapshot-2016-07-18/package_index.json.gz"; 9 - sha256 = "11y16864bca6h5n03xbk8cw3v9b4xwvjz5mkirkcxslkkf7cx5yg"; 10 - }; 11 - "package_index.json.sig" = fetchurl { 12 - url = "https://github.com/binarin/arduino-indexes/raw/snapshot-2016-07-18/package_index.json.sig"; 13 - sha256 = "14ky3qb81mvqswaw9g5cpg5jcjqx6knfm75mzx1si7fbx576amls"; 14 - }; 15 - "library_index.json.gz" = fetchurl { 16 - url = "https://github.com/binarin/arduino-indexes/raw/snapshot-2016-07-18/library_index.json.gz"; 17 - sha256 = "19md4yf4m4wh9vnc3aj0gm3jak1qa591z5yhg0x8lsxx5hr2v85z"; 18 - }; 19 - 20 4 "build/shared/reference-1.6.6-3.zip" = fetchurl { 21 5 url = "http://downloads.arduino.cc/reference-1.6.6-3.zip"; 22 6 sha256 = "119nj1idz85l71fy6a6wwsx0mcd8y0ib1wy0l6j9kz88nkwvggy3"; ··· 29 13 url = "http://downloads.arduino.cc/Edison_help_files-1.6.2.zip"; 30 14 sha256 = "1x25rivmh0zpa6lr8dafyxvim34wl3wnz3r9msfxg45hnbjqqwan"; 31 15 }; 32 - "build/Firmata-2.5.2.zip" = fetchurl { 33 - url = "https://github.com/arduino-libraries/Firmata/archive/2.5.2.zip"; 34 - sha256 = "1r75bxvpr17kwhpks9nxxpm5d5qbw0qnhygakv06whan9s0dc5cz"; 16 + "build/Firmata-2.5.3.zip" = fetchurl { 17 + url = "https://github.com/arduino-libraries/Firmata/archive/2.5.3.zip"; 18 + sha256 = "1ims6bdmwv8lgcvd4ri4i39vqm1q5jbwirmki35bybqqb1sl171v"; 35 19 }; 36 - "build/Bridge-1.6.2.zip" = fetchurl { 37 - url = "https://github.com/arduino-libraries/Bridge/archive/1.6.2.zip"; 38 - sha256 = "10v557bsxasq8ya09m9157nlk50cbkb0wlzrm54cznzmwc0gx49a"; 20 + "build/Bridge-1.6.3.zip" = fetchurl { 21 + url = "https://github.com/arduino-libraries/Bridge/archive/1.6.3.zip"; 22 + sha256 = "1lha5wkzz63bgcn7bhx4rmgsh9ywa47lffycpyz6qjnl1pvm5mmj"; 39 23 }; 40 24 "build/Robot_Control-1.0.2.zip" = fetchurl { 41 25 url = "https://github.com/arduino-libraries/Robot_Control/archive/1.0.2.zip"; ··· 49 33 url = "https://github.com/arduino-libraries/RobotIRremote/archive/1.0.2.zip"; 50 34 sha256 = "0wkya7dy4x0xyi7wn5aghmr1gj0d0wszd61pq18zgfdspz1gi6xn"; 51 35 }; 52 - "build/SpacebrewYun-1.0.0.zip" = fetchurl { 53 - url = "https://github.com/arduino-libraries/SpacebrewYun/archive/1.0.0.zip"; 54 - sha256 = "1sklyp92m8i31rfb9b9iw0zvvab1zd7jdmg85fr908xn6k05qhmp"; 36 + "build/SpacebrewYun-1.0.1.zip" = fetchurl { 37 + url = "https://github.com/arduino-libraries/SpacebrewYun/archive/1.0.1.zip"; 38 + sha256 = "1zs6ymlzw66bglrm0x6d3cvr52q85c8rlm525x0wags111xx3s90"; 55 39 }; 56 - "build/Temboo-1.1.5.zip" = fetchurl { 57 - url = "https://github.com/arduino-libraries/Temboo/archive/1.1.5.zip"; 58 - sha256 = "1ak9b2wrd42n3ak7kcqwg28ianq01acsi5jv4cc031wr0kpq4507"; 40 + "build/Temboo-1.1.7.zip" = fetchurl { 41 + url = "https://github.com/arduino-libraries/Temboo/archive/1.1.7.zip"; 42 + sha256 = "0fq2q6qs0qp15njsl9dif8dkpxgb4cgg8jk3s5y0fcz9lb8m2j50"; 59 43 }; 60 44 "build/Esplora-1.0.4.zip" = fetchurl { 61 45 url = "https://github.com/arduino-libraries/Esplora/archive/1.0.4.zip"; ··· 73 57 url = "http://downloads.arduino.cc/libastylej-2.05.1-3.zip"; 74 58 sha256 = "0a1xy2cdl0xls5r21vy5d2j1dapn1jsdw0vbimlwnzfx7r84mxa6"; 75 59 }; 76 - "build/liblistSerials-1.1.0.zip" = fetchurl { 77 - url = "http://downloads.arduino.cc/liblistSerials/liblistSerials-1.1.0.zip"; 78 - sha256 = "12n3y9y3gfi7i3x6llbwvi59jram02v8yyilv2kd38dm7wrqpw16"; 60 + "build/liblistSerials-1.1.4.zip" = fetchurl { 61 + url = "http://downloads.arduino.cc/liblistSerials/liblistSerials-1.1.4.zip"; 62 + sha256 = "1w0zs155hs5b87i5wj049hfj2jsnf9jk30qq93wz1mxab01261v0"; 63 + }; 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"; 79 67 }; 80 68 } 81 69 // optionalAttrs (system == "x86_64-linux") { 82 - "build/arduino-builder-linux64-1.3.18.tar.bz2" = fetchurl { 83 - url = "http://downloads.arduino.cc/tools/arduino-builder-linux64-1.3.18.tar.bz2"; 84 - sha256 = "0xbzcmvfa1h22dlvym8v4s68w4r1vdq8pj086sk1iwlkfiq0y4zq"; 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"; 85 73 }; 86 - "build/linux/avr-gcc-4.8.1-arduino5-x86_64-pc-linux-gnu.tar.bz2" = fetchurl { 87 - url = "http://downloads.arduino.cc/tools/avr-gcc-4.8.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"; 88 - sha256 = "1k793qsv1jdc0m4i9k40l2k7blnarfzy2k3clndl2yirfk0zqm4h"; 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"; 89 77 }; 90 - "build/linux/avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2" = fetchurl { 91 - url = "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"; 92 - sha256 = "0xm4hfr4binny9f5affnmyrrq3lhrxr66s6ymplgfq9l72kwq9nq"; 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"; 93 81 }; 94 82 } 95 83 // optionalAttrs (system == "i686-linux") { 96 - "build/arduino-builder-linux32-1.3.18.tar.bz2" = fetchurl { 97 - url = "http://downloads.arduino.cc/tools/arduino-builder-linux32-1.3.18.tar.bz2"; 98 - sha256 = "0b6ls31gaagni929v4isr8ivyviid37721ffhgw6mnb8vshcws2d"; 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"; 99 87 }; 100 - "build/linux/avr-gcc-4.8.1-arduino5-i686-pc-linux-gnu.tar.bz2" = fetchurl { 101 - url = "http://downloads.arduino.cc/tools/avr-gcc-4.8.1-arduino5-i686-pc-linux-gnu.tar.bz2"; 102 - sha256 = "07ql6apml1w5gy3ygd1wmj12yr8vg6p3pr8b1gd92wdk97svfj3n"; 88 + "build/linux/avr-gcc-4.9.2-arduino5-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"; 103 91 }; 104 - "build/linux/avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2" = fetchurl { 105 - url = "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2"; 106 - sha256 = "1vmzqvkg8z2xp3j5qypzyg26hgymy6vshs4vpax6mr5w4xlxccsr"; 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"; 107 95 }; 108 96 } 109 97 // optionalAttrs (system == "x86_64-darwin") { 110 - "build/arduino-builder-macosx-1.3.18.tar.bz2" = fetchurl { 111 - url = "http://downloads.arduino.cc/tools/arduino-builder-macosx-1.3.18.tar.bz2"; 112 - sha256 = "01m21r2blh3rwzmjgjn65hivlbj95ddqkjq5xm1yb4b5h3i03mfj"; 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"; 113 101 }; 114 - "build/linux/avr-gcc-4.8.1-arduino5-i386-apple-darwin11.tar.bz2" = fetchurl { 115 - url = "http://downloads.arduino.cc/tools/avr-gcc-4.8.1-arduino5-i386-apple-darwin11.tar.bz2"; 116 - sha256 = "00d9i1vg1zngcd3f52c6d7j2iffb0qs97a1pnag0czbk1pq3w6qi"; 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"; 117 105 }; 118 - "build/linux/avrdude-6.0.1-arduino5-i386-apple-darwin11.tar.bz2" = fetchurl { 119 - url = "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-i386-apple-darwin11.tar.bz2"; 120 - sha256 = "1rf3dwb4534qzn0gdpbh3155knx07hbbakvv67456s2q18xqvbs1"; 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"; 121 109 }; 122 110 } 123 111 // optionalAttrs (system == "armv6l-linux") { 124 - "build/arduino-builder-arm-1.3.18.tar.bz2" = fetchurl { 125 - url = "http://downloads.arduino.cc/tools/arduino-builder-arm-1.3.18.tar.bz2"; 126 - sha256 = "1v4vrmv24cajl7hxmyz5nh2y007kmwrcgl6180dlfwpc9526s4p1"; 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"; 127 115 }; 128 - "build/linux/avr-gcc-4.8.1-arduino5-armhf-pc-linux-gnu.tar.bz2" = fetchurl { 129 - url = "http://downloads.arduino.cc/tools/avr-gcc-4.8.1-arduino5-armhf-pc-linux-gnu.tar.bz2"; 130 - sha256 = "0jqmyamvvwiab6ag580h09zkxbpv6i5xn6ganj5b8ld6nwnwvzy8"; 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"; 131 119 }; 132 - "build/linux/avrdude-6.0.1-arduino5-armhf-pc-linux-gnu.tar.bz2" = fetchurl { 133 - url = "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-armhf-pc-linux-gnu.tar.bz2"; 134 - sha256 = "1d7n0jcc6670n803q57hzw8pvp9bmnca9c9fgw3fq5y1vd0i7si3"; 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"; 135 123 }; 136 124 }