nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 16:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

lorri: 1.6.0 -> 1.7.0 (#322749)

Browse Source 
* (lorri): (1.6.0 -> 1.7.0)

1.7.0 supports Flakes

* (lorri) (update tests)

* lorri: 1.6.0 -> 1.7.0

Removing superfluous binding for `gitRev`
This commit is contained in:
Judson Lester 2024-07-07 02:16:23 -07:00 committed by GitHub
parent 516b55050f
commit a9c8ff2cee
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,12 +17,12 @@ import ../make-test-python.nix {
# Start the daemon and wait until it is ready # Start the daemon and wait until it is ready
machine.execute("lorri daemon > lorri.stdout 2> lorri.stderr &") 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 # 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 # 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
pkgs/tools/misc/lorri/default.nix
View File

@ -14,10 +14,9 @@ let
# Run `eval $(nix-build -A lorri.updater)` after updating the revision! # Run `eval $(nix-build -A lorri.updater)` after updating the revision!
# It will copy some required files if necessary. # It will copy some required files if necessary.
# Also don’t forget to run `nix-build -A lorri.tests` # Also don’t forget to run `nix-build -A lorri.tests`
version = "1.6.0"; version = "1.7.0";
gitRev = "1.6.0"; sha256 = "sha256-pGNhhEBHyWhTaW24dHrxAvpb/qr5RPbHXRwDZx6Rf74=";
sha256 = "sha256-peelMKv9GOTPdyb1iifzlFikeayTchqaYCgeXyR5EgM="; cargoSha256 = "sha256-ENZATiBhoO+N6NpSknOWpvsatkaYb4mS/E63XNRXfMU=";
cargoSha256 = "sha256-UFAmTYnCqsQxBnCm1zMu+BcWIZMuuxvpF7poLlzC6Kg=";
in (rustPlatform.buildRustPackage rec { in (rustPlatform.buildRustPackage rec {
pname = "lorri"; pname = "lorri";
@ -26,7 +25,7 @@ in (rustPlatform.buildRustPackage rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nix-community"; owner = "nix-community";
repo = pname; repo = pname;
rev = gitRev; rev = version;
inherit sha256; inherit sha256;
}; };
@ -65,9 +64,9 @@ in (rustPlatform.buildRustPackage rec {
meta = with lib; { meta = with lib; {
description = "Your project's nix-env"; description = "Your project's nix-env";
homepage = "https://github.com/target/lorri"; homepage = "https://github.com/nix-community/lorri";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ grahamc Profpatsch ]; maintainers = with maintainers; [ grahamc Profpatsch nyarly ];
mainProgram = "lorri"; mainProgram = "lorri";
}; };
}) })