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

flake: fix patch for nix-eval-jobs #256

Merged
merged 3 commits into from
Dec 22, 2024

Conversation

pks-t
Copy link
Contributor

@pks-t pks-t commented Dec 15, 2024

We carry a custom patch for nix-eval-jobs that causes the tool to not unset the NIX_PATH environment variable anymore. The patch does not apply anymore starting with d0bcdae (clang-tidy: use trailing return type, 2024-11-10) because surrounding code has changed. Other than that the patch still applies.

The mentioned commit was released with nix-eval-jobs v2.25.0, which nixos-unstable has recently upgraded to. Adapt the patch to unbreak the build.

Fixes #255.

@zhaofengli zhaofengli force-pushed the pks-nix-eval-job-fix-patch branch from ed38ef0 to 5b124f7 Compare December 16, 2024 16:34
@zhaofengli
Copy link
Owner

Thanks!

@zhaofengli zhaofengli enabled auto-merge December 16, 2024 16:34
auto-merge was automatically disabled December 16, 2024 18:03

Head branch was pushed to by a user without write access

@zhaofengli zhaofengli force-pushed the pks-nix-eval-job-fix-patch branch from 50a13db to a0caac4 Compare December 16, 2024 18:36
The `writeReferencesToFile` builder has been removed in favor of
`writeClosure` in 51da8b6b00c2 (writeReferencesToFile: remove,
2024-11-17). Adapt the code accordingly.
@zhaofengli zhaofengli force-pushed the pks-nix-eval-job-fix-patch branch from a0caac4 to c9e5689 Compare December 16, 2024 18:39
@zhaofengli zhaofengli enabled auto-merge December 16, 2024 18:40
@zhaofengli
Copy link
Owner

zhaofengli commented Dec 16, 2024

(Sorry, missed your writeClosure fix - Just cherry-picked it)

Will need to fix the Cargo flake tests later - Will merge as long as the integration tests pass.

@pks-t
Copy link
Contributor Author

pks-t commented Dec 16, 2024

Hm. I don't get why the Linux test keeps failing. It passes on my machine 🤔

@pks-t
Copy link
Contributor Author

pks-t commented Dec 16, 2024

(Sorry, missed your writeClosure fix - Just cherry-picked it)

No worries :) Thanks for fixing up, didn't have the time yesterday when creating the MR to bring it over the finishing line.

Will need to fix the Cargo flake tests later - Will merge as long as the integration tests pass.

Ok. 👍

@zhaofengli
Copy link
Owner

Hm. I don't get why the Linux test keeps failing. It passes on my machine 🤔

It fails on newer Nix versions (not pinned by the devShell, regrettably).

We carry a custom patch for nix-eval-jobs that causes the tool to not
unset the `NIX_PATH` environment variable anymore. The patch does not
apply anymore starting with d0bcdae (clang-tidy: use trailing return
type, 2024-11-10) because surrounding code has changed. Other than that
the patch still applies.

The mentioned commit was released with nix-eval-jobs v2.25.0, which
nixos-unstable has recently upgraded to. Adapt the patch to unbreak the
build.

Fixes zhaofengli#255.
@pks-t
Copy link
Contributor Author

pks-t commented Dec 16, 2024

Pushed another fix to make this work with older nixpkgs.

auto-merge was automatically disabled December 16, 2024 19:46

Head branch was pushed to by a user without write access

@pks-t pks-t force-pushed the pks-nix-eval-job-fix-patch branch from c9e5689 to caabefa Compare December 16, 2024 19:46
@zhaofengli
Copy link
Owner

Sorry for the late reply, let's merge this now and fix the remaining issues later.

@zhaofengli zhaofengli merged commit a6b51f5 into zhaofengli:main Dec 22, 2024
16 of 17 checks passed
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.

Patch against nix-eval-jobs fails to apply on unstable
2 participants