Skip to content
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

Jump to bottom

lorri: 1.0 -> 1.1 #91848

Merged
merged 1 commit into from Jun 30, 2020
Merged

lorri: 1.0 -> 1.1 #91848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion nixos/tests/lorri/default.nix
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@ import ../make-test-python.nix {
machine.wait_until_succeeds("grep --fixed-strings 'ready' lorri.stdout")

# Ping the daemon
machine.succeed("lorri internal__ping shell.nix")
machine.succeed("lorri internal ping shell.nix")

# Wait for the daemon to finish the build
machine.wait_until_succeeds("grep --fixed-strings 'Completed' lorri.stdout")
Expand Down
14 changes: 7 additions & 7 deletions pkgs/tools/misc/lorri/default.nix
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
, rustPlatform
# Updater script
, runtimeShell
, writeScript
, writers
# Tests
, nixosTests
# Apple dependencies
Expand All @@ -14,7 +14,7 @@

rustPlatform.buildRustPackage rec {
pname = "lorri";
version = "1.0";
version = "1.1";

meta = with stdenv.lib; {
description = "Your project's nix-env";
Expand All @@ -27,11 +27,12 @@ rustPlatform.buildRustPackage rec {
owner = "target";
repo = pname;
# Run `eval $(nix-build -A lorri.updater)` after updating the revision!
rev = "88c680c9abf0f04f2e294436d20073ccf26f0781";
sha256 = "1415mhdr0pwvshs04clfz1ys76r5qf9jz8jchm63l6llaj6m7mrv";
# ALSO don’t forget to update the cargoSha256!
rev = "93d93013217cd9aa09d2bd316d6c3abf827a6601";
sha256 = "0wbkx8hmikngfp6fp0y65yla22f3k0jszq8a6pas80q0b33llwm5";
};

cargoSha256 = "1kdpzbn3353yk7i65hll480fcy16wdvppdr6xgfh06x88xhim4mp";
cargoSha256 = "1nz1g1r94i81b728y0c5szfvxfkz9bqry3xag22alrhjhlc66kpp";
doCheck = false;

BUILD_REV_COUNT = src.revCount or 1;
Expand All @@ -42,8 +43,7 @@ rustPlatform.buildRustPackage rec {
stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];

passthru = {
updater = with builtins; writeScript "copy-runtime-nix.sh" ''
#!${runtimeShell}
updater = writers.writeBash "copy-runtime-nix.sh" ''
set -euo pipefail
cp ${src}/nix/runtime.nix ${toString ./runtime.nix}
cp ${src}/nix/runtime-closure.nix.template ${toString ./runtime-closure.nix.template}
Expand Down