Skip to content

Comments

nixVersions: remove obsolete patch for boehmgc#306036

Merged
vcunat merged 1 commit intoNixOS:stagingfrom
mweinelt:fix-nix-boehmgc
Apr 22, 2024
Merged

nixVersions: remove obsolete patch for boehmgc#306036
vcunat merged 1 commit intoNixOS:stagingfrom
mweinelt:fix-nix-boehmgc

Conversation

@mweinelt
Copy link
Member

The patch does not apply anymore since the 8.2.6 bump of boehmgc.

Description of changes

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.

The patch does not apply anymore since the 8.2.6 bump of boehmgc.
@mweinelt mweinelt marked this pull request as ready for review April 22, 2024 15:50
@ofborg ofborg bot requested review from Artturin, edolstra and lovesegfault April 22, 2024 16:38
@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. labels Apr 22, 2024
@vcunat vcunat merged commit 8bc4f93 into NixOS:staging Apr 22, 2024
@vcunat
Copy link
Member

vcunat commented Apr 22, 2024

Yes, looks all good to me. Thanks. (I've tested building some of nixVersions.*)

@mweinelt mweinelt deleted the fix-nix-boehmgc branch April 22, 2024 22:58
@luxus
Copy link
Contributor

luxus commented May 13, 2024

is it possible that it got broken on aarch64-darwin? its a dependency of devenv

nix log /nix/store/fkdaync4ahz8zc0gs49n3lqzh2kxipr0-boehm-gc-8.2.6.drv
warning: The interpretation of store paths arguments ending in `.drv` recently changed. If this command is now failing try again with '/nix/store/fkdaync4ahz8zc0gs49n3lqzh2kxipr0-boehm-gc-8.2.6.drv^*'
@nix { "action": "setPhase", "phase": "unpackPhase" }
Running phase: unpackPhase
unpacking source archive /nix/store/1knirm8jgazkcgnrv72bajb3vlg039wd-source
source root is source
@nix { "action": "setPhase", "phase": "patchPhase" }
Running phase: patchPhase
applying patch /nix/store/bj54wqjwik55hpiq7kgdi4j6wcw07hza-boehmgc-traceable_allocator-public.diff
patching file include/gc_allocator.h
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file include/gc_allocator.h.rej

@vcunat
Copy link
Member

vcunat commented May 13, 2024

This pull request dropped that patch. So after this PR you can't get into the state that it fails to apply. So... you're apparently on some version before this PR?

@domenkozar
Copy link
Member

@luxus are you using flakes?

@luxus
Copy link
Contributor

luxus commented May 14, 2024

@domenkozar yes i do(unstable)!
and if i install it via comma (i guess it uses stable) it works fine

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants