diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-22 20:57:14 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-22 20:57:14 +0200 |
commit | e78fd235649e52180198f9f65ca9f172f8fe8161 (patch) | |
tree | ce63052e1bfb8fe03dd3fcf6f9fb4cd00ff1b495 /pkgs/development | |
parent | 2d9bd29cc5c949b84fd595334b6e223c22be438b (diff) | |
parent | cf68a14a0184138ca7644a14c0724fa32e0e34a5 (diff) | |
download | nixpkgs-e78fd235649e52180198f9f65ca9f172f8fe8161.tar nixpkgs-e78fd235649e52180198f9f65ca9f172f8fe8161.tar.gz nixpkgs-e78fd235649e52180198f9f65ca9f172f8fe8161.tar.bz2 nixpkgs-e78fd235649e52180198f9f65ca9f172f8fe8161.tar.lz nixpkgs-e78fd235649e52180198f9f65ca9f172f8fe8161.tar.xz nixpkgs-e78fd235649e52180198f9f65ca9f172f8fe8161.tar.zst nixpkgs-e78fd235649e52180198f9f65ca9f172f8fe8161.zip |
Merge branch 'master' into staging
Hydra: ?compare=1474932
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/appstream-glib/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/libraries/audio/lilv/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/libblockdev/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/libvirt/default.nix | 14 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/io-page/default.nix | 17 | ||||
-rw-r--r-- | pkgs/development/python-modules/libvirt/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/analysis/radare2/cutter.nix (renamed from pkgs/development/tools/analysis/radare2-cutter/default.nix) | 17 | ||||
-rw-r--r-- | pkgs/development/tools/analysis/radare2/default.nix | 137 | ||||
-rwxr-xr-x | pkgs/development/tools/analysis/radare2/update.py | 123 | ||||
-rw-r--r-- | pkgs/development/tools/ocaml/obuild/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/rust/cbindgen/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/selenium/chromedriver/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/web/nodejs/v10.nix | 4 |
13 files changed, 212 insertions, 134 deletions
diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index 3a0868ccecb..48dfe9ad894 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchFromGitHub, substituteAll, pkgconfig, gettext, gtk3, glib , gtk-doc, libarchive, gobjectIntrospection, libxslt, pngquant -, sqlite, libsoup, gcab, attr, acl, docbook_xsl, docbook_xml_dtd_42 +, sqlite, libsoup, attr, acl, docbook_xsl, docbook_xml_dtd_42 , libuuid, json-glib, meson, gperf, ninja }: stdenv.mkDerivation rec { - name = "appstream-glib-0.7.9"; + name = "appstream-glib-0.7.10"; outputs = [ "out" "dev" "man" "installedTests" ]; outputBin = "dev"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "appstream-glib"; rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name; - sha256 = "10b32qw7iy0v1jvmf18wqgs8d1cpy52zm5rzw0wv421n90qiyidk"; + sha256 = "1m4gww09id7hwzh4hri1y3hp7p0mdrf6fk9f924r2w66hlsdil0d"; }; nativeBuildInputs = [ @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ glib gettext sqlite libsoup - gcab attr acl libuuid json-glib + attr acl libuuid json-glib libarchive gobjectIntrospection gperf ]; propagatedBuildInputs = [ gtk3 ]; diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index 710c5b1a92c..f28e374c852 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "lilv-${version}"; - version = "0.24.2"; + version = "0.24.4"; src = fetchurl { url = "https://download.drobilla.net/${name}.tar.bz2"; - sha256 = "08m5a372pr1l7aii9s3pic5nm68gynx1n1bc7bnlswziq6qnbv7p"; + sha256 = "0f24cd7wkk5l969857g2ydz2kjjrkvvddg1g87xzzs78lsvq8fy3"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix index b5402984d16..585f6f18bba 100644 --- a/pkgs/development/libraries/libblockdev/default.nix +++ b/pkgs/development/libraries/libblockdev/default.nix @@ -4,7 +4,7 @@ }: let - version = "2.18"; + version = "2.19"; in stdenv.mkDerivation rec { name = "libblockdev-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { owner = "storaged-project"; repo = "libblockdev"; rev = "${version}-1"; - sha256 = "03gbmji401nz1sff2zp61dhal80qls4blqwadj2p4ckbxdlmid4i"; + sha256 = "1ny31vaarzbpw0h863p2r5cvjsfs77d33nnisf8bhjc6ps6js3ys"; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 4b104a04c15..fd35864fe34 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -4,7 +4,7 @@ , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages -, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, jansson +, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode , enableXen ? false, xen ? null , enableIscsi ? false, openiscsi }: @@ -16,26 +16,26 @@ let buildFromTarball = stdenv.isDarwin; in stdenv.mkDerivation rec { name = "libvirt-${version}"; - version = "4.6.0"; + version = "4.5.0"; src = if buildFromTarball then fetchurl { url = "http://libvirt.org/sources/${name}.tar.xz"; - sha256 = "0rj0azi766g0xdxydvkq9nj95hhsiwqgclzzmyxvk2axhb8nrb5l"; + sha256 = "02dbfyi80im37gdsxglb4fja78q63b8ahmgdc5kh8lx51kf5xsg7"; } else fetchgit { url = git://libvirt.org/libvirt.git; rev = "v${version}"; - sha256 = "1lv1s93k056wylrlc7j4q45zir9z4qshzcl454spy2wb8cdn3h4s"; + sha256 = "0ija9a02znajsa2pbxamrmz87zwpmba9s29vdzzqqqw5c1rdpcr6"; fetchSubmodules = true; }; nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl - libxslt xhtml1 perlPackages.XMLXPath curl libpcap jansson + libxslt xhtml1 perlPackages.XMLXPath curl libpcap ] ++ optionals (!buildFromTarball) [ libtool autoconf automake ] ++ optionals stdenv.isLinux [ @@ -60,9 +60,7 @@ in stdenv.mkDerivation rec { --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",' patchShebangs . # fixes /usr/bin/python references - substituteInPlace src/util/virjsoncompat.c --replace \ - '"libjansson.so.4"' '"${jansson}/lib/libjansson${stdenv.targetPlatform.extensions.sharedLibrary}"' - ''; + ''; configureFlags = [ "--localstatedir=/var" diff --git a/pkgs/development/ocaml-modules/io-page/default.nix b/pkgs/development/ocaml-modules/io-page/default.nix index 24aa2557082..72b7a3a54ce 100644 --- a/pkgs/development/ocaml-modules/io-page/default.nix +++ b/pkgs/development/ocaml-modules/io-page/default.nix @@ -1,23 +1,24 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, cstruct }: +{ stdenv, fetchzip, ocaml, findlib, jbuilder, configurator, cstruct }: -let version = "1.6.1"; in +let version = "2.0.1"; in stdenv.mkDerivation { - name = "ocaml-io-page-${version}"; + name = "ocaml${ocaml.version}-io-page-${version}"; src = fetchzip { - url = "https://github.com/mirage/io-page/archive/v${version}.tar.gz"; - sha256 = "1djwks3ss12m55q6h4jsvfsy848cxfnpaxkilw10h26xj6jchflz"; + url = "https://github.com/mirage/io-page/archive/${version}.tar.gz"; + sha256 = "1rw04dwrlx5hah5dkjf7d63iff82j9cifr8ifjis5pdwhgwcff8i"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + buildInputs = [ ocaml findlib jbuilder configurator ]; propagatedBuildInputs = [ cstruct ]; - createFindlibDestdir = true; + inherit (jbuilder) installPhase; meta = { homepage = https://github.com/mirage/io-page; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; + license = stdenv.lib.licenses.isc; description = "IO memory page library for Mirage backends"; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index 71e9adf11d2..26b42020fc3 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "libvirt"; - version = "4.6.0"; + version = "4.5.0"; src = assert version == libvirt.version; fetchgit { url = git://libvirt.org/libvirt-python.git; rev = "v${version}"; - sha256 = "0yrgibd5c9wy82ak8g9ykar6fma1wf7xzmmc47657lzm70m5av68"; + sha256 = "0w2rzkxv7jsq4670m0j5c6p4hpyi0r0ja6wd3wdvixcwc6hhx407"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/analysis/radare2-cutter/default.nix b/pkgs/development/tools/analysis/radare2/cutter.nix index ff2b4d3b54f..4269661a4ff 100644 --- a/pkgs/development/tools/analysis/radare2-cutter/default.nix +++ b/pkgs/development/tools/analysis/radare2/cutter.nix @@ -4,20 +4,11 @@ # Qt , qtbase, qtsvg, qtwebengine # buildInputs -, radare2 +, r2-for-cutter , python3 }: let - r2 = radare2.overrideDerivation (o: { - name = "radare2-for-cutter-${version}"; - src = fetchFromGitHub { - owner = "radare"; - repo = "radare2"; - rev = "a98557bfbfa96e9f677a8c779ee78085ee5a23bb"; - sha256 = "04jl1lq3dqljb6vagzlym4wc867ayhx1v52f75rkfz0iybsh249r"; - }; - }); - version = "1.6"; + version = "1.7"; in stdenv.mkDerivation rec { name = "radare2-cutter-${version}"; @@ -26,7 +17,7 @@ stdenv.mkDerivation rec { owner = "radareorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "1ps52yf94yfnws3nn1iiwch2jy33dyvi7j47xkmh0m5fpdqi5xk7"; + sha256 = "0z9wzxd5hw0ivakrg3xiv4zx1rjj032hlmizq0pxj22xjrj1gg9n"; }; postUnpack = "export sourceRoot=$sourceRoot/src"; @@ -41,7 +32,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ qmake pkgconfig ]; - buildInputs = [ qtbase qtsvg qtwebengine r2 python3 ]; + buildInputs = [ qtbase qtsvg qtwebengine r2-for-cutter python3 ]; qmakeFlags = [ "CONFIG+=link_pkgconfig" diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 0264305134c..85559269f27 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -1,4 +1,5 @@ {stdenv, fetchFromGitHub +, callPackage , ninja, meson , pkgconfig , libusb, readline, libewf, perl, zlib, openssl , gtk2 ? null, vte ? null, gtkdialog ? null @@ -15,66 +16,94 @@ assert pythonBindings -> python != null; let inherit (stdenv.lib) optional; - #<generated> - # DO NOT EDIT! Automatically generated by ./update.py - version_commit = "18681"; - gittap = "2.7.0"; - gittip = "6e08e452a7ec231a73997c44b4ff556c2998c7d9"; - version = "2.7.0"; - sha256 = "1a9z8w897256dhh3yhyfnshz3n2nrc4plc2i06cm5sznhl6x9xfx"; - cs_tip = "ec8a5ce98fa0422a395489ed47da912b15d77441"; - cs_sha256 = "080a64bqck28a2xfjwz29ddcr8p6hc6gi67mgry3pca289qrkk3q"; - #</generated> -in -stdenv.mkDerivation rec { - name = "radare2-${version}"; - src = fetchFromGitHub { - owner = "radare"; - repo = "radare2"; - rev = version; - inherit sha256; - }; + generic = { + version_commit, + gittap, + gittip, + rev, + version, + sha256, + cs_tip, + cs_sha256 + }: + stdenv.mkDerivation rec { + name = "radare2-${version}"; + + src = fetchFromGitHub { + owner = "radare"; + repo = "radare2"; + inherit rev sha256; + }; - postPatch = let - capstone = fetchFromGitHub { - owner = "aquynh"; - repo = "capstone"; - # version from $sourceRoot/shlr/Makefile - rev = cs_tip; - sha256 = cs_sha256; - }; - in '' - if ! grep -F "CS_TIP=${cs_tip}" shlr/Makefile; then echo "CS_TIP mismatch"; exit 1; fi - ln -s ${capstone} shlr/capstone - ''; + postPatch = let + capstone = fetchFromGitHub { + owner = "aquynh"; + repo = "capstone"; + # version from $sourceRoot/shlr/Makefile + rev = cs_tip; + sha256 = cs_sha256; + }; + in '' + if ! grep -F "CS_TIP=${cs_tip}" shlr/Makefile; then echo "CS_TIP mismatch"; exit 1; fi + # When using meson, it expects capstone source relative to build directory + mkdir -p build/shlr + ln -s ${capstone} build/shlr/capstone + ''; - postInstall = '' - ln -s $out/bin/radare2 $out/bin/r2 - install -D -m755 $src/binr/r2pm/r2pm $out/bin/r2pm - ''; + postInstall = '' + ln -s $out/bin/radare2 $out/bin/r2 + install -D -m755 $src/binr/r2pm/r2pm $out/bin/r2pm + ''; - mesonFlags = [ - "-Dr2_version_commit=${version_commit}" - "-Dr2_gittap=${gittap}" - "-Dr2_gittip=${gittip}" - ]; + mesonFlags = [ + "-Dr2_version_commit=${version_commit}" + "-Dr2_gittap=${gittap}" + "-Dr2_gittip=${gittip}" + # 2.8.0 expects this, but later it becomes an option with default=false. + "-Dcapstone_in_builddir=true" + ]; - enableParallelBuilding = true; + enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ninja meson ]; - buildInputs = [ readline libusb libewf perl zlib openssl] - ++ optional useX11 [gtkdialog vte gtk2] - ++ optional rubyBindings [ruby] - ++ optional pythonBindings [python] - ++ optional luaBindings [lua]; + nativeBuildInputs = [ pkgconfig ninja meson ]; + buildInputs = [ readline libusb libewf perl zlib openssl] + ++ optional useX11 [gtkdialog vte gtk2] + ++ optional rubyBindings [ruby] + ++ optional pythonBindings [python] + ++ optional luaBindings [lua]; - meta = { - description = "unix-like reverse engineering framework and commandline tools"; - homepage = http://radare.org/; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [raskin makefu mic92]; - platforms = with stdenv.lib.platforms; linux; - inherit version; + meta = { + description = "unix-like reverse engineering framework and commandline tools"; + homepage = http://radare.org/; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = with stdenv.lib.maintainers; [raskin makefu mic92]; + platforms = with stdenv.lib.platforms; linux; + inherit version; + }; }; +in { + #<generated> + # DO NOT EDIT! Automatically generated by ./update.py + radare2 = generic { + version_commit = "19251"; + gittap = "2.8.0"; + gittip = "a76b965410aba07b4ef8b96d90b25b271c2003dd"; + rev = "2.8.0"; + version = "2.8.0"; + sha256 = "1d9rkzc3vychy2h1bnywwx4why83rr18r0lvvl1cqx87ad5awcjk"; + cs_tip = "782ea67e17a391ca0d3faafdc365b335a1a8930a"; + cs_sha256 = "1maww4ir78a193pm3f8lr2kdkizi7rywn68ffa65ipyr7j4pl6i4"; + }; + r2-for-cutter = generic { + version_commit = "19251"; + gittap = "2.8.0-118-gb0547831f"; + gittip = "b0547831f127b7357e3c93bc43933482a4d6213b"; + rev = "b0547831f127b7357e3c93bc43933482a4d6213b"; + version = "2018-08-07"; + sha256 = "1ix42kipd1aayb494ajbxawzc1cwikm9fxk343d1kchxx4a30a1m"; + cs_tip = "782ea67e17a391ca0d3faafdc365b335a1a8930a"; + cs_sha256 = "1maww4ir78a193pm3f8lr2kdkizi7rywn68ffa65ipyr7j4pl6i4"; + }; + #</generated> } diff --git a/pkgs/development/tools/analysis/radare2/update.py b/pkgs/development/tools/analysis/radare2/update.py index 1f16a00905c..fae6a52a392 100755 --- a/pkgs/development/tools/analysis/radare2/update.py +++ b/pkgs/development/tools/analysis/radare2/update.py @@ -2,14 +2,16 @@ #!nix-shell -p nix -p python3 -p git -i python # USAGE - just run the script: ./update.py # When editing this file, make also sure it passes the mypy typecheck -# and is formatted with yapf. -import urllib.request -import json -import tempfile -import subprocess +# and is formatted with black. import fileinput +import json import re +import subprocess +import tempfile +import urllib.request +from datetime import datetime from pathlib import Path +from typing import Dict def sh(*args: str) -> str: @@ -18,50 +20,107 @@ def sh(*args: str) -> str: def prefetch_github(owner: str, repo: str, ref: str) -> str: - return sh("nix-prefetch-url", "--unpack", - f"https://github.com/{owner}/{repo}/archive/{ref}.tar.gz") + return sh( + "nix-prefetch-url", + "--unpack", + f"https://github.com/{owner}/{repo}/archive/{ref}.tar.gz", + ) -def main() -> None: +def get_radare2_rev() -> str: url = "https://api.github.com/repos/radare/radare2/releases/latest" with urllib.request.urlopen(url) as response: release = json.load(response) # type: ignore - version = release["tag_name"] - with tempfile.TemporaryDirectory() as dirname: + return release["tag_name"] + + +def get_r2_cutter_rev() -> str: + url = "https://api.github.com/repos/radareorg/cutter/contents/" + with urllib.request.urlopen(url) as response: + data = json.load(response) # type: ignore + for entry in data: + if entry["name"] == "radare2": + return entry["sha"] + raise Exception("no radare2 submodule found in github.com/radareorg/cutter") + - def git(*args: str) -> str: - return sh("git", "-C", dirname, *args) +def git(dirname: str, *args: str) -> str: + return sh("git", "-C", dirname, *args) - git("clone", "--branch", version, "https://github.com/radare/radare2", - ".") - sha256 = prefetch_github("radare", "radare2", version) + +def get_repo_info(dirname: str, rev: str) -> Dict[str, str]: + sha256 = prefetch_github("radare", "radare2", rev) + + cs_tip = None + with open(Path(dirname).joinpath("shlr", "Makefile")) as makefile: + for l in makefile: + match = re.match("CS_TIP=(\S+)", l) + if match: + cs_tip = match.group(1) + assert cs_tip is not None + + cs_sha256 = prefetch_github("aquynh", "capstone", cs_tip) + + return dict( + rev=rev, + sha256=sha256, + version_commit=git(dirname, "rev-list", "--all", "--count"), + gittap=git(dirname, "describe", "--tags", "--match", "[0-9]*"), + gittip=git(dirname, "rev-parse", "HEAD"), + cs_tip=cs_tip, + cs_sha256=cs_sha256, + ) + + +def write_package_expr(version: str, info: Dict[str, str]) -> str: + return f"""generic {{ + version_commit = "{info["version_commit"]}"; + gittap = "{info["gittap"]}"; + gittip = "{info["gittip"]}"; + rev = "{info["rev"]}"; + version = "{version}"; + sha256 = "{info["sha256"]}"; + cs_tip = "{info["cs_tip"]}"; + cs_sha256 = "{info["cs_sha256"]}"; + }}""" + + +def main() -> None: + radare2_rev = get_radare2_rev() + r2_cutter_rev = get_r2_cutter_rev() + + with tempfile.TemporaryDirectory() as dirname: + git( + dirname, + "clone", + "--branch", + radare2_rev, + "https://github.com/radare/radare2", + ".", + ) nix_file = str(Path(__file__).parent.joinpath("default.nix")) - cs_tip = None - with open(Path(dirname).joinpath("shlr", "Makefile")) as makefile: - for l in makefile: - match = re.match("CS_TIP=(\S+)", l) - if match: - cs_tip = match.group(1) - assert cs_tip is not None + radare2_info = get_repo_info(dirname, radare2_rev) + + git(dirname, "checkout", r2_cutter_rev) + + timestamp = git(dirname, "log", "-n1", "--format=%at") + r2_cutter_version = datetime.fromtimestamp(int(timestamp)).strftime("%Y-%m-%d") - cs_sha256 = prefetch_github("aquynh", "capstone", cs_tip) + r2_cutter_info = get_repo_info(dirname, r2_cutter_rev) in_block = False with fileinput.FileInput(nix_file, inplace=True) as f: for l in f: if "#<generated>" in l: in_block = True - print(f""" #<generated> + print( + f""" #<generated> # DO NOT EDIT! Automatically generated by ./update.py - version_commit = "{git("rev-list", "--all", "--count")}"; - gittap = "{git("describe", "--tags", "--match", "[0-9]*")}"; - gittip = "{git("rev-parse", "HEAD")}"; - version = "{version}"; - sha256 = "{sha256}"; - cs_tip = "{cs_tip}"; - cs_sha256 = "{cs_sha256}"; - #</generated>""") + radare2 = {write_package_expr(radare2_rev, radare2_info)}; + r2-for-cutter = {write_package_expr(r2_cutter_version, r2_cutter_info)}; + #</generated>""" + ) elif "#</generated>" in l: in_block = False elif not in_block: diff --git a/pkgs/development/tools/ocaml/obuild/default.nix b/pkgs/development/tools/ocaml/obuild/default.nix index 1de95f73037..41cde6f8ab7 100644 --- a/pkgs/development/tools/ocaml/obuild/default.nix +++ b/pkgs/development/tools/ocaml/obuild/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchzip, ocaml }: -let version = "0.1.8"; in +let version = "0.1.10"; in stdenv.mkDerivation { name = "obuild-${version}"; src = fetchzip { url = "https://github.com/ocaml-obuild/obuild/archive/obuild-v${version}.tar.gz"; - sha256 = "1q1k2qqd08j1zakvydgvwgwpyn0ll7rs65gap0pvg3amnh5cp3wd"; + sha256 = "15arsgbhk1c39vd8qhpa3pag94m44bwvzggdvkibx6hnpkv8z9bn"; }; buildInputs = [ ocaml ]; diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index 0dcc1287791..c3040ec567c 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { name = "rust-cbindgen-${version}"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "eqrion"; repo = "cbindgen"; rev = "v${version}"; - sha256 = "03qzqy3indqghqy7rnli1zrrlnyfkygxjpb2s7041cik54kf2krw"; + sha256 = "0hifmn9578cf1r5m4ajazg3rhld2ybd2v48xz04vfhappkarv4w2"; }; cargoSha256 = "0c3xpzff8jldqbn5a25yy6c2hlz5xy636ml6sj5d24wzcgwg5a2i"; diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index a2cd55f52b9..238c3bc704d 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -6,12 +6,12 @@ let allSpecs = { "x86_64-linux" = { system = "linux64"; - sha256 = "07b39j1glr53yxbbkkkkx12h8r44fybqkn4fd7s2lr1ysyq5vn1a"; + sha256 = "1iwmdkkxfmmiqzvj2bjh98db6j6zfb8s2m5kq15wmnq0g44gxski"; }; "x86_64-darwin" = { system = "mac64"; - sha256 = "11hs4mmlvxjaanq41h0dljj4sff0lfwk31svvdmzfg91idlikpsz"; + sha256 = "1blp4ig5fm6ar8mxm78dc2gvv7n82mq3kqswbyjrcizl91qs4cpx"; }; }; @@ -28,7 +28,7 @@ let in stdenv.mkDerivation rec { name = "chromedriver-${version}"; - version = "2.40"; + version = "2.41"; src = fetchurl { url = "https://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip"; diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix index 1d307c77f9f..ee88b231366 100644 --- a/pkgs/development/web/nodejs/v10.nix +++ b/pkgs/development/web/nodejs/v10.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "10.7.0"; - sha256 = "0qp93ddbnvadimj11wnznwhkq8vq1f7q259iq8siy5b7r936kvil"; + version = "10.9.0"; + sha256 = "00hdachbmcf9pyd1iksprsi5mddwp6z59mb3lr81z8ynfbmzhzni"; } |