From 9a5b23119ceeeb006c335e0442c6cd8d2b25ed57 Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <brightone@protonmail.com>
Date: Wed, 8 Jan 2020 16:01:08 +0200
Subject: [PATCH 1/2] rq: 0.10.4 -> 1.0.2

---
 pkgs/development/tools/rq/default.nix | 19 ++++++++-----------
 pkgs/top-level/all-packages.nix       |  8 +++++---
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/tools/rq/default.nix b/pkgs/development/tools/rq/default.nix
index e00f0ae7dd0..fcbca2ea5b8 100644
--- a/pkgs/development/tools/rq/default.nix
+++ b/pkgs/development/tools/rq/default.nix
@@ -1,19 +1,17 @@
-{ stdenv, fetchFromGitHub, rustPlatform, llvmPackages, v8 }:
+{ lib, fetchFromGitHub, rustPlatform, libiconv, llvmPackages, v8 }:
 
-with rustPlatform;
-
-buildRustPackage rec {
+rustPlatform.buildRustPackage rec {
   pname = "rq";
-  version = "0.10.4";
+  version = "1.0.2";
 
   src = fetchFromGitHub {
     owner = "dflemstr";
-    repo = "rq";
+    repo = pname;
     rev = "v${version}";
-    sha256 = "066f6sdy0vrp113wlg18q9p0clyrg9iqbj17ly0yn8dxr5iar002";
+    sha256 = "0km9d751jr6c5qy4af6ks7nv3xfn13iqi03wq59a1c73rnf0zinp";
   };
 
-  cargoSha256 = "1n92d82l9wqrpsbkqiir6zsgf12xp4xb6bxq2nywg4lmwrnyapbh";
+  cargoSha256 = "0km9d751jr6c5qy4af6ks7nv3xfn13iqi03wq59a1c73rnf0zinp";
 
   buildInputs = [ llvmPackages.clang-unwrapped v8 ];
 
@@ -22,12 +20,11 @@ buildRustPackage rec {
     export V8_SOURCE="${v8}"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A tool for doing record analysis and transformation";
-    homepage = https://github.com/dflemstr/rq ;
+    homepage = "https://github.com/dflemstr/rq";
     license = with licenses; [ asl20 ];
     maintainers = [ maintainers.aristid ];
     platforms = platforms.all;
-    broken = true;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 18132524fba..8a0a92f172f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6112,7 +6112,9 @@ in
 
   routino = callPackage ../tools/misc/routino { };
 
-  rq = callPackage ../development/tools/rq { };
+  rq = callPackage ../development/tools/rq {
+    inherit (darwin) libiconv;
+  };
 
   rsnapshot = callPackage ../tools/backup/rsnapshot { };
 
@@ -23697,8 +23699,8 @@ in
 
   bftools = callPackage ../applications/science/biology/bftools { };
 
-  blast = callPackage ../applications/science/biology/blast { 
-    inherit (darwin.apple_sdk.frameworks) ApplicationServices; 
+  blast = callPackage ../applications/science/biology/blast {
+    inherit (darwin.apple_sdk.frameworks) ApplicationServices;
   };
 
   cd-hit = callPackage ../applications/science/biology/cd-hit { };

From 03b6800bd0a99dbb77187da602da46e19ee6b28b Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <brightone@protonmail.com>
Date: Wed, 8 Jan 2020 16:01:25 +0200
Subject: [PATCH 2/2] rq: add filalex77 to maintainers

---
 pkgs/development/tools/rq/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/rq/default.nix b/pkgs/development/tools/rq/default.nix
index fcbca2ea5b8..78a8c7470df 100644
--- a/pkgs/development/tools/rq/default.nix
+++ b/pkgs/development/tools/rq/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0km9d751jr6c5qy4af6ks7nv3xfn13iqi03wq59a1c73rnf0zinp";
   };
 
-  cargoSha256 = "0km9d751jr6c5qy4af6ks7nv3xfn13iqi03wq59a1c73rnf0zinp";
+  cargoSha256 = "0z971fpyj4v5hjp6q4yxgxv069h9idkpkcixb14gxi7kpiswprvz";
 
   buildInputs = [ llvmPackages.clang-unwrapped v8 ];
 
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
     description = "A tool for doing record analysis and transformation";
     homepage = "https://github.com/dflemstr/rq";
     license = with licenses; [ asl20 ];
-    maintainers = [ maintainers.aristid ];
+    maintainers = with maintainers; [ aristid filalex77 ];
     platforms = platforms.all;
   };
 }