Skip to content

Comments

haskell.compiler.ghc9{6,8}: fix elfutils splicing#305394

Merged
sternenseemann merged 1 commit intoNixOS:haskell-updatesfrom
sternenseemann:ghc-hadrian-elfutils-target
May 26, 2024
Merged

haskell.compiler.ghc9{6,8}: fix elfutils splicing#305394
sternenseemann merged 1 commit intoNixOS:haskell-updatesfrom
sternenseemann:ghc-hadrian-elfutils-target

Conversation

@sternenseemann
Copy link
Member

elfutils is used in the RTS (rts/Libdw.c), i.e. it will be used on the target platform.

Tested via pkgsCross.gnu32.haskellPackages.ghc (nix-shell -E 'with import ./. { crossSystem = "i686-linux"; }; mkShell { nativeBuildInputs = [haskellPackages.ghc ]; }'), though #304605 needs to be cherry-picked for elfutils to build.

Pinging @AlexandreTunstall for review (#243619 may need to do something in addition) .

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.

elfutils is used in the RTS (rts/Libdw.c), i.e. it will be used on the
target platform.

Tested via pkgsCross.gnu32.haskellPackages.ghc [1], though NixOS#304605 needs
to be cherry-picked for elfutils to build.

[1]: nix-shell -E 'with import ./. { crossSystem = "i686-linux"; };
       mkShell { nativeBuildInputs = [haskellPackages.ghc ]; }'
@github-actions github-actions bot added the 6.topic: haskell General-purpose, statically typed, purely functional programming language label Apr 19, 2024
@ofborg ofborg bot added 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 Apr 19, 2024
@sternenseemann sternenseemann added 9.needs: port to stable A PR needs a backport to the stable release. backport release-24.05 labels May 26, 2024
@sternenseemann sternenseemann merged commit 69bdf62 into NixOS:haskell-updates May 26, 2024
@sternenseemann sternenseemann deleted the ghc-hadrian-elfutils-target branch May 26, 2024 19:29
@github-actions
Copy link
Contributor

Successfully created backport PR for release-24.05:

@sternenseemann sternenseemann added 8.has: port to stable This PR already has a backport to the stable release. and removed 9.needs: port to stable A PR needs a backport to the stable release. labels May 26, 2024
@github-actions
Copy link
Contributor

Git push to origin failed for release-24.05 with exitcode 1

@sternenseemann
Copy link
Member Author

Git push to origin failed for release-24.05 with exitcode 1

Now why would you do that…

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

Labels

6.topic: haskell General-purpose, statically typed, purely functional programming language 8.has: port to stable This PR already has a backport to the stable release. 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.

1 participant