lorri: 1.0 -> 1.1

Changed files
+8 -8
nixos
tests
lorri
pkgs
tools
misc
lorri
+1 -1
nixos/tests/lorri/default.nix
···
machine.wait_until_succeeds("grep --fixed-strings 'ready' lorri.stdout")
# Ping the daemon
-
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")
···
machine.wait_until_succeeds("grep --fixed-strings 'ready' lorri.stdout")
# Ping the daemon
+
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")
+7 -7
pkgs/tools/misc/lorri/default.nix
···
, rustPlatform
# Updater script
, runtimeShell
-
, writeScript
# Tests
, nixosTests
# Apple dependencies
···
rustPlatform.buildRustPackage rec {
pname = "lorri";
-
version = "1.0";
meta = with stdenv.lib; {
description = "Your project's nix-env";
···
owner = "target";
repo = pname;
# Run `eval $(nix-build -A lorri.updater)` after updating the revision!
-
rev = "88c680c9abf0f04f2e294436d20073ccf26f0781";
-
sha256 = "1415mhdr0pwvshs04clfz1ys76r5qf9jz8jchm63l6llaj6m7mrv";
};
-
cargoSha256 = "1iwd0cad8dp8q5xz2mm7zn1wphr5brkw937dfygc88afj6bv3d68";
doCheck = false;
BUILD_REV_COUNT = src.revCount or 1;
···
stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
passthru = {
-
updater = with builtins; writeScript "copy-runtime-nix.sh" ''
-
#!${runtimeShell}
set -euo pipefail
cp ${src}/nix/runtime.nix ${toString ./runtime.nix}
cp ${src}/nix/runtime-closure.nix.template ${toString ./runtime-closure.nix.template}
···
, rustPlatform
# Updater script
, runtimeShell
+
, writers
# Tests
, nixosTests
# Apple dependencies
···
rustPlatform.buildRustPackage rec {
pname = "lorri";
+
version = "1.1";
meta = with stdenv.lib; {
description = "Your project's nix-env";
···
owner = "target";
repo = pname;
# Run `eval $(nix-build -A lorri.updater)` after updating the revision!
+
# ALSO don’t forget to update the cargoSha256!
+
rev = "93d93013217cd9aa09d2bd316d6c3abf827a6601";
+
sha256 = "0wbkx8hmikngfp6fp0y65yla22f3k0jszq8a6pas80q0b33llwm5";
};
+
cargoSha256 = "1a3n1ylyp63x6v7b07nnqpfxjzmsgwmgraza23lx8z4gh167gv46";
doCheck = false;
BUILD_REV_COUNT = src.revCount or 1;
···
stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
passthru = {
+
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}