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

nixos/hydra: use set-default in hydra-env wrapper package #287257

Merged
merged 1 commit into from
Feb 18, 2024

Conversation

999eagle
Copy link
Contributor

@999eagle 999eagle commented Feb 8, 2024

Description of changes

This fixes #115024 to actually work. While that PR added application_name to HYDRA_DBI for every service, this was pointless as the wrapped binaries in the hydra-env will override HYDRA_DBI to the default value, ignoring whatever is set in the systemd service.

I've noticed this while trying to override HYDRA_DBI for just a single service for my workaround for NixOS/hydra#1358.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions 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 Feb 8, 2024
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Feb 8, 2024
@999eagle 999eagle requested review from Artturin and Ma27 February 9, 2024 12:10
@999eagle 999eagle force-pushed the fix/hydra-pg-application-name branch from 7acfc35 to b670443 Compare February 12, 2024 10:16
@999eagle 999eagle changed the title nixos/hydra: remove hydra-env wrapper package nixos/hydra: use set-default in hydra-env wrapper package Feb 12, 2024
Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

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

diff LGTM

@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Feb 12, 2024
Copy link
Member

@Ma27 Ma27 left a comment

Choose a reason for hiding this comment

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

Though I use the upstream flake directly and not this module anymore, the change looks reasonable -> approving.

@delroth delroth added 12.approvals: 2 This PR was reviewed and approved by two reputable people and removed 12.approvals: 1 This PR was reviewed and approved by one reputable person labels Feb 12, 2024
@Artturin Artturin merged commit dab023d into NixOS:master Feb 18, 2024
26 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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: 1-10 12.approvals: 2 This PR was reviewed and approved by two reputable people
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants