public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lorri: 1.0 -> 1.1

This commit is contained in:
Profpatsch 2020-06-30 02:09:13 +02:00
parent d13d819b89
commit 1c04554e4b
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,7 @@ import ../make-test-python.nix {
machine.wait_until_succeeds("grep --fixed-strings 'ready' lorri.stdout") machine.wait_until_succeeds("grep --fixed-strings 'ready' lorri.stdout")
# Ping the daemon # 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 # 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.stdout")

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

@ -4,7 +4,7 @@
, rustPlatform , rustPlatform
# Updater script # Updater script
, runtimeShell , runtimeShell
, writeScript , writers
# Tests # Tests
, nixosTests , nixosTests
# Apple dependencies # Apple dependencies
@ -14,7 +14,7 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "lorri"; pname = "lorri";
version = "1.0"; version = "1.1";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Your project's nix-env"; description = "Your project's nix-env";
@ -27,11 +27,12 @@ rustPlatform.buildRustPackage rec {
owner = "target"; owner = "target";
repo = pname; repo = pname;
# Run `eval $(nix-build -A lorri.updater)` after updating the revision! # Run `eval $(nix-build -A lorri.updater)` after updating the revision!
rev = "88c680c9abf0f04f2e294436d20073ccf26f0781"; # ALSO don’t forget to update the cargoSha256!
sha256 = "1415mhdr0pwvshs04clfz1ys76r5qf9jz8jchm63l6llaj6m7mrv"; rev = "93d93013217cd9aa09d2bd316d6c3abf827a6601";
sha256 = "0wbkx8hmikngfp6fp0y65yla22f3k0jszq8a6pas80q0b33llwm5";
}; };
cargoSha256 = "1iwd0cad8dp8q5xz2mm7zn1wphr5brkw937dfygc88afj6bv3d68"; cargoSha256 = "1a3n1ylyp63x6v7b07nnqpfxjzmsgwmgraza23lx8z4gh167gv46";
doCheck = false; doCheck = false;
BUILD_REV_COUNT = src.revCount or 1; BUILD_REV_COUNT = src.revCount or 1;
@ -42,8 +43,7 @@ rustPlatform.buildRustPackage rec {
stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
passthru = { passthru = {
updater = with builtins; writeScript "copy-runtime-nix.sh" '' updater = writers.writeBash "copy-runtime-nix.sh" ''
#!${runtimeShell}
set -euo pipefail set -euo pipefail
cp ${src}/nix/runtime.nix ${toString ./runtime.nix} cp ${src}/nix/runtime.nix ${toString ./runtime.nix}
cp ${src}/nix/runtime-closure.nix.template ${toString ./runtime-closure.nix.template} cp ${src}/nix/runtime-closure.nix.template ${toString ./runtime-closure.nix.template}