Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport release-24.05] forgejo: 7.0.9 -> 7.0.10 #351932

Merged
merged 1 commit into from
Oct 29, 2024

Conversation

NyCodeGHG
Copy link
Member

@NyCodeGHG NyCodeGHG commented Oct 28, 2024

Release Notes: https://codeberg.org/forgejo/forgejo/milestone/8286

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.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.

@NyCodeGHG
Copy link
Member Author

Looks like upstream bumped the required go version, but I cannot get it to build somehow

@emilylange
Copy link
Member

emilylange commented Oct 28, 2024

Needs something like:

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 86fc821111e2..7784ea70e472 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -30693,6 +30693,10 @@ with pkgs;
 
   fontpreview = callPackage ../applications/misc/fontpreview { };
 
+  forgejo = callPackage ../by-name/fo/forgejo/package.nix {
+    # buildGoModule = buildGo123Module;
+  };
+
   fossil = callPackage ../applications/version-management/fossil {
     sqlite = sqlite.override { enableDeserialize = true; };
   };

Just as a fyi:
Even with by-name packages, we override stuff like that in all-packages.nix and not in the package definition itself so our override interfaces stays intact.
See #348925 (comment)


Also, please fix the commit message.
The package is called forgejo in 24.05, not forgejo-lts.

But take your time. This isn't urgent.

Yes, this is a security release, but its severity isn't that high and it will take a fair time until this reaches our nixos-24.05 nixos-24.05-small channels anyway.

@emilylange emilylange changed the title [Backport release-24.05] forgejo-lts: 7.0.9 -> 7.0.10 [Backport release-24.05] forgejo: 7.0.9 -> 7.0.10 Oct 28, 2024
@ofborg ofborg bot requested a review from urandom2 October 28, 2024 22:14
@adamcstephens
Copy link
Contributor

This should be a cherry-pick -x of the relevant commit from master. Doing so gives a link back to the original commit.

@NyCodeGHG
Copy link
Member Author

This should be a cherry-pick -x of the relevant commit from master. Doing so gives a link back to the original commit.

Should this still be done when the commit differs quite a bit from the original?
I mean this commit has the go bump which is required to build in 24.05, which has nothing to do with the original one

@adamcstephens
Copy link
Contributor

Should this still be done when the commit differs quite a bit from the original?

Yeah, it's a bit more work to do since it requires a rebase, but in the end shouldn't be that bad.

(cherry picked from commit 0e158f7)
@NyCodeGHG NyCodeGHG marked this pull request as ready for review October 29, 2024 13:12
Copy link
Member

@emilylange emilylange left a comment

Choose a reason for hiding this comment

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

The commit message is technically missing the

Release Notes: https://codeberg.org/forgejo/forgejo/milestone/8286

bit, but that's okay.
No need to fix and force push that now.
Just something I wanted to point out, for the sake of acknowledging part of the failing backport CI check.

Builds on x86_64-linux:

# nix-build -A forgejo.tests
/nix/store/zapcwj2ylg18kdkmy3br3md4qkzv1h3j-vm-test-run-forgejo-mysql
/nix/store/jd2lmv7pan59vyxr56cnh9r2h0jv02wh-vm-test-run-forgejo-postgres
/nix/store/jm0y4nkr95n3kf7drfb12dim98dkwdy8-vm-test-run-forgejo-sqlite3

thanks :)

@adamcstephens
Copy link
Contributor

aarch64-linux
/nix/store/mkd8a2cji8l6lviv1s48v3b1pwlmdx57-vm-test-run-forgejo-mysql
/nix/store/1flfzbd1pldrzvkgkvws8wjr5g9ay1dn-vm-test-run-forgejo-postgres
/nix/store/3944nqxhnns19a20sk6irhncxh62bgiv-vm-test-run-forgejo-sqlite3

@adamcstephens adamcstephens merged commit 1a45f6a into NixOS:release-24.05 Oct 29, 2024
10 of 12 checks passed
@NyCodeGHG NyCodeGHG deleted the push-slxrwpnwvmsy branch October 29, 2024 16:40
@ofborg ofborg bot requested a review from emilylange October 29, 2024 16:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants