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

Jump to bottom

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

Merged
merged 1 commit into from Jan 10, 2020
Merged

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

merged 1 commit into from Jan 10, 2020

Conversation

curiousleo
Copy link
Contributor

@curiousleo curiousleo commented Jan 9, 2020 •
edited

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

@curiousleo curiousleo mentioned this pull request Jan 9, 2020
Closed
4 tasks
@ofborg ofborg bot requested review from grahamc and Profpatsch January 9, 2020 16:21
flokli
flokli reviewed Jan 9, 2020
View reviewed changes
pkgs/tools/misc/lorri/default.nix Outdated Show resolved Hide resolved
pkgs/tools/misc/lorri/default.nix Outdated
};

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 ];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor Author

@curiousleo curiousleo Jan 9, 2020 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
Copy link
Contributor Author

@GrahamcOfBorg eval

@curiousleo
lorri: unstable-2019-10-30 -> unstable-2020-01-09
c976dc1 
`rustfmt` is now a compile time dependency because the varlink generated
code is formatted with it.
@flokli
Copy link
Contributor

flokli commented Jan 10, 2020

@GrahamcOfBorg build lorri

@flokli flokli merged commit fe414f3 into NixOS:master Jan 10, 2020
@flokli
Copy link
Contributor

flokli commented Jan 10, 2020

@curiousleo can you do the corresponding backport PR?

@curiousleo
Copy link
Contributor Author

@curiousleo can you do the corresponding backport PR?

Will do, thanks for your help here!

@curiousleo curiousleo mentioned this pull request Jan 10, 2020
Merged
10 tasks
curiousleo added a commit to curiousleo/lorri that referenced this pull request Jan 16, 2020
@curiousleo
Remove nix, direnv, which from buildInputs
97ce8a1 
See NixOS/nixpkgs#77380 (comment)
and
NixOS/nixpkgs@c976dc1#diff-cf738915a62799c87e7c6834f40c3fcd
@curiousleo curiousleo mentioned this pull request Jan 16, 2020
Merged
3 tasks
curiousleo added a commit to curiousleo/lorri that referenced this pull request Jan 16, 2020
@curiousleo
Remove nix, direnv, which from buildInputs
524b8c2 
See NixOS/nixpkgs#77380 (comment)
and
NixOS/nixpkgs@c976dc1#diff-cf738915a62799c87e7c6834f40c3fcd
@curiousleo curiousleo deleted the lorri-unstable-2020-01-09 branch January 30, 2020 12:45
This was referenced Jan 30, 2020
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@flokli flokli flokli left review comments

@grahamc grahamc Awaiting requested review from grahamc

@Profpatsch Profpatsch Awaiting requested review from Profpatsch

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@curiousleo @flokli