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.

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

Patch against nix-eval-jobs fails to apply on unstable #255

Closed
mweinelt opened this issue Dec 14, 2024 · 0 comments · Fixed by #256
Closed

Patch against nix-eval-jobs fails to apply on unstable #255

mweinelt opened this issue Dec 14, 2024 · 0 comments · Fixed by #256

Comments

@mweinelt
Copy link 

Running phase: patchPhase
applying patch /nix/store/sxppmnpzsx6fh7xcxd1v44rwqg15brkb-6ff5972724230ac2b96eb1ec355cd25ca512ef57.patch
patching file src/nix-eval-jobs.cc
Hunk #1 FAILED at 342.
1 out of 1 hunk FAILED -- saving rejects to file src/nix-eval-jobs.cc.rej

Likely due to NixOS/nixpkgs@c64ac9f
zhaofengli pushed a commit to pks-t/colmena that referenced this issue Dec 16, 2024
@pks-t @zhaofengli
flake: fix patch for nix-eval-jobs
5b124f7 
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.
@zhaofengli zhaofengli mentioned this issue Dec 16, 2024
Merged
zhaofengli pushed a commit to pks-t/colmena that referenced this issue Dec 16, 2024
@pks-t @zhaofengli
flake: fix patch for nix-eval-jobs
a0caac4 
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.
zhaofengli pushed a commit to pks-t/colmena that referenced this issue Dec 16, 2024
@pks-t @zhaofengli
flake: fix patch for nix-eval-jobs
c9e5689 
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 added a commit to pks-t/colmena that referenced this issue Dec 16, 2024
@pks-t
flake: fix patch for nix-eval-jobs
caabefa 
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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

flake: fix patch for nix-eval-jobs pks-t/colmena
1 participant
@mweinelt