Skip to content

sourcehut: update all components#286993

Merged
tomberek merged 12 commits intoNixOS:masterfrom
christoph-heiss:srht-updates-next-round
Feb 10, 2024
Merged

sourcehut: update all components#286993
tomberek merged 12 commits intoNixOS:masterfrom
christoph-heiss:srht-updates-next-round

Conversation

@christoph-heiss
Copy link
Contributor

Description of changes

This is a new round of updates across the sourcehut stack. Keeping close to upstream should help us all around, as big version upgrades can be painful.
Pretty minor version upgrades for most packages, nothing should be broken (or at least; not more than before).

It has also been tested on top of the incoming, much more expansive testsuite in #271324.

Two more things to note:

  • I've added myself as maintainer for anything sourcehut, since I already spend way to much time on this.
  • Refactored the todo, man, lists, hub and hg packages, such that they are all now pretty similar. I would then combine them using some common expression and factor out most of the now-common stuff between all of them as a next step.

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.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Feb 7, 2024
Copy link
Member

@mfrw mfrw left a comment

Choose a reason for hiding this comment

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

A few cosmetic suggestions: s/sha256/hash/g :)

@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 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 Feb 7, 2024
Signed-off-by: Christoph Heiss <christoph@c8h4.io>
Signed-off-by: Christoph Heiss <christoph@c8h4.io>
Signed-off-by: Christoph Heiss <christoph@c8h4.io>
Also refactor it to the same common structure as all other sourcehut
packages, thus opening the possibility to even further simplify this in
the future.

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
Also refactor it to the same common structure as all other sourcehut
packages, thus opening the possibility to even further simplify this in
the future.

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
Also refactor it to the same common structure as all other sourcehut
packages, thus opening the possibility to even further simplify this in
the future.

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
Signed-off-by: Christoph Heiss <christoph@c8h4.io>
Signed-off-by: Christoph Heiss <christoph@c8h4.io>
Also refactor it to the same common structure as all other sourcehut
packages, thus opening the possibility to even further simplify this in
the future.

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
@christoph-heiss christoph-heiss force-pushed the srht-updates-next-round branch from 2a1b8f8 to b8f5bf6 Compare February 7, 2024 13:50
This provides the same common structure as all other sourcehut packages,
thus opening the possibility to even further simplify this in the
future.

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
Signed-off-by: Christoph Heiss <christoph@c8h4.io>
I worked already a lot on this stuff, esp. modules - so it just makes
sense.

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
@christoph-heiss christoph-heiss force-pushed the srht-updates-next-round branch from b8f5bf6 to 62854c0 Compare February 7, 2024 13:58
@mfrw
Copy link
Member

mfrw commented Feb 7, 2024

Result of nixpkgs-review pr 286993 run on x86_64-linux 1

2 packages blacklisted:
  • nixos-install-tools
  • tests.nixos-functions.nixos-test
21 packages built:
  • sourcehut.buildsrht
  • sourcehut.buildsrht.dist
  • sourcehut.coresrht
  • sourcehut.coresrht.dist
  • sourcehut.gitsrht
  • sourcehut.gitsrht.dist
  • sourcehut.hgsrht
  • sourcehut.hgsrht.dist
  • sourcehut.hubsrht
  • sourcehut.hubsrht.dist
  • sourcehut.listssrht
  • sourcehut.listssrht.dist
  • sourcehut.mansrht
  • sourcehut.mansrht.dist
  • sourcehut.metasrht
  • sourcehut.metasrht.dist
  • sourcehut.pagessrht
  • sourcehut.pastesrht
  • sourcehut.pastesrht.dist
  • sourcehut.todosrht
  • sourcehut.todosrht.dist

Copy link
Contributor

@nessdoor nessdoor left a comment

Choose a reason for hiding this comment

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

Thank you for taking on maintainership and keeping track of upstream changes! All those gqlgen dependencies always make me so nervous...

+1 for the intention of factoring common parts more rationally, all these versions and hashes scattered around make version bumps so very tedious.

I also tested compilation on an AArch64 box; results follow.

Result of nixpkgs-review pr 286993 run on aarch64-linux 1

1 package blacklisted:
  • nixos-install-tools
21 packages built:
  • sourcehut.buildsrht
  • sourcehut.buildsrht.dist
  • sourcehut.coresrht
  • sourcehut.coresrht.dist
  • sourcehut.gitsrht
  • sourcehut.gitsrht.dist
  • sourcehut.hgsrht
  • sourcehut.hgsrht.dist
  • sourcehut.hubsrht
  • sourcehut.hubsrht.dist
  • sourcehut.listssrht
  • sourcehut.listssrht.dist
  • sourcehut.mansrht
  • sourcehut.mansrht.dist
  • sourcehut.metasrht
  • sourcehut.metasrht.dist
  • sourcehut.pagessrht
  • sourcehut.pastesrht
  • sourcehut.pastesrht.dist
  • sourcehut.todosrht
  • sourcehut.todosrht.dist

@nessdoor nessdoor added 12.approvals: 1 This PR was reviewed and approved by one person. 12.approvals: 2 This PR was reviewed and approved by two persons. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels Feb 8, 2024
Copy link
Member

@mfrw mfrw left a comment

Choose a reason for hiding this comment

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

LGTM :)
Thanks

@tomberek tomberek merged commit 6e60c85 into NixOS:master Feb 10, 2024
@christoph-heiss christoph-heiss deleted the srht-updates-next-round branch February 10, 2024 17:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 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. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 12.approvals: 2 This PR was reviewed and approved by two persons.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants