From f375592f36732d2d199a24a41f0e5e24c2d98a41 Mon Sep 17 00:00:00 2001
From: Leonhard Markert <curiousleo@users.noreply.github.com>
Date: Tue, 4 Feb 2020 17:13:36 +0100
Subject: [PATCH] lorri: unstable-2020-01-09 -> 1.0

(cherry picked from commit 42a2668eb07b169264bca841a1ae31a11452b178)
---
 nixos/tests/lorri/default.nix     | 6 +++---
 pkgs/tools/misc/lorri/default.nix | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/nixos/tests/lorri/default.nix b/nixos/tests/lorri/default.nix
index d5bb979789a6..bca355c18fcb 100644
--- a/nixos/tests/lorri/default.nix
+++ b/nixos/tests/lorri/default.nix
@@ -13,12 +13,12 @@ import ../make-test.nix {
 
     # Start the daemon and wait until it is ready
     $machine->execute("lorri daemon > lorri.stdout 2> lorri.stderr &");
-    $machine->waitUntilSucceeds("grep --fixed-strings 'lorri: ready' lorri.stdout");
+    $machine->waitUntilSucceeds("grep --fixed-strings 'ready' lorri.stdout");
 
     # Ping the daemon
-    $machine->execute("lorri ping_ \$(readlink -f shell.nix)");
+    $machine->succeed("lorri internal__ping shell.nix");
 
     # Wait for the daemon to finish the build
-    $machine->waitUntilSucceeds("grep --fixed-strings 'OutputPaths' lorri.stdout");
+    $machine->waitUntilSucceeds("grep --fixed-strings 'Completed' lorri.stdout");
   '';
 }
diff --git a/pkgs/tools/misc/lorri/default.nix b/pkgs/tools/misc/lorri/default.nix
index 0261a6040065..e29bb93cff58 100644
--- a/pkgs/tools/misc/lorri/default.nix
+++ b/pkgs/tools/misc/lorri/default.nix
@@ -15,7 +15,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "lorri";
-  version = "unstable-2020-01-09";
+  version = "1.0";
 
   meta = with stdenv.lib; {
     description = "Your project's nix-env";
@@ -28,11 +28,11 @@ rustPlatform.buildRustPackage rec {
     owner = "target";
     repo = pname;
     # Run `eval $(nix-build -A lorri.updater)` after updating the revision!
-    rev = "7b84837b9988d121dd72178e81afd440288106c5";
-    sha256 = "0rkga944jl6i0051vbsddfqbvzy12168cbg4ly2ng1rk0x97dbr8";
+    rev = "88c680c9abf0f04f2e294436d20073ccf26f0781";
+    sha256 = "1415mhdr0pwvshs04clfz1ys76r5qf9jz8jchm63l6llaj6m7mrv";
   };
 
-  cargoSha256 = "0k7l0zhk2vzf4nlwv4xr207irqib2dqjxfdjk1fprff84c4kblx8";
+  cargoSha256 = "1kdpzbn3353yk7i65hll480fcy16wdvppdr6xgfh06x88xhim4mp";
   doCheck = false;
 
   BUILD_REV_COUNT = src.revCount or 1;