Skip to content

Revert "haskellPackages.heystone: fix darwin dylibs"#217683

Merged
sternenseemann merged 1 commit intohaskell-updatesfrom
revert-214680-heystone-darwin
Feb 23, 2023
Merged

Revert "haskellPackages.heystone: fix darwin dylibs"#217683
sternenseemann merged 1 commit intohaskell-updatesfrom
revert-214680-heystone-darwin

Conversation

@sternenseemann
Copy link
Member

This reverts commit 32eecc6.

Reason for revert: This fix doesn't alleviate the problem in two ways:

  1. It is in the aarch64-darwin section of configuration-darwin.nix, the problem appears on x86_64-darwin (bytepatch doesn't support aarch64).

  2. When moving the override into the general *-darwin section, the problem with bytepatch is also unaffected, see my attempt in keystone: make sure dylib's install name is correct on darwin  #217201.

cc @raehik

Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.05 Release Notes (or backporting 22.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.

This reverts commit 32eecc6.

Reason for revert: This fix doesn't alleviate the problem in two ways:

1. It is in the aarch64-darwin section of configuration-darwin.nix,
   the problem appears on x86_64-darwin (bytepatch doesn't support
   aarch64).

2. When moving the override into the general *-darwin section, the
   problem with bytepatch is also unaffected, see my attempt in
   #217201.
@github-actions github-actions bot added the 6.topic: haskell General-purpose, statically typed, purely functional programming language label Feb 22, 2023
@ofborg ofborg bot added 6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Feb 22, 2023
@cdepillabout
Copy link
Member

@sternenseemann Sorry about that. Thanks for putting together this revert.

@sternenseemann sternenseemann merged commit 7f65851 into haskell-updates Feb 23, 2023
@sternenseemann sternenseemann deleted the revert-214680-heystone-darwin branch February 23, 2023 12:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: darwin Running or building packages on Darwin 6.topic: haskell General-purpose, statically typed, purely functional programming language 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

Comments