Skip to content

Comments

Release 24.05: update hercules ci packages#319390

Merged
roberth merged 5 commits intoNixOS:release-24.05from
hercules-ci:release-24.05-update-hercules-ci
Jun 25, 2024
Merged

Release 24.05: update hercules ci packages#319390
roberth merged 5 commits intoNixOS:release-24.05from
hercules-ci:release-24.05-update-hercules-ci

Conversation

@roberth
Copy link
Member

@roberth roberth commented Jun 12, 2024

Description of changes

  • Deliver stability improvements to 24.05.

  • Haskell package sets weren't normally updated on stable, so this is a bit new-ish. I've added a bit of code to replace packages. Previously (year ago?) I'd just used non-hackage-packages.nix directly, but I figured the following is a nicer solution:

haskell-modules/replacements-by-name

This directory is scanned, and all .nix files are called in order to replace their respective packages in the haskellPackages set.
They're loaded after hackage-packages.nix but before any overrides are applied.
See non-hackage-packages.nix for the implementation.

This is used for selective backports of updates, as the hackage package set won't be updated in its entirety.

Things done

  • Built on platform(s)
    • x86_64-linux
      • hci
      • hercules-ci-agent
      • cachix
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
      • hci
      • hercules-ci-agent
      • cachix
  • 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.11 Release Notes (or backporting 23.11 and 24.05 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.

@roberth roberth added the 6.topic: haskell General-purpose, statically typed, purely functional programming language label Jun 12, 2024
@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 Jun 12, 2024
@sternenseemann
Copy link
Member

I think it is probably wise to rebase this onto staging-next-24.05 and merging it into that branch. A backport of #312934 is in staging-next-24.05 atm and I have no clue how the changes will interact.

@roberth
Copy link
Member Author

roberth commented Jun 13, 2024

They merge fine and I don't see anything that's worrying in the diffs. Also evaluates fine.

This PR behaves a lot like updates in hackage-packages.nix would; it just updates a few packages a little bit more.

I appreciate your concern and thanks for the heads-up.
I'll check with staging again in a few days, when it's actually feasible to build, just to be sure.

@roberth
Copy link
Member Author

roberth commented Jun 25, 2024

Staging has released and I've found no issues after merging this locally.

@roberth roberth merged commit 08b970d into NixOS:release-24.05 Jun 25, 2024
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.

2 participants