diff options
9 files changed, 175 insertions, 92 deletions
diff --git a/nixos/modules/services/networking/jormungandr.nix b/nixos/modules/services/networking/jormungandr.nix index 68f1e9af9fff..85e804d6cf25 100644 --- a/nixos/modules/services/networking/jormungandr.nix +++ b/nixos/modules/services/networking/jormungandr.nix @@ -82,6 +82,9 @@ in { description = "jormungandr server"; wantedBy = [ "multi-user.target" ]; after = [ "network-online.target" ]; + environment = { + RUST_BACKTRACE = "full"; + }; serviceConfig = { DynamicUser = true; StateDirectory = baseNameOf dataDir; diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index 2db13e1586ba..9a4ab636c5fe 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -3,13 +3,13 @@ , gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }: let - version = "5.2.0"; + version = "5.3.1"; in stdenv.mkDerivation { pname = "franz"; inherit version; src = fetchurl { url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb"; - sha256 = "1wlfd1ja38vbjy8y5pg95cpvf5ixkkq53m7v3c24q473jax4ynvg"; + sha256 = "16ssg4cjjmq3cps8klyx3jxqma7f83cczwjnknlfqglrwwdpnb5d"; }; # don't remove runtime deps diff --git a/pkgs/applications/science/logic/petrinizer/default.nix b/pkgs/applications/science/logic/petrinizer/default.nix index cb35b9f27d52..d277e0e1521a 100644 --- a/pkgs/applications/science/logic/petrinizer/default.nix +++ b/pkgs/applications/science/logic/petrinizer/default.nix @@ -1,6 +1,12 @@ -{ mkDerivation, async, base, bytestring, containers, fetchFromGitLab, mtl -, parallel-io, parsec, sbv, stdenv, stm, transformers +{ mkDerivation, callPackage, buildPackages +, async, base, bytestring, containers, fetchFromGitLab, mtl +, parallel-io, parsec, stdenv, stm, transformers }: +let + z3 = callPackage ./z3.nix { gomp = null; z3 = buildPackages.z3; }; +in let + sbv = callPackage ./sbv-7.13.nix { inherit z3; }; +in mkDerivation rec { pname = "petrinizer"; version = "0.9.1.1"; diff --git a/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix b/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix new file mode 100644 index 000000000000..ed10e9f3db19 --- /dev/null +++ b/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix @@ -0,0 +1,26 @@ +{ mkDerivation, array, async, base, bytestring, containers +, crackNum, deepseq, directory, doctest, filepath, generic-deriving +, ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random +, stdenv, syb, tasty, tasty-golden, tasty-hunit, tasty-quickcheck +, template-haskell, time, z3 +}: +mkDerivation { + pname = "sbv"; + version = "7.13"; + sha256 = "0bk400swnb4s98c5p71ml1px6jndaiqhf5dj7zmnliyplqcgpfik"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array async base containers crackNum deepseq directory filepath + generic-deriving ghc mtl pretty process QuickCheck random syb + template-haskell time + ]; + testHaskellDepends = [ + base bytestring containers crackNum directory doctest filepath Glob + hlint mtl QuickCheck random syb tasty tasty-golden tasty-hunit + tasty-quickcheck template-haskell + ]; + testSystemDepends = [ z3 ]; + homepage = "http://leventerkok.github.com/sbv/"; + description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; + license = stdenv.lib.licenses.bsd3; +} diff --git a/pkgs/applications/science/logic/petrinizer/z3.nix b/pkgs/applications/science/logic/petrinizer/z3.nix new file mode 100644 index 000000000000..4d868054c09b --- /dev/null +++ b/pkgs/applications/science/logic/petrinizer/z3.nix @@ -0,0 +1,24 @@ +{ mkDerivation, fetchpatch +, base, containers, gomp, hspec, QuickCheck, stdenv +, transformers, z3 +}: +mkDerivation { + pname = "z3"; + version = "408.0"; + sha256 = "13qkzy9wc17rm60i24fa9sx15ywbxq4a80g33w20887gvqyc0q53"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers transformers ]; + librarySystemDepends = [ gomp z3 ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/IagoAbal/haskell-z3"; + description = "Bindings for the Z3 Theorem Prover"; + license = stdenv.lib.licenses.bsd3; + doCheck = false; + patches = [ + (fetchpatch { + url = "https://github.com/IagoAbal/haskell-z3/commit/b10e09b8a809fb5bbbb1ef86aeb62109ece99cae.patch"; + sha256 = "13fnrs27mg3985r3lwks8fxfxr5inrayy2cyx2867d92pnl3yry4"; + }) + ]; +} diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index 5d151e5fa210..efc8446b1a10 100644 --- a/pkgs/development/arduino/arduino-core/default.nix +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -24,8 +24,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-arduino1.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-arduino1.jar"; file = "libs/linux/libjSSC-2.8_x86.so";} + 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";} ; # abiVersion 6 is default, but we need 5 for `avrdude_bin` executable ncurses5 = ncurses.override { abiVersion = "5"; }; @@ -58,37 +58,37 @@ let + stdenv.lib.optionalString (!withGui) "-core"; in stdenv.mkDerivation rec { - version = "1.8.5"; + version = "1.8.9"; name = "${flavor}-${version}"; src = fetchFromGitHub { owner = "arduino"; repo = "Arduino"; rev = "${version}"; - sha256 = "0ww72qfk7fyvprz15lc80i1axfdacb5fij4h5j5pakrg76mng2c3"; + sha256 = "0kblq0bqap2zzkflrj6rmdi8dvqxa28fcwwrc3lfmbz2893ni3w4"; }; - teensyduino_version = "145"; + teensyduino_version = "147"; teensyduino_src = fetchurl { url = "https://www.pjrc.com/teensy/td_${teensyduino_version}/TeensyduinoInstall.${teensy_architecture}"; sha256 = lib.optionalString ("${teensy_architecture}" == "linux64") - "0n8812znwdyvy7d1321p4r6j5pixg1sr31z5pfr7i0ikw0jxfrxb" + "09ysanip5d2f5axzd81z2l74ayng60zqhjxmxs7xa5098fff46il" + lib.optionalString ("${teensy_architecture}" == "linux32") - "1p74rb8g4v6kd09a0af1yra8xjzy3iyv5w5b6h6ljfhb022v3l57" + "1zw3cfv2p62dwg8838vh0gd1934b18cyx7c13azvwmrpj601l0xx" + lib.optionalString ("${teensy_architecture}" == "linuxarm") - "0jd9dvr8zx9hlyn6j979d66qdvzgv3dmx5x9yviqvrn1f3w4hfbf"; + "12421z26ksx84aldw1pq0cakh8jhs33mwafgvfij0zfgn9x0i877"; }; # Used because teensyduino requires jars be a specific size arduino_dist_src = fetchurl { url = "http://downloads.arduino.cc/arduino-${version}-${teensy_architecture}.tar.xz"; sha256 = lib.optionalString ("${teensy_architecture}" == "linux64") - "1f8s3by5lc6fazyaa9zc9kz3ar8zj8jabab1fy5jzh49fbd8bydx" + "1lv4in9j0r8s0cis4zdvbk2637vlj12w69wdxgcxcrwvkcdahkpa" + lib.optionalString ("${teensy_architecture}" == "linux32") - "1r9ral9aq5vp02dwgagifk5h403l7knxdyi1w23rqpcbbpa423lw" + "0zla3a6gd9prclgrbbgsmhf8ds8zb221m65x21pvz0y1cwsdvjpm" + lib.optionalString ("${teensy_architecture}" == "linuxarm") - "0sz18wns00kysmb2zv7a67dy9wpxiawq3ykfr07wjyg8h1fy3p6h"; + "1w5m49wfd68zazli0lf3w4zykab8n7mzp3wnbjqfpx2vip80bqnz"; }; @@ -216,6 +216,6 @@ stdenv.mkDerivation rec { homepage = http://arduino.cc/; license = if withTeensyduino then licenses.unfreeRedistributable else licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ antono auntie robberer bjornfor ]; + maintainers = with maintainers; [ antono auntie robberer bjornfor bergey ]; }; } diff --git a/pkgs/development/arduino/arduino-core/downloads.nix b/pkgs/development/arduino/arduino-core/downloads.nix index 12cc7a6e52ca..9c4f795d2936 100644 --- a/pkgs/development/arduino/arduino-core/downloads.nix +++ b/pkgs/development/arduino/arduino-core/downloads.nix @@ -16,13 +16,33 @@ url = "https://downloads.arduino.cc/Edison_help_files-1.6.2.zip"; sha256 = "1x25rivmh0zpa6lr8dafyxvim34wl3wnz3r9msfxg45hnbjqqwan"; }; - "build/Firmata-2.5.6.zip" = fetchurl { - url = "https://github.com/arduino-libraries/Firmata/archive/2.5.6.zip"; - sha256 = "117dd4pdlgv60gdlgm2ckjfq89i0dg1q8vszg6hxywdf701c1fk4"; + "build/Ethernet-2.0.0.zip" = fetchurl { + url = "https://github.com/arduino-libraries/Ethernet/archive/2.0.0.zip"; + sha256 = "0had46c1n1wx9fa7ki5dwidvchiy00pv7qj9msp6wgv199vm19m8"; }; - "build/Bridge-1.6.3.zip" = fetchurl { - url = "https://github.com/arduino-libraries/Bridge/archive/1.6.3.zip"; - sha256 = "1lha5wkzz63bgcn7bhx4rmgsh9ywa47lffycpyz6qjnl1pvm5mmj"; + "build/GSM-1.0.6.zip" = fetchurl { + url = "https://github.com/arduino-libraries/GSM/archive/1.0.6.zip"; + sha256 = "1kmikxr07cyzsnhhymvgj9m4dxi671ni120l33gfmmm6079qfwbk"; + }; + "build/Stepper-1.1.3.zip" = fetchurl { + url = "https://github.com/arduino-libraries/Stepper/archive/1.1.3.zip"; + sha256 = "1kyv6bmhmbjh7z8x77v04aywd2s54nm80g0j07gay2sa3f6k1p4v"; + }; + "build/TFT-1.0.6.zip" = fetchurl { + url = "https://github.com/arduino-libraries/TFT/archive/1.0.6.zip"; + sha256 = "1d69xp3hrva58nrx0vy4skrr1h63649q1jnc2g55bpbaxjhf5j5w"; + }; + "build/WiFi-1.2.7.zip" = fetchurl { + url = "https://github.com/arduino-libraries/WiFi/archive/1.2.7.zip"; + sha256 = "1fmj2q2672hivp5jn05xhc875ii3w54nfja3b1yrp8s2fwinh7f6"; + }; + "build/Firmata-2.5.8.zip" = fetchurl { + url = "https://github.com/firmata/arduino/archive/2.5.8.zip"; + sha256 = "0jmlqrnw5fksyqkjhcsl6j1q7c0clnvfr8yknanqqssc19pxp722"; + }; + "build/Bridge-1.7.0.zip" = fetchurl { + url = "https://github.com/arduino-libraries/Bridge/archive/1.7.0.zip"; + sha256 = "1qpnb2mj77jm4qczk1ndgjc9j2kqxnyahxdvlp0120x6w2jcq8s8"; }; "build/Robot_Control-1.0.4.zip" = fetchurl { url = "https://github.com/arduino-libraries/Robot_Control/archive/1.0.4.zip"; @@ -52,87 +72,91 @@ url = "https://github.com/arduino-libraries/Mouse/archive/1.0.1.zip"; sha256 = "106jjqxzpf5lrs9akwvamqsblj5w2fb7vd0wafm9ihsikingiypr"; }; - "build/Keyboard-1.0.1.zip" = fetchurl { - url = "https://github.com/arduino-libraries/Keyboard/archive/1.0.1.zip"; - sha256 = "1spv73zhjbrb0vgpzjnh6wr3bddlbyzv78d21dbn8z2l0aqv2sac"; + "build/Keyboard-1.0.2.zip" = fetchurl { + url = "https://github.com/arduino-libraries/Keyboard/archive/1.0.2.zip"; + sha256 = "17yfj95r1i7fb87q4krmxmaq07b4x2xf8cjngrj5imj68wgjck53"; }; - "build/SD-1.1.1.zip" = fetchurl { - url = "https://github.com/arduino-libraries/SD/archive/1.1.1.zip"; - sha256 = "0nackcf7yx5np1s24wnsrcjl8j0nlmqqir6316vqqkfayvb1247n"; + "build/SD-1.2.3.zip" = fetchurl { + url = "https://github.com/arduino-libraries/SD/archive/1.2.3.zip"; + sha256 = "0i5hb5hmrsrhfgxx8w7zzrfrkc751vs63vhxrj6qvwazhfcdpjw2"; }; - "build/Servo-1.1.2.zip" = fetchurl { - url = "https://github.com/arduino-libraries/Servo/archive/1.1.2.zip"; - sha256 = "14k1883qrx425wnm0r8kszzq32yvvs3jwxf3g7ybp7v0ga0q47l7"; + "build/Servo-1.1.3.zip" = fetchurl { + url = "https://github.com/arduino-libraries/Servo/archive/1.1.3.zip"; + sha256 = "1m019a75cdn1fg0cwlzbahmaqvg8sgzr6v1812rd7rjh8ismiah6"; }; "build/LiquidCrystal-1.0.7.zip" = fetchurl { url = "https://github.com/arduino-libraries/LiquidCrystal/archive/1.0.7.zip"; sha256 = "1wrxrqz3n4yrj9j1a2b7pdd7a1rlyi974ra7crv5amjng8817x9n"; }; - "build/Adafruit_CircuitPlayground-1.6.8.zip" = fetchurl { - url = "https://github.com/Adafruit/Adafruit_CircuitPlayground/archive/1.6.8.zip"; - sha256 = "0zm667xiaygx8v1ygcls43s6qd5n7pf21n0998n1z7nf18s35j41"; + "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-3.zip" = fetchurl { - url = "https://downloads.arduino.cc/libastylej-2.05.1-3.zip"; - sha256 = "0a1xy2cdl0xls5r21vy5d2j1dapn1jsdw0vbimlwnzfx7r84mxa6"; + "build/libastylej-2.05.1-4.zip" = fetchurl { + url = "https://downloads.arduino.cc/libastylej-2.05.1-4.zip"; + sha256 = "0q307b85xba7izjh344kqby3qahg3f5zy18gg52sjk1lbkl9i39s"; }; - "build/liblistSerials-1.4.0.zip" = fetchurl { - url = "https://downloads.arduino.cc/liblistSerials/liblistSerials-1.4.0.zip"; - sha256 = "129mfbyx7snq3znzhkfbdjiifdr85cwk6wjn8l9ia0wynszs5zyv"; + "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.9.1.zip" = fetchurl { - url = "https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.9.1/WiFi101-Updater-ArduinoIDE-Plugin-0.9.1.zip"; - sha256 = "15przp8z1dp6lamcvqdx4daq6fqi3c1algc3sbinyh25pm69pq74"; + "build/shared/WiFi101-Updater-ArduinoIDE-Plugin-0.10.6.zip" = fetchurl { + url = "https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.10.6/WiFi101-Updater-ArduinoIDE-Plugin-0.10.6.zip"; + sha256 = "1k23xyr5dmr60y8hb9x24wrgd4mfgvrzky621p6fvawn5xbdq8a3"; }; } // optionalAttrs (system == "x86_64-linux") { - "build/arduino-builder-linux64-1.3.25.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/arduino-builder-linux64-1.3.25.tar.bz2"; - sha256 = "15y80p255w2rg028vc8dq4hpqsmf770qigv3hgf78npb4qrjnqqf"; + "build/arduino-builder-linux64-1.4.4.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduino-builder-linux64-1.4.4.tar.bz2"; + sha256 = "1m5b4rc9i235ra6isqdpjj9llddb5sldkhidb8c4i14mcqbdci1n"; + }; + "build/linux/avr-gcc-5.4.0-atmel3.6.1-arduino2-x86_64-pc-linux-gnu.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avr-gcc-5.4.0-atmel3.6.1-arduino2-x86_64-pc-linux-gnu.tar.bz2"; + sha256 = "11ciwv9sw900wxb2fwm4i4ml4a85ylng0f595v0mf0xifc6jnhh5"; }; - "build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-x86_64-pc-linux-gnu.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-x86_64-pc-linux-gnu.tar.bz2"; - sha256 = "132qm8l6h50z4s9h0i5mfv6bp0iia0pp9kc3gd37hkajy4bh4j0r"; + "build/linux/avrdude-6.3.0-arduino14-x86_64-pc-linux-gnu.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino14-x86_64-pc-linux-gnu.tar.bz2"; + sha256 = "1z4b6pvn1823h8mg0iph88igmcnrk2y7skr3z44dqlwk0pryi1kr"; }; - "build/linux/avrdude-6.3.0-arduino9-x86_64-pc-linux-gnu.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-x86_64-pc-linux-gnu.tar.bz2"; - sha256 = "0shz5ymnlsrbnaqcb13fwbd73hz9k45adw14gf1ywjgywa2cpk68"; + "build/linux/arduinoOTA-1.2.1-linux_amd64.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduinoOTA-1.2.1-linux_amd64.tar.bz2"; + sha256 = "1ya834p2cqjj8k1ad3yxcnzd4bcgrlqsqsli9brq1138ac6k30jv"; }; - "build/linux/arduinoOTA-1.1.1-linux_amd64.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/arduinoOTA-1.1.1-linux_amd64.tar.bz2"; - sha256 = "0xy25srvpz6d0yfnz8b17mkmary3k51lb1cvgw7n2zyxayjd0npb"; + "build/avr-1.6.23.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/cores/avr-1.6.23.tar.bz2"; + sha256 = "1al449r8hcdck7f4y295g7q388qvbn6qhk2zqdvws9kg4mzqsq8q"; }; } // optionalAttrs (system == "i686-linux") { - "build/arduino-builder-linux32-1.3.25.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/arduino-builder-linux32-1.3.25.tar.bz2"; - sha256 = "0hjiqbf7xspdcr7lganqnl68qcmndc9pz06dghkrwzbzc5ki72qr"; + "build/arduino-builder-linux32-1.4.4.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduino-builder-linux32-1.4.4.tar.bz2"; + sha256 = "0q3i1ba7vh14616d9ligizcz89yadr0skazxbrcq3mvvjqzbifw8"; }; - "build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-pc-linux-gnu.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-pc-linux-gnu.tar.bz2"; - sha256 = "1d81z5m4cklv29hgb5ywrmyq64ymlwmjx2plm1gzs1mcpg7d9ab3"; + "build/linux/avr-gcc-5.4.0-atmel3.6.1-arduino2-i686-pc-linux-gnu.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avr-gcc-5.4.0-atmel3.6.1-arduino2-i686-pc-linux-gnu.tar.bz2"; + sha256 = "13skspybzq80ndsi93s7v15900lf26n5243mbib77andyc27xy2i"; }; - "build/linux/avrdude-6.3.0-arduino9-i686-pc-linux-gnu.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-i686-pc-linux-gnu.tar.bz2"; - sha256 = "12r1drjafxwzrvf1y1glxd46rv870mhz1ifn0g328ciwivas4da2"; + "build/linux/avrdude-6.3.0-arduino14-i686-pc-linux-gnu.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino14-i686-pc-linux-gnu.tar.bz2"; + sha256 = "1jklpk1sgrmbh1r25ynps4qcs5dbg6hd54fzjx4hcdf68cw0w42g"; }; - "build/linux/arduinoOTA-1.1.1-linux_386.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/arduinoOTA-1.1.1-linux_386.tar.bz2"; - sha256 = "1vvilbbbvv68svxzyhjspacbavcqakph5glhnz7c0mxkspqixjbs"; + "build/linux/arduinoOTA-1.2.1-linux_386.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduinoOTA-1.2.1-linux_386.tar.bz2"; + sha256 = "1m56ps58h0fs8rr4ifc45slmrdvalc63vhldy85isv28g15zdz9g"; }; } // optionalAttrs (system == "x86_64-darwin") { - "build/arduino-builder-macosx-1.3.25.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/arduino-builder-macosx-1.3.25.tar.bz2"; - sha256 = "0inkxjzdplb8b17j7lyam6v9gca25rxmsinrkgqnx3xxgkaxz2k0"; + "build/arduino-builder-macosx-1.4.4.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduino-builder-macosx-1.4.4.tar.bz2"; + sha256 = "1jp5kg32aiw062kcxlv660w38iaprifm8h3g2798izpwyfj0dmwg"; }; - "build/macosx/avr-gcc-4.9.2-atmel3.5.4-arduino2-i386-apple-darwin11.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-i386-apple-darwin11.tar.bz2"; - sha256 = "0c27i3y4f5biinxjdpp43wbj00lz7dvl08pnqr7hpkzaalsyvcv7"; + "build/macosx/avr-gcc-5.4.0-atmel3.6.1-arduino2-i386-apple-darwin11.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avr-gcc-5.4.0-atmel3.6.1-arduino2-i386-apple-darwin11.tar.bz2"; + sha256 = "1y2972b08ac59xwjqkyjmi5lf2pmzw88a6sdgci3x9rvahvh3idb"; }; - "build/macosx/avrdude-6.3.0-arduino9-i386-apple-darwin11.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-i386-apple-darwin11.tar.bz2"; - sha256 = "0rc4x8mcsva4v6j7ssfj8rdyg14l2pd9ivgdm39m5wnz8b06p85z"; + "build/macosx/avrdude-6.3.0-arduino14-i386-apple-darwin11.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino14-i386-apple-darwin11.tar.bz2"; + sha256 = "0qsa3sb3f480fm2z75fq14cqddw5hq8w8q0c2a9cw8i7aa8kkl27"; }; "build/macosx/appbundler/appbundler-1.0ea-arduino4.jar.zip" = fetchurl { url = "https://downloads.arduino.cc/appbundler-1.0ea-arduino4.jar.zip"; @@ -140,20 +164,20 @@ }; } // optionalAttrs (system == "armv6l-linux") { - "build/arduino-builder-linuxarm-1.3.25.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/arduino-builder-linuxarm-1.3.25.tar.bz2"; - sha256 = "1jvlihpcbdv1sgq1wjdwp7dhznk7nd88zin6yj40kr80gcd2ykry"; + "build/arduino-builder-linuxarm-1.4.4.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduino-builder-linuxarm-1.4.4.tar.bz2"; + sha256 = "03bhlhdkg1jx0d3lh9194xgaqsbank9njhlnwy8braa7pw4p58gn"; }; - "build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-armhf-pc-linux-gnu.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-armhf-pc-linux-gnu.tar.bz2"; - sha256 = "033jb1vmspcxsv0w9pk73xv195xnbnmckjsiccgqs8xx36g00dpf"; + "build/linux/avr-gcc-5.4.0-atmel3.6.1-arduino2-armhf-pc-linux-gnu.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avr-gcc-5.4.0-atmel3.6.1-arduino2-armhf-pc-linux-gnu.tar.bz2"; + sha256 = "17z9li387mx2acgad733h7l1jnnwv09ynw4nrwlqfahqqdfgjhb7"; }; - "build/linux/avrdude-6.3.0-arduino9-armhf-pc-linux-gnu.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-armhf-pc-linux-gnu.tar.bz2"; - sha256 = "1kp1xry97385zbrs94j285h1gqlzyyhkchh26z7zq6c0wi5879i5"; + "build/linux/avrdude-6.3.0-arduino14-armhf-pc-linux-gnu.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino14-armhf-pc-linux-gnu.tar.bz2"; + sha256 = "12amp8hqcj6gcdga7hfs22asgmgzafy8ny0rqhqs8n8d95sn586i"; }; - "build/linux/arduinoOTA-1.1.1-linux_arm.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/arduinoOTA-1.1.1-linux_arm.tar.bz2"; - sha256 = "0k1pib8lmvk6c0y3m038fj3mc18ax1hy3kbvgd5nygrxvy1hv274"; + "build/linux/arduinoOTA-1.2.1-linux_arm.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduinoOTA-1.2.1-linux_arm.tar.bz2"; + sha256 = "1q79w1d0h2lp3jcg58qrlh3k5lak7dbsnawrzm0jj8c6spfb6m5d"; }; } diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index f65b4628e8c8..06adbdae802a 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -262,8 +262,8 @@ in { }; php73 = generic { - version = "7.3.8"; - sha256 = "1xbndimrfamf97m3vln842g9w1ikq071gjfkk15ai7sx2wqccrnm"; + version = "7.3.9"; + sha256 = "1i33v50rbqrfwjwch1d46mbpwbxrg1xfycs9mjl7xsy9m04rg753"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch; diff --git a/pkgs/tools/package-management/morph/default.nix b/pkgs/tools/package-management/morph/default.nix index 9804c0fa1851..0daba5fadf3a 100644 --- a/pkgs/tools/package-management/morph/default.nix +++ b/pkgs/tools/package-management/morph/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "morph"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "dbcdk"; repo = "morph"; rev = "v${version}"; - sha256 = "0jhypvj45yjg4cn4rvb2j9091pl6z5j541vcfaln5sb3ds14fkwf"; + sha256 = "1lp5nsril9pnqllkpmvj8wd2f7p4xzwc2z3f5j6yfakd2sg41kgc"; }; goPackagePath = "github.com/dbcdk/morph"; |