diff --git a/nixos/tests/lorri/default.nix b/nixos/tests/lorri/default.nix index a4bdc92490ce..e9e26c03f6ca 100644 --- a/nixos/tests/lorri/default.nix +++ b/nixos/tests/lorri/default.nix @@ -17,12 +17,12 @@ import ../make-test-python.nix { # Start the daemon and wait until it is ready machine.execute("lorri daemon > lorri.stdout 2> lorri.stderr &") - machine.wait_until_succeeds("grep --fixed-strings 'ready' lorri.stdout") + machine.wait_until_succeeds("grep --fixed-strings 'ready' lorri.stderr") # Ping the daemon - machine.succeed("lorri internal ping shell.nix") + machine.succeed("lorri internal ping --shell-file shell.nix") # Wait for the daemon to finish the build - machine.wait_until_succeeds("grep --fixed-strings 'Completed' lorri.stdout") + machine.wait_until_succeeds("grep --fixed-strings 'Completed' lorri.stderr") ''; } diff --git a/pkgs/tools/misc/lorri/default.nix b/pkgs/tools/misc/lorri/default.nix index a2cd0ef600d1..c20c1c5aee51 100644 --- a/pkgs/tools/misc/lorri/default.nix +++ b/pkgs/tools/misc/lorri/default.nix @@ -14,10 +14,9 @@ let # Run `eval $(nix-build -A lorri.updater)` after updating the revision! # It will copy some required files if necessary. # Also don’t forget to run `nix-build -A lorri.tests` - version = "1.6.0"; - gitRev = "1.6.0"; - sha256 = "sha256-peelMKv9GOTPdyb1iifzlFikeayTchqaYCgeXyR5EgM="; - cargoSha256 = "sha256-UFAmTYnCqsQxBnCm1zMu+BcWIZMuuxvpF7poLlzC6Kg="; + version = "1.7.0"; + sha256 = "sha256-pGNhhEBHyWhTaW24dHrxAvpb/qr5RPbHXRwDZx6Rf74="; + cargoSha256 = "sha256-ENZATiBhoO+N6NpSknOWpvsatkaYb4mS/E63XNRXfMU="; in (rustPlatform.buildRustPackage rec { pname = "lorri"; @@ -26,7 +25,7 @@ in (rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "nix-community"; repo = pname; - rev = gitRev; + rev = version; inherit sha256; }; @@ -65,9 +64,9 @@ in (rustPlatform.buildRustPackage rec { meta = with lib; { description = "Your project's nix-env"; - homepage = "https://github.com/target/lorri"; + homepage = "https://github.com/nix-community/lorri"; license = licenses.asl20; - maintainers = with maintainers; [ grahamc Profpatsch ]; + maintainers = with maintainers; [ grahamc Profpatsch nyarly ]; mainProgram = "lorri"; }; })