Skip to content

[Backport release-24.05] lorri: 1.6.0 -> 1.7.0 #325339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yayayayaka merged 3 commits into from
Jul 9, 2024
Merged

[Backport release-24.05] lorri: 1.6.0 -> 1.7.0 #325339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa8a8cb
(lorri): (1.6.0 -> 1.7.0)
nyarly Jun 26, 2024
f1417e7
(lorri) (update tests)
nyarly Jun 27, 2024
4219441
lorri: 1.6.0 -> 1.7.0
nyarly Jul 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions nixos/tests/lorri/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
'';
}
13 changes: 6 additions & 7 deletions pkgs/tools/misc/lorri/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -26,7 +25,7 @@ in (rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "nix-community";
repo = pname;
rev = gitRev;
rev = version;
inherit sha256;
};

Expand Down Expand Up @@ -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";
};
})