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

gitea: Fix postPatch command; add coreutils to PATH #236700

Merged
merged 2 commits into from
Jun 9, 2023

Conversation

mitya57
Copy link
Contributor

@mitya57 mitya57 commented Jun 8, 2023

Description of changes
  • Fixed substitution of wrong file in postPatch phase. This command is needed to substitute @data@ which is added by static-root-path.patch. When that patch was rebased for 1.19.0 in 5c5f710, the file name changed from setting.go to server.go, but the command was not updated. So I was not able to start gitea without setting STATIC_ROOT_PATH in my config file explicitly.

  • Added coreutils to PATH explicitly. Coreutils is used in git hooks generated by gitea, e.g. here, and if you omit coreutils and it's not present in default PATH, you get these errors when doing git push:

    remote: hooks/pre-receive: line 3: cat: command not found
    remote: hooks/pre-receive: line 5: basename: command not found
    remote: hooks/update: line 4: basename: command not found
    remote: hooks/post-receive: line 3: cat: command not found
    remote: hooks/post-receive: line 5: basename: command not found
    
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.11 Release Notes (or backporting 23.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.

This command is needed to substitute @DaTa@ which is added by
static-root-path.patch. When this patch was rebased for 1.19.0,
the file name changed, but the command was not updated.
coreutils is used by hooks which are generated by gitea, e.g.:

  $ cat hooks/pre-receive
  #!/usr/bin/env bash
  # AUTO GENERATED BY GITEA, DO NOT MODIFY
  data=$(cat)
  exitcodes=""
  hookname=$(basename $0)
@github-actions
Copy link
Contributor

github-actions bot commented Jun 9, 2023

Successfully created backport PR for release-23.05:

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.

2 participants