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

forgejo: remove no longer needed preBuild phase (noop) #313227

Merged
merged 1 commit into from
May 21, 2024

Conversation

emilylange
Copy link
Member

@emilylange emilylange commented May 20, 2024

Description of changes

This slipped through the 1.21.11-1 -> 7.0.0 bump in #306341 (6c359d6).

Upstream made this a noop with a deprecation warning instead of a hard fail in https://codeberg.org/forgejo/forgejo/pulls/2864.

Note: In that PR (it's commit) they link to nixpkgs as downstream consumer of it (build/merge-forgejo-locales.go).

# Before
Running phase: buildPhase
NOT NEEDED: THIS IS A NOOP AS OF Forgejo 7.0 BUT KEPT FOR BACKWARD COMPATIBILITY
Building subPackage ./.

# After
Running phase: buildPhase
Building subPackage ./.

Upstream commit: https://codeberg.org/forgejo/forgejo/commit/6647e4d53f04f8d5585090c7f0cf266713542b4b

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.

This slipped through the 1.21.11-1 -> 7.0.0 bump in
6c359d6.

Upstream made this a noop with a deprecation warning instead of a
hard fail in https://codeberg.org/forgejo/forgejo/pulls/2864.

Note: In that PR (it's commit) they link to nixpkgs as downstream
consumer of it (`build/merge-forgejo-locales.go`).

~~~
# Before
Running phase: buildPhase
NOT NEEDED: THIS IS A NOOP AS OF Forgejo 7.0 BUT KEPT FOR BACKWARD COMPATIBILITY
Building subPackage ./.

# After
Running phase: buildPhase
Building subPackage ./.
~~~

Upstream commit: https://codeberg.org/forgejo/forgejo/commit/6647e4d53f04f8d5585090c7f0cf266713542b4b
@cole-h
Copy link
Member

cole-h commented May 20, 2024

@ofborg eval

@NickCao NickCao merged commit 6cde993 into NixOS:master May 21, 2024
30 of 31 checks passed
@emilylange emilylange deleted the forgejo-fixup branch May 21, 2024 23:56
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.

None yet

4 participants