Skip to content

feat: add EXTRA_NIX_CONFIG variable#65

Merged
Defelo merged 1 commit intomainfrom
push-lltwvsmxsrsm
Oct 23, 2025
Merged

feat: add EXTRA_NIX_CONFIG variable#65
Defelo merged 1 commit intomainfrom
push-lltwvsmxsrsm

Conversation

@Defelo
Copy link
Owner

@Defelo Defelo commented Oct 17, 2025

No description provided.

@Defelo Defelo changed the base branch from main to push-mllzlywwyzum October 17, 2025 14:48
Copy link
Contributor

@MattSturgeon MattSturgeon left a comment

Choose a reason for hiding this comment

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

Nice feature!

@MattSturgeon
Copy link
Contributor

Is it intended that the target branch is push-mllzlywwyzum, rather than main?

@Defelo Defelo force-pushed the push-lltwvsmxsrsm branch from 3ad6bf7 to db442d4 Compare October 18, 2025 22:05
@Defelo
Copy link
Owner Author

Defelo commented Oct 18, 2025

Is it intended that the target branch is push-mllzlywwyzum, rather than main?

Yes, unfortunately GitHub doesn't really supported stacked PRs, so if you have a PR "A" and use that as the base of another PR "B", GH includes the changes of "A" in the diff view of "B", if both of them use main as the base branch. Also, if you merge "A" now, by doing a fast forward, GitHub doesn't update the diff of "B" (and any descendants) and still includes the commits and changes of "A". But if you set the base branch of "B" to the branch of "A", only those commits that are in "B" but not in "A" are shown in the diff view of "B", and if "A" is merged and the branch of "A" is deleted, GH automatically updates "B" to instead target the main branch (see #62 for example).

Copy link

@cameronraysmith cameronraysmith left a comment

Choose a reason for hiding this comment

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

Works for me. Many thanks for this Defelo.
Resolves #49.

README.md Outdated
extra-substituters = https://nix-community.cachix.org
extra-trusted-public-keys = nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=
```

Choose a reason for hiding this comment

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

From the gh cli you can set this via

gh variable set -R [fork-username]/nixpkgs-review-gha EXTRA_NIX_CONFIG <<'EOF'
extra-substituters = https://nix-community.cachix.org
extra-trusted-public-keys = nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=
EOF

and then you should find something like the following in the workflow run logs

Run cachix/install-nix-action@v31
  with:
    extra_nix_config: build-dir = /nix/build
  sandbox = true
  system = x86_64-linux
  extra-substituters = https://nix-community.cachix.org/
  extra-trusted-public-keys = nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=
  
    enable_kvm: true
    set_as_trusted_user: true
  env:
    PR_NUMBER: NNNNNN
    TMPDIR: /mnt/tmp.jqTjgZ6hYE

@Defelo Defelo force-pushed the push-lltwvsmxsrsm branch from fbab3f6 to a4df497 Compare October 23, 2025 17:33
@Defelo Defelo force-pushed the push-mllzlywwyzum branch from 551887d to 14dae8f Compare October 23, 2025 17:33
Base automatically changed from push-mllzlywwyzum to main October 23, 2025 17:57
@Defelo Defelo merged commit a4df497 into main Oct 23, 2025
8 checks passed
@Defelo Defelo deleted the push-lltwvsmxsrsm branch October 23, 2025 17:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants