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.

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

lorri: unstable-2019-10-30 -> unstable-2020-01-09 #77380

Merged
merged 1 commit into from Jan 10, 2020

Conversation

@curiousleo
Copy link
Contributor

@curiousleo curiousleo commented Jan 9, 2020

Motivation for this change

lorri development is making rapid progress. This release fixes one bug in particular that many users come across: target/lorri#176 / fix in target/lorri#260.

Note: rustfmt is now a compile time dependency because the varlink generated code is formatted with it.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @Profpatsch

pkgs/tools/misc/lorri/default.nix Outdated Show resolved Hide resolved
};

cargoSha256 = "1daff4plh7hwclfp21hkx4fiflh9r80y2c7k2sd3zm4lmpy0jpfz";
cargoSha256 = "0k7l0zhk2vzf4nlwv4xr207irqib2dqjxfdjk1fprff84c4kblx8";
doCheck = false;

BUILD_REV_COUNT = src.revCount or 1;
RUN_TIME_CLOSURE = pkgs.callPackage ./runtime.nix {};

nativeBuildInputs = with pkgs; [ nix direnv which ];

This comment has been minimized.

@flokli

flokli Jan 9, 2020
Contributor

Also, this looks weird - why do we need nix and direnv as nativeBuildInput?

This comment has been minimized.

@curiousleo

curiousleo Jan 9, 2020
Author Contributor

nix and direnv are runtime dependencies of lorri. Is there a better way of declaring that dependency?

This comment has been minimized.

@flokli

flokli Jan 9, 2020
Contributor

nativeBuildInputs is useful to distinguish between platforms w.r.t cross-compiling. Do we execute nix or direnv during build? The build might also work without which.

Does lorri rely on nix and direnv being available during runtime? Or is it only nix? It might be sufficient to have it available in the systemd service path - in interactive shells nix should already be available in $PATH.

This comment has been minimized.

@curiousleo

curiousleo Jan 10, 2020
Author Contributor

lorri requires nix at runtime. Some integration tests require direnv, but we don't run them on Hydra at the moment. Similarly for which, though it looks like the integration tests only claim to use it but don't really: https://github.com/target/lorri/blob/7b84837b9988d121dd72178e81afd440288106c5/tests/integration/envrctestcase.rs#L19-L23

It might be sufficient to have it available in the systemd service path - in interactive shells nix should already be available in $PATH.

So you're saying that there is no need to have nix in nativeBuildInputs? Cool, I'll remove it.

@curiousleo curiousleo force-pushed the curiousleo:lorri-unstable-2020-01-09 branch from 1e96cdd to 2efd290 Jan 9, 2020
@curiousleo
Copy link
Contributor Author

@curiousleo curiousleo commented Jan 9, 2020

@curiousleo curiousleo force-pushed the curiousleo:lorri-unstable-2020-01-09 branch from 2efd290 to cae6989 Jan 10, 2020
`rustfmt` is now a compile time dependency because the varlink generated
code is formatted with it.
@curiousleo curiousleo force-pushed the curiousleo:lorri-unstable-2020-01-09 branch from cae6989 to c976dc1 Jan 10, 2020
@flokli
Copy link
Contributor

@flokli flokli commented Jan 10, 2020

@GrahamcOfBorg build lorri

@flokli flokli merged commit fe414f3 into NixOS:master Jan 10, 2020
12 of 13 checks passed
12 of 13 checks passed
grahamcofborg-eval Calculating Changed Outputs
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
lorri on aarch64-linux Success
Details
lorri on x86_64-darwin Success
Details
lorri on x86_64-linux Success
Details
@flokli
Copy link
Contributor

@flokli flokli commented Jan 10, 2020

@curiousleo can you do the corresponding backport PR?

@curiousleo
Copy link
Contributor Author

@curiousleo curiousleo commented Jan 10, 2020

@curiousleo can you do the corresponding backport PR?

Will do, thanks for your help here!

curiousleo added a commit to curiousleo/nixpkgs that referenced this pull request Jan 10, 2020
lorri: unstable-2019-10-30 -> unstable-2020-01-09
curiousleo added a commit to curiousleo/lorri that referenced this pull request Jan 16, 2020
@curiousleo curiousleo mentioned this pull request Jan 16, 2020
1 of 3 tasks complete
curiousleo added a commit to curiousleo/lorri that referenced this pull request Jan 16, 2020
@curiousleo curiousleo deleted the curiousleo:lorri-unstable-2020-01-09 branch Jan 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.