-
-
Notifications
You must be signed in to change notification settings - Fork 14k
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
[Backport release-24.05] forgejo: 7.0.9 -> 7.0.10 #351932
Conversation
69bdeea
to
94e319b
Compare
Looks like upstream bumped the required go version, but I cannot get it to build somehow |
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: Also, please fix the commit message. 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 |
94e319b
to
cc090c7
Compare
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? |
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)
cc090c7
to
d0f1128
Compare
There was a problem hiding this 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 :)
|
Release Notes: https://codeberg.org/forgejo/forgejo/milestone/8286
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.