Merge master into staging-next

pkgs/development/tools/analysis/flow/default.nix

@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, ocamlPackages, cf-private, CoreServices }:
 
 stdenv.mkDerivation rec {
-  version = "0.86.0";
+  version = "0.87.0";
   name = "flow-${version}";
 
   src = fetchFromGitHub {
     owner  = "facebook";
     repo   = "flow";
     rev    = "refs/tags/v${version}";
-    sha256 = "0sxg066bfkgqyq2fcjkff4jbhpxrzsqgz53h2b4wscxr076r9bjp";
+    sha256 = "10f7rwkgh40wl8z3wgcsvyzm65zsf3zd143q4nv6q6g3m9izh40k";
   };
 
   installPhase = ''

pkgs/development/tools/analysis/radare/default.nix

@@ -1,38 +0,0 @@
-{stdenv, fetchurl, pkgconfig, libusb, readline, lua, perl,
-gtk2 ? null, vte ? null, gtkdialog ? null,
-python ? null,
-ruby ? null,
-useX11, rubyBindings, pythonBindings, luaBindings}:
-
-assert useX11 -> (gtk2 != null && vte != null && gtkdialog != null);
-assert rubyBindings -> ruby != null;
-assert pythonBindings -> python != null;
-
-let
-  inherit (stdenv.lib) optional;
-in
-stdenv.mkDerivation rec {
-  name = "radare-1.5.2";
-
-  src = fetchurl {
-    url = "https://radare.org/get/${name}.tar.gz";
-    sha256 = "1qdrmcnzfvfvqb27c7pknwm8jl2hqa6c4l66wzyddwlb8yjm46hd";
-  };
-
-  hardeningDisable = [ "format" ];
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ readline libusb perl]
-    ++ optional useX11 [gtkdialog vte gtk2]
-    ++ optional rubyBindings [ruby]
-    ++ optional pythonBindings [python]
-    ++ optional luaBindings [lua];
-
-  meta = {
-    description = "Free advanced command line hexadecimal editor";
-    homepage = http://radare.org/;
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
-  };
-}

pkgs/development/tools/analysis/radare/ired.nix

@@ -1,22 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation rec {
-  name = "ired-0.4";
-
-  src = fetchurl {
-    url = "https://radare.org/get/${name}.tar.gz";
-    sha256 = "0wya1ylc6adqg4qw5fi8aspc5d1yr27x9r2vpy133qxzia9qv3mm";
-  };
-  
-  installPhase = ''
-    make install PREFIX=$out
-  '';
-
-  meta = {
-    description = "Interactive Raw Editor";
-    homepage = http://radare.org/;
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; all;
-  };
-}

pkgs/development/tools/analysis/radare2/default.nix

@@ -90,17 +90,17 @@ in {
   #<generated>
   # DO NOT EDIT! Automatically generated by ./update.py
   radare2 = generic {
-    version_commit = "20285";
-    gittap = "3.1.1";
-    gittip = "b143e1b1b5622ef2f41a90f4c0f7ed4c477caf40";
-    rev = "3.1.1";
-    version = "3.1.1";
-    sha256 = "09kn25ijqhk3x9f3k6mw1g0wvwym8ys6qz53ybx3qizy4fzln0hw";
+    version_commit = "20315";
+    gittap = "3.1.3";
+    gittip = "57dd0b4e7ec70cc95f859651b1b63b076b8df7a7";
+    rev = "3.1.3";
+    version = "3.1.3";
+    sha256 = "17bd7i9lbr0nxa3llw354mppx44xi7bjwif7g7wxw0zcjlfxnk5d";
     cs_tip = "f01c267f889e932b069a559ce0c604c1ae986c0a";
     cs_sha256 = "15ifnql2gi2f9g8j60hc4hbxbvi2qn1r110ry32qmlz55svxh67y";
   };
   r2-for-cutter = generic {
-    version_commit = "20285";
+    version_commit = "20315";
     gittap = "2.9.0-310-gcb62c376b";
     gittip = "cb62c376bef6c7427019a7c28910c33c364436dd";
     rev = "cb62c376bef6c7427019a7c28910c33c364436dd";