Skip to content

Comments

haskellPackages.hercules-ci-*: update#312878

Closed
roberth wants to merge 1 commit intoNixOS:masterfrom
hercules-ci:hercules-ci-update
Closed

haskellPackages.hercules-ci-*: update#312878
roberth wants to merge 1 commit intoNixOS:masterfrom
hercules-ci:hercules-ci-update

Conversation

@roberth
Copy link
Member

@roberth roberth commented May 19, 2024

Description of changes

This is an ad hoc update ahead of haskell-updates because of a build issue introduced by #312433

I'll take care of any merge conflicts.

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.

This is an ad hoc update ahead of haskell-updates because of a
build issue introduced by NixOS#312433
@github-actions github-actions bot added the 6.topic: haskell General-purpose, statically typed, purely functional programming language label May 19, 2024
@roberth
Copy link
Member Author

roberth commented May 19, 2024

@ofborg build hci hercules-ci-agent cachix

@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels May 19, 2024
@maralorn
Copy link
Member

Ah, you are right hercules-ci-agent builds just fine on haskell-updates even though the cachix bump is included there.
I think the haskell-updates branch is in really good shape right now. Maybe we can just merge it quickly instead of doing this high volume fix?
@ncfavier what do you think?

@ncfavier
Copy link
Member

Sounds good.

Copy link
Member

@maralorn maralorn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since hercules-ci is now fixed on master I suggest not doing this dance.

@roberth roberth closed this May 19, 2024
@roberth
Copy link
Member Author

roberth commented May 20, 2024

Hmm, branch-off is on Wednesday.
Unless we can merge #312934 before that, I'm going to have to do something like this anyway, at least for the release-24.05 branch.

@sternenseemann
Copy link
Member

It would be my goal to get that into 24.05. If all fails, it'll just have to be in the first staging iteration for that release.

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 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants