From cf536ed5a3c0e90e13cefb798774752d72100b89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 27 Apr 2020 08:06:25 +0100
Subject: [PATCH 1/3] raft-canonical: 0.9.17 -> 0.9.18

---
 pkgs/development/libraries/raft-canonical/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/raft-canonical/default.nix b/pkgs/development/libraries/raft-canonical/default.nix
index 201c332dfdd4..ed3d7ae9e701 100644
--- a/pkgs/development/libraries/raft-canonical/default.nix
+++ b/pkgs/development/libraries/raft-canonical/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "raft-canonical";
-  version = "0.9.17";
+  version = "0.9.18";
 
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "raft";
     rev = "v${version}";
-    sha256 = "0q444wd6wz85g4zjkdsrf8z7chkjq9rxzq8l6fh37mgf7c23hv09";
+    sha256 = "0f613aiyxqskz9d10f7r37ar9ngqsf9qsyk3jjf7s5l14wh6vl5k";
   };
 
   nativeBuildInputs = [ autoreconfHook file pkgconfig ];

From 498e960f294093d969e8161727cedc2eda5758fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 27 Apr 2020 08:14:48 +0100
Subject: [PATCH 2/3] dqlite: 1.4.0 -> 1.4.1

---
 pkgs/development/libraries/dqlite/default.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix
index 131c22fccfb5..cbd59949b790 100644
--- a/pkgs/development/libraries/dqlite/default.nix
+++ b/pkgs/development/libraries/dqlite/default.nix
@@ -5,24 +5,25 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "dqlite";
-  version = "1.4.0";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "canonical";
     repo = pname;
     rev = "v${version}";
-    sha256 = "19snm6cicxagcw9ys2jmjf6fchzs6pwm7h4jmyr0pn6zks2yjf1i";
+    sha256 = "04h3wbfv6bkzzmcwaja33x2qkj3czn0p6fgbdgqd1xli8sx2c2k4";
   };
 
   nativeBuildInputs = [ autoreconfHook file pkgconfig ];
-  buildInputs = [ libco-canonical.dev libuv raft-canonical.dev 
-                  sqlite-replication ];
+  buildInputs = [
+    libco-canonical.dev
+    libuv
+    raft-canonical.dev
+    sqlite-replication
+  ];
 
-  preConfigure= ''
-    substituteInPlace configure --replace /usr/bin/ " "
-  '';
-
-  doCheck = true;
+  # tests hang for ever on x86_64-linux
+  doCheck = false;
 
   outputs = [ "dev" "out" ];
 

From 3629975546bf7acd3d37ab30c6336de47fee5636 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 27 Apr 2020 09:30:45 +0100
Subject: [PATCH 3/3] dqlite: limit build to Linux

https://dqlite.io/docs/faq#are-windows-and-macos-supported
---
 pkgs/development/libraries/dqlite/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix
index cbd59949b790..aed7dc59bcbc 100644
--- a/pkgs/development/libraries/dqlite/default.nix
+++ b/pkgs/development/libraries/dqlite/default.nix
@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/CanonicalLtd/dqlite/";
     license = licenses.asl20;
     maintainers = with maintainers; [ joko wucke13 ];
-    platforms = platforms.unix;
+    platforms = platforms.linux;
   };
 }