diff options
Diffstat (limited to 'pkgs/development')
130 files changed, 1579 insertions, 803 deletions
diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index 3512dcbd2bcf..2a7387c4378a 100644 --- a/pkgs/development/arduino/arduino-core/default.nix +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -1,22 +1,36 @@ -{ stdenv, lib, fetchFromGitHub, fetchurl, jdk, ant -, libusb-compat-0_1, libusb1, unzip, zlib, ncurses, readline -, withGui ? false, gtk2 ? null, withTeensyduino ? false +{ stdenv +, lib +, fetchFromGitHub +, fetchurl +, jdk +, ant +, libusb-compat-0_1 +, libusb1 +, unzip +, zlib +, ncurses +, readline +, withGui ? false +, gtk2 ? null +, withTeensyduino ? false /* Packages needed for Teensyduino */ -, upx, fontconfig, xorg, gcc -, atk, glib, pango, gdk-pixbuf, libpng12, expat, freetype -, cairo, udev +, upx +, fontconfig +, xorg +, gcc +, atk +, glib +, pango +, gdk-pixbuf +, libpng12 +, expat +, freetype +, cairo +, udev }: assert withGui -> gtk2 != null; assert withTeensyduino -> withGui; - -# TODO: Teensyduino is disabled for i686-linux due to an indefinite hang in the -# xdotool script; the cause of this hang is not yet known. -# TODO: There is a fair chance that Teensyduino works with arm-linux, but it -# has not yet been tested. -if withTeensyduino && (stdenv.hostPlatform.system != "x86_64-linux") then throw - "Teensyduino is only supported on x86_64-linux at this time (patches welcome)." -else let externalDownloads = import ./downloads.nix { inherit fetchurl; @@ -25,12 +39,13 @@ 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 == "aarch64-linux") { jar = "share/arduino/lib/jssc-2.8.0-arduino4.jar"; file = "libs/linux/libjSSC-2.8_aarch64.so"; } + ++ lib.optional (builtins.match "armv[67]l-linux" stdenv.hostPlatform.system != null) { jar = "share/arduino/lib/jssc-2.8.0-arduino4.jar"; file = "libs/linux/libjSSC-2.8_armhf.so"; } + ++ lib.optional (stdenv.hostPlatform.system == "x86_64-linux") { jar = "share/arduino/lib/jssc-2.8.0-arduino4.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-arduino4.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"; }; - teensy_libpath = stdenv.lib.makeLibraryPath [ atk cairo @@ -54,49 +69,61 @@ let zlib ]; teensy_architecture = - lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") "linux64" - + lib.optionalString (stdenv.hostPlatform.system == "i686-linux") "linux32" - + lib.optionalString (stdenv.hostPlatform.system == "arm-linux") "linuxarm"; - - flavor = (if withTeensyduino then "teensyduino" else "arduino") - + stdenv.lib.optionalString (!withGui) "-core"; + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") "linux64" + + lib.optionalString (stdenv.hostPlatform.system == "i686-linux") "linux32" + + lib.optionalString (stdenv.hostPlatform.system == "aarch64-linux") "linuxaarch64" + + lib.optionalString (builtins.match "armv[67]l-linux" stdenv.hostPlatform.system != null) "linuxarm"; + flavor = ( if withTeensyduino then "teensyduino" else "arduino") + + 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"; + teensyduino_version = "151"; teensyduino_src = fetchurl { url = "https://www.pjrc.com/teensy/td_${teensyduino_version}/TeensyduinoInstall.${teensy_architecture}"; sha256 = lib.optionalString (teensy_architecture == "linux64") - "09ysanip5d2f5axzd81z2l74ayng60zqhjxmxs7xa5098fff46il" + "0q8mw9bm2vb5vwa98gwcs6ad164i98hc1qqh2qw029yhwm599pn0" + lib.optionalString (teensy_architecture == "linux32") - "1zw3cfv2p62dwg8838vh0gd1934b18cyx7c13azvwmrpj601l0xx" + "1rq6sx0048ab200jy0cz5vznwxi99avidngj42rjnh7kcfas5c4m" + + lib.optionalString (teensy_architecture == "linuxaarch64") + "09k78dycn1vcpcx37c1dak8bgjv8gs34l89n9r9s0c3rqmv3pg4x" + lib.optionalString (teensy_architecture == "linuxarm") - "12421z26ksx84aldw1pq0cakh8jhs33mwafgvfij0zfgn9x0i877"; - }; + "19j55bq36040rpdpfxcqimda76rkbx137q15bs8nvxj13wrbl4ip"; + }; # 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") - "1lv4in9j0r8s0cis4zdvbk2637vlj12w69wdxgcxcrwvkcdahkpa" + "128f34kkxz7ab6ir5mqyr8d1mgxig8f9jygwxy44pdnq2rk6gmh9" + lib.optionalString (teensy_architecture == "linux32") - "0zla3a6gd9prclgrbbgsmhf8ds8zb221m65x21pvz0y1cwsdvjpm" + "11n85lwsn1w4ysfacyw08v85s3f3zvl8j8ac7rld19yxgjslvisi" + + lib.optionalString (teensy_architecture == "linuxaarch64") + "04v2nhyjhahml6nmz23bfb63c0an4a7zxgcgxqqq442i8vd304wa" + lib.optionalString (teensy_architecture == "linuxarm") - "1w5m49wfd68zazli0lf3w4zykab8n7mzp3wnbjqfpx2vip80bqnz"; + "1k8yjivaydm6y16mplrjyblgx7l0wjzm3mjxh5saxrjq7drswmxx"; }; - buildInputs = [ jdk ant libusb-compat-0_1 libusb1 unzip zlib ncurses5 readline + buildInputs = [ + jdk + ant + libusb-compat-0_1 + libusb1 + unzip + zlib + ncurses5 + readline ] ++ stdenv.lib.optionals withTeensyduino [ upx ]; downloadSrcList = builtins.attrValues externalDownloads; downloadDstList = builtins.attrNames externalDownloads; @@ -116,7 +143,8 @@ stdenv.mkDerivation rec { # Deliberately break build.xml's download statement in order to cause # an error if anything needed is missing from download.nix. - substituteInPlace build/build.xml --replace "get src" "get error" + substituteInPlace build/build.xml \ + --replace 'ignoreerrors="true"' 'ignoreerrors="false"' cd ./arduino-core && ant cd ../build && ant @@ -125,11 +153,11 @@ stdenv.mkDerivation rec { # This will be patched into `arduino` wrapper script # Java loads gtk dynamically, so we need to provide it using LD_LIBRARY_PATH - dynamicLibraryPath = lib.makeLibraryPath [gtk2]; - javaPath = lib.makeBinPath [jdk]; + dynamicLibraryPath = lib.makeLibraryPath [ gtk2 ]; + javaPath = lib.makeBinPath [ jdk ]; # Everything else will be patched into rpath - rpath = (lib.makeLibraryPath [zlib libusb-compat-0_1 libusb1 readline ncurses5 stdenv.cc.cc]); + rpath = (lib.makeLibraryPath [ zlib libusb-compat-0_1 libusb1 readline ncurses5 stdenv.cc.cc ]); installPhase = '' mkdir -p $out/share/arduino @@ -192,19 +220,19 @@ stdenv.mkDerivation rec { done ${lib.concatMapStringsSep "\n" - ({jar, file}: + ({ jar, file }: '' - jar xvf $out/${jar} ${file} - patchelf --set-rpath $rpath ${file} - jar uvf $out/${jar} ${file} - rm -f ${file} + jar xvf $out/${jar} ${file} + patchelf --set-rpath $rpath ${file} + jar uvf $out/${jar} ${file} + rm -f ${file} '' ) - patchelfInJars} + patchelfInJars} # avrdude_bin is linked against libtinfo.so.5 mkdir $out/lib/ - ln -s ${lib.makeLibraryPath [ncurses5]}/libtinfo.so.5 $out/lib/libtinfo.so.5 + ln -s ${lib.makeLibraryPath [ ncurses5 ]}/libtinfo.so.5 $out/lib/libtinfo.so.5 ${stdenv.lib.optionalString withTeensyduino '' # Patch the Teensy loader binary diff --git a/pkgs/development/arduino/arduino-core/downloads.nix b/pkgs/development/arduino/arduino-core/downloads.nix index 9c4f795d2936..f2edf64ceb6f 100644 --- a/pkgs/development/arduino/arduino-core/downloads.nix +++ b/pkgs/development/arduino/arduino-core/downloads.nix @@ -1,4 +1,7 @@ -{fetchurl, optionalAttrs, system}: +{ fetchurl +, optionalAttrs +, system +}: # This file preloads all the archives which Arduino's build/build.xml # would otherwise try to download itself. When updating this for a new # version of Arduino, check build.xml for version numbers and new @@ -56,9 +59,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"; @@ -76,108 +79,135 @@ 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/Adafruit_Circuit_Playground-1.10.4.zip" = fetchurl { + url = "https://github.com/adafruit/Adafruit_CircuitPlayground/archive/1.10.4.zip"; + sha256 = "194az5pxxzs0wg4ng7w0zqrdw93qdyv02y0q2yy57dr4kwfrm6nl"; }; - "build/libastylej-2.05.1-4.zip" = fetchurl { - url = "https://downloads.arduino.cc/libastylej-2.05.1-4.zip"; - sha256 = "0q307b85xba7izjh344kqby3qahg3f5zy18gg52sjk1lbkl9i39s"; + "build/libastylej-2.05.1-5.zip" = fetchurl { + url = "https://downloads.arduino.cc/libastylej-2.05.1-5.zip"; + sha256 = "11mlprwvqfq3nvmz6hdf1fcg02a7xi2a9qhffa1d8a4w15s2iwny"; }; - "build/liblistSerials-1.4.2.zip" = fetchurl { - url = "https://downloads.arduino.cc/liblistSerials/liblistSerials-1.4.2.zip"; - sha256 = "1p58b421k92rbgwfgbihy0d04mby7kfssghpmjb4gk9yix09za3m"; + "build/liblistSerials-1.4.2-2.zip" = fetchurl { + url = "https://downloads.arduino.cc/liblistSerials/liblistSerials-1.4.2-2.zip"; + sha256 = "0sqzwp1lfjy452z3d4ma5c4blwsj7za72ymxf7crpq9dh9qd8f53"; }; - "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"; + "build/shared/WiFi101-Updater-ArduinoIDE-Plugin-0.10.10.zip" = fetchurl { + url = "https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.10.10/WiFi101-Updater-ArduinoIDE-Plugin-0.10.10.zip"; + sha256 = "0bs5qdglsfc2q5c48m6wdjpzhz4ya4askh1g8364dp6p7jmg6w0d"; + }; + "build/avr-1.8.2.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/cores/avr-1.8.2.tar.bz2"; + sha256 = "06zl8fwphknd0qdx87fcr1003gid1yqsazaj674mm9widqfd84v2"; }; } + // 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"; - 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/arduino-builder-linux64-1.5.2.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduino-builder-linux64-1.5.2.tar.bz2"; + sha256 = "0wypr9a2cbv9r0ignsr13raw09i3vfc5zvkjxp2xwb7mv35y77z3"; }; - "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/avr-gcc-7.3.0-atmel3.6.1-arduino5-x86_64-pc-linux-gnu.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avr-gcc-7.3.0-atmel3.6.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"; + sha256 = "1yq6a811dabrkcgzfi3jsys41r19qsna46kglkjbcy0rza7yvzry"; }; - "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/avrdude-6.3.0-arduino17-x86_64-pc-linux-gnu.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino17-x86_64-pc-linux-gnu.tar.bz2"; + sha256 = "0gfic26af9vlcpkw8v914psn05vmq1rsrlk1fi7vzapj1a9gpkdc"; }; - "build/avr-1.6.23.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/cores/avr-1.6.23.tar.bz2"; - sha256 = "1al449r8hcdck7f4y295g7q388qvbn6qhk2zqdvws9kg4mzqsq8q"; + "build/linux/arduinoOTA-1.3.0-linux_amd64.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduinoOTA-1.3.0-linux_amd64.tar.bz2"; + sha256 = "1ylz4pfa9np0nn0w9igmmm3sr8hz3na04n7cv8ia3hzz84jfwida"; }; } + // 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"; - sha256 = "0q3i1ba7vh14616d9ligizcz89yadr0skazxbrcq3mvvjqzbifw8"; + "build/arduino-builder-linux32-1.5.2.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduino-builder-linux32-1.5.2.tar.bz2"; + sha256 = "1slzw8fzxkqsp2izjisjd1rxxbqkrq6n72jc4frk5z2gdm6zfa0l"; }; - "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/avr-gcc-7.3.0-atmel3.6.1-arduino5-i686-pc-linux-gnu.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avr-gcc-7.3.0-atmel3.6.1-arduino5-i686-pc-linux-gnu.tar.bz2"; + sha256 = "078f3rbpdrghk63mbaq73bd5p6znimp14b1wdf6nh2gdswwjgw9g"; }; - "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/avrdude-6.3.0-arduino17-i686-pc-linux-gnu.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino17-i686-pc-linux-gnu.tar.bz2"; + sha256 = "0py0jvpim0frmv0dnvzfj122ni5hg1qwshgya4a0wc5rgp0wd32w"; }; - "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"; + "build/linux/arduinoOTA-1.3.0-linux_386.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduinoOTA-1.3.0-linux_386.tar.bz2"; + sha256 = "1cl79019ldsq0sc3fd4pm0vx2kqcklld7w03hdcj99y7zgb5jzry"; }; } + // optionalAttrs (system == "x86_64-darwin") { - "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/arduino-builder-macosx-1.5.2-signed.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduino-builder-macosx-1.5.2-signed.tar.bz2"; + sha256 = "1pa795vwly1z9h1bp5qzbx2c2pq4n6p7ab5ivhmd3q89z0ywyqgz"; + }; + "build/macosx/avr-gcc-7.3.0-atmel3.6.1-arduino5-x86_64-apple-darwin14-signed.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avr-gcc-7.3.0-atmel3.6.1-arduino5-x86_64-apple-darwin14-signed.tar.bz2"; + sha256 = "0lcnp525glnc2chcynnz2nllm4q6ar4n9nrjqd1jbj4m706zbv67"; + }; + "build/macosx/avrdude-6.3.0-arduino17-x86_64-apple-darwin12-signed.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino17-x86_64-apple-darwin12-signed.tar.bz2"; + sha256 = "1m24dci8mjf70yrf033mp1834pbp870m8sns2jxs3iy2i4qviiki"; + }; + "build/linux/arduinoOTA-1.3.0-darwin_amd64-signed.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduinoOTA-1.3.0-darwin_amd64-signed.tar.bz2"; + sha256 = "12pwfnikq3z3ji5wgjhzx1mfyaha5cym7mr63r8kfl5a85fhk8nz"; + }; + "build/macosx/appbundler/appbundler-1.0ea-arduino5.jar.zip" = fetchurl { + url = "https://downloads.arduino.cc/appbundler-1.0ea-arduino5.jar.zip"; + sha256 = "1ims951z7ajprqms7yd8ll83c79n7krhd9ljw30yn61f6jk46x82"; + }; +} + +// optionalAttrs (system == "aarch64-linux") { + "build/arduino-builder-linuxaarch64-1.5.2.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduino-builder-linuxaarch64-1.5.2.tar.bz2"; + sha256 = "14k7h7anjizbs2h04phw784slpfbi6hch9skvhy5ll805dmr24ci"; }; - "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/linux/avr-gcc-7.3.0-atmel3.6.1-arduino5-aarch64-pc-linux-gnu.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avr-gcc-7.3.0-atmel3.6.1-arduino5-aarch64-pc-linux-gnu.tar.bz2"; + sha256 = "040cspc41iv59fb2g9fzc6w5523dvqa1bavxni7s8w731ccp176x"; }; - "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/linux/avrdude-6.3.0-arduino17-aarch64-pc-linux-gnu.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino17-aarch64-pc-linux-gnu.tar.bz2"; + sha256 = "1z59dx2j2j4675awjzag9fswhvkn3hlz4ds5d2b7pzmca7vliybc"; }; - "build/macosx/appbundler/appbundler-1.0ea-arduino4.jar.zip" = fetchurl { - url = "https://downloads.arduino.cc/appbundler-1.0ea-arduino4.jar.zip"; - sha256 = "1vz0g98ancfqdf7yx5m3zrxmzb3fwp18zh5lkh2nyl5xlr9m368z"; + "build/linux/arduinoOTA-1.3.0-linux_aarch64.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduinoOTA-1.3.0-linux_aarch64.tar.bz2"; + sha256 = "04s1is2w8xhvc7lg0lmyk0yjsnar2l2gdc6ig7lkgb7zgkrxhpl3"; }; } -// optionalAttrs (system == "armv6l-linux") { - "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-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-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.2.1-linux_arm.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/arduinoOTA-1.2.1-linux_arm.tar.bz2"; - sha256 = "1q79w1d0h2lp3jcg58qrlh3k5lak7dbsnawrzm0jj8c6spfb6m5d"; + +// optionalAttrs (builtins.match "armv[67]l-linux" system != null) { + "build/arduino-builder-linuxarm-1.5.2.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduino-builder-linuxarm-1.5.2.tar.bz2"; + sha256 = "1vs2s5px07jb2sdv83qxkf9lxmsy8j4dm7bn3vpw5dcjqd3qdyww"; + }; + "build/linux/avr-gcc-7.3.0-atmel3.6.1-arduino5-arm-linux-gnueabihf.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avr-gcc-7.3.0-atmel3.6.1-arduino5-arm-linux-gnueabihf.tar.bz2"; + sha256 = "0fcn0s0fdgbz3yma2gjv16s1idrzn6nhmypdw8awg0kb3i9xbb7l"; + }; + "build/linux/avrdude-6.3.0-arduino17-armhf-pc-linux-gnu.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino17-armhf-pc-linux-gnu.tar.bz2"; + sha256 = "1lah9wvwvliajrrf5jw5blkjhk1sxivz26gj5s86zah3v32ni3ia"; + }; + "build/linux/arduinoOTA-1.3.0-linux_arm.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduinoOTA-1.3.0-linux_arm.tar.bz2"; + sha256 = "0mm6spjlg0lhkfx5c9q27b6agjywnc1nf3mbl15yysmm15s5i20q"; }; } diff --git a/pkgs/development/compilers/abcl/default.nix b/pkgs/development/compilers/abcl/default.nix index 005e4186b152..543ba6036e4a 100644 --- a/pkgs/development/compilers/abcl/default.nix +++ b/pkgs/development/compilers/abcl/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ant, jre, jdk}: stdenv.mkDerivation rec { pname = "abcl"; - version = "1.6.1"; + version = "1.7.0"; # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) src = fetchurl { url = "https://common-lisp.net/project/armedbear/releases/${version}/${pname}-src-${version}.tar.gz"; - sha256 = "04myiba6g0vij2ym2dmb0156k20ki2lz13dxwp2bk9kvjn2zg88b"; + sha256 = "0pbn5s22zygk6k0rzjc9g76220628lj1b3057gr0n4grl11p4lx5"; }; configurePhase = '' mkdir nix-tools diff --git a/pkgs/development/compilers/go-jsonnet/default.nix b/pkgs/development/compilers/go-jsonnet/default.nix index 6c00d5ee6ce5..d85cf1adfe78 100644 --- a/pkgs/development/compilers/go-jsonnet/default.nix +++ b/pkgs/development/compilers/go-jsonnet/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-jsonnet"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "google"; repo = "go-jsonnet"; rev = "v${version}"; - sha256 = "0l6cwky2xl7m8nnc9abp76bhkdcf2ldbbv3r8p30xv2yr5wd1j8i"; + sha256 = "17606gc75wnkm64am4hmlv7m3fy2hi8rnzadp6nrgpcd6rl26m83"; }; - vendorSha256 = "1vdv0nq31mjprxzxf8x0diaigissy07vnm338h8jrk5i74x5by39"; + vendorSha256 = "0nsm4gsbbn8myz4yfi6m7qc3iizhdambsr18iks0clkdn3mi2jn1"; subPackages = [ "cmd/jsonnet" ]; diff --git a/pkgs/development/compilers/go/1.13.nix b/pkgs/development/compilers/go/1.13.nix index b524d3d6b093..8b013bbd6503 100644 --- a/pkgs/development/compilers/go/1.13.nix +++ b/pkgs/development/compilers/go/1.13.nix @@ -30,11 +30,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.13.11"; + version = "1.13.12"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "0y86q2k00lh8c7wj3lha43g804iwr61nap8j3i907l2sway1mvc9"; + sha256 = "0d5s5rqyzp6ykj4x1dz8infcsmj3gy8djnf63ji971ypwi6jrfhp"; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/graalvm/enterprise-edition.nix b/pkgs/development/compilers/graalvm/enterprise-edition.nix index 5a6c96507649..89896c556efa 100644 --- a/pkgs/development/compilers/graalvm/enterprise-edition.nix +++ b/pkgs/development/compilers/graalvm/enterprise-edition.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg, libGL, atk, alsaLib, libav_0_8, setJavaClassPath }: +{ stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg_3, libGL, atk, alsaLib, libav_0_8, setJavaClassPath }: let common = javaVersion: @@ -117,7 +117,7 @@ let }.${javaVersion} }:${ stdenv.lib.strings.makeLibraryPath [ glibc xorg.libXxf86vm xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender - glib zlib bzip2 alsaLib fontconfig freetype pango gtk3 gtk2 cairo gdk-pixbuf atk ffmpeg libGL ]}" + glib zlib bzip2 alsaLib fontconfig freetype pango gtk3 gtk2 cairo gdk-pixbuf atk ffmpeg_3 libGL ]}" for f in $(find $out -type f -perm -0100); do patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true diff --git a/pkgs/development/compilers/julia/1.3.nix b/pkgs/development/compilers/julia/1.3.nix index b67a78b4a5ab..15694734d487 100644 --- a/pkgs/development/compilers/julia/1.3.nix +++ b/pkgs/development/compilers/julia/1.3.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { LD_LIBRARY_PATH = makeLibraryPath [ arpack fftw fftwSinglePrec gmp libgit2 mpfr blas openlibm - openspecfun pcre2 + openspecfun pcre2 lapack ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix index 7ba04ed50cc0..adb564f7cfee 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, writeText, gradleGen, pkgconfig, perl, cmake -, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg, python, ruby +, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg_3, python, ruby , openjdk11-bootstrap }: let @@ -19,7 +19,7 @@ let sha256 = "1h7qsylr7rnwnbimqjyn3whszp9kv4h3gpicsrb3mradxc9yv194"; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg_3 ]; nativeBuildInputs = [ gradle_ perl pkgconfig cmake gperf python ruby ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/compilers/openjdk/openjfx/14.nix b/pkgs/development/compilers/openjdk/openjfx/14.nix index 12d9448595e3..04bb1fa56274 100644 --- a/pkgs/development/compilers/openjdk/openjfx/14.nix +++ b/pkgs/development/compilers/openjdk/openjfx/14.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradleGen , pkgconfig, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib -, ffmpeg, python, ruby }: +, ffmpeg_3, python, ruby }: let major = "14"; @@ -21,7 +21,7 @@ let sha256 = "16aj15xksc266gv3y42m0g277pfvp71901lrngndcnpr7i2zshnr"; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg_3 ]; nativeBuildInputs = [ gradle_ perl pkgconfig cmake gperf python ruby ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 092af49a9f8b..78fff4a59fba 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -19,7 +19,7 @@ , glib , libxml2 , libav_0_8 -, ffmpeg +, ffmpeg_3 , libxslt , libGL , freetype @@ -171,7 +171,7 @@ let result = stdenv.mkDerivation rec { * libXt is only needed on amd64 */ libraries = - [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++ + [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg_3 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++ (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []); rpath = stdenv.lib.strings.makeLibraryPath libraries; diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 3a54d42498ce..332824185616 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -1,5 +1,6 @@ { stdenv , abc-verifier +, bash , bison , fetchFromGitHub , flex @@ -15,13 +16,13 @@ stdenv.mkDerivation rec { pname = "yosys"; - version = "2020.03.24"; + version = "2020.06.11"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; - rev = "c9555c9adeba886a308c60615ac794ec20d9276e"; - sha256 = "1fh118fv06jyfmkx6zy0w2k0rjj22m0ffyll3k5giaw8zzaf0j3a"; + rev = "a1785e988b2b51dac32985dd6b0afdcedc6bda1d"; + sha256 = "0987f5vm2zb0i02c3vlw21gihky2cfj5l9b78ddzhxfiv0qfkdfp"; }; enableParallelBuilding = true; @@ -38,6 +39,8 @@ stdenv.mkDerivation rec { --replace 'LD = gcc' 'LD = $(CXX)' \ --replace 'ABCMKARGS = CC="$(CXX)" CXX="$(CXX)"' 'ABCMKARGS =' \ --replace 'echo UNKNOWN' 'echo ${builtins.substring 0 10 src.rev}' + substituteInPlace ./misc/yosys-config.in \ + --replace '/bin/bash' '${bash}/bin/bash' patchShebangs tests ''; diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix index ed3d67ff8621..e48fee0a6a59 100644 --- a/pkgs/development/compilers/zulu/8.nix +++ b/pkgs/development/compilers/zulu/8.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath -, zulu, glib, libxml2, libav_0_8, ffmpeg, libxslt, libGL, alsaLib +, zulu, glib, libxml2, libav_0_8, ffmpeg_3, libxslt, libGL, alsaLib , fontconfig, freetype, gnome2, cairo, gdk-pixbuf, atk, xorg , swingSupport ? true }: @@ -15,7 +15,7 @@ let extension = if stdenv.isDarwin then "zip" else "tar.gz"; libraries = [ - stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL + stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg_3 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango gnome2.gtk cairo gdk-pixbuf atk ] ++ (lib.optionals swingSupport (with xorg; [ diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index d13e574a81a1..bfaa4c777b32 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath -, zulu, glib, libxml2, libav_0_8, ffmpeg, libxslt, libGL, alsaLib +, zulu, glib, libxml2, libav_0_8, ffmpeg_3, libxslt, libGL, alsaLib , fontconfig, freetype, gnome2, cairo, gdk-pixbuf, atk, xorg, zlib , swingSupport ? true }: @@ -15,7 +15,7 @@ let extension = if stdenv.isDarwin then "zip" else "tar.gz"; libraries = [ - stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL + stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg_3 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango gnome2.gtk cairo gdk-pixbuf atk zlib ] ++ (lib.optionals swingSupport (with xorg; [ diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index 333b89d0fad8..3857146ea605 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -2,9 +2,9 @@ let params = { "8.11" = rec { - version = "1.4.0"; + version = "1.4.1"; rev = "v${version}"; - sha256 = "1pzmjgvvdwki59rfsha3c1ik4gii39j44ijyb9m9as1cyfpxx906"; + sha256 = "12jwldcianai62y9jnghsjfya5dj6fvc6ilf37c7w037kylx45sd"; }; }; param = params.${coq.coq-version}; diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix index e0c32bc430ed..c5d3a295f2bc 100644 --- a/pkgs/development/coq-modules/flocq/default.nix +++ b/pkgs/development/coq-modules/flocq/default.nix @@ -2,11 +2,11 @@ let params = if stdenv.lib.versionAtLeast coq.coq-version "8.7" then { - version = "3.2.0"; - sha256 = "15bi36x7zj0glsb3s2gwqd4wswhfzh36rbp7imbyff53a7nna95l"; + version = "3.3.1"; + sha256 = "0k1nfgiszmai5dihhpfa5mgq9rwigl0n38dw10jn79x89xbdpyh5"; } else { version = "2.6.1"; - sha256 = "1y4czkfrd8p37vwv198nns4hz1brfv71na17pxsidwpxy7qnyfw1"; + sha256 = "0q5a038ww5dn72yvwn5298d3ridkcngb1dik8hdyr3xh7gr5qibj"; } ; in @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]); buildPhase = '' - ${bash}/bin/bash autogen.sh + ${bash}/bin/bash autogen.sh || autoconf ${bash}/bin/bash configure --libdir=$out/lib/coq/${coq.coq-version}/user-contrib/Flocq ./remake ''; @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { }; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" "8.10" ]; + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ]; }; } diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 140bf8ab5364..d4d5f924f52f 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -66,7 +66,8 @@ let ####################################################################### # sha256 of released mathcomp versions sha256 = { - "1.11.0+beta1" = "12i3zznwajlihzpqsiqniv20rklj8d8401lhd241xy4s21fxkkjm"; + "1.11.0" = "06a71d196wd5k4wg7khwqb7j7ifr7garhwkd54s86i0j7d6nhl3c"; + "1.11+beta1" = "12i3zznwajlihzpqsiqniv20rklj8d8401lhd241xy4s21fxkkjm"; "1.10.0" = "1b9m6pwxxyivw7rgx82gn5kmgv2mfv3h3y0mmjcjfypi8ydkrlbv"; "1.9.0" = "0lid9zaazdi3d38l8042lczb02pw5m9wq0yysiilx891hgq2p81r"; "1.8.0" = "07l40is389ih8bi525gpqs3qp4yb2kl11r9c8ynk1ifpjzpnabwp"; @@ -75,7 +76,8 @@ let }; # versions of coq compatible with released mathcomp versions coq-versions = { - "1.11.0+beta1" = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" ]; + "1.11.0" = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" ]; + "1.11+beta1" = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" ]; "1.10.0" = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" ]; "1.9.0" = flip elem [ "8.7" "8.8" "8.9" "8.10" ]; "1.8.0" = flip elem [ "8.7" "8.8" "8.9" ]; @@ -94,7 +96,7 @@ let # mathcomp preferred versions by decreasing order # (the first version in the list will be tried first) version-preferences = - [ "1.10.0" "1.9.0" "1.11.0+beta1" "1.8.0" "1.7.0" "1.6.1" ]; + [ "1.10.0" "1.11.0" "1.9.0" "1.8.0" "1.7.0" "1.6.1" ]; # list of core mathcomp packages sorted by dependency order packages = _version: # unused in current versions of mathcomp diff --git a/pkgs/development/coq-modules/mathcomp/extra.nix b/pkgs/development/coq-modules/mathcomp/extra.nix index a53caac621c3..6a2dfcda3456 100644 --- a/pkgs/development/coq-modules/mathcomp/extra.nix +++ b/pkgs/development/coq-modules/mathcomp/extra.nix @@ -112,7 +112,7 @@ let mathcomp-analysis = {version, coqPackages}: { propagatedBuildInputs = with coqPackages; - [ mathcomp.field mathcomp-finmap mathcomp-bigenough ]; + [ mathcomp.field mathcomp-finmap mathcomp-bigenough mathcomp-real-closed ]; meta = { description = "Analysis library compatible with Mathematical Components"; homepage = "https://github.com/math-comp/analysis"; @@ -168,12 +168,15 @@ let "1.0.0" = "10g0gp3hk7wri7lijkrqna263346wwf6a3hbd4qr9gn8hmsx70wg"; }; mathcomp-analysis = { + "0.3.1" = "1iad288yvrjv8ahl9v18vfblgqb1l5z6ax644w49w9hwxs93f2k8"; + "0.3.0" = "03klwi4fja0cqb4myp3kgycfbmdv00bznmxf8yg3zzzzw997hjqc"; "0.2.3" = "0p9mr8g1qma6h10qf7014dv98ln90dfkwn76ynagpww7qap8s966"; "0.2.2" = "1d5dwg9di2ppdzfg21zr0a691zigb5kz0lcw263jpyli1nrq7cvk"; "0.2.0" = "1186xjxgns4ns1szyi931964bjm0mp126qzlv10mkqqgfw07nhrd"; "0.1.0" = "0hwkr2wzy710pcyh274fcarzdx8sv8myp16pv0vq5978nmih46al"; }; multinomials = { + "1.5.2" = "15aspf3jfykp1xgsxf8knqkxv8aav2p39c2fyirw7pwsfbsv2c4s"; "1.5.1" = "13nlfm2wqripaq671gakz5mn4r0xwm0646araxv0nh455p9ndjs3"; "1.5" = "064rvc0x5g7y1a0nip6ic91vzmq52alf6in2bc2dmss6dmzv90hw"; "1.4" = "0vnkirs8iqsv8s59yx1fvg1nkwnzydl42z3scya1xp1b48qkgn0p"; @@ -183,6 +186,8 @@ let "1.0" = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m"; }; mathcomp-real-closed = { + "1.1.1" = "0ksjscrgq1i79vys4zrmgvzy2y4ylxa8wdsf4kih63apw6v5ws6b"; + "1.1.0" = "0zgfmrlximw77bw5w6w0xg2nampp02pmrwnrzx8m1n5pqljnv8fh"; "1.0.5" = "0q8nkxr9fba4naylr5xk7hfxsqzq2pvwlg1j0xxlhlgr3fmlavg2"; "1.0.4" = "058v9dj973h9kfhqmvcy9a6xhhxzljr90cf99hdfcdx68fi2ha1b"; "1.0.3" = "1xbzkzqgw5p42dx1liy6wy8lzdk39zwd6j14fwvv5735k660z7yb"; @@ -190,6 +195,7 @@ let "1.0.1" = "0j81gkjbza5vg89v4n9z598mfdbql416963rj4b8fzm7dp2r4rxg"; }; coqeal = { + "1.0.4" = "1g5m26lr2lwxh6ld2gykailhay4d0ayql4bfh0aiwqpmmczmxipk"; "1.0.3" = "0hc63ny7phzbihy8l7wxjvn3haxx8jfnhi91iw8hkq8n29i23v24"; "1.0.2" = "1brmf3gj03iky1bcl3g9vx8vknny7xfvs0y2rfr85am0296sxsfj"; "1.0.1" = "19jhdrv2yp9ww0h8q73ihb2w1z3glz4waf2d2n45klafxckxi7bm"; @@ -201,13 +207,21 @@ let # CONSISTENT sets of packages. # ################################ for-coq-and-mc = let + v6 = { + mathcomp-finmap = "1.5.0"; + mathcomp-bigenough = "1.0.0"; + mathcomp-analysis = "0.3.1"; + multinomials = "1.5.2"; + mathcomp-real-closed = "1.1.1"; + coqeal = "1.0.4"; + }; v5 = { mathcomp-finmap = "1.5.0"; mathcomp-bigenough = "1.0.0"; - mathcomp-analysis = "678d3cc37f5f3c71b1bd550836eb44e3ba2a5459"; - multinomials = "1.5.1"; + mathcomp-analysis = "0.3.0"; + multinomials = "1.5.1"; mathcomp-real-closed = "1.0.5"; - coqeal = "CohenCyril/bdfc96771644b082e41268edc43d61dc5fda2358"; + coqeal = "1.0.4"; }; v4 = v3 // { coqeal = "1.0.3"; }; v3 = { @@ -236,29 +250,34 @@ let in { "8.11" = { - "1.11.0+beta1" = v5; + "1.11.0" = v6; + "1.11+beta1" = v5; "1.10.0" = v4 // {mathcomp-finmap = "1.4.0+coq-8.11";}; }; "8.10" = { - "1.11.0+beta1" = removeAttrs v5 ["coqeal"]; + "1.11.0" = removeAttrs v6 ["coqeal"]; + "1.11+beta1" = removeAttrs v5 ["coqeal"]; "1.10.0" = v4; "1.9.0" = removeAttrs v3 ["coqeal"]; }; "8.9" = { - "1.11.0+beta1" = removeAttrs v5 ["mathcomp-analysis"]; + "1.11.0" = removeAttrs v6 ["mathcomp-analysis"]; + "1.11+beta1" = removeAttrs v5 ["mathcomp-analysis"]; "1.10.0" = v4; "1.9.0" = removeAttrs v3 ["coqeal"]; "1.8.0" = removeAttrs v2 ["coqeal"]; }; "8.8" = { - "1.11.0+beta1" = removeAttrs v5 ["mathcomp-analysis"]; + "1.11.0" = removeAttrs v6 ["mathcomp-analysis"]; + "1.11+beta1" = removeAttrs v5 ["mathcomp-analysis"]; "1.10.0" = removeAttrs v4 ["mathcomp-analysis"]; "1.9.0" = removeAttrs v3 ["coqeal"]; "1.8.0" = removeAttrs v2 ["coqeal"]; "1.7.0" = removeAttrs v1 ["coqeal" "multinomials"]; }; "8.7" = { - "1.11.0+beta1" = removeAttrs v5 ["mathcomp-analysis"]; + "1.11.0" = removeAttrs v6 ["mathcomp-analysis"]; + "1.11+beta1" = removeAttrs v5 ["mathcomp-analysis"]; "1.10.0" = removeAttrs v4 ["mathcomp-analysis"]; "1.9.0" = removeAttrs v3 ["coqeal" "mathcomp-analysis"]; "1.8.0" = removeAttrs v2 ["coqeal" "mathcomp-analysis"]; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d15c37a65fbe..2177630f8bb7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1405,6 +1405,9 @@ self: super: { # $HOME, which we don't have in our build sandbox. cabal-install-parsers = dontCheck super.cabal-install-parsers; + # gitit is unbroken in the latest release + gitit = markUnbroken super.gitit; + # haskell-ci-0.8 needs cabal-install-parsers ==0.1, but we have 0.2. haskell-ci = doJailbreak super.haskell-ci; @@ -1450,6 +1453,7 @@ self: super: { }; # Test suite requires running a database server. Testing is done upstream. + hasql-notifications = dontCheck super.hasql-notifications; hasql-pool = dontCheck super.hasql-pool; # This bumps optparse-applicative to <0.16 in the cabal file, as otherwise diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 1b02c07bbc20..4f4b85b3315c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -5137,7 +5137,6 @@ broken-packages: - github-webhooks - githud - gitignore - - gitit - gitlab-api - gitlib - gitlib-cmdline @@ -5673,7 +5672,6 @@ broken-packages: - hasql-generic - hasql-implicits - hasql-migration - - hasql-notifications - hasql-optparse-applicative - hasql-postgres - hasql-postgres-options diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 472b1fc75691..ec14c565b74e 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -724,7 +724,7 @@ self: super: builtins.intersectAttrs super { dhall_1_32_0 = dontCheck super.dhall_1_32_0; cut-the-crap = - let path = pkgs.stdenv.lib.makeBinPath [ pkgs.ffmpeg ]; + let path = pkgs.stdenv.lib.makeBinPath [ pkgs.ffmpeg_3 ]; in overrideCabal (addBuildTool super.cut-the-crap pkgs.makeWrapper) (_drv: { postInstall = '' wrapProgram $out/bin/cut-the-crap \ diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index 789816c34d04..823ab6d10990 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "joker"; - version = "0.15.3"; + version = "0.15.4"; src = fetchFromGitHub { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "1pxj6flyhf522zjab1dfvxfajyx3v3rzs7l8ma7ma6b8zmwp2wdn"; + sha256 = "1ad6cdqadd1zs9zh85zyhdiiv6ir28k28w034vzsx5zaipvy4kml"; }; - vendorSha256 = "1rn8ijq3v3fzlbyvm7g4i3qpwcl3vrl4rbcvlbzv05wxrgcw9iqb"; + vendorSha256 = "031ban30kx84r54fj9aq96pwkz9nqh4p9yzs4l8i1wqmy52rldvl"; preBuild = '' go generate ./... diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 6ab682d97e6c..b56824c77238 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -195,9 +195,10 @@ let hardeningDisable = [ "bindnow" ]; - preConfigure = '' - # Don't record the configure flags since this causes unnecessary - # runtime dependencies + preConfigure = + # Don't record the configure flags since this causes unnecessary + # runtime dependencies + '' for i in main/build-defs.h.in scripts/php-config.in; do substituteInPlace $i \ --replace '@CONFIGURE_COMMAND@' '(omitted)' \ @@ -206,7 +207,14 @@ let done export EXTENSION_DIR=$out/lib/php/extensions - + '' + # PKG_CONFIG need not be a relative path + + lib.optionalString (! lib.versionAtLeast version "7.4") '' + for i in $(find . -type f -name "*.m4"); do + substituteInPlace $i \ + --replace 'test -x "$PKG_CONFIG"' 'type -P "$PKG_CONFIG" >/dev/null' + done + '' + '' ./buildconf --copy --force if test -f $src/genfiles; then diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index d09d150bd79c..41cf4c221c6a 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python2Packages, pkgconfig, SDL2 -, libpng, ffmpeg, freetype, glew, libGL, libGLU, fribidi, zlib +, libpng, ffmpeg_3, freetype, glew, libGL, libGLU, fribidi, zlib , glib }: @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ python cython wrapPython tkinter - SDL2 libpng ffmpeg freetype glew libGLU libGL fribidi zlib pygame_sdl2 glib + SDL2 libpng ffmpeg_3 freetype glew libGLU libGL fribidi zlib pygame_sdl2 glib ]; pythonPath = [ pygame_sdl2 tkinter ]; RENPY_DEPS_INSTALL = stdenv.lib.concatStringsSep "::" (map (path: path) [ - SDL2 SDL2.dev libpng ffmpeg ffmpeg.out freetype glew.dev glew.out libGLU libGL fribidi zlib + SDL2 SDL2.dev libpng ffmpeg_3 ffmpeg_3.out freetype glew.dev glew.out libGLU libGL fribidi zlib ]); buildPhase = '' diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix index 4fa9df617a6a..c90c0fd08a83 100644 --- a/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/pkgs/development/libraries/SDL2_mixer/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, autoreconfHook, pkgconfig, which -, SDL2, libogg, libvorbis, smpeg2, flac, libmodplug, opusfile +, SDL2, libogg, libvorbis, smpeg2, flac, libmodplug, opusfile, mpg123 , CoreServices, AudioUnit, AudioToolbox , enableNativeMidi ? false, fluidsynth ? null }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ]; - propagatedBuildInputs = [ SDL2 libogg libvorbis fluidsynth smpeg2 flac libmodplug opusfile ]; + propagatedBuildInputs = [ SDL2 libogg libvorbis fluidsynth smpeg2 flac libmodplug opusfile mpg123 ]; configureFlags = [ "--disable-music-ogg-shared" ] ++ lib.optional enableNativeMidi "--enable-music-native-midi-gpl" diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index dbf7afd596fb..12547bcb4c75 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -5,17 +5,18 @@ , pkgconfig , gobject-introspection , lcms2 +, vala }: stdenv.mkDerivation rec { pname = "babl"; - version = "0.1.74"; + version = "0.1.78"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://download.gimp.org/pub/babl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "03nfcvy3453xkfvsfcnsfcjf2vg2pin09qnr9jlssdysa1lhnwcs"; + sha256 = "F9VJNjO/9VhdnzdbxN9ZJRV80ccMzXwipjW+dcFyUjo="; }; nativeBuildInputs = [ @@ -23,6 +24,7 @@ stdenv.mkDerivation rec { ninja pkgconfig gobject-introspection + vala ]; buildInputs = [ diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix index 4702d67a01f2..9da5a80f6205 100644 --- a/pkgs/development/libraries/chromaprint/default.nix +++ b/pkgs/development/libraries/chromaprint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, boost, ffmpeg }: +{ stdenv, fetchurl, cmake, boost, ffmpeg_3 }: stdenv.mkDerivation rec { pname = "chromaprint"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ boost ffmpeg ]; + buildInputs = [ boost ffmpeg_3 ]; cmakeFlags = [ "-DBUILD_EXAMPLES=ON" "-DBUILD_TOOLS=ON" ]; diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 4f03f775fff6..95be159b2e19 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -82,6 +82,7 @@ #, libnut ? null # NUT (de)muxer, native (de)muser exists , libogg ? null # Ogg container used by vorbis & theora , libopus ? null # Opus de/encoder +, librsvg ? null # SVG protocol , libssh ? null # SFTP protocol , libtheora ? null # Theora encoder , libv4l ? null # Video 4 Linux support @@ -355,6 +356,7 @@ stdenv.mkDerivation rec { (enableFeature (libmysofa != null) "libmysofa") #(enableFeature (libnut != null) "libnut") (enableFeature (libopus != null) "libopus") + (enableFeature (librsvg != null) "librsvg") (enableFeature (libssh != null) "libssh") (enableFeature (libtheora != null) "libtheora") (enableFeature (if isLinux then libv4l != null else false) "libv4l2") @@ -416,7 +418,7 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 celt dav1d fontconfig freetype frei0r fribidi game-music-emu gnutls gsm libjack2 ladspaH lame libaom libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa - libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11 + libogg libopus librsvg libssh libtheora libvdpau libvorbis libvpx libwebp libX11 libxcb libXv libXext lzma openal openjpeg libpulseaudio rtmpdump opencore-amr samba SDL2 soxr speex vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore zeromq4 zlib diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix index 82a30337348a..4e3c10e8829d 100644 --- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix +++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, ffmpeg, cmake, libpng, pkgconfig, libjpeg +{ fetchFromGitHub, stdenv, ffmpeg_3, cmake, libpng, pkgconfig, libjpeg }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ ffmpeg libpng libjpeg ]; + buildInputs = [ ffmpeg_3 libpng libjpeg ]; meta = with stdenv.lib; { homepage = "https://github.com/dirkvdb/ffmpegthumbnailer"; diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix index 5a87402e0d92..ebbced19eb8e 100644 --- a/pkgs/development/libraries/ffms/default.nix +++ b/pkgs/development/libraries/ffms/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zlib, ffmpeg, pkgconfig }: +{ stdenv, fetchFromGitHub, zlib, ffmpeg_3, pkgconfig }: stdenv.mkDerivation rec { pname = "ffms"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fPIC"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ zlib ffmpeg ]; + buildInputs = [ zlib ffmpeg_3 ]; # ffms includes a built-in vapoursynth plugin, see: # https://github.com/FFMS/ffms2#avisynth-and-vapoursynth-plugin diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 96ec3434b782..f244bdc7ad2b 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.1.39"; + version = "1.1.40"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - sha256 = "1p5ixc1hxh9mmhplndf1j87cw9989bp0fh0nsbx6l3p2wnqz9nyl"; + sha256 = "0wc7xxf8fzpp3pc3hpsamnykn0vjkq53qp53nyxjjcri8g0ch7wq"; }; buildInputs = [ diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index 968ee3a09d08..745c96f57943 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, vtk_7, darwin }: stdenv.mkDerivation rec { - version = "3.0.5"; + version = "3.0.6"; pname = "gdcm"; src = fetchurl { url = "mirror://sourceforge/gdcm/${pname}-${version}.tar.bz2"; - sha256 = "16d3sf81n4qhwbbx1d80jg6fhrla5paan384c4bbbqvbhm222yby"; + sha256 = "048ycvhk143cvsf09r7vwmp4sm9ah9bh5pbbrl366m5a4sp7fr89"; }; dontUseCmakeBuildDir = true; diff --git a/pkgs/development/libraries/gdk-pixbuf/xlib.nix b/pkgs/development/libraries/gdk-pixbuf/xlib.nix index e5f1718f0751..53414d921288 100644 --- a/pkgs/development/libraries/gdk-pixbuf/xlib.nix +++ b/pkgs/development/libraries/gdk-pixbuf/xlib.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { domain = "gitlab.gnome.org"; owner = "Archive"; repo = "gdk-pixbuf-xlib"; - rev = "dc22ea36f69755007c66877284596df270532cc1"; - sha256 = "XhBQ4wano+MtGaqF6JNKoWgYQN6eBW+b8ZCGEBGt8IM="; + rev = "19482794a621d542b223219940e836257d4ae2c9"; + sha256 = "7Qv6tyjR0/iFXYHx5jPhvLLLt0Ms2nzpyWw02oXTkZc="; }; nativeBuildInputs = [ @@ -33,12 +33,9 @@ stdenv.mkDerivation rec { gtk-doc ]; - buildInputs = [ - libX11 - ]; - propagatedBuildInputs = [ gdk-pixbuf + libX11 ]; mesonFlags = [ diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index 3b48a0968ea1..85699a8828b0 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -35,26 +35,16 @@ stdenv.mkDerivation rec { pname = "gegl"; - version = "0.4.22"; + version = "0.4.24"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0q9cckf90fb82qc5d496fjz459f1xw4j4p3rff1f57yivx0yr20q"; + sha256 = "d2VJnyc0Gw0WAy5mUxnLwSh2SD/2qUT83ySpxY4+JUo="; }; - patches = [ - # Prevent deadlock making tests time-out - # https://gitlab.gnome.org/GNOME/gegl/issues/226 - # https://gitlab.gnome.org/GNOME/glib/issues/1941 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gegl/commit/1d530816266b52c8788bbe1504c5b2d6eceba036.patch"; - sha256 = "1d8nhrzvwq35c5ws00xy9y6bfd9wsj3dm0301hiwkfi4niq59ygh"; - }) - ]; - nativeBuildInputs = [ pkgconfig gettext diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index ee29c6a97a45..357bf076459a 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -17,6 +17,7 @@ , dbus , gdk-pixbuf , makeWrapper +, which , xvfb_run , nixosTests }: @@ -28,11 +29,11 @@ let ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.64.2"; + version = "1.64.3"; src = fetchurl { url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0ywrsfmkxaw11z83dnmb9yqkn6k3c1mkxw2mv6arbwad6x6q7zqm"; + sha256 = "1rl524rmdbpmp5xdkm8dx3znq47l7dgvh192x80zjf8wc1af35lx"; }; outputs = [ "out" "dev" "installedTests" ]; @@ -42,6 +43,7 @@ in stdenv.mkDerivation rec { ninja pkgconfig makeWrapper + which # for locale detection libxml2 # for xml-stripblanks ]; @@ -74,11 +76,10 @@ in stdenv.mkDerivation rec { ./installed-tests-path.patch ]; - # Gio test is failing - # https://github.com/NixOS/nixpkgs/pull/81626#issuecomment-599325843 - doCheck = false; + doCheck = true; postPatch = '' + patchShebangs build/choose-tests-locale.sh substituteInPlace installed-tests/debugger-test.sh --subst-var-by gjsConsole $out/bin/gjs-console ''; @@ -95,7 +96,15 @@ in stdenv.mkDerivation rec { ''; postInstall = '' + # TODO: make the glib setup hook handle this + installedTestsSchemaDatadir="$installedTests/share/gsettings-schemas/${pname}-${version}" + mkdir -p "$installedTestsSchemaDatadir" + mv "$installedTests/share/glib-2.0" "$installedTestsSchemaDatadir" + ''; + + postFixup = '' wrapProgram "$installedTests/libexec/gjs/installed-tests/minijasmine" \ + --prefix XDG_DATA_DIRS : "$installedTestsSchemaDatadir" \ --prefix GI_TYPELIB_PATH : "${stdenv.lib.makeSearchPath "lib/girepository-1.0" testDeps}" ''; diff --git a/pkgs/development/libraries/gjs/installed-tests-path.patch b/pkgs/development/libraries/gjs/installed-tests-path.patch index 11a39b2dd9a5..f9b1515b68e3 100644 --- a/pkgs/development/libraries/gjs/installed-tests-path.patch +++ b/pkgs/development/libraries/gjs/installed-tests-path.patch @@ -1,5 +1,5 @@ diff --git a/installed-tests/meson.build b/installed-tests/meson.build -index 294d20c6..1e5029e0 100644 +index 7e842025..1e5029e0 100644 --- a/installed-tests/meson.build +++ b/installed-tests/meson.build @@ -1,7 +1,7 @@ @@ -12,6 +12,19 @@ index 294d20c6..1e5029e0 100644 # Simple shell script tests # +diff --git a/meson.build b/meson.build +index 084d5396..e5d73fcd 100644 +--- a/meson.build ++++ b/meson.build +@@ -540,7 +540,7 @@ install_data('installed-tests/extra/lsan.supp', + install_dir: get_option('datadir') / api_name / 'lsan') + + if get_option('installed_tests') +- schemadir = abs_datadir / 'glib-2.0' / 'schemas' ++ schemadir = get_option('installed_test_prefix') / 'share' / 'glib-2.0' / 'schemas' + install_data('installed-tests/js/org.gnome.GjsTest.gschema.xml', install_dir: schemadir) + meson.add_install_script('build/compile-gschemas.py', schemadir) + endif diff --git a/meson_options.txt b/meson_options.txt index 66f66024..008687cb 100644 --- a/meson_options.txt diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index ac4bdb4b14c9..366e34ddf4d9 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchFromGitHub -, cmake, pkgconfig +, cmake, pkg-config , libva, libpciaccess, intel-gmmlib, libX11 }: stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "19.4.0r"; + version = "20.1.1"; src = fetchFromGitHub { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "0gnd82z0wgiw5my1hnqlk9hcjjqpsgasqq5xcdrbkfa40wpb132a"; + sha256 = "1mww20c9r7a57njqa2835ayjvk46lrv2yks9a2y8i0s5qzdi8m1i"; }; cmakeFlags = [ @@ -21,15 +21,21 @@ stdenv.mkDerivation rec { "-DMEDIA_RUN_TEST_SUITE=OFF" ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libva libpciaccess intel-gmmlib libX11 ]; meta = with stdenv.lib; { + description = "Intel Media Driver for VAAPI — Broadwell+ iGPUs"; + longDescription = '' + The Intel Media Driver for VAAPI is a new VA-API (Video Acceleration API) + user mode driver supporting hardware accelerated decoding, encoding, and + video post processing for GEN based graphics hardware. + ''; homepage = "https://github.com/intel/media-driver"; + changelog = "https://github.com/intel/media-driver/releases/tag/intel-media-${version}"; license = with licenses; [ bsd3 mit ]; - description = "Intel Media Driver for VAAPI — Broadwell+ iGPUs"; platforms = platforms.linux; - maintainers = with maintainers; [ jfrankenau ]; + maintainers = with maintainers; [ primeos jfrankenau ]; }; } diff --git a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix index c72cb5b71a43..90a7116f42ad 100644 --- a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, copyPathsToStore, extra-cmake-modules, - attr, ebook_tools, exiv2, ffmpeg, karchive, kcoreaddons, ki18n, poppler, qtbase, qtmultimedia, taglib + attr, ebook_tools, exiv2, ffmpeg_3, karchive, kcoreaddons, ki18n, poppler, qtbase, qtmultimedia, taglib }: mkDerivation { @@ -9,7 +9,7 @@ mkDerivation { meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - attr ebook_tools exiv2 ffmpeg karchive kcoreaddons ki18n poppler qtbase qtmultimedia + attr ebook_tools exiv2 ffmpeg_3 karchive kcoreaddons ki18n poppler qtbase qtmultimedia taglib ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); diff --git a/pkgs/development/libraries/libcloudproviders/default.nix b/pkgs/development/libraries/libcloudproviders/default.nix index f48ee9e5df06..87c86ea2fbea 100644 --- a/pkgs/development/libraries/libcloudproviders/default.nix +++ b/pkgs/development/libraries/libcloudproviders/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "libcloudproviders"; - version = "0.3.0"; + version = "0.3.1"; src = fetchurl { url = "https://gitlab.gnome.org/World/${pname}/repository/archive.tar.gz?ref=${version}"; - sha256 = "1hby7vhxn6fw4ih3xbx6ab9vqp3a3dmlhr0z7mrwr73b7ankly0l"; + sha256 = "0zazjhj3xbwxyzi2b2aws7qdnwn092zg9yrk9v3wd19m3mxq5na3"; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/liberfa/default.nix b/pkgs/development/libraries/liberfa/default.nix new file mode 100644 index 000000000000..097b0b85e3e8 --- /dev/null +++ b/pkgs/development/libraries/liberfa/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + pname = "erfa"; + version = "1.7.0"; + + buildInputs = [ autoreconfHook ]; + + src = fetchFromGitHub { + owner = "liberfa"; + repo = "erfa"; + rev = "v${version}"; + sha256 = "1z4k2phrw6wwi0kax6ac80jk9c036gi7pmhmg6gaf3lk81k6xz2r"; + }; + + configureFlags = [ "--enable-shared" ]; + + meta = with stdenv.lib; { + description = "Essential Routines for Fundamental Astronomy"; + homepage = "https://github.com/liberfa/erfa"; + maintainers = with maintainers; [ mir06 ]; + license = { + url = "https://github.com/liberfa/erfa/blob/master/LICENSE"; + free = true; + }; + }; +} diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index 3db0b056c0f0..f7e9606bbe77 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -13,11 +13,11 @@ # ''; # See also <https://nixos.org/nixpkgs/manual/#sec-language-gnome>. , gtkSupport ? true, glib ? null, gtk3 ? null -, videoSupport ? true, ffmpeg ? null, libmpeg2 ? null}: +, videoSupport ? true, ffmpeg_3 ? null, libmpeg2 ? null}: assert gstreamerSupport -> gst_all_1 != null && builtins.isList (gstPlugins gst_all_1); assert gtkSupport -> glib != null && gtk3 != null; -assert videoSupport -> ffmpeg != null && libmpeg2 != null; +assert videoSupport -> ffmpeg_3 != null && libmpeg2 != null; stdenv.mkDerivation rec { name = "libextractor-1.9"; @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optionals gstreamerSupport ([ gst_all_1.gstreamer ] ++ gstPlugins gst_all_1) ++ stdenv.lib.optionals gtkSupport [ glib gtk3 ] - ++ stdenv.lib.optionals videoSupport [ ffmpeg libmpeg2 ]; + ++ stdenv.lib.optionals videoSupport [ ffmpeg_3 libmpeg2 ]; configureFlags = [ "--disable-ltdl-install" diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index 62409bb7f649..762e707528a6 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, qt4, pkgconfig, libsamplerate, fftwSinglePrec, which, cmake +{ stdenv, fetchurl, pkgconfig, which, cmake +, fftwSinglePrec, libsamplerate, qtbase , darwin }: let version = "1.1.0"; in @@ -14,16 +15,22 @@ stdenv.mkDerivation rec { sha256 = "1j34xc30vg7sfszm2jx9mlz9hy7p1l929fka9wnfcpbib8gfi43x"; }; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace 'find_package(Qt5Core QUIET)' \ + 'find_package(Qt5 REQUIRED COMPONENTS Core Network Sql Test Xml)' + ''; + prefixKey = "--prefix "; - propagatedBuildInputs = [ qt4 libsamplerate fftwSinglePrec ]; nativeBuildInputs = [ pkgconfig which cmake ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; + buildInputs = [ fftwSinglePrec libsamplerate qtbase ] + ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; meta = with stdenv.lib; { homepage = "https://github.com/lastfm/liblastfm"; repositories.git = "git://github.com/lastfm/liblastfm.git"; description = "Official LastFM library"; - inherit (qt4.meta) platforms; + platforms = platforms.unix; maintainers = [ maintainers.phreedom ]; license = licenses.gpl3; }; diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/development/libraries/liblinphone/default.nix index a0ee8fe00539..1c414b9dd866 100644 --- a/pkgs/development/libraries/liblinphone/default.nix +++ b/pkgs/development/libraries/liblinphone/default.nix @@ -11,7 +11,7 @@ , doxygen , fetchFromGitLab , fetchurl -, ffmpeg +, ffmpeg_3 , gdk-pixbuf , git , glib @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { bzrtp cairo cyrus_sasl - ffmpeg + ffmpeg_3 gdk-pixbuf git glib diff --git a/pkgs/development/libraries/libmilter/darwin.patch b/pkgs/development/libraries/libmilter/darwin.patch new file mode 100644 index 000000000000..be46662d6b38 --- /dev/null +++ b/pkgs/development/libraries/libmilter/darwin.patch @@ -0,0 +1,28 @@ +Fix build issues on Darwin. + +--- a/devtools/OS/Darwin 2014-03-05 01:59:45.000000000 +0100 ++++ b/devtools/OS/Darwin 2020-05-18 14:47:57.000000000 +0200 +@@ -8,6 +8,8 @@ + # We look a lot more like 4.4BSD than NeXTStep or OpenStep. + # + define(`confCC', `cc -traditional-cpp -pipe ${Extra_CC_Flags}') ++define(`confCCOPTS_SO', `-fPIC') ++define(`confSOEXT', `dylib') + define(`confMAPDEF', `-DNEWDB -DNIS -DMAP_REGEX -DNETINFO -DAUTO_NETINFO_ALIASES -DAUTO_NETINFO_HOSTS') + define(`confENVDEF', `-DDARWIN') + define(`confLDOPTS', `${Extra_LD_Flags}') +--- a/sendmail/sendmail.h 2020-05-18 14:51:17.000000000 +0200 ++++ b/sendmail/sendmail.h 2020-05-18 14:51:00.000000000 +0200 +@@ -104,7 +104,11 @@ + # endif /* NETX25 */ + + # if NAMED_BIND +-# include <arpa/nameser.h> ++# ifdef __APPLE__ ++# include <arpa/nameser_compat.h> ++# else ++# include <arpa/nameser.h> ++# endif + # ifdef NOERROR + # undef NOERROR /* avoid <sys/streams.h> conflict */ + # endif /* NOERROR */ diff --git a/pkgs/development/libraries/libmilter/default.nix b/pkgs/development/libraries/libmilter/default.nix index 8d677d858de8..f937d818a559 100644 --- a/pkgs/development/libraries/libmilter/default.nix +++ b/pkgs/development/libraries/libmilter/default.nix @@ -28,10 +28,11 @@ stdenv.mkDerivation rec { define(\`confLIBGRP', \`root') APPENDDEF(\`confENVDEF', \`-DNETINET6') EOF + export MILTER_SOVER=1 sh Build -f ./a.m4 ''; - patches = [ ./install.patch ./sharedlib.patch ./glibc-2.30.patch ]; + patches = [ ./install.patch ./sharedlib.patch ./glibc-2.30.patch ./darwin.patch ]; nativeBuildInputs = [ m4 ]; diff --git a/pkgs/development/libraries/libmilter/sharedlib.patch b/pkgs/development/libraries/libmilter/sharedlib.patch index bbc69a516ffd..1e256c59ec3e 100644 --- a/pkgs/development/libraries/libmilter/sharedlib.patch +++ b/pkgs/development/libraries/libmilter/sharedlib.patch @@ -16,28 +16,29 @@ diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/milterlibrary.m4 sendmail-8.14.3 +# +divert(0)dnl +include(confBUILDTOOLSDIR`/M4/'bldM4_TYPE_DIR`/links.m4')dnl ++define(`confSOEXT', ifdef(`confSOEXT', `confSOEXT', `so'))dnl +bldLIST_PUSH_ITEM(`bldC_PRODUCTS', bldCURRENT_PRODUCT)dnl -+bldPUSH_TARGET(bldCURRENT_PRODUCT`.so' bldCURRENT_PRODUCT`.a')dnl ++bldPUSH_TARGET(bldCURRENT_PRODUCT`.'confSOEXT bldCURRENT_PRODUCT`.a')dnl +bldPUSH_INSTALL_TARGET(`install-'bldCURRENT_PRODUCT)dnl +bldPUSH_CLEAN_TARGET(bldCURRENT_PRODUCT`-clean')dnl + +include(confBUILDTOOLSDIR`/M4/'bldM4_TYPE_DIR`/defines.m4') +divert(bldTARGETS_SECTION) -+bldCURRENT_PRODUCT.so: ${BEFORE} ${bldCURRENT_PRODUCT`OBJS'} -+ ${CCLINK} ${LDOPTS_SO} -o bldCURRENT_PRODUCT.so -Wl,confSONAME,bldCURRENT_PRODUCT.so.${MILTER_SOVER} ${bldCURRENT_PRODUCT`OBJS'} -lc ${LIBS} ++bldCURRENT_PRODUCT`.'confSOEXT: ${BEFORE} ${bldCURRENT_PRODUCT`OBJS'} ++ ${CCLINK} ${LDOPTS_SO} -o bldCURRENT_PRODUCT.confSOEXT ifdef(`confSONAME',`-Wl,confSONAME,bldCURRENT_PRODUCT.confSOEXT.${MILTER_SOVER}') ${bldCURRENT_PRODUCT`OBJS'} -lc ${LIBS} +bldCURRENT_PRODUCT.a: ${BEFORE} ${bldCURRENT_PRODUCT`OBJS'} + ${AR} ${AROPTS} bldCURRENT_PRODUCT.a ${bldCURRENT_PRODUCT`OBJS'} + ${RANLIB} ${RANLIBOPTS} bldCURRENT_PRODUCT.a +ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE_LINKS(bldLINK_SOURCES)') + -+install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT.so bldCURRENT_PRODUCT.a ++install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT.confSOEXT bldCURRENT_PRODUCT.a +ifdef(`bldINSTALLABLE', ` ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${bldINSTALL_DIR`'LIBDIR}" ]; then confMKDIR -p "${DESTDIR}${bldINSTALL_DIR`'LIBDIR}"; else :; fi ') -+ ${INSTALL} -c bldCURRENT_PRODUCT.so "${DESTDIR}${LIBDIR}/bldCURRENT_PRODUCT.so.${MILTER_SOVER}" -+ ${LN} ${LNOPTS} bldCURRENT_PRODUCT.so.${MILTER_SOVER} "${DESTDIR}${LIBDIR}/bldCURRENT_PRODUCT.so" -+ ${INSTALL} -c bldCURRENT_PRODUCT.a "${DESTDIR}${LIBDIR}"') ++ ${INSTALL} -c bldCURRENT_PRODUCT.confSOEXT "${DESTDIR}${LIBDIR}/bldCURRENT_PRODUCT.confSOEXT.${MILTER_SOVER}" ++ ${LN} ${LNOPTS} bldCURRENT_PRODUCT.confSOEXT.${MILTER_SOVER} "${DESTDIR}${LIBDIR}/bldCURRENT_PRODUCT.confSOEXT" ++ ${INSTALL} -c -m 644 bldCURRENT_PRODUCT.a "${DESTDIR}${LIBDIR}"') + +bldCURRENT_PRODUCT-clean: -+ rm -f ${OBJS} bldCURRENT_PRODUCT.so bldCURRENT_PRODUCT.a ${MANPAGES} ++ rm -f ${OBJS} bldCURRENT_PRODUCT.confSOEXT bldCURRENT_PRODUCT.a ${MANPAGES} + +divert(0) +COPTS+= confCCOPTS_SO diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index 39a3bf6b2c55..6e7512535949 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "libosinfo"; - version = "1.7.1"; + version = "1.8.0"; src = fetchurl { url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1s97sv24bybggjx6hgqba2qdqz3ivfpd4cmkh4zm5y59sim109mv"; + sha256 = "1988l5rykpzvml1l7bi2hcax0gdc811vja0f92cnr7r01nz35zs9"; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index 123c2f2f0676..35cf4485f72e 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, flex, bison }: +{ stdenv, fetchurl, flex, bison, bluez, pkgconfig, withBluez ? false }: + +with stdenv.lib; stdenv.mkDerivation rec { pname = "libpcap"; @@ -9,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "153h1378diqyc27jjgz6gg5nxmb4ddk006d9xg69nqavgiikflk3"; }; - nativeBuildInputs = [ flex bison ]; + nativeBuildInputs = [ flex bison ] + ++ optionals withBluez [ bluez.dev pkgconfig ]; # We need to force the autodetection because detection doesn't # work in pure build enviroments. @@ -18,17 +21,16 @@ stdenv.mkDerivation rec { linux = "linux"; darwin = "bpf"; }.${stdenv.hostPlatform.parsed.kernel.name}) - ] ++ stdenv.lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ - "ac_cv_linux_vers=2" - ]; + ] ++ optionals (stdenv.hostPlatform == stdenv.buildPlatform) + [ "ac_cv_linux_vers=2" ]; dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; - prePatch = stdenv.lib.optionalString stdenv.isDarwin '' + prePatch = optionalString stdenv.isDarwin '' substituteInPlace configure --replace " -arch i386" "" ''; - meta = with stdenv.lib; { + meta = { homepage = "https://www.tcpdump.org"; description = "Packet Capture Library"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix index 8d9cf381ff80..00a87402fa3f 100644 --- a/pkgs/development/libraries/libqtav/default.nix +++ b/pkgs/development/libraries/libqtav/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchFromGitHub, extra-cmake-modules , qtbase, qtmultimedia, qtquick1, qttools , libGL, libX11 -, libass, openal, ffmpeg, libuchardet +, libass, openal, ffmpeg_3, libuchardet , alsaLib, libpulseaudio, libva }: @@ -15,7 +15,7 @@ mkDerivation rec { buildInputs = [ qtbase qtmultimedia qtquick1 libGL libX11 - libass openal ffmpeg libuchardet + libass openal ffmpeg_3 libuchardet alsaLib libpulseaudio libva ]; diff --git a/pkgs/development/libraries/libucl/default.nix b/pkgs/development/libraries/libucl/default.nix new file mode 100644 index 000000000000..b9b33453a4c6 --- /dev/null +++ b/pkgs/development/libraries/libucl/default.nix @@ -0,0 +1,58 @@ +{ stdenv +, fetchFromGitHub +, pkg-config +, autoreconfHook +, curl +, lua +, openssl +, features ? { + urls = false; + # Upstream enables regex by default + regex = true; + # Signature support is broken with openssl 1.1.1: https://github.com/vstakhov/libucl/issues/203 + signatures = false; + lua = false; + utils = false; + } +}: + +let + featureDeps = { + urls = [ curl ]; + signatures = [ openssl ]; + lua = [ lua ]; + }; +in +stdenv.mkDerivation rec { + pname = "libucl"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "vstakhov"; + repo = pname; + rev = version; + sha256 = "1h52ldxankyhbbm1qbqz1f2q0j03c1b4mig7343bs3mc6fpm18gf"; + }; + + nativeBuildInputs = [ pkg-config autoreconfHook ]; + + buildInputs = with stdenv.lib; + concatLists ( + mapAttrsToList (feat: enabled: + optionals enabled (featureDeps."${feat}" or []) + ) features + ); + + enableParallelBuilding = true; + + configureFlags = with stdenv.lib; + mapAttrsToList (feat: enabled: strings.enableFeature enabled feat) features; + + meta = with stdenv.lib; { + description = "Universal configuration library parser"; + homepage = "https://github.com/vstakhov/libucl"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = with maintainers; [ jpotier ]; + }; +} diff --git a/pkgs/development/libraries/libvdpau-va-gl/default.nix b/pkgs/development/libraries/libvdpau-va-gl/default.nix index cfc74a8a759c..98176cd41f14 100644 --- a/pkgs/development/libraries/libvdpau-va-gl/default.nix +++ b/pkgs/development/libraries/libvdpau-va-gl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, libX11, libpthreadstubs, libXau, libXdmcp -, libXext, libvdpau, glib, libva, ffmpeg, libGLU }: +, libXext, libvdpau, glib, libva, ffmpeg_3, libGLU }: stdenv.mkDerivation rec { pname = "libvdpau-va-gl"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ libX11 libpthreadstubs libXau libXdmcp libXext libvdpau glib libva ffmpeg libGLU ]; + buildInputs = [ libX11 libpthreadstubs libXau libXdmcp libXext libvdpau glib libva ffmpeg_3 libGLU ]; doCheck = false; # fails. needs DRI access diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 5f7daa83b2f5..81c7c8fcacf3 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -5,7 +5,7 @@ , doxygen , fetchFromGitLab , fetchpatch -, ffmpeg +, ffmpeg_3 , glew , gsm , intltool @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { alsaLib bctoolbox bzrtp - ffmpeg + ffmpeg_3 glew gsm libGL diff --git a/pkgs/development/libraries/mm-common/default.nix b/pkgs/development/libraries/mm-common/default.nix index 890ab6fca11c..3c02e537d2a3 100644 --- a/pkgs/development/libraries/mm-common/default.nix +++ b/pkgs/development/libraries/mm-common/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "mm-common"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1m4w33da9f4rx2d6kdj3ix3kl0gn16ml82v2mdn4hljr3q29nzdr"; + sha256 = "1jasx9a9g7nqf7jcv3mrg4qh5cp9sq724jxjaz4wa1dzmxsxg8i8"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 5251c680361a..622d11c31605 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -66,6 +66,7 @@ in stdenv.mkDerivation rec { "USE_SYSTEM_ZLIB=1" "NSS_USE_SYSTEM_SQLITE=1" "NATIVE_CC=${buildPackages.stdenv.cc}/bin/cc" + ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ # Pass in CPU even if we're not cross compiling, because otherwise it tries to guess with # uname, which can be wrong if e.g. we're compiling for aarch32 on aarch64 "OS_TEST=${cpu}" diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 6f327ca396a9..1597eb7913a5 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -23,7 +23,7 @@ , enableGtk2 ? false, gtk2 , enableGtk3 ? false, gtk3 , enableVtk ? false, vtk -, enableFfmpeg ? false, ffmpeg +, enableFfmpeg ? false, ffmpeg_3 , enableGStreamer ? false, gst_all_1 , enableTesseract ? false, tesseract, leptonica , enableTbb ? false, tbb @@ -188,7 +188,7 @@ stdenv.mkDerivation { ++ lib.optional enableWebP libwebp ++ lib.optionals enableEXR [ openexr ilmbase ] ++ lib.optional enableJPEG2K jasper - ++ lib.optional enableFfmpeg ffmpeg + ++ lib.optional enableFfmpeg ffmpeg_3 ++ lib.optionals (enableFfmpeg && stdenv.isDarwin) [ VideoDecodeAcceleration bzip2 ] ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 9dcb9956838b..dd71b10728d8 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -23,7 +23,7 @@ , enableGtk2 ? false, gtk2 , enableGtk3 ? false, gtk3 , enableVtk ? false, vtk -, enableFfmpeg ? false, ffmpeg +, enableFfmpeg ? false, ffmpeg_3 , enableGStreamer ? false, gst_all_1 , enableTesseract ? false, tesseract, leptonica , enableTbb ? false, tbb @@ -204,7 +204,7 @@ stdenv.mkDerivation { ++ lib.optional enableWebP libwebp ++ lib.optionals enableEXR [ openexr ilmbase ] ++ lib.optional enableJPEG2K jasper - ++ lib.optional enableFfmpeg ffmpeg + ++ lib.optional enableFfmpeg ffmpeg_3 ++ lib.optionals (enableFfmpeg && stdenv.isDarwin) [ VideoDecodeAcceleration bzip2 ] ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index f637e730179b..06a3d5f194fb 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -7,7 +7,7 @@ , enableTIFF ? true, libtiff , enableEXR ? (!stdenv.isDarwin), openexr, ilmbase , enableJPEG2K ? false, jasper # disable jasper by default (many CVE) -, enableFfmpeg ? false, ffmpeg +, enableFfmpeg ? false, ffmpeg_3 , enableGStreamer ? false, gst_all_1 , enableEigen ? true, eigen , Cocoa, QTKit @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ++ lib.optional enableTIFF libtiff ++ lib.optionals enableEXR [ openexr ilmbase ] ++ lib.optional enableJPEG2K jasper - ++ lib.optional enableFfmpeg ffmpeg + ++ lib.optional enableFfmpeg ffmpeg_3 ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optional enableEigen eigen ++ lib.optionals stdenv.isDarwin [ Cocoa QTKit ] diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index a209c950d482..a86171852164 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -11,7 +11,7 @@ curlSupport ? true, curl, colladaSupport ? false, opencollada, opencascadeSupport ? false, opencascade, - ffmpegSupport ? false, ffmpeg, + ffmpegSupport ? false, ffmpeg_3, nvttSupport ? false, nvidia-texture-tools, freetypeSupport ? true, freetype, svgSupport ? false, librsvg, @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ++ lib.optional curlSupport curl ++ lib.optional colladaSupport opencollada ++ lib.optional opencascadeSupport opencascade - ++ lib.optional ffmpegSupport ffmpeg + ++ lib.optional ffmpegSupport ffmpeg_3 ++ lib.optional nvttSupport nvidia-texture-tools ++ lib.optional freetypeSupport freetype ++ lib.optional svgSupport librsvg diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix index e9f55dd6145f..3af1833fe49f 100644 --- a/pkgs/development/libraries/pangolin/default.nix +++ b/pkgs/development/libraries/pangolin/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen, libGL, glew -, xorg , ffmpeg, python3 , libjpeg, libpng, libtiff, eigen +, xorg , ffmpeg_3, python3 , libjpeg, libpng, libtiff, eigen , Carbon ? null, Cocoa ? null }: @@ -21,7 +21,7 @@ stdenv.mkDerivation { libGL glew xorg.libX11 - ffmpeg + ffmpeg_3 python3 libjpeg libpng diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 2e44a7136df8..97822d769dd5 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -5,6 +5,7 @@ , enableQT ? false , enableXM ? false , enableOpenGLX11 ? true +, enablePython ? false , enableRaytracerX11 ? false # Standard build environment with cmake. @@ -33,8 +34,16 @@ , libGLU, libGL , xlibsWrapper , libXmu + +# For enablePython +, boost +, python3 }: +let + boost_python = boost.override { enablePython = true; python = python3; }; +in + stdenv.mkDerivation rec { version = "10.6.2"; pname = "geant4"; @@ -44,6 +53,16 @@ stdenv.mkDerivation rec { sha256 = "0vznm3pjlbihjy1wsxc4gj229k0dzc283wvil2xghyl08vwdpnpc"; }; + boost_python_lib = "python${builtins.replaceStrings ["."] [""] python3.pythonVersion}"; + postPatch = '' + # Fix for boost 1.67+ + substituteInPlace environments/g4py/CMakeLists.txt \ + --replace "find_package(Boost REQUIRED python)" \ + "find_package(Boost REQUIRED COMPONENTS $boost_python_lib)" + substituteInPlace environments/g4py/G4PythonHelpers.cmake \ + --replace "Boost::python" "Boost::$boost_python_lib" + ''; + cmakeFlags = [ "-DGEANT4_INSTALL_DATA=OFF" "-DGEANT4_USE_GDML=${if enableGDML then "ON" else "OFF"}" @@ -52,11 +71,14 @@ stdenv.mkDerivation rec { "-DGEANT4_USE_XM=${if enableXM then "ON" else "OFF"}" "-DGEANT4_USE_OPENGL_X11=${if enableOpenGLX11 then "ON" else "OFF"}" "-DGEANT4_USE_INVENTOR=${if enableInventor then "ON" else "OFF"}" + "-DGEANT4_USE_PYTHON=${if enablePython then "ON" else "OFF"}" "-DGEANT4_USE_RAYTRACER_X11=${if enableRaytracerX11 then "ON" else "OFF"}" "-DGEANT4_USE_SYSTEM_CLHEP=${if clhep != null then "ON" else "OFF"}" "-DGEANT4_USE_SYSTEM_EXPAT=${if expat != null then "ON" else "OFF"}" "-DGEANT4_USE_SYSTEM_ZLIB=${if zlib != null then "ON" else "OFF"}" "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}" + ] ++ stdenv.lib.optionals (enableMultiThreading && enablePython) [ + "-DGEANT4_BUILD_TLS_MODEL=global-dynamic" ] ++ stdenv.lib.optionals enableInventor [ "-DINVENTOR_INCLUDE_DIR=${coin3d}/include" "-DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so" @@ -66,7 +88,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libGLU xlibsWrapper libXmu ] - ++ stdenv.lib.optionals enableInventor [ libXpm coin3d soxt motif ]; + ++ stdenv.lib.optionals enableInventor [ libXpm coin3d soxt motif ] + ++ stdenv.lib.optionals enablePython [ boost_python python3 ]; propagatedBuildInputs = [ clhep expat zlib libGL ] ++ stdenv.lib.optionals enableGDML [ xercesc ] diff --git a/pkgs/development/libraries/physics/geant4/g4py/default.nix b/pkgs/development/libraries/physics/geant4/g4py/default.nix deleted file mode 100644 index 4937cc0eca93..000000000000 --- a/pkgs/development/libraries/physics/geant4/g4py/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ stdenv, cmake, xercesc - -# The target version of Geant4 -, geant4 - -# Python (obviously) and boost::python for wrapping. -, python -, boost -}: - -let - # g4py does not support MT and will fail to build against MT geant - geant4_nomt = geant4.override { enableMultiThreading = false; }; - boost_python = boost.override { enablePython = true; inherit python; }; -in - -stdenv.mkDerivation { - inherit (geant4_nomt) version src; - pname = "g4py"; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ geant4_nomt xercesc boost_python python ]; - - GEANT4_INSTALL = geant4_nomt; - - postPatch = '' - cd environments/g4py - ''; - - preConfigure = '' - # Fix for boost 1.67+ - substituteInPlace CMakeLists.txt \ - --replace "find_package(Boost)" "find_package(Boost 1.40 REQUIRED COMPONENTS python${builtins.replaceStrings ["."] [""] python.pythonVersion})" - for f in `find . -name CMakeLists.txt`; do - substituteInPlace "$f" \ - --replace "boost_python" "\''${Boost_LIBRARIES}" - done - ''; - - enableParallelBuilding = true; - - setupHook = ./setup-hook.sh; - - # Make sure we set PYTHONPATH - shellHook = '' - source $out/nix-support/setup-hook - ''; - - meta = { - description = "Python bindings and utilities for Geant4"; - longDescription = '' - Geant4 is a toolkit for the simulation of the passage of particles - through matter. Its areas of application include high energy, - nuclear and accelerator physics, as well as studies in medical and - space science. The two main reference papers for Geant4 are - published in Nuclear Instruments and Methods in Physics Research A - 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1 - (2006) 270-278. - ''; - homepage = "http://www.geant4.org"; - license = stdenv.lib.licenses.g4sl; - maintainers = [ ]; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/libraries/physics/geant4/g4py/setup-hook.sh b/pkgs/development/libraries/physics/geant4/g4py/setup-hook.sh deleted file mode 100644 index 8abfb461fc0f..000000000000 --- a/pkgs/development/libraries/physics/geant4/g4py/setup-hook.sh +++ /dev/null @@ -1 +0,0 @@ -export PYTHONPATH=$PYTHONPATH:@out@/lib diff --git a/pkgs/development/libraries/pipewire/0.2.nix b/pkgs/development/libraries/pipewire/0.2.nix index e9656ee23ec5..1dbfe0647f47 100644 --- a/pkgs/development/libraries/pipewire/0.2.nix +++ b/pkgs/development/libraries/pipewire/0.2.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind -, glib, dbus, gst_all_1, alsaLib, ffmpeg, libjack2, udev, libva, xorg +, glib, dbus, gst_all_1, alsaLib, ffmpeg_3, libjack2, udev, libva, xorg , sbc, SDL2, makeFontsConf }: @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer - alsaLib ffmpeg libjack2 udev libva xorg.libX11 sbc SDL2 + alsaLib ffmpeg_3 libjack2 udev libva xorg.libX11 sbc SDL2 ]; mesonFlags = [ diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index a6599bd8a35b..21dcf5af3159 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitLab +, fetchpatch , meson , ninja , pkgconfig @@ -10,7 +11,7 @@ , dbus , gst_all_1 , alsaLib -, ffmpeg +, ffmpeg_3 , libjack2 , udev , libva @@ -32,7 +33,7 @@ let in stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.5"; + version = "0.3.6"; outputs = [ "out" "lib" "dev" "doc" ]; @@ -41,9 +42,16 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "1x0rsq68vsl39bps2g397pa097q37mdjh595bjf7rd2lm9yf21ws"; + sha256 = "0g149vyaigf4gzm764fcgxxci9niw19z0af9afs4diwq5xzr1qd3"; }; + patches = [ (fetchpatch { + # Brought by https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/263, + # should be part of > 0.3.6 + url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/d1162f28efd502fcb973e172867970f5cc8d7a6b.patch"; + sha256 = "0ng34yin5726cvv0nll1b2xigyq6mj6j516l3xi0ys1i2g2fyby9"; + })]; + nativeBuildInputs = [ doxygen graphviz @@ -58,7 +66,7 @@ stdenv.mkDerivation rec { alsaLib bluez dbus - ffmpeg + ffmpeg_3 glib gst_all_1.gst-plugins-base gst_all_1.gstreamer diff --git a/pkgs/development/libraries/protozero/default.nix b/pkgs/development/libraries/protozero/default.nix index 0bbfab62fcd8..1c8e7e99313a 100644 --- a/pkgs/development/libraries/protozero/default.nix +++ b/pkgs/development/libraries/protozero/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "protozero"; - version = "1.6.8"; + version = "1.7.0"; src = fetchFromGitHub { owner = "mapbox"; repo = "protozero"; rev = "v${version}"; - sha256 = "1hfijpfylf1c71wa3mk70gjc88b6k1q7cxb87cwqdflw5q2x8ma6"; + sha256 = "0fdihfl5j68wayjjxvpvhvnjq1anzcfnfl09f68wpzbkg3zmhblz"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index df444eee2eb5..512060701e2d 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -14,7 +14,7 @@ , enableProprietaryCodecs ? true , gn , cups, darwin, openbsm, runCommand, xcbuild -, ffmpeg ? null +, ffmpeg_3 ? null , lib, stdenv }: @@ -152,7 +152,7 @@ EOF libevent ] ++ optionals (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [ - ffmpeg + ffmpeg_3 ] ++ optionals (!stdenv.isDarwin) [ dbus zlib minizip snappy nss protobuf jsoncpp diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix index 66a7b95e334f..388665f5aabd 100644 --- a/pkgs/development/libraries/qtutilities/default.nix +++ b/pkgs/development/libraries/qtutilities/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtutilities"; - version = "6.0.5"; + version = "6.0.6"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "1f2nir1qb0d6r1ndpsg7vpskdw08szq82mqvbwm5bi160xkrqhjf"; + sha256 = "0g3f18530w5f8dlzrh45k868hspga5p3m8qpz7pcg3nsdjda8cwz"; }; buildInputs = [ qtbase cpp-utilities ]; diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix index de621b30e247..a12f040bf49c 100644 --- a/pkgs/development/libraries/uriparser/default.nix +++ b/pkgs/development/libraries/uriparser/default.nix @@ -2,22 +2,14 @@ stdenv.mkDerivation rec { pname = "uriparser"; - version = "0.9.3"; + version = "0.9.4"; # Release tarball differs from source tarball src = fetchurl { url = "https://github.com/uriparser/uriparser/releases/download/${pname}-${version}/${pname}-${version}.tar.bz2"; - sha256 = "13z234jdaqs9jj7i66gcv4q1rgsypjz6cighnlm1j4g80pdlmbr8"; + sha256 = "0yzqp1j6sglyrmwcasgn7zlwg841p3nbxy0h78ngq20lc7jspkdp"; }; - patches = [ - # fixes tests - (fetchpatch { - url = "https://github.com/uriparser/uriparser/commit/f870e6c68696a6018702caa5c8a2feba9b0f99fa.diff"; - sha256 = "1nd6bhys9hwy6ippa42vm95zhw6hldm1s4xbdzmdjswc96as1ff5"; - }) - ]; - nativeBuildInputs = [ cmake ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix index 602f3e670dde..9fa64be4d53e 100644 --- a/pkgs/development/libraries/wxSVG/default.nix +++ b/pkgs/development/libraries/wxSVG/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , pkgconfig, wxGTK -, ffmpeg, libexif +, ffmpeg_3, libexif , cairo, pango }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ wxGTK ffmpeg libexif ]; + propagatedBuildInputs = [ wxGTK ffmpeg_3 libexif ]; buildInputs = [ cairo pango ]; diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index aa9600085c01..4322278e2fd6 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, xorg, alsaLib, libGLU, libGL, aalib -, libvorbis, libtheora, speex, zlib, perl, ffmpeg +, libvorbis, libtheora, speex, zlib, perl, ffmpeg_3 , flac, libcaca, libpulseaudio, libmng, libcdio, libv4l, vcdimager , libmpcdec }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ xorg.libX11 xorg.libXv xorg.libXinerama xorg.libxcb xorg.libXext - alsaLib libGLU libGL aalib libvorbis libtheora speex perl ffmpeg flac + alsaLib libGLU libGL aalib libvorbis libtheora speex perl ffmpeg_3 flac libcaca libpulseaudio libmng libcdio libv4l vcdimager libmpcdec ]; diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 7ff3db8894ec..2ceef0f477f2 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -39,14 +39,6 @@ let meta.broken = since "12"; }; - dnschain = super.dnschain.override { - buildInputs = [ pkgs.makeWrapper super.coffee-script ]; - postInstall = '' - wrapProgram $out/bin/dnschain --suffix PATH : ${pkgs.openssl.bin}/bin - ''; - meta.broken = since "14"; - }; - bitwarden-cli = pkgs.lib.overrideDerivation super."@bitwarden/cli" (drv: { name = "bitwarden-cli-${drv.version}"; }); @@ -160,6 +152,9 @@ let thelounge = super.thelounge.override { buildInputs = [ self.node-pre-gyp ]; + postInstall = '' + echo /var/lib/thelounge > $out/lib/node_modules/thelounge/.thelounge_home + ''; }; }; in self diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 76b24cf1f23d..f26c7885dfb6 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -60,12 +60,12 @@ , "csslint" , "dat" , "dhcp" -, "dnschain" , "dockerfile-language-server-nodejs" , "elasticdump" , "elm-oracle" , "emoj" , "emojione" +, "escape-string-regexp" , "eslint" , "eslint_d" , {"fast-cli": "1.x"} @@ -80,6 +80,7 @@ , "gtop" , "gulp" , "gulp-cli" +, "he" , "html-minifier" , "htmlhint" , "http-server" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 57913cc581b9..69045fa7d615 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -2623,13 +2623,13 @@ let sha512 = "O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q=="; }; }; - "@octokit/types-4.1.9" = { + "@octokit/types-4.1.10" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "4.1.9"; + version = "4.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-4.1.9.tgz"; - sha512 = "hinM/BA2c1vebN2HSR3JtVdYtrSbmvn/doUBZXXuQuh/9o60hYwitQQAGTpJu+k6pjtjURskDHQxUFvqLvYCeA=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-4.1.10.tgz"; + sha512 = "/wbFy1cUIE5eICcg0wTKGXMlKSbaAxEr00qaBXzscLXpqhcwgXeS6P8O0pkysBhRfyjkKjJaYrvR1ExMO5eOXQ=="; }; }; "@parcel/fs-1.11.0" = { @@ -2857,13 +2857,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-2.30.13" = { + "@serverless/components-2.30.14" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "2.30.13"; + version = "2.30.14"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-2.30.13.tgz"; - sha512 = "0IUJ6O7UywHpNgEFE7Ym06HhxbebTl767v/J4TMwTaftTJP5e4/ezxdJPxtZe75CdWUCCy+aaHP7VUAqqJdYVA=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-2.30.14.tgz"; + sha512 = "sWCuALO55BhdJAPJSN4KgifRJUCkr44FE/Bhw6hpz+3vK49mfnjDF6iHdNi6wNx85BRRgXGz1z/015epwqRtnA=="; }; }; "@serverless/core-1.1.2" = { @@ -3082,13 +3082,13 @@ let sha512 = "IUq5bHRL0vtVKtfvd4GOccAIaLYHbcertug2UVZzk5+yY6R/CxfYsnFUTho1h4BdkfNdin2tPjE/5jRF4SKSrw=="; }; }; - "@snyk/java-call-graph-builder-1.8.1" = { + "@snyk/java-call-graph-builder-1.10.0" = { name = "_at_snyk_slash_java-call-graph-builder"; packageName = "@snyk/java-call-graph-builder"; - version = "1.8.1"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.8.1.tgz"; - sha512 = "2G96dChYYXV73G8y9U0fi45dH6ybOjUSRBTJrMnmNkHJoOp1bzz8L4p5rkRypHQqr4SBS1EdCQeRw1eWRLm+Lg=="; + url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.10.0.tgz"; + sha512 = "x3vKElHJRsPjlMBRACeD6kHtki54ffahYeAm4ny5epVpxm16/OT6f6AjNjPuX8DbxcauaD7wqirtc62OPH3YqA=="; }; }; "@snyk/lodash-4.17.15-patch" = { @@ -3100,13 +3100,13 @@ let sha512 = "e4+t34bGyjjRnwXwI14hqye9J/nRbG9iwaqTgXWHskm5qC+iK0UrjgYdWXiHJCf3Plbpr+1rpW+4LPzZnCGMhQ=="; }; }; - "@snyk/rpm-parser-1.2.0" = { + "@snyk/rpm-parser-2.0.0" = { name = "_at_snyk_slash_rpm-parser"; packageName = "@snyk/rpm-parser"; - version = "1.2.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/rpm-parser/-/rpm-parser-1.2.0.tgz"; - sha512 = "9D2Vjg9LAONz9hHNPd/ORYF5Mv1Yw/uhJpJbwI3YRxKjlB3JY2UNLSVl1XWWr03hA1M+3rNAwVeOZNm3IJajgw=="; + url = "https://registry.npmjs.org/@snyk/rpm-parser/-/rpm-parser-2.0.0.tgz"; + sha512 = "bWjQY5Xk3TcfVpeo8M5BhhSUEdPr2P19AWW13CHPu6sFZkckLWEcjQycnBsVD6RBmxGXecJ1YNui8dq6soHoYQ=="; }; }; "@snyk/ruby-semver-2.2.0" = { @@ -3649,13 +3649,13 @@ let sha512 = "c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A=="; }; }; - "@types/istanbul-lib-coverage-2.0.2" = { + "@types/istanbul-lib-coverage-2.0.3" = { name = "_at_types_slash_istanbul-lib-coverage"; packageName = "@types/istanbul-lib-coverage"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.2.tgz"; - sha512 = "rsZg7eL+Xcxsxk2XlBt9KcG8nOp9iYdKCOikY9x2RFJCyOdNj4MKPQty0e8oZr29vVAzKXr1BmR+kZauti3o1w=="; + url = "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz"; + sha512 = "sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw=="; }; }; "@types/istanbul-lib-report-3.0.0" = { @@ -3694,13 +3694,13 @@ let sha512 = "fYMgzN+9e28R81weVN49inn/u798ruU91En1ZnGvSZzCRc5jXx9B2EDhlRaWmcO1RIxFHL8AajRXzxDuJu93+A=="; }; }; - "@types/json-schema-7.0.4" = { + "@types/json-schema-7.0.5" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; - version = "7.0.4"; + version = "7.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.4.tgz"; - sha512 = "8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA=="; + url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.5.tgz"; + sha512 = "7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ=="; }; }; "@types/keygrip-1.0.2" = { @@ -3793,31 +3793,31 @@ let sha512 = "ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w=="; }; }; - "@types/node-10.17.25" = { + "@types/node-10.17.26" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.17.25"; + version = "10.17.26"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.17.25.tgz"; - sha512 = "EWPw3jDB0jip4HafDkoezNOwG00TtVZ1TOe74MaxIBWgpyM60UF/LXzFVx9+8AdSYNNOPgx7TuJoRmgnhHZ/7g=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.17.26.tgz"; + sha512 = "myMwkO2Cr82kirHY8uknNRHEVtn0wV3DTQfkrjx17jmkstDRZ24gNUdl8AHXVyVclTYI/bNjgTPTAWvWLqXqkw=="; }; }; - "@types/node-13.13.11" = { + "@types/node-13.13.12" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.13.11"; + version = "13.13.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.13.11.tgz"; - sha512 = "FX7mIFKfnGCfq10DGWNhfCNxhACEeqH5uulT6wRRA1KEt7zgLe0HdrAd9/QQkObDqp2Z0KEV3OAmNgs0lTx5tQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.13.12.tgz"; + sha512 = "zWz/8NEPxoXNT9YyF2osqyA9WjssZukYpgI4UYZpOjcyqwIUqWGkcCionaEb9Ki+FULyPyvNFpg/329Kd2/pbw=="; }; }; - "@types/node-14.0.12" = { + "@types/node-14.0.13" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.0.12"; + version = "14.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.0.12.tgz"; - sha512 = "/sjzehvjkkpvLpYtN6/2dv5kg41otMGuHQUt9T2aiAuIfleCQRQHXXzF1eAw/qkZTj5Kcf4JSTf7EIizHocy6Q=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.0.13.tgz"; + sha512 = "rouEWBImiRaSJsVA+ITTFM6ZxibuAlTuNOCyxVbwreu6k6+ujs7DfnU9o+PShFhET78pMBl3eH+AGSI5eOTkPA=="; }; }; "@types/node-6.14.10" = { @@ -7069,13 +7069,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.692.0" = { + "aws-sdk-2.693.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.692.0"; + version = "2.693.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.692.0.tgz"; - sha512 = "fQRbZq+urzE4VjciEr6KNY7vbzougcVg7UqbHKGcgBT7EPtSbog9C2i9YY9Yum8PRuP1GAmfvC2Vthlw6dVTGw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.693.0.tgz"; + sha512 = "/0zy5IlE8wHrTXCxPYMSJGaqTKN1ulBBOSuWYeGxHU8pnTT6ZHpDdHlS83DHrVbsXnO/zq9prEf1nXRWlwgARw=="; }; }; "aws-sign2-0.6.0" = { @@ -9490,13 +9490,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001079" = { + "caniuse-lite-1.0.30001081" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001079"; + version = "1.0.30001081"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001079.tgz"; - sha512 = "2KaYheg0iOY+CMmDuAB3DHehrXhhb4OZU4KBVGDr/YKyYAcpudaiUQ9PJ9rxrPlKEoJ3ATasQ5AN48MqpwS43Q=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001081.tgz"; + sha512 = "iZdh3lu09jsUtLE6Bp8NAbJskco4Y3UDtkR3GTCJGsbMowBU5IWDFF79sV2ws7lSqTzWyKazxam2thasHymENQ=="; }; }; "capture-exit-2.0.0" = { @@ -9697,6 +9697,15 @@ let sha512 = "N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A=="; }; }; + "chalk-4.1.0" = { + name = "chalk"; + packageName = "chalk"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz"; + sha512 = "qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A=="; + }; + }; "chance-1.0.18" = { name = "chance"; packageName = "chance"; @@ -15242,13 +15251,13 @@ let sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="; }; }; - "electron-to-chromium-1.3.465" = { + "electron-to-chromium-1.3.466" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.465"; + version = "1.3.466"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.465.tgz"; - sha512 = "K/lUeT3NLAsJ5SHRDhK3/zd0tw7OUllYD8w+fTOXm6ljCPsp2qq+vMzxpLo8u1M27ZjZAjRbsA6rirvne2nAMQ=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.466.tgz"; + sha512 = "eieqkoM2hCkZZRhETKyCouMziDV3l4XEKHRLuzcHG+HV+P7PeODU/z9HAmBgMQkzvHg2DoyQhfIDmmeguLZT/Q=="; }; }; "elegant-spinner-1.0.1" = { @@ -16494,6 +16503,15 @@ let sha512 = "YVFs6dPpZIgH665kKckDktEVvSBccSYJmoZUfhNUdv5d3Xv+Q+SKF4Xis1jolq9aBzuW1ZZhQh/m/zU/TPdDhw=="; }; }; + "event-loop-spinner-2.0.0" = { + name = "event-loop-spinner"; + packageName = "event-loop-spinner"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/event-loop-spinner/-/event-loop-spinner-2.0.0.tgz"; + sha512 = "1y4j/Mhttr8ordvHkbDsGzGrlQaSYJoXD/3YKUxiOXIk7myEn9UPfybEk/lLtrcU3D4QvCNmVUxVQaPtvAIaUw=="; + }; + }; "event-pubsub-4.3.0" = { name = "event-pubsub"; packageName = "event-pubsub"; @@ -18429,13 +18447,13 @@ let sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; }; }; - "fp-ts-2.6.3" = { + "fp-ts-2.6.5" = { name = "fp-ts"; packageName = "fp-ts"; - version = "2.6.3"; + version = "2.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.6.3.tgz"; - sha512 = "d/djF6VTApJB9DwD/yec2dlKd7h3oqiOv+6vtBnC1pKbHrhz7aEAGcKd4luraUQDJ3pt3C6W4Npd8s+l5xIquQ=="; + url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.6.5.tgz"; + sha512 = "lQNzOMJj98b623+UZLQ+tnN/8qtNXz/vRoR9k7L/9OlUIyYH3qVzSUVZBDXYsAd7nOWzzdQALCX1ZqcF70altQ=="; }; }; "fraction.js-4.0.12" = { @@ -20149,13 +20167,13 @@ let sha512 = "/tq02ayMQjrG4oDFDRLLrPk0KvJXue0nVXoItBe7uAdbNXjQUu+HYCBdAmPLQoseVzUKKMzrhq2P/sfI76ON6w=="; }; }; - "graphql-type-json-0.3.1" = { + "graphql-type-json-0.3.2" = { name = "graphql-type-json"; packageName = "graphql-type-json"; - version = "0.3.1"; + version = "0.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-type-json/-/graphql-type-json-0.3.1.tgz"; - sha512 = "1lPkUXQ2L8o+ERLzVAuc3rzc/E6pGF+6HnjihCVTK0VzR0jCuUd92FqNxoHdfILXqOn2L6b4y47TBxiPyieUVA=="; + url = "https://registry.npmjs.org/graphql-type-json/-/graphql-type-json-0.3.2.tgz"; + sha512 = "J+vjof74oMlCWXSvt0DOf2APEdZOCdubEvGDUAlqH//VBYcOYsGgRW7Xzorr44LvkjiuvecWc8fChxuZZbChtg=="; }; }; "graphql-upload-8.1.0" = { @@ -30515,15 +30533,6 @@ let sha512 = "ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg=="; }; }; - "node-alias-1.0.4" = { - name = "node-alias"; - packageName = "node-alias"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/node-alias/-/node-alias-1.0.4.tgz"; - sha1 = "1f1b916b56b9ea241c0135f97ced6940f556f292"; - }; - }; "node-appc-0.2.49" = { name = "node-appc"; packageName = "node-appc"; @@ -40220,13 +40229,13 @@ let sha512 = "3UlyogA67/9WOssJ7s4d7gqWQRWyO/LbgdBBNMhhmFDKa7eTUSW+A782CVHgyDSJZ2kNANcMWwMiOL+h3p6zQg=="; }; }; - "snyk-docker-plugin-3.6.3" = { + "snyk-docker-plugin-3.10.0" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "3.6.3"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-3.6.3.tgz"; - sha512 = "+9pQc9+tetzMiUIV42WA3LAUkrZh6hhkhURv1X4kKyo2c1C8PSbCmpvycx/irilzfmH7dqBv0RXmb4vONPBXHA=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-3.10.0.tgz"; + sha512 = "0OIIqBOq76wBZ/09oB+L+5CdyNXEeDAgLH92TRydEj5iuJwjddAfzWtoqeCIeh3d09DidsHBRP8mMhXKAht7Sg=="; }; }; "snyk-go-parser-1.4.1" = { @@ -40283,13 +40292,13 @@ let sha512 = "HHuOYEAACpUpkFgU8HT57mmxmonaJ4O3YADoSkVhnhkmJ+AowqZyJOau703dYHNrq2DvQ7qYw81H7yyxS1Nfjw=="; }; }; - "snyk-mvn-plugin-2.15.2" = { + "snyk-mvn-plugin-2.17.0" = { name = "snyk-mvn-plugin"; packageName = "snyk-mvn-plugin"; - version = "2.15.2"; + version = "2.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.15.2.tgz"; - sha512 = "2TTRizQxfUrA9w0pjxxsvGE+FgFSgog2wwpm378jNiKAZazGgV0txVMM4CoZJMz/tbUmzaJSS8DMQe1C7wlBFQ=="; + url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.17.0.tgz"; + sha512 = "Yl/d7CPJ0LRgHL5dciz/MbjnmsnwAEHA3uBE7Rr5bxZRJ1/ssot9e2OC9ORLJztK86Dggd9ReFocrzD5CWT5PA=="; }; }; "snyk-nodejs-lockfile-parser-1.22.0" = { @@ -47133,13 +47142,13 @@ let sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec"; }; }; - "vsce-1.76.0" = { + "vsce-1.76.1" = { name = "vsce"; packageName = "vsce"; - version = "1.76.0"; + version = "1.76.1"; src = fetchurl { - url = "https://registry.npmjs.org/vsce/-/vsce-1.76.0.tgz"; - sha512 = "Agvw37yFXxOtCM5HRk7jdtCzLMvrVKWG0TJ+7NZHrQcHVe0ad79/WAvVSm8E58RSENj0dcmG/x1Ln5yRNVr9aw=="; + url = "https://registry.npmjs.org/vsce/-/vsce-1.76.1.tgz"; + sha512 = "WNx6JzRywxAOuhVpjmrsI0eHMK0mCA0YKD8u++7sprmhwCHsoQIBpSf0vp6kVMHBmafknr1Z6K7IC5jIjsNL9Q=="; }; }; "vscode-css-languageservice-3.0.13" = { @@ -50315,7 +50324,7 @@ in sources."@apollo/federation-0.16.2" (sources."@apollo/protobufjs-1.0.4" // { dependencies = [ - sources."@types/node-10.17.25" + sources."@types/node-10.17.26" ]; }) sources."@apollographql/apollo-tools-0.4.8" @@ -50467,7 +50476,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-2.0.2" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.12" + sources."@types/node-14.0.13" (sources."@types/node-fetch-2.5.7" // { dependencies = [ sources."form-data-3.0.0" @@ -50999,7 +51008,7 @@ in sources."graphql-subscriptions-1.1.0" sources."graphql-tag-2.10.3" sources."graphql-tools-4.0.8" - sources."graphql-type-json-0.3.1" + sources."graphql-type-json-0.3.2" sources."graphql-upload-8.1.0" sources."growly-1.3.0" sources."har-schema-2.0.0" @@ -52125,7 +52134,7 @@ in dependencies = [ sources."@types/glob-7.1.2" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.12" + sources."@types/node-14.0.13" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -52668,7 +52677,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.11" + sources."@types/node-13.13.12" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.2" @@ -53156,10 +53165,10 @@ in coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; - version = "1.7.13"; + version = "1.7.14"; src = fetchurl { - url = "https://registry.npmjs.org/coc-git/-/coc-git-1.7.13.tgz"; - sha512 = "sSONrN4MpxZmQ1+oprl9fZgTymxod9u4euEkoA4Dhb7/h5zuKeEJXfHbEoDzQIYejqq34ElFVMJHfogMOHjVhg=="; + url = "https://registry.npmjs.org/coc-git/-/coc-git-1.7.14.tgz"; + sha512 = "LOq7zTp2mb2omi1Pc0r1PEK2N+bwuPYpSfszm78Rsvvht9cU+o/YuC0HagG4VZ7iwuiy9VRvpNz218sMZJqm7Q=="; }; buildInputs = globalBuildInputs; meta = { @@ -53347,7 +53356,7 @@ in sources."fb-watchman-2.0.1" sources."flatted-2.0.2" sources."follow-redirects-1.11.0" - sources."fp-ts-2.6.3" + sources."fp-ts-2.6.5" sources."fs-extra-8.1.0" sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" @@ -53469,7 +53478,7 @@ in sources."@nodelib/fs.stat-1.1.3" sources."@types/color-name-1.1.1" sources."@types/eslint-visitor-keys-1.0.0" - sources."@types/json-schema-7.0.4" + sources."@types/json-schema-7.0.5" sources."@typescript-eslint/experimental-utils-3.2.0" sources."@typescript-eslint/parser-3.2.0" sources."@typescript-eslint/typescript-estree-3.2.0" @@ -53535,7 +53544,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001079" + sources."caniuse-lite-1.0.30001081" sources."capture-stack-trace-1.0.1" sources."ccount-1.0.5" sources."chalk-2.4.2" @@ -53631,7 +53640,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.2.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.465" + sources."electron-to-chromium-1.3.466" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -54461,10 +54470,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.7.2"; + version = "0.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.7.2.tgz"; - sha512 = "HJg4Y0gRqzxYkVZGZECjfTvC2sctBLKkvPZYIRUb/dVedsNqhO/NLA1xTdNZ0J3sU55sVOzqN2oKmwEEHNMs6A=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.7.3.tgz"; + sha512 = "VgL/6zKfm+ASlpNnCl7xY8CYMqycbK3ZEmn0ApVa+CITTkSLOBVFW5B9n53djq5HpPr9QxvGORbxYMQ0INo3kg=="; }; buildInputs = globalBuildInputs; meta = { @@ -54497,10 +54506,10 @@ in coc-snippets = nodeEnv.buildNodePackage { name = "coc-snippets"; packageName = "coc-snippets"; - version = "2.1.26"; + version = "2.1.28"; src = fetchurl { - url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.1.26.tgz"; - sha512 = "4/XHrxJV5kN0aCrW/Kkw6s19ORs/V26zzZzQ/jFP8BT+HWZegbqPZIP9c+xB9nwknCwa9Tovx3mzcUMq0w0KMw=="; + url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.1.28.tgz"; + sha512 = "okVbjhKbFH6iTPeTpjxhtYtBBTFy5neOQYtn1H9CrbPpjnjodWzBDq3izoXCsC4BMMyBRzOwmwmJ0eA65S6JnQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -54560,7 +54569,7 @@ in sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.1.2" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.12" + sources."@types/node-14.0.13" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -54611,7 +54620,7 @@ in sources."callsites-2.0.0" sources."camelcase-4.1.0" sources."camelcase-keys-4.2.0" - sources."caniuse-lite-1.0.30001079" + sources."caniuse-lite-1.0.30001081" sources."ccount-1.0.5" sources."chalk-2.4.2" sources."character-entities-1.2.4" @@ -54670,7 +54679,7 @@ in sources."domhandler-2.4.2" sources."domutils-1.7.0" sources."dot-prop-5.2.0" - sources."electron-to-chromium-1.3.465" + sources."electron-to-chromium-1.3.466" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -55270,10 +55279,10 @@ in sources."@types/color-name-1.1.1" sources."@types/eslint-visitor-keys-1.0.0" sources."@types/glob-7.1.2" - sources."@types/json-schema-7.0.4" + sources."@types/json-schema-7.0.5" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.0.12" + sources."@types/node-14.0.13" sources."@types/normalize-package-data-2.4.0" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" @@ -56508,7 +56517,7 @@ in sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.1.2" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.12" + sources."@types/node-14.0.13" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ajv-6.12.2" @@ -57120,7 +57129,7 @@ in sources."@types/glob-7.1.2" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.0.12" + sources."@types/node-14.0.13" sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.0.1" sources."ansi-styles-3.2.1" @@ -57488,7 +57497,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.1" - sources."@types/node-14.0.12" + sources."@types/node-14.0.13" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -58677,7 +58686,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.692.0" + sources."aws-sdk-2.693.0" sources."aws-sign2-0.7.0" sources."aws4-1.10.0" sources."base64-js-1.3.1" @@ -58859,7 +58868,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.0" - sources."@types/node-14.0.12" + sources."@types/node-14.0.13" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -59156,6 +59165,24 @@ in bypassCache = true; reconstructLock = true; }; + escape-string-regexp = nodeEnv.buildNodePackage { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; + sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Escape RegExp special characters"; + homepage = "https://github.com/sindresorhus/escape-string-regexp#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; @@ -59188,7 +59215,7 @@ in sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."callsites-3.1.0" - (sources."chalk-4.0.0" // { + (sources."chalk-4.1.0" // { dependencies = [ sources."ansi-styles-4.2.1" sources."color-convert-2.0.1" @@ -59335,15 +59362,19 @@ in eslint_d = nodeEnv.buildNodePackage { name = "eslint_d"; packageName = "eslint_d"; - version = "8.1.1"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint_d/-/eslint_d-8.1.1.tgz"; - sha512 = "eYr8vOwCQynnI8b5e5R07D2JI6jCItT9QZzWKGZnqMs9lKN+z0bvn1ULCNKp0u4mz1V+lLRglIDiSGIkIDDcLw=="; + url = "https://registry.npmjs.org/eslint_d/-/eslint_d-9.0.0.tgz"; + sha512 = "yWXSiBvn6u4pLpGrLuebCtSQ8fJ8jUkUdfD6QqqYp7fSuY4+YW6mW1UusY/gCgfByrgU518o6DCeBmPg6HLkcw=="; }; dependencies = [ sources."@babel/code-frame-7.10.1" sources."@babel/helper-validator-identifier-7.10.1" - sources."@babel/highlight-7.10.1" + (sources."@babel/highlight-7.10.1" // { + dependencies = [ + sources."chalk-2.4.2" + ]; + }) sources."@types/color-name-1.1.1" sources."acorn-7.2.0" sources."acorn-jsx-5.2.0" @@ -59360,7 +59391,15 @@ in sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."callsites-3.1.0" - sources."chalk-2.4.2" + (sources."chalk-4.1.0" // { + dependencies = [ + sources."ansi-styles-4.2.1" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.1.0" + ]; + }) sources."chardet-0.7.0" sources."cli-cursor-3.1.0" sources."cli-width-2.2.1" @@ -59368,21 +59407,17 @@ in sources."color-name-1.1.3" sources."concat-map-0.0.1" sources."core_d-1.0.1" - (sources."cross-spawn-6.0.5" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) + sources."cross-spawn-7.0.3" sources."debug-4.2.0" sources."deep-is-0.1.3" sources."doctrine-3.0.0" sources."emoji-regex-8.0.0" sources."escape-string-regexp-1.0.5" - sources."eslint-6.8.0" + sources."eslint-7.2.0" sources."eslint-scope-5.1.0" - sources."eslint-utils-1.4.3" + sources."eslint-utils-2.0.0" sources."eslint-visitor-keys-1.2.0" - sources."espree-6.2.1" + sources."espree-7.1.0" sources."esprima-4.0.1" (sources."esquery-1.3.1" // { dependencies = [ @@ -59419,7 +59454,6 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."strip-ansi-6.0.0" sources."supports-color-7.1.0" ]; }) @@ -59431,7 +59465,7 @@ in sources."js-yaml-3.14.0" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" - sources."levn-0.3.0" + sources."levn-0.4.1" sources."lodash-4.17.15" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" @@ -59441,19 +59475,18 @@ in sources."mute-stream-0.0.8" sources."nanolru-1.0.0" sources."natural-compare-1.4.0" - sources."nice-try-1.0.5" sources."once-1.4.0" sources."onetime-5.1.0" - sources."optionator-0.8.3" + sources."optionator-0.9.1" sources."os-tmpdir-1.0.2" sources."parent-module-1.0.1" sources."path-is-absolute-1.0.1" - sources."path-key-2.0.1" + sources."path-key-3.1.1" sources."path-parse-1.0.6" - sources."prelude-ls-1.1.2" + sources."prelude-ls-1.2.1" sources."progress-2.0.3" sources."punycode-2.1.1" - sources."regexpp-2.0.1" + sources."regexpp-3.1.0" sources."resolve-1.17.0" sources."resolve-from-4.0.0" sources."restore-cursor-3.1.0" @@ -59461,9 +59494,9 @@ in sources."run-async-2.4.1" sources."rxjs-6.5.5" sources."safer-buffer-2.1.2" - sources."semver-6.3.0" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" + sources."semver-7.3.2" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."signal-exit-3.0.3" (sources."slice-ansi-2.1.0" // { dependencies = [ @@ -59471,34 +59504,28 @@ in ]; }) sources."sprintf-js-1.0.3" - (sources."string-width-4.2.0" // { - dependencies = [ - sources."strip-ansi-6.0.0" - ]; - }) - (sources."strip-ansi-5.2.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - ]; - }) + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" sources."strip-json-comments-3.1.0" sources."supports-color-5.5.0" (sources."table-5.4.6" // { dependencies = [ + sources."ansi-regex-4.1.0" sources."emoji-regex-7.0.3" sources."is-fullwidth-code-point-2.0.0" sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" ]; }) sources."text-table-0.2.0" sources."through-2.3.8" sources."tmp-0.0.33" sources."tslib-1.13.0" - sources."type-check-0.3.2" + sources."type-check-0.4.0" sources."type-fest-0.8.1" sources."uri-js-4.2.2" sources."v8-compile-cache-2.1.1" - sources."which-1.3.1" + sources."which-2.0.2" sources."word-wrap-1.2.3" sources."wrappy-1.0.2" sources."write-1.0.3" @@ -61666,7 +61693,7 @@ in (sources."marked-terminal-4.1.0" // { dependencies = [ sources."ansi-styles-4.2.1" - sources."chalk-4.0.0" + sources."chalk-4.1.0" sources."supports-color-7.1.0" ]; }) @@ -62517,6 +62544,24 @@ in bypassCache = true; reconstructLock = true; }; + he = nodeEnv.buildNodePackage { + name = "he"; + packageName = "he"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/he/-/he-1.2.0.tgz"; + sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "A robust HTML entities encoder/decoder with full Unicode support."; + homepage = https://mths.be/he; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; html-minifier = nodeEnv.buildNodePackage { name = "html-minifier"; packageName = "html-minifier"; @@ -63621,10 +63666,10 @@ in jake = nodeEnv.buildNodePackage { name = "jake"; packageName = "jake"; - version = "10.8.1"; + version = "10.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/jake/-/jake-10.8.1.tgz"; - sha512 = "eSp5h9S7UFzKdQERTyF+KuPLjDZa1Tbw8gCVUn98n4PbIkLEDGe4zl7vF4Qge9kQj06HcymnksPk8jznPZeKsA=="; + url = "https://registry.npmjs.org/jake/-/jake-10.8.2.tgz"; + sha512 = "eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A=="; }; dependencies = [ sources."ansi-styles-3.2.1" @@ -65813,11 +65858,11 @@ in ]; }) sources."@octokit/rest-16.43.1" - sources."@octokit/types-4.1.9" + sources."@octokit/types-4.1.10" sources."@types/glob-7.1.2" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.0.12" + sources."@types/node-14.0.13" sources."@types/normalize-package-data-2.4.0" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" @@ -67776,11 +67821,11 @@ in sources."@types/color-name-1.1.1" sources."@types/estree-0.0.44" sources."@types/graceful-fs-4.1.3" - sources."@types/istanbul-lib-coverage-2.0.2" + sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" - sources."@types/json-schema-7.0.4" - sources."@types/node-14.0.12" + sources."@types/json-schema-7.0.5" + sources."@types/node-14.0.13" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.5" @@ -67961,7 +68006,7 @@ in sources."cache-base-1.0.1" sources."cached-path-relative-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001079" + sources."caniuse-lite-1.0.30001081" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -68083,7 +68128,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.465" + sources."electron-to-chromium-1.3.466" (sources."elliptic-6.5.2" // { dependencies = [ sources."bn.js-4.11.9" @@ -68866,7 +68911,7 @@ in sources."aws4-1.10.0" sources."bcrypt-pbkdf-1.0.2" sources."caseless-0.12.0" - sources."chalk-4.0.0" + sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."combined-stream-1.0.8" @@ -71365,10 +71410,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "6.0.1"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-6.0.1.tgz"; - sha512 = "lzoVW35KWaBn0m1O1AVr0G9/20niK13mYftoAr09WuQszoeTdlrjCNyC0pRNiTfb5ZxubZaUAi7HdVzkEihwwA=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-7.0.1.tgz"; + sha512 = "z/i1nhxW1OJ2a8wZtm92PS+4vCZ5Y5d86pLDPJScWf8G3vTYJlxd11UqUymnaZWK2nYPMmgxnneAKnFGODDxjw=="; }; dependencies = [ sources."@npmcli/ci-detect-1.2.0" @@ -71428,7 +71473,7 @@ in }) sources."camelcase-5.3.1" sources."caseless-0.12.0" - sources."chalk-4.0.0" + sources."chalk-4.1.0" sources."chownr-2.0.0" sources."ci-info-2.0.0" sources."cint-8.2.1" @@ -71466,7 +71511,6 @@ in sources."env-paths-2.2.0" sources."err-code-1.1.2" sources."escape-goat-2.1.1" - sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."extend-3.0.2" sources."extsprintf-1.3.0" @@ -71488,7 +71532,6 @@ in sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" - sources."has-ansi-2.0.0" sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."has-yarn-2.1.0" @@ -71582,13 +71625,6 @@ in sources."mkdirp-1.0.4" sources."ms-2.1.2" sources."nested-error-stacks-2.0.1" - (sources."node-alias-1.0.4" // { - dependencies = [ - sources."ansi-styles-2.2.1" - sources."chalk-1.1.3" - sources."supports-color-2.0.0" - ]; - }) (sources."node-gyp-6.1.0" // { dependencies = [ sources."chownr-1.1.4" @@ -71732,7 +71768,7 @@ in ]; buildInputs = globalBuildInputs; meta = { - description = "Find newer versions of dependencies than what your package.json or bower.json allows"; + description = "Find newer versions of dependencies than what your package.json allows"; homepage = https://github.com/raineorshine/npm-check-updates; license = "Apache-2.0"; }; @@ -72185,7 +72221,7 @@ in sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001079" + sources."caniuse-lite-1.0.30001081" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -72326,7 +72362,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.465" + sources."electron-to-chromium-1.3.466" (sources."elliptic-6.5.2" // { dependencies = [ sources."bn.js-4.11.9" @@ -73933,10 +73969,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "5.1.5"; + version = "5.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-5.1.5.tgz"; - sha512 = "yKNHD9xXeT1v7h4ExFDib7CWzNvHzuyUX4T+ItgWIJAnG0331WNCZHXAbcvMWazJASGb+NYWgcERCkwSWnHRcg=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-5.1.6.tgz"; + sha512 = "BMY+RH2ggxY27pSlO5RtGAtTUcUfFVetQZHJdZURWu9tankNO0iDuqSx4w9iBGdIm9+Gd5eQqNYylqTksu2ueA=="; }; buildInputs = globalBuildInputs; meta = { @@ -73973,7 +74009,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."camelcase-5.3.1" - sources."chalk-4.0.0" + sources."chalk-4.1.0" sources."chokidar-3.4.0" sources."cliui-6.0.0" sources."color-convert-2.0.1" @@ -74650,10 +74686,10 @@ in sources."@types/eslint-visitor-keys-1.0.0" sources."@types/estree-0.0.39" sources."@types/glob-7.1.2" - sources."@types/json-schema-7.0.4" + sources."@types/json-schema-7.0.5" sources."@types/minimatch-3.0.3" sources."@types/mocha-7.0.2" - sources."@types/node-14.0.12" + sources."@types/node-14.0.13" sources."@types/node-fetch-2.5.7" sources."@types/resolve-0.0.8" sources."@types/vscode-1.45.0" @@ -74696,7 +74732,7 @@ in sources."builtin-modules-3.1.0" sources."callsites-3.1.0" sources."camelcase-5.3.1" - (sources."chalk-4.0.0" // { + (sources."chalk-4.1.0" // { dependencies = [ sources."ansi-styles-4.2.1" sources."color-convert-2.0.1" @@ -74999,7 +75035,7 @@ in sources."url-join-1.1.0" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.1.1" - (sources."vsce-1.76.0" // { + (sources."vsce-1.76.1" // { dependencies = [ sources."chalk-2.4.2" sources."semver-5.7.1" @@ -75339,7 +75375,7 @@ in sources."@protobufjs/utf8-1.1.0" sources."@serverless/cli-1.4.0" sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-2.30.13" // { + (sources."@serverless/components-2.30.14" // { dependencies = [ sources."globby-10.0.2" sources."semver-7.3.2" @@ -75381,7 +75417,7 @@ in sources."@types/lodash-4.14.155" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.13.11" + sources."@types/node-13.13.12" (sources."@typescript-eslint/typescript-estree-2.34.0" // { dependencies = [ sources."semver-7.3.2" @@ -75444,7 +75480,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.692.0" // { + (sources."aws-sdk-2.693.0" // { dependencies = [ sources."buffer-4.9.2" sources."isarray-1.0.0" @@ -77065,10 +77101,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.336.0"; + version = "1.338.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.336.0.tgz"; - sha512 = "Dzk2xpaHZahZmjM8s3VHRPJgU1q28MAZr1TfnuRLIGDRT4eRiUdiFWdFMC6xqto7VJGJr31HYn1Di4Luv/1Bgg=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.338.0.tgz"; + sha512 = "kygisp/bsNVLnATEdHeb3ASQS58b8DKOju9BcVNC3OpUi0Ajjiqy5o7RdfNPfCzp9lYglLT9grIM59zJuC2sFg=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -77088,13 +77124,17 @@ in sources."@snyk/gemfile-1.2.0" sources."@snyk/graphlib-2.1.9-patch" sources."@snyk/inquirer-6.2.2-patch" - (sources."@snyk/java-call-graph-builder-1.8.1" // { + (sources."@snyk/java-call-graph-builder-1.10.0" // { dependencies = [ sources."debug-4.2.0" ]; }) sources."@snyk/lodash-4.17.15-patch" - sources."@snyk/rpm-parser-1.2.0" + (sources."@snyk/rpm-parser-2.0.0" // { + dependencies = [ + sources."event-loop-spinner-2.0.0" + ]; + }) sources."@snyk/ruby-semver-2.2.0" (sources."@snyk/snyk-cocoapods-plugin-2.3.0" // { dependencies = [ @@ -77111,7 +77151,7 @@ in sources."@types/debug-4.1.5" sources."@types/hosted-git-info-2.7.0" sources."@types/js-yaml-3.12.4" - sources."@types/node-14.0.12" + sources."@types/node-14.0.13" sources."@types/semver-5.5.0" sources."@types/xml2js-0.4.5" sources."@yarnpkg/lockfile-1.1.0" @@ -77411,7 +77451,7 @@ in sources."debug-4.2.0" ]; }) - (sources."snyk-docker-plugin-3.6.3" // { + (sources."snyk-docker-plugin-3.10.0" // { dependencies = [ sources."debug-4.2.0" ]; @@ -77447,7 +77487,7 @@ in sources."debug-4.2.0" ]; }) - (sources."snyk-mvn-plugin-2.15.2" // { + (sources."snyk-mvn-plugin-2.17.0" // { dependencies = [ sources."@snyk/cli-interface-2.5.0" sources."debug-4.2.0" @@ -78780,7 +78820,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.692.0" // { + (sources."aws-sdk-2.693.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -81416,7 +81456,7 @@ in sources."@types/debug-4.1.5" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-14.0.12" + sources."@types/node-14.0.13" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-1.0.0" @@ -82354,7 +82394,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" - sources."@types/node-13.13.11" + sources."@types/node-13.13.12" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."after-0.8.2" @@ -83050,7 +83090,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.0.12" + sources."@types/node-14.0.13" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -84001,7 +84041,7 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.12" + sources."@types/node-14.0.13" sources."JSONSelect-0.2.1" sources."acorn-6.4.1" sources."acorn-jsx-5.2.0" @@ -85961,7 +86001,7 @@ in dependencies = [ sources."@types/glob-7.1.2" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.12" + sources."@types/node-14.0.13" sources."accepts-1.3.7" sources."ajv-6.12.2" sources."ajv-errors-1.0.1" @@ -86557,7 +86597,7 @@ in sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" sources."@npmcli/move-file-1.0.1" - sources."@types/json-schema-7.0.4" + sources."@types/json-schema-7.0.5" sources."aggregate-error-3.0.1" sources."ajv-6.12.2" sources."ajv-keywords-3.4.1" @@ -86686,7 +86726,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.11" + sources."@types/node-13.13.12" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.0" @@ -87096,7 +87136,7 @@ in sources."@types/color-name-1.1.1" sources."@types/glob-7.1.2" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.12" + sources."@types/node-14.0.13" sources."@types/normalize-package-data-2.4.0" sources."JSONStream-1.3.5" sources."aggregate-error-3.0.1" diff --git a/pkgs/development/ocaml-modules/dns/client.nix b/pkgs/development/ocaml-modules/dns/client.nix index 0dd0541138c8..a6dc40de24ea 100644 --- a/pkgs/development/ocaml-modules/dns/client.nix +++ b/pkgs/development/ocaml-modules/dns/client.nix @@ -1,5 +1,6 @@ { lib, buildDunePackage, dns, ocaml_lwt, mirage-clock, mirage-time -, mirage-random, mirage-stack, mirage-crypto-rng, mtime, randomconv }: +, mirage-random, mirage-stack, mirage-crypto-rng, mtime, randomconv +, cstruct, fmt, logs, rresult, domain-name, ipaddr, alcotest }: buildDunePackage { pname = "dns-client"; @@ -7,8 +8,11 @@ buildDunePackage { useDune2 = true; - propagatedBuildInputs = [ dns mtime ocaml_lwt randomconv mirage-clock mirage-time - mirage-random mirage-stack mirage-crypto-rng ]; + propagatedBuildInputs = [ cstruct fmt logs dns rresult randomconv domain-name ipaddr + ocaml_lwt mirage-stack mirage-random mirage-time mirage-clock + mtime mirage-crypto-rng ]; + checkInputs = [ alcotest ]; + doCheck = true; meta = dns.meta // { description = "Pure DNS resolver API"; diff --git a/pkgs/development/ocaml-modules/dns/default.nix b/pkgs/development/ocaml-modules/dns/default.nix index 01bbffd40b94..68a8ad8da4ed 100644 --- a/pkgs/development/ocaml-modules/dns/default.nix +++ b/pkgs/development/ocaml-modules/dns/default.nix @@ -1,19 +1,19 @@ { lib, buildDunePackage, fetchurl, alcotest -, cstruct, domain-name, duration, gmap, ipaddr, logs, lru, metrics, ptime, rresult +, cstruct, domain-name, duration, gmap, ipaddr, logs, lru, metrics, ptime, rresult, astring, fmt }: buildDunePackage rec { pname = "dns"; - version = "4.5.0"; + version = "4.6.0"; minimumOCamlVersion = "4.07"; src = fetchurl { url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-v${version}.tbz"; - sha256 = "10jrnnxvp06rvzk285wibyi9hn15qhjnqjy9xsfbwl8yhmzzqnq0"; + sha256 = "1gkswpc91j4ps60bp52ggg4qwj5g88f49x6p6d619p4x8vmhjylv"; }; - propagatedBuildInputs = [ cstruct domain-name duration gmap ipaddr logs lru metrics ptime rresult ]; + propagatedBuildInputs = [ rresult astring fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics ]; doCheck = true; checkInputs = lib.optional doCheck alcotest; diff --git a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix index 4dfca784dfa3..a0f3136de22b 100644 --- a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "ocsigen-toolkit"; name = "ocaml${ocaml.version}-${pname}-${version}"; - version = "2.5.0"; + version = "2.7.0"; propagatedBuildInputs = [ calendar js_of_ocaml-ppx_deriving_json eliom ]; buildInputs = [ ocaml findlib opaline ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "ocsigen"; repo = pname; rev = version; - sha256 = "0hll8qr363pbb65jnr2w36zcbplbwn08xb7826ayiwigakj783p9"; + sha256 = "0jan5779nc0jf993hmvfii15ralcs20sm4mcnqwqrnhjbq6f6zpk"; }; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix index dea03f2b38a7..0c3eaf33e782 100644 --- a/pkgs/development/ocaml-modules/tls/default.nix +++ b/pkgs/development/ocaml-modules/tls/default.nix @@ -6,12 +6,12 @@ buildDunePackage rec { minimumOCamlVersion = "4.07"; - version = "0.12.0"; + version = "0.12.1"; pname = "tls"; src = fetchurl { url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-v${version}.tbz"; - sha256 = "0fy38qmy7rcld1b4qzz4ycl1fr0v1wa7qd24125lpd6hly86fn57"; + sha256 = "09jhzjhni3il5bmy2c6gylmg9s45ppckjc7nm5nyg5dbm699cwxg"; }; useDune2 = true; diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix index 0a127e49fdc2..d33f03a0d347 100644 --- a/pkgs/development/ocaml-modules/vg/default.nix +++ b/pkgs/development/ocaml-modules/vg/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg , uchar, result, gg, uutf, otfm -, js_of_ocaml, js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, +, js_of_ocaml, js_of_ocaml-ppx, pdfBackend ? true, # depends on uutf and otfm htmlcBackend ? true # depends on js_of_ocaml }: @@ -11,7 +11,7 @@ let inherit (stdenv.lib) optionals versionAtLeast; pname = "vg"; - version = "0.9.3"; + version = "0.9.4"; webpage = "https://erratique.ch/software/${pname}"; in @@ -25,14 +25,14 @@ stdenv.mkDerivation { src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "0jj5hrqxdb6yyplnz0r7am4mbjzgcn876qp7sqs2x93a97fk6lwd"; + sha256 = "181sz6l5xrj5jvwg4m2yqsjzwp2s5h8v0mwhjcwbam90kdfx2nak"; }; buildInputs = [ ocaml findlib ocamlbuild topkg ]; propagatedBuildInputs = [ uchar result gg ] ++ optionals pdfBackend [ uutf otfm ] - ++ optionals htmlcBackend [ js_of_ocaml js_of_ocaml-ocamlbuild js_of_ocaml-ppx ]; + ++ optionals htmlcBackend [ js_of_ocaml js_of_ocaml-ppx ]; buildPhase = topkg.buildPhase + " --with-uutf ${boolToString pdfBackend}" diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index e8a20b6df47d..97c6b957a437 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -7,6 +7,7 @@ , gzip , bzip2 , gnutar +, p7zip , cabextract , lzma , nose @@ -28,7 +29,7 @@ buildPythonPackage { sha256 = "1bxgj569fzwv6jhcbl864nmlsi9x1k1r20aywjxc8b9b1zgqrlvc"; }; - propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar cabextract lzma pycrypto ] + propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract lzma pycrypto ] ++ stdenv.lib.optional visualizationSupport pyqtgraph; # setup.py only installs version.py during install, not test diff --git a/pkgs/development/python-modules/bravia-tv/default.nix b/pkgs/development/python-modules/bravia-tv/default.nix index 2df937f4232c..8050f886db5a 100644 --- a/pkgs/development/python-modules/bravia-tv/default.nix +++ b/pkgs/development/python-modules/bravia-tv/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "bravia-tv"; - version = "1.0.1"; + version = "1.0.5"; disabled = isPy27; src = fetchFromGitHub { owner = "dcnielsen90"; repo = "python-bravia-tv"; rev = "v${version}"; - sha256 = "0jlrin5qw3ny2r961y5divd5xa9giprxhhxdc84rjlq9qdmnsk68"; + sha256 = "17nd0v3pgmbfafi3vypls9jnpg4dk7wyh7fl7gpzcnkq1f8pf087"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/citeproc-py/default.nix b/pkgs/development/python-modules/citeproc-py/default.nix new file mode 100644 index 000000000000..bd1ae0c563a4 --- /dev/null +++ b/pkgs/development/python-modules/citeproc-py/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, git +, lxml +, rnc2rng +}: + +buildPythonPackage rec { + pname = "citeproc-py"; + version = "0.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "00aaff50jy4j0nakdzq9258z1gzrac9baarli2ymgspj88jg5968"; + }; + + buildInputs = [ rnc2rng ]; + + propagatedBuildInputs = [ lxml ]; + + checkInputs = [ nose git ]; + checkPhase = "nosetests tests"; + doCheck = false; # seems to want a Git repository, but fetchgit with leaveDotGit also fails + pythonImportsCheck = [ "citeproc" ]; + + meta = with lib; { + homepage = "https://github.com/brechtm/citeproc-py"; + description = "Citation Style Language (CSL) parser for Python"; + license = licenses.bsd2; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/duecredit/default.nix b/pkgs/development/python-modules/duecredit/default.nix new file mode 100644 index 000000000000..28aaf8ee47c9 --- /dev/null +++ b/pkgs/development/python-modules/duecredit/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, contextlib2 +, pytest +, pytestCheckHook +, vcrpy +, citeproc-py +, requests +, setuptools +, six +}: + +buildPythonPackage rec { + pname = "duecredit"; + version = "0.8.0"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "1yxd8579pakrfhq0hls0iy37nxllsm8y33na220g08znibrp7ix0"; + }; + + # bin/duecredit requires setuptools at runtime + propagatedBuildInputs = [ citeproc-py requests setuptools six ]; + + checkInputs = [ contextlib2 pytest pytestCheckHook vcrpy ]; + disabledTests = [ "test_io" ]; + + meta = with lib; { + homepage = "https://github.com/duecredit/duecredit"; + description = "Simple framework to embed references in code"; + license = licenses.bsd2; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/fake-useragent/default.nix b/pkgs/development/python-modules/fake-useragent/default.nix new file mode 100644 index 000000000000..fb85408dd3d2 --- /dev/null +++ b/pkgs/development/python-modules/fake-useragent/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchPypi, buildPythonPackage, six, pytest }: + +buildPythonPackage rec { + pname = "fake-useragent"; + version = "0.1.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "0dfz3bpmjmaxlhda6hfgsac7afb65pljibi8zkp9gc0ffn5rj161"; + }; + + propagatedBuildInputs = [ six ]; + + checkInputs = [ pytest ]; + + meta = with stdenv.lib; { + description = "Up to date simple useragent faker with real world database"; + homepage = "https://github.com/hellysmile/fake-useragent"; + license = licenses.asl20; + maintainers = with maintainers; [ evanjs ]; + }; +} diff --git a/pkgs/development/python-modules/ffmpeg-python/default.nix b/pkgs/development/python-modules/ffmpeg-python/default.nix index ae7dc43020b5..51b0060cb2d6 100644 --- a/pkgs/development/python-modules/ffmpeg-python/default.nix +++ b/pkgs/development/python-modules/ffmpeg-python/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , substituteAll -, ffmpeg +, ffmpeg_3 , future , pytest , pytestrunner @@ -24,7 +24,7 @@ buildPythonPackage rec { ( substituteAll { src = ./ffmpeg-location.patch; - inherit ffmpeg; + ffmpeg = ffmpeg_3; } ) ]; diff --git a/pkgs/development/python-modules/gidgethub/default.nix b/pkgs/development/python-modules/gidgethub/default.nix index 634d7c2ddc04..a9214cf49f70 100644 --- a/pkgs/development/python-modules/gidgethub/default.nix +++ b/pkgs/development/python-modules/gidgethub/default.nix @@ -11,22 +11,26 @@ , tornado , aiohttp , uritemplate +, pyjwt }: buildPythonPackage rec { pname = "gidgethub"; - version = "3.2.0"; + version = "4.1.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "8f4b69063a256994d38243cc0eba4e1453017b5b8b04a173216d02d47ffc3989"; + sha256 = "13nzc40c71kxvjxahgnc6c974xp5fpm02gqymwgfjbj2dmlzmayg"; }; nativeBuildInputs = [ setuptools pytestrunner ]; checkInputs = [ pytest pytest-asyncio twisted treq tornado aiohttp ]; - propagatedBuildInputs = [ uritemplate ]; + propagatedBuildInputs = [ + uritemplate + pyjwt + ]; postPatch = '' substituteInPlace setup.py \ diff --git a/pkgs/development/python-modules/ha-ffmpeg/default.nix b/pkgs/development/python-modules/ha-ffmpeg/default.nix index d6438c6a5b8b..cf119c1dec56 100644 --- a/pkgs/development/python-modules/ha-ffmpeg/default.nix +++ b/pkgs/development/python-modules/ha-ffmpeg/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi, isPy3k -, ffmpeg, async-timeout }: +, ffmpeg_3, async-timeout }: buildPythonPackage rec { pname = "ha-ffmpeg"; @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "230f2fa990c9caaff1c67c2227b64756062248083849651a9bec7d599e519a42"; }; - buildInputs = [ ffmpeg ]; + buildInputs = [ ffmpeg_3 ]; propagatedBuildInputs = [ async-timeout ]; diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index 5433e1ea9e41..ebb7f86f5afb 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -8,7 +8,7 @@ , pytest , numpy , isPy3k -, ffmpeg +, ffmpeg_3 , futures , enum34 }: @@ -23,7 +23,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest psutil ] ++ stdenv.lib.optionals isPy3k [ - imageio-ffmpeg ffmpeg + imageio-ffmpeg ffmpeg_3 ]; propagatedBuildInputs = [ numpy pillow ] ++ stdenv.lib.optionals (!isPy3k) [ futures diff --git a/pkgs/development/python-modules/infoqscraper/default.nix b/pkgs/development/python-modules/infoqscraper/default.nix index ce265d013785..4a1543083432 100644 --- a/pkgs/development/python-modules/infoqscraper/default.nix +++ b/pkgs/development/python-modules/infoqscraper/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; buildInputs = [ html5lib ]; - propagatedBuildInputs = [ six beautifulsoup4 pkgs.ffmpeg pkgs.swftools pkgs.rtmpdump ]; + propagatedBuildInputs = [ six beautifulsoup4 pkgs.ffmpeg_3 pkgs.swftools pkgs.rtmpdump ]; meta = with stdenv.lib; { description = "Discover presentations and/or create a movie consisting of slides and audio track from an infoq url"; diff --git a/pkgs/development/python-modules/iterm2/default.nix b/pkgs/development/python-modules/iterm2/default.nix new file mode 100644 index 000000000000..33504323802a --- /dev/null +++ b/pkgs/development/python-modules/iterm2/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi +, protobuf +, websockets +}: + +buildPythonPackage rec { + pname = "iterm2"; + version = "1.14"; + + src = fetchPypi { + inherit pname version; + sha256 = "089pln3c41n6dyh91hw9gy6mpm9s663lpmdc4gamig3g6pfmbsk4"; + }; + + propagatedBuildInputs = [ protobuf websockets ]; + + # The tests require pyobjc. We can't use pyobjc because at + # time of writing the pyobjc derivation is disabled on python 3. + # iterm2 won't build on python 2 because it depends on websockets + # which is disabled below python 3.3. + doCheck = false; + + pythonImportsCheck = [ "iterm2" ]; + + meta = with lib; { + description = "Python interface to iTerm2's scripting API"; + homepage = "http://github.com/gnachman/iTerm2"; + license = licenses.gpl2; + maintainers = with maintainers; [ jeremyschlatter ]; + }; +} diff --git a/pkgs/development/python-modules/libevdev/default.nix b/pkgs/development/python-modules/libevdev/default.nix new file mode 100644 index 000000000000..ab00340cfe19 --- /dev/null +++ b/pkgs/development/python-modules/libevdev/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, isPy27, fetchPypi }: + +buildPythonPackage rec { + pname = "libevdev"; + version = "0.7"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "10gwj08kn2rs4waq7807mq34cbavgkpg8fpir8mvnba601b8q4r4"; + }; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Python wrapper around the libevdev C library"; + homepage = "https://gitlab.freedesktop.org/libevdev/python-libevdev"; + license = licenses.mit; + maintainers = with maintainers; [ nickhu ]; + }; +} diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index 1bf23111422d..362e34157676 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.5.0"; + version = "0.5.4"; src = fetchPypi { inherit pname version; - sha256 = "0hcm2hwryfr6js33zcl2k95wbjrgcj89pi90lka0hjw9vs9bmdz6"; + sha256 = "0csvk3y0y2r9gnfqj91fiqprgp8dxiv4n80b6myraab5s7zn1mvv"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nix-prefetch-github/default.nix b/pkgs/development/python-modules/nix-prefetch-github/default.nix index 17e4669b6bed..56387835cc6e 100644 --- a/pkgs/development/python-modules/nix-prefetch-github/default.nix +++ b/pkgs/development/python-modules/nix-prefetch-github/default.nix @@ -9,13 +9,17 @@ buildPythonPackage rec { pname = "nix-prefetch-github"; - version = "2.3.2"; + version = "2.4"; src = fetchPypi { inherit pname version; - sha256 = "18xj618zjs13ib7f996fnl0xiqig0w48yns45nvy3xab55wximdx"; + sha256 = "sha256-PVB/cL0NVB5pHxRMjg8TLatvIvHjfCvaRWBanVHYT+E="; }; + # The tests for this package require nix and network access. That's + # why we cannot execute them inside the building process. + doCheck = false; + propagatedBuildInputs = [ attrs click diff --git a/pkgs/development/python-modules/piccata/default.nix b/pkgs/development/python-modules/piccata/default.nix index f1cfb362a80c..bbb4fcf19934 100644 --- a/pkgs/development/python-modules/piccata/default.nix +++ b/pkgs/development/python-modules/piccata/default.nix @@ -1,16 +1,22 @@ -{ buildPythonPackage, fetchPypi, lib, ipaddress, isPy3k }: +{ buildPythonPackage, isPy27, fetchFromGitHub, lib, ipaddress }: buildPythonPackage rec { pname = "piccata"; - version = "1.0.1"; - disabled = isPy3k; + version = "2.0.0"; + disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "45f6c98c2ea809d445040888117f99bc3ee843490d86fecc5805ff5ea41508f7"; + src = fetchFromGitHub { + owner = "NordicSemiconductor"; + repo = pname; + rev = version; + sha256 = "0pn842jcf2czjks5dphivgp1s7wiifqiv93s0a89h0wxafd6pbsr"; }; - propagatedBuildInputs = [ ipaddress ]; + propagatedBuildInputs = [ + ipaddress + ]; + + pythonImportsCheck = [ "piccata" ]; meta = { description = "Simple CoAP (RFC7252) toolkit"; diff --git a/pkgs/development/python-modules/pynput/default.nix b/pkgs/development/python-modules/pynput/default.nix new file mode 100644 index 000000000000..2b83f4c1223b --- /dev/null +++ b/pkgs/development/python-modules/pynput/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi, sphinx, setuptools-lint, xlib }: + +buildPythonPackage rec { + pname = "pynput"; + version = "1.6.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "16h4wn7f54rw30jrya7rmqkx3f51pxn8cplid95v880md8yqdhb8"; + }; + + nativeBuildInputs = [ sphinx ]; + + propagatedBuildInputs = [ setuptools-lint xlib ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "A library to control and monitor input devices"; + homepage = "https://github.com/moses-palmer/pynput"; + license = licenses.lgpl3; + maintainers = with maintainers; [ nickhu ]; + }; +} + diff --git a/pkgs/development/python-modules/python-daemon/default.nix b/pkgs/development/python-modules/python-daemon/default.nix index e33aee6c1c91..d8b501d62e5a 100644 --- a/pkgs/development/python-modules/python-daemon/default.nix +++ b/pkgs/development/python-modules/python-daemon/default.nix @@ -2,7 +2,7 @@ , docutils , lockfile , mock -, pytest +, pytest_4 , testscenarios , twine }: @@ -19,7 +19,7 @@ buildPythonPackage rec { nativeBuildInputs = [ twine ]; propagatedBuildInputs = [ docutils lockfile ]; - checkInputs = [ pytest mock testscenarios ]; + checkInputs = [ pytest_4 mock testscenarios ]; checkPhase = '' pytest -k 'not detaches_process_context \ and not standard_stream_file_descriptors' diff --git a/pkgs/development/python-modules/rnc2rng/default.nix b/pkgs/development/python-modules/rnc2rng/default.nix new file mode 100644 index 000000000000..8e42baf8ff74 --- /dev/null +++ b/pkgs/development/python-modules/rnc2rng/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +, rply +}: + +buildPythonPackage rec { + pname = "rnc2rng"; + version = "2.6.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1kmp3iwxxyzjsd47j2sprd47ihhkwhb3yydih3af5bbfq0ibh1w8"; + }; + + propagatedBuildInputs = [ rply ]; + + checkPhase = "${python.interpreter} test.py"; + + meta = with lib; { + homepage = "https://github.com/djc/rnc2rng"; + description = "Compact to regular syntax conversion library for RELAX NG schemata"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/scrapy-deltafetch/default.nix b/pkgs/development/python-modules/scrapy-deltafetch/default.nix new file mode 100644 index 000000000000..cf6f8a010714 --- /dev/null +++ b/pkgs/development/python-modules/scrapy-deltafetch/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchPypi, buildPythonPackage, pytest, scrapy, bsddb3 }: + +buildPythonPackage rec { + pname = "scrapy-deltafetch"; + version = "1.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1m511psddvlapg492ny36l8rzy7z4i39yx6a1agxzfz6s9b83fq8"; + }; + + propagatedBuildInputs = [ bsddb3 scrapy ]; + + checkInputs = [ pytest ]; + + meta = with stdenv.lib; { + description = "Scrapy spider middleware to ignore requests to pages containing items seen in previous crawls"; + homepage = "https://github.com/scrapy-plugins/scrapy-deltafetch"; + license = licenses.bsd3; + maintainers = with maintainers; [ evanjs ]; + }; +} diff --git a/pkgs/development/python-modules/scrapy-fake-useragent/default.nix b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix new file mode 100644 index 000000000000..26e142434c59 --- /dev/null +++ b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchPypi, buildPythonPackage, pytest, fake-useragent, scrapy }: + +buildPythonPackage rec { + pname = "scrapy-fake-useragent"; + version = "1.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "02mayk804vdl15wjpx7jcjkc4zgrra4izf6iv00mcxq4fd4ck03l"; + }; + + propagatedBuildInputs = [ fake-useragent ]; + + checkInputs = [ pytest scrapy ]; + + meta = with stdenv.lib; { + description = "Random User-Agent middleware based on fake-useragent"; + homepage = "https://github.com/alecxe/scrapy-fake-useragent"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/scrapy-splash/default.nix b/pkgs/development/python-modules/scrapy-splash/default.nix new file mode 100644 index 000000000000..7799186d6216 --- /dev/null +++ b/pkgs/development/python-modules/scrapy-splash/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchPypi, buildPythonPackage, pytest, hypothesis, scrapy }: + +buildPythonPackage rec { + pname = "scrapy-splash"; + version = "0.7.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1dg7csdza2hzqskd9b9gx0v3saqsch4f0fwdp0a3p0822aqqi488"; + }; + + checkInputs = [ pytest hypothesis scrapy ]; + + meta = with stdenv.lib; { + description = "Scrapy+Splash for JavaScript integration"; + homepage = "https://github.com/scrapy-plugins/scrapy-splash"; + license = licenses.bsd3; + maintainers = with maintainers; [ evanjs ]; + }; +} diff --git a/pkgs/development/python-modules/screeninfo/default.nix b/pkgs/development/python-modules/screeninfo/default.nix new file mode 100644 index 000000000000..9ee04cb50a82 --- /dev/null +++ b/pkgs/development/python-modules/screeninfo/default.nix @@ -0,0 +1,35 @@ +{ stdenv, buildPythonApplication, fetchPypi, isPy36, dataclasses, libX11, libXinerama, libXrandr }: + +buildPythonApplication rec { + pname = "screeninfo"; + version = "0.6.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0vcw54crdgmbzwlrfg80kd1a8p9i10yks8k0szzi0k5q80zhp8xz"; + }; + + # dataclasses is a compatibility shim for python 3.6 ONLY + patchPhase = if isPy36 then "" else '' + substituteInPlace setup.py \ + --replace "\"dataclasses\"," "" + '' + '' + substituteInPlace screeninfo/enumerators/xinerama.py \ + --replace "load_library(\"X11\")" "ctypes.cdll.LoadLibrary(\"${libX11}/lib/libX11.so\")" \ + --replace "load_library(\"Xinerama\")" "ctypes.cdll.LoadLibrary(\"${libXinerama}/lib/libXinerama.so\")" + substituteInPlace screeninfo/enumerators/xrandr.py \ + --replace "load_library(\"X11\")" "ctypes.cdll.LoadLibrary(\"${libX11}/lib/libX11.so\")" \ + --replace "load_library(\"Xrandr\")" "ctypes.cdll.LoadLibrary(\"${libXrandr}/lib/libXrandr.so\")" + ''; + + propagatedBuildInputs = stdenv.lib.optional isPy36 dataclasses; + + buildInputs = [ libX11 libXinerama libXrandr]; + + meta = with stdenv.lib; { + description = "Fetch location and size of physical screens"; + homepage = "https://github.com/rr-/screeninfo"; + license = licenses.mit; + maintainers = [ maintainers.nickhu ]; + }; +} diff --git a/pkgs/development/python-modules/setuptools-lint/default.nix b/pkgs/development/python-modules/setuptools-lint/default.nix new file mode 100644 index 000000000000..fbe1528c4c3b --- /dev/null +++ b/pkgs/development/python-modules/setuptools-lint/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, pylint }: + +buildPythonPackage rec { + pname = "setuptools-lint"; + version = "0.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "16a1ac5n7k7sx15cnk03gw3fmslab3a7m74dc45rgpldgiff3577"; + }; + + propagatedBuildInputs = [ pylint ]; + + meta = with stdenv.lib; { + description = "Package to expose pylint as a lint command into setup.py"; + homepage = "https://github.com/johnnoone/setuptools-pylint"; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ nickhu ]; + }; +} + diff --git a/pkgs/development/python-modules/sipsimple/default.nix b/pkgs/development/python-modules/sipsimple/default.nix index 76820b6ebc6a..d7791fcf96cb 100644 --- a/pkgs/development/python-modules/sipsimple/default.nix +++ b/pkgs/development/python-modules/sipsimple/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ pkgs.pkgconfig ]; - buildInputs = with pkgs; [ alsaLib ffmpeg libv4l sqlite libvpx ]; + buildInputs = with pkgs; [ alsaLib ffmpeg_3 libv4l sqlite libvpx ]; propagatedBuildInputs = [ cython pkgs.openssl dnspython dateutil xcaplib msrplib lxml python-otr ]; meta = with lib; { diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix index 306737c40028..958c9ab82662 100644 --- a/pkgs/development/python-modules/somajo/default.nix +++ b/pkgs/development/python-modules/somajo/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "SoMaJo"; - version = "2.0.5"; + version = "2.0.6"; disabled = !isPy3k; src = fetchFromGitHub { owner = "tsproisl"; repo = pname; rev = "v${version}"; - sha256 = "01zvmqilnndh2b257z7bhcc7av5vhjm1g8gmdiiw15gcd2xfmqjs"; + sha256 = "08nicj3nj6pi6djli26gf0kf3s2da9ysn1cpkyw7j88v8vav0p7s"; }; propagatedBuildInputs = [ regex ]; diff --git a/pkgs/development/python-modules/stytra/default.nix b/pkgs/development/python-modules/stytra/default.nix index 970fe5a19878..8a1154d66c88 100644 --- a/pkgs/development/python-modules/stytra/default.nix +++ b/pkgs/development/python-modules/stytra/default.nix @@ -8,7 +8,7 @@ , pandas , tables , git -, ffmpeg +, ffmpeg_3 , scikitimage , matplotlib , qdarkstyle @@ -55,7 +55,7 @@ buildPythonPackage rec { pandas tables git - ffmpeg + ffmpeg_3 scikitimage matplotlib qdarkstyle diff --git a/pkgs/development/python-modules/thumbor/default.nix b/pkgs/development/python-modules/thumbor/default.nix index ee805ce6300f..86a2dd200110 100644 --- a/pkgs/development/python-modules/thumbor/default.nix +++ b/pkgs/development/python-modules/thumbor/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { gifsicle = "${pkgs.gifsicle}/bin/gifsicle"; exiftool = "${pkgs.exiftool}/bin/exiftool"; jpegtran = "${pkgs.libjpeg}/bin/jpegtran"; - ffmpeg = "${pkgs.ffmpeg}/bin/ffmpeg"; + ffmpeg = "${pkgs.ffmpeg_3}/bin/ffmpeg"; }) ]; diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index ec985a2ae19b..545cc035c929 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.1.4"; + version = "2.2.1"; dontConfigure = true; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "0jgwvc9flqdm88q9kknzjs125j9d3j5l5adcpngfy17ljgziy4nn"; + sha256 = "0ijgvp2ifs4wnqmxidinwdcpv41iia74nk0xahasnjm8ljvgnnqh"; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/development/tools/analysis/hopper/default.nix index 8a265d89849d..bd7b831b8162 100644 --- a/pkgs/development/tools/analysis/hopper/default.nix +++ b/pkgs/development/tools/analysis/hopper/default.nix @@ -12,12 +12,12 @@ }: stdenv.mkDerivation rec { pname = "hopper"; - version = "4.5.27"; + version = "4.5.28"; rev = "v${lib.versions.major version}"; src = fetchurl { url = "https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-${rev}-${version}-Linux.pkg.tar.xz"; - sha256 = "1c0lyj20kvb6ljf7zk6hzs70bl5fwnmyiv6w3hhr079bgn4fq4m0"; + sha256 = "0mjpkd5c9igkxp9jg8cvrgrxw9x7ag1p5xivjbzhb3vld6xjm4dh"; }; sourceRoot = "."; diff --git a/pkgs/development/tools/build-managers/tup/default.nix b/pkgs/development/tools/build-managers/tup/default.nix index 709528b2ad30..80ee38105ca5 100644 --- a/pkgs/development/tools/build-managers/tup/default.nix +++ b/pkgs/development/tools/build-managers/tup/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tup"; - version = "0.7.8"; + version = "0.7.9"; src = fetchFromGitHub { owner = "gittup"; repo = "tup"; rev = "v${version}"; - sha256 = "07dmz712zbs5kayf98kywp7blssgh0y2gc1623jbsynmqwi77mcb"; + sha256 = "1b9rllwfdmjvfmwvzqfbqfi1flf4y9zzjmyp0dizq23gpkvhi42f"; }; nativeBuildInputs = [ pkgconfig ]; @@ -37,6 +37,8 @@ stdenv.mkDerivation rec { cp tup.1 $out/share/man/man1/ ''; + setupHook = ./setup-hook.sh; + meta = with stdenv.lib; { description = "A fast, file-based build system"; longDescription = '' @@ -49,6 +51,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://gittup.org/tup/"; license = licenses.gpl2; + maintainers = with maintainers; [ ehmry ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/tools/build-managers/tup/setup-hook.sh b/pkgs/development/tools/build-managers/tup/setup-hook.sh new file mode 100644 index 000000000000..5bf64ae59d35 --- /dev/null +++ b/pkgs/development/tools/build-managers/tup/setup-hook.sh @@ -0,0 +1,44 @@ +#!/bin/sh + +tupConfigurePhase() { + runHook preConfigure + + echo -n CONFIG_TUP_ARCH= >> tup.config + case "$system" in + "i686-*") echo i386 >> tup.config;; + "x86_64-*") echo x86_64 >> tup.config;; + "powerpc-*") echo powerpc >> tup.config;; + "powerpc64-*") echo powerpc64 >> tup.config;; + "ia64-*") echo ia64 >> tup.config;; + "alpha-*") echo alpha >> tup.config;; + "sparc-*") echo sparc >> tup.config;; + "aarch64-*") echo arm64 >> tup.config;; + "arm*") echo arm >> tup.config;; + esac + + echo "${tupConfig-}" >> tup.config + + tup init + tup generate tupBuild.sh + + runHook postConfigure +} + +if [ -z "${dontUseTupConfigure-}" -a -z "${configurePhase-}" ]; then + configurePhase=tupConfigurePhase +fi + + +tupBuildPhase() { + runHook preBuild + + pushd . + . tupBuild.sh + popd + + runHook postBuild +} + +if [ -z "${dontUseTupBuild-}" -a -z "${buildPhase-}" ]; then + buildPhase=tupBuildPhase +fi diff --git a/pkgs/development/tools/casperjs/default.nix b/pkgs/development/tools/casperjs/default.nix deleted file mode 100644 index 80786a10f5f1..000000000000 --- a/pkgs/development/tools/casperjs/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv, fetchFromGitHub, fontsConf, phantomjs2, python, nodePackages }: - -let version = "1.1.1"; - -in stdenv.mkDerivation { - - pname = "casperjs"; - inherit version; - - src = fetchFromGitHub { - owner = "casperjs"; - repo = "casperjs"; - rev = version; - sha256 = "187prrm728xpn0nx9kxfxa4fwd7w25z78nsxfk6a6kl7c5656jpz"; - }; - - buildInputs = [ phantomjs2 python nodePackages.eslint ]; - - patchPhase = '' - substituteInPlace bin/casperjs --replace "/usr/bin/env python" "${python}/bin/python" \ - --replace "'phantomjs'" "'${phantomjs2}/bin/phantomjs'" - ''; - - dontBuild = true; - - doCheck = true; - checkPhase = '' - export FONTCONFIG_FILE=${fontsConf} - make test - ''; - - installPhase = '' - cp -r . $out - ''; - - meta = { - - description = '' - Navigation scripting & testing utility for PhantomJS and SlimerJS - ''; - - longDescription = '' - CasperJS is a navigation scripting & testing utility for PhantomJS and - SlimerJS (still experimental). It eases the process of defining a full - navigation scenario and provides useful high-level functions, methods & - syntactic sugar for doing common tasks. - ''; - - homepage = "http://casperjs.org"; - license = stdenv.lib.licenses.mit; - - maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; - platforms = stdenv.lib.platforms.linux; - broken = true; - }; -} diff --git a/pkgs/development/tools/cmake-language-server/default.nix b/pkgs/development/tools/cmake-language-server/default.nix index 943655b881c2..135fdccd7c53 100644 --- a/pkgs/development/tools/cmake-language-server/default.nix +++ b/pkgs/development/tools/cmake-language-server/default.nix @@ -5,14 +5,14 @@ buildPythonApplication rec { pname = "cmake-language-server"; - version = "0.1.1"; + version = "0.1.2"; format = "pyproject"; src = fetchFromGitHub { owner = "regen100"; repo = pname; rev = "v${version}"; - sha256 = "09rijjksx07inbwxjinrsqihkxb011l2glysasmwpkhy0rmmhbcm"; + sha256 = "0vz7bjxkk0phjhz3h9kj6yr7wnk3g7lqmkqraa0kw12mzcfck837"; }; nativeBuildInputs = [ poetry ]; diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 6018d6306745..1349d4c009aa 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "6.4.2"; + version = "6.4.3"; in stdenv.mkDerivation { pname = "flyway"; inherit version; src = fetchurl { url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "1m5i7mw3ml2iaqy09h8nmykn602rwkjfgh2mrmc1gss9q3klj1r8"; + sha256 = "05gbqc3hvi7yiqf03iwyamvvhc3jmyfvv1989527psdzhxs8gw7b"; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/development/tools/gogetdoc/default.nix b/pkgs/development/tools/gogetdoc/default.nix index 5d360f4572ab..6898c998ef60 100644 --- a/pkgs/development/tools/gogetdoc/default.nix +++ b/pkgs/development/tools/gogetdoc/default.nix @@ -10,7 +10,6 @@ buildGoModule rec { vendorSha256 = null; - goPackagePath = "github.com/zmb3/gogetdoc"; excludedPackages = "\\(testdata\\)"; src = fetchFromGitHub { @@ -21,8 +20,6 @@ buildGoModule rec { sha256 = "1v74zd0x2xh10603p8raazssacv3y0x0lr9apkpsdk0bfp5jj0lr"; }; - goDeps = ./deps.nix; - meta = with lib; { description = "Gets documentation for items in Go source code"; homepage = "https://github.com/zmb3/gogetdoc"; @@ -30,4 +27,4 @@ buildGoModule rec { maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/gogetdoc/deps.nix b/pkgs/development/tools/gogetdoc/deps.nix deleted file mode 100644 index d770057d1d78..000000000000 --- a/pkgs/development/tools/gogetdoc/deps.nix +++ /dev/null @@ -1,13 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "6adeb8aab2de"; - sha256 = "0kylkki0ksdm12ppl37fghzbma9hmgqwph0nwngv08v4blk6li6k"; - }; - } -] diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index 19e51fa998cf..b8a8dc75158e 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ktlint"; - version = "0.37.0"; + version = "0.37.1"; src = fetchurl { url = "https://github.com/shyiko/ktlint/releases/download/${version}/ktlint"; - sha256 = "1z2hvhcrz1rj9g8749x640axrf529wk361pckwb4ihn43c19ajpf"; + sha256 = "0i5frcy3ya1qwq0hl67gq6fgz0c8vgskgha25irsw7j2ndf4qp8i"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 7144c2bd0ae5..8c87e1642df3 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.7868"; + version = "0.1.7971"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "1a9gnqrkvifrwr8wpv5f6zv8xs8myzbzlhn5w72xxzh2gxdaflwg"; + sha256 = "0nrmdql3h9jnfgmp8898c9v07f5h5r9dvabaqhk98r6a77g3rr98"; }; vendorSha256 = "0y35ps2pw9z7gi4z50byd1py87bf2jdvj7l7w2gxpppmhi83myc9"; diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix new file mode 100644 index 000000000000..cbbdd416ff8b --- /dev/null +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "terraform-ls"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "hashicorp"; + repo = pname; + rev = "v${version}"; + sha256 = "11776nq1ixrg791xlmryjxldsc8gn69j1fc0wd6cdywy8yp2lh4w"; + }; + + goPackagePath = "github.com/hashicorp/terraform-ls"; + + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + + meta = with lib; { + description = "Terraform Language Server (official)"; + homepage = "https://github.com/hashicorp/terraform-ls"; + license = licenses.mpl20; + maintainers = with maintainers; [ mbaillie ]; + }; +} diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index 463642988a8f..ab16d9511514 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -3,7 +3,7 @@ , xorg, alsaLib, dbus, glib, gtk3, atk, pango, freetype, fontconfig , gdk-pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap , libnotify -, ffmpeg, libxcb, cups +, ffmpeg_3, libxcb, cups , sqlite, udev , libuuid , sdk ? false @@ -22,7 +22,7 @@ let xorg.libXScrnSaver cups libcap libnotify # libnw-specific (not chromium dependencies) - ffmpeg libxcb + ffmpeg_3 libxcb # chromium runtime deps (dlopen’d) sqlite udev libuuid diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index fa78e47951f3..4b11dd13983d 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "merlin"; - version = "3.3.4"; + version = "3.3.6"; minimumOCamlVersion = "4.02.1"; src = fetchurl { url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz"; - sha256 = "12wxric6n3rmsn0w16xm8vjd8p5aw24cj76zw2x87qfwwgmy1kdd"; + sha256 = "1360cm0jkn2v2y5p3yzdyw9661a1vpddcibkbfblmk95qafx4civ"; }; buildInputs = [ yojson ]; diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 32ac95cff6a4..382fda72a4cd 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "packer"; - version = "1.5.6"; + version = "1.6.0"; goPackagePath = "github.com/hashicorp/packer"; @@ -11,14 +11,14 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "0pwygrh6pjmx8a1jc12929x0slj7w3b8p3pzswnbk7klyhj4jkp8"; + sha256 = "0qddljg330i7059kvij84pjzz67g6qh1w2zcmsj6rv58ix8xsfx7"; }; meta = with stdenv.lib; { description = "A tool for creating identical machine images for multiple platforms from a single source configuration"; homepage = "https://www.packer.io"; license = licenses.mpl20; - maintainers = with maintainers; [ cstrahan zimbatm ]; + maintainers = with maintainers; [ cstrahan zimbatm ma27 ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/pandoc/default.nix b/pkgs/development/tools/pandoc/default.nix index ce7132b0007b..0bf9ce71e481 100644 --- a/pkgs/development/tools/pandoc/default.nix +++ b/pkgs/development/tools/pandoc/default.nix @@ -10,8 +10,8 @@ in buildTools = (drv.buildTools or []) ++ [ removeReferencesTo ]; })).overrideAttrs (drv: { - # These libraries are still referenced, because pandoc references - # their `Paths_*` module for figuring out their version. + # These libraries are still referenced, because they generate + # a `Paths_*` module for figuring out their version. # The `Paths_*` module is generated by Cabal, and contains the # version, but also paths to e.g. the data directories, which # lead to a transitive runtime dependency on the whole GHC distribution. diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index 4176db2940cf..5f9e122c16a9 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -18,11 +18,11 @@ let in buildPythonApplication rec { pname = "pipenv"; - version = "2020.5.28"; + version = "2020.6.2"; src = fetchPypi { inherit pname version; - sha256 = "072lc4nywcf9q9irvanwcz7w0sd9dcyannz208jm6glyj8a271l1"; + sha256 = "12s7c3f3k5v1szdhklsxwisf9v3dk4mb9fh7762afpgs8mrrmm3x"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix index ac0eeff2c09c..850b6d2e1e71 100644 --- a/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/pkgs/development/tools/rust/cargo-watch/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-watch"; - version = "7.4.0"; + version = "7.4.1"; src = fetchFromGitHub { owner = "passcod"; repo = pname; rev = "v${version}"; - sha256 = "0yg6im7hzwzl84gxcg7wbix5h0ciq4l4ql6ili7k0k7j8bhrxn82"; + sha256 = "1nq7sfdxvqldj94laz562y4cvgagm67b6a5b7bzxdip0sf1l11f8"; }; - cargoSha256 = "1y299mvg9k568f16d2r92y0bgwfrng6idw21wcsd5mnsd28fsww1"; + cargoSha256 = "1rjx3k8li8ck5cdygm4pd2i5wkslr6d9z9vl2vp0x6hqv1gcv5zh"; buildInputs = lib.optional stdenv.isDarwin CoreServices; diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index 882199a82a93..fc6fcd234850 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -1,17 +1,26 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "yq-go"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "mikefarah"; rev = version; repo = "yq"; - sha256 = "1jll5nmskvs61031h3sizhv3scv8znrr9apyc4qlxcp4jiv7xpmp"; + sha256 = "0fr6zwnij3r53dqdw43qfmp4nw26gv6zmj066l44fazka4fl25i6"; }; - vendorSha256 = "0rlvbyhl53x1bhwr7f7zs4swa580saak19z3d3g58srq3jyw6zlc"; + vendorSha256 = "1bjy3qr26zndr3dhh9gd33rhm5gy779525qgzjw4a4mla0p2q6kl"; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + for shell in bash fish zsh; do + $out/bin/yq shell-completion --variation $shell > yq.$shell + installShellCompletion yq.$shell + done + ''; meta = with lib; { description = "Portable command-line YAML processor"; @@ -19,4 +28,4 @@ buildGoModule rec { license = [ licenses.mit ]; maintainers = [ maintainers.lewo ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index 9c8c14bab651..3b38d86b45b4 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cypress"; - version = "4.5.0"; + version = "4.8.0"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "0pr9b36s63xplmyjgjdifw5pgas7bxwbnsckjix7djyln0j5ja3q"; + sha256 = "0wivvh3fhyhxx9f6vp0kgqkjj4957hj0b15r2igbxnyqvahwxgx7"; }; # don't remove runtime deps diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 629c1eeb41a1..28e438fa1e95 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -3,52 +3,34 @@ , fetchFromGitHub , rust , rustPlatform -, python27 , installShellFiles , Security , CoreServices }: let + deps = import ./deps.nix { }; + arch = rust.toRustTarget stdenv.hostPlatform; + rustyV8Lib = with deps.rustyV8Lib; fetchurl { + url = "https://github.com/denoland/rusty_v8/releases/download/v${version}/librusty_v8_release_${arch}.a"; + sha256 = sha256s."${stdenv.hostPlatform.system}"; + meta = { inherit version; }; + }; +in +rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.0.0"; + version = "1.0.5"; - denoSrc = fetchFromGitHub { + src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "0k8mqy1hf9hkp60jhd0x4z814y36g51083b3r7prc69ih2523hd1"; - + sha256 = "1hlmgcppr01bddvp28js010hhlzyx2lm7g7lq9nrcjazfw7kd2pf"; fetchSubmodules = true; }; - cargoSha256 = "1fjl07qqvl1f20qazcqxh32xmdfh80jni7i3jzvz6vgsfw1g5cmk"; - - rustyV8Lib = fetchlib "rusty_v8" "0.4.2" { - x86_64-linux = "1ac6kv3kv087df6kdgfd7kbh24187cg9z7xhbz6rw6jjv4ci2zbi"; - aarch64-linux = "06iyjx4p4vp2i81wdy0vxai2k18pki972ff7k0scjqrgmnav1p8k"; - x86_64-darwin = "02hwbpsqdzb9mvfndgykvv44f1jig3w3a26l0h26hs5shsrp47jv"; - }; - - arch = rust.toRustTarget stdenv.hostPlatform; - fetchlib = name: version: sha256: fetchurl { - url = "https://github.com/denoland/${name}/releases/download/v${version}/librusty_v8_release_${arch}.a"; - sha256 = sha256."${stdenv.hostPlatform.system}"; - meta = { inherit version; }; - }; -in -rustPlatform.buildRustPackage rec { - inherit pname version cargoSha256; - - src = denoSrc; + cargoSha256 = "1jqaryr7np6h65a1bqr952h0vllsvd6v6v6wvivc7933dcbhdal4"; - nativeBuildInputs = [ - # chromium/V8 requires python 2.7, we're not building V8 from source - # but as a result rusty_v8's download script also uses python 2.7 - # tracking issue: https://bugs.chromium.org/p/chromium/issues/detail?id=942720 - python27 - - # Install completions post-install - installShellFiles - ]; + # Install completions post-install + nativeBuildInputs = [ installShellFiles ]; buildInputs = with stdenv.lib; [ ] ++ optionals stdenv.isDarwin [ Security CoreServices ]; @@ -56,16 +38,6 @@ rustPlatform.buildRustPackage rec { # The rusty_v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem # To avoid this we pre-download the file and place it in the locations it will require it in advance preBuild = '' - # Check the rusty_v8 lib downloaded matches the Cargo.lock file - rusty_v8_ver="$(grep 'name = "rusty_v8"' -A 1 Cargo.lock | grep "version =" | cut -d\" -f2)" - if [ "${rustyV8Lib.meta.version}" != "$rusty_v8_ver" ]; then - printf "%s\n" >&2 \ - "version mismatch between 'rusty_v8' in Cargo.lock and downloaded library:" \ - " wanted: ${rustyV8Lib.meta.version}" \ - " got: $rusty_v8_ver" - exit 1 - fi; - _rusty_v8_setup() { for v in "$@"; do dir="target/$v/gn_out/obj" @@ -77,40 +49,9 @@ rustPlatform.buildRustPackage rec { _rusty_v8_setup "debug" "release" "${arch}/release" ''; - # Set home to existing env var TMP dir so tests that write there work correctly - preCheck = '' - export HOME="$TMPDIR" - ''; - - checkFlags = [ - # Strace not allowed on hydra - "--skip benchmark_test" - - # Tests that try to write to `/build/source/target/debug` - "--skip _017_import_redirect" - "--skip https_import" - "--skip js_unit_tests" - "--skip lock_write_fetch" - - # Cargo test runs a deno test on the std lib with sub-benchmarking-tests, - # The sub-sub-tests that are failing: - # forAwaitFetchDenolandX10, promiseAllFetchDenolandX10is - # Trying to access https://deno.land/ on build's limited network access - "--skip std_tests" - - # Fails on aarch64 machines - # tracking issue: https://github.com/denoland/deno/issues/5324 - "--skip run_v8_flags" - - # Skip for multiple reasons: - # downloads x86_64 binary on aarch64 machines - # tracking issue: https://github.com/denoland/deno/pull/5402 - # downloads a binary that needs ELF patching & tries to run imediately - # upgrade will likely never work with nix as it tries to replace itself - # code: https://github.com/denoland/deno/blob/v1.0.0/cli/upgrade.rs#L211 - "--skip upgrade_in_tmpdir" - "--skip upgrade_with_version_in_tmpdir" - ]; + # Tests have some inconsistencies between runs with output integration tests + # Skipping until resolved + doCheck = false; # TODO: Move to enhanced installShellCompletion when merged: PR #83630 postInstall = '' @@ -120,8 +61,11 @@ rustPlatform.buildRustPackage rec { installShellCompletion deno.{bash,fish} --zsh _deno ''; + passthru.updateScript = ./update/update.ts; + meta = with stdenv.lib; { homepage = "https://deno.land/"; + changelog = "${src.meta.homepage}/releases/tag/v${version}"; description = "A secure runtime for JavaScript and TypeScript"; longDescription = '' Deno aims to be a productive and secure scripting environment for the modern programmer. diff --git a/pkgs/development/web/deno/deps.nix b/pkgs/development/web/deno/deps.nix new file mode 100644 index 000000000000..9218e8ad97d2 --- /dev/null +++ b/pkgs/development/web/deno/deps.nix @@ -0,0 +1,12 @@ +# auto-generated file -- DO NOT EDIT! +{}: +rec { + rustyV8Lib = { + version = "0.5.0"; + sha256s = { + x86_64-linux = "1jmrqf5ns2y51cxx9r88my15m6gc6wmg54xadi3kphq47n4hmdfw"; + aarch64-linux = "14v57pxpkz1fs483rbbc8k55rc4x41dqi0k12zdrjwa5ycdam3m5"; + x86_64-darwin = "0466px7k2zvbsswwcrr342i5ml669gf76xd8yzzypsmb7l71s6vr"; + }; + }; +} diff --git a/pkgs/development/web/deno/update/common.ts b/pkgs/development/web/deno/update/common.ts new file mode 100644 index 000000000000..71e4d638f8d7 --- /dev/null +++ b/pkgs/development/web/deno/update/common.ts @@ -0,0 +1,52 @@ +interface GHRelease { + tag_name: string; +} + +const decode = (buffer: Uint8Array) => new TextDecoder("utf-8").decode(buffer); +const run = async (command: string, args: string[]) => { + const cmd = Deno.run( + { cmd: [command, ...args], stdout: "piped", stderr: "piped" }, + ); + if (!(await cmd.status()).success) { + throw await cmd.stderrOutput().then((b) => decode(b)); + } + return cmd.output().then((b) => decode(b).trimEnd()); +}; + +// Exports +export const versionRegExp = /\d+\.\d+\.\d+/; +export const sha256RegExp = /[a-z0-9]{52}/; + +export async function commit( + name: string, + oldVer: string, + newVer: string, + files: string[], +) { + await run("git", ["add", ...files]); + await run("git", ["commit", "-m", `${name}: ${oldVer} -> ${newVer}`]); +} + +export const getExistingVersion = async (filePath: string) => + read(filePath).then((s) => + s.match(genValueRegExp("version", versionRegExp))?.shift() || "" + ); + +export const getLatestVersion = (owner: string, repo: string) => + fetch(`https://api.github.com/repos/${owner}/${repo}/releases`) + .then((res) => res.json()) + .then((res: GHRelease[]) => res[0].tag_name); + +// The (?<=) and (?=) allow replace to only change inside +// Match the regex passed in or empty +export const genValueRegExp = (key: string, regex: RegExp) => + new RegExp(`(?<=${key} = ")(${regex.source}|)(?=")`); + +export const logger = (name: string) => + (...a: any) => console.log(`[${name}]`, ...a); + +export const nixPrefetch = (args: string[]) => run("nix-prefetch", args); +export const nixPrefetchURL = (args: string[]) => run("nix-prefetch-url", args); + +export const read = Deno.readTextFile; +export const write = Deno.writeTextFile; diff --git a/pkgs/development/web/deno/update/deps.ts b/pkgs/development/web/deno/update/deps.ts new file mode 100644 index 000000000000..beedeade3a86 --- /dev/null +++ b/pkgs/development/web/deno/update/deps.ts @@ -0,0 +1,79 @@ +import { + getExistingVersion, + genValueRegExp, + logger, + nixPrefetchURL, + versionRegExp, + write, +} from "./common.ts"; + +const log = logger("deps"); + +export interface Architecture { + nix: string; + rust: string; +} +interface PrefetchResult { + arch: Architecture; + sha256: string; +} + +const getRustyV8Version = async ( + owner: string, + repo: string, + version: string, +) => + fetch( + `https://github.com/${owner}/${repo}/raw/${version}/core/Cargo.toml`, + ) + .then((res) => res.text()) + .then((txt) => + txt.match(genValueRegExp("rusty_v8", versionRegExp))?.shift() + ); + +const archShaTasks = (version: string, arches: Architecture[]) => + arches.map(async (arch: Architecture): Promise<PrefetchResult> => { + log("Fetching:", arch.nix); + const sha256 = await nixPrefetchURL( + [`https://github.com/denoland/rusty_v8/releases/download/v${version}/librusty_v8_release_${arch.rust}.a`], + ); + log("Done: ", arch.nix); + return { arch, sha256 }; + }); + +const templateDeps = (version: string, deps: PrefetchResult[]) => + `# auto-generated file -- DO NOT EDIT! +{}: +rec { + rustyV8Lib = { + version = "${version}"; + sha256s = { +${deps.map((d) => ` ${d.arch.nix} = "${d.sha256}";`).join("\n")} + }; + }; +} +`; + +export async function updateDeps( + filePath: string, + owner: string, + repo: string, + denoVersion: string, + arches: Architecture[], +) { + log("Starting deps update"); + // 0.0.0 + const version = await getRustyV8Version(owner, repo, denoVersion); + if (typeof version !== "string") { + throw "no rusty_v8 version"; + } + log("rusty_v8 version:", version); + const existingVersion = await getExistingVersion(filePath); + if (version === existingVersion) { + log("Version already matches latest, skipping..."); + return; + } + const archShaResults = await Promise.all(archShaTasks(version, arches)); + await write(filePath, templateDeps(version, archShaResults)); + log("Finished deps update"); +} diff --git a/pkgs/development/web/deno/update/src.ts b/pkgs/development/web/deno/update/src.ts new file mode 100644 index 000000000000..fae15acd0d2c --- /dev/null +++ b/pkgs/development/web/deno/update/src.ts @@ -0,0 +1,67 @@ +import { + genValueRegExp, + logger, + nixPrefetch, + read, + sha256RegExp, + versionRegExp, + write, +} from "./common.ts"; + +interface Replacer { + regex: RegExp; + value: string; +} + +const log = logger("src"); + +const prefetchSha256 = (nixpkgs: string, version: string) => + nixPrefetch(["-f", nixpkgs, "deno.src", "--rev", version]); +const prefetchCargoSha256 = (nixpkgs: string) => + nixPrefetch( + [`{ sha256 }: (import ${nixpkgs} {}).deno.cargoDeps.overrideAttrs (_: { outputHash = sha256; })`], + ); + +const replace = (str: string, replacers: Replacer[]) => + replacers.reduce( + (str, r) => str.replace(r.regex, r.value), + str, + ); + +const updateNix = (filePath: string, replacers: Replacer[]) => + read(filePath).then((str) => write(filePath, replace(str, replacers))); + +const genVerReplacer = (k: string, value: string): Replacer => ( + { regex: genValueRegExp(k, versionRegExp), value } +); +const genShaReplacer = (k: string, value: string): Replacer => ( + { regex: genValueRegExp(k, sha256RegExp), value } +); + +export async function updateSrc( + filePath: string, + nixpkgs: string, + denoVersion: string, +) { + log("Starting src update"); + const trimVersion = denoVersion.substr(1); + log("Fetching sha256 for:", trimVersion); + const sha256 = await prefetchSha256(nixpkgs, denoVersion); + log("sha256 to update:", sha256); + await updateNix( + filePath, + [ + genVerReplacer("version", trimVersion), + genShaReplacer("sha256", sha256), + genShaReplacer("cargoSha256", ""), // Empty ready for prefetchCargoSha256 + ], + ); + log("Fetching cargoSha256 for:", sha256); + const cargoSha256 = await prefetchCargoSha256(nixpkgs); + log("cargoSha256 to update:", cargoSha256); + await updateNix( + filePath, + [genShaReplacer("cargoSha256", cargoSha256)], + ); + log("Finished src update"); +} diff --git a/pkgs/development/web/deno/update/update.ts b/pkgs/development/web/deno/update/update.ts new file mode 100755 index 000000000000..ab13cee9dbe2 --- /dev/null +++ b/pkgs/development/web/deno/update/update.ts @@ -0,0 +1,50 @@ +#!/usr/bin/env nix-shell +/* +#!nix-shell -i "deno run --allow-net --allow-run --allow-read --allow-write" -p deno git nix-prefetch nix-prefetch-url +*/ +import { + commit, + getExistingVersion, + getLatestVersion, + logger, +} from "./common.ts"; +import { Architecture, updateDeps } from "./deps.ts"; +import { updateSrc } from "./src.ts"; + +const log = logger("update"); +// TODO: Getting current file position to more-safely point to nixpkgs root +const nixpkgs = Deno.cwd(); +// TODO: Read values from default.nix +const owner = "denoland"; +const repo = "deno"; +const denoDir = `${nixpkgs}/pkgs/development/web/${repo}`; +const src = `${denoDir}/default.nix`; +const deps = `${denoDir}/deps.nix`; +const architectures: Architecture[] = [ + { nix: "x86_64-linux", rust: "x86_64-unknown-linux-gnu" }, + { nix: "aarch64-linux", rust: "aarch64-unknown-linux-gnu" }, + { nix: "x86_64-darwin", rust: "x86_64-apple-darwin" }, +]; + +log("Updating deno"); + +log("Getting latest deno version"); +const version = await getLatestVersion(owner, repo); +const existingVersion = await getExistingVersion(src); +const trimVersion = version.substr(1); // Strip v from v0.0.0 +log("Latest version: ", trimVersion); +log("Extracted version:", existingVersion); +if (trimVersion === existingVersion) { + log("Version already matches latest, skipping..."); + Deno.exit(0); +} + +const tasks = [ + updateSrc(src, nixpkgs, version), + updateDeps(deps, owner, repo, version, architectures), +]; +await Promise.all(tasks); +log("Updating deno complete"); +log("Commiting"); +await commit(repo, existingVersion, trimVersion, [src, deps]); +log("Done"); |