Skip to content

nixos/hydra: wrap systemPackages with hydra envvars #84977

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.

Sign up for GitHub

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
Closed
wants to merge 1 commit into from
Closed

nixos/hydra: wrap systemPackages with hydra envvars #84977

wants to merge 1 commit into from
+18 −3

Conversation

ehmry
Copy link
Contributor

@ehmry ehmry commented Apr 11, 2020

Leave environment.variables untouched and wrap the utilities that are
added to environment.systemPackages. This avoids problems where shells
fail to source environment.variables.

Motivation for this change

I had a very frustrating situation where the fish shell failed to source HYDRA_DBI set by environment.systemPackages and the hydra-create-user utility fell back to a stale Sqlite codepath.

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.

Sorry, something went wrong.

@ofborg ofborg bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Apr 11, 2020
@ehmry
Copy link
Contributor Author

ehmry commented Apr 11, 2020

This patch removes HYDRA_DBI, HYDRA_CONFIG, and HYDRA_DATA from the global environmental variables, which I can't be sure wont cause problems for all deployments.

@ehmry ehmry requested a review from Ma27 April 11, 2020 06:22
@ehmry
nixos/hydra: wrap systemPackages with hydra envvars

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
a030607 
Leave environment.variables untouched and wrap the utilities that are
added to environment.systemPackages. This avoids problems where shells
fail to source environment.variables.
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Apr 11, 2020
@Ma27 Ma27 closed this in d7e011c Apr 11, 2020
@Ma27
Copy link
Member

Ma27 commented Apr 11, 2020

@ehmry thanks for your PR! Unfortunately I had to close it since this is a duplicate of #82507 which is also a bit nicer since it uses buildEnv rather than fixing duplications with meta.priority.

I'm very sorry I forgot about this PR and you fixed the issue yourself!

@ehmry ehmry deleted the hydraEnv branch April 12, 2020 09:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ma27 Ma27

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@ehmry @Ma27