nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-23 17:12:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #79261 from curiousleo/lorri-1.0-backport

Browse Source 
lorri: unstable-2020-01-09 -> 1.0 (backport to release-19.09)
This commit is contained in:
Graham Christensen
2020-02-05 08:34:18 -05:00
committed by GitHub
parent 4e3aa3de41 f375592f36
commit 34b08ff838
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/tests/lorri/default.nix
View File

@@ -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");
'';
}

8
pkgs/tools/misc/lorri/default.nix
View File

@@ -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;