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

rss-bridge: 2022-06-14 -> 2023-09-24 #257641

Merged
merged 3 commits into from
Oct 22, 2023
Merged

Conversation

Mynacol
Copy link
Contributor

@Mynacol Mynacol commented Sep 27, 2023

Description of changes

Update to the latest release: https://github.com/RSS-Bridge/rss-bridge/releases/tag/2023-09-24

The source code substitutions have to be adopted to continue working. The PATH_CACHE const has to use define instead, as const forbids using functions.

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.

@dawidsowa

Copy link
Contributor

@quantenzitrone quantenzitrone left a comment

Choose a reason for hiding this comment

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

LGTM

Comment on lines 15 to 20
substituteInPlace lib/RssBridge.php \
--replace "__DIR__ . '/../config.ini.php'" "getenv('RSSBRIDGE_DATA') . '/config.ini.php'"
substituteInPlace lib/bootstrap.php \
--replace "const PATH_CACHE = __DIR__ . '/../cache/';" "define('PATH_CACHE', getenv('RSSBRIDGE_DATA') . '/cache/');"
substituteInPlace lib/Configuration.php \
--replace "__DIR__ . '/../whitelist.txt'" "getenv('RSSBRIDGE_DATA') . '/whitelist.txt'"
Copy link
Member

Choose a reason for hiding this comment

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

Can we use the patch from https://github.com/NixOS/nixpkgs/pull/223066/files instead?

The source code substitutions have to be adopted to continue working.
The PATH_CACHE const has to use `define` instead, as const forbids using
functions.
@Mynacol
Copy link
Contributor Author

Mynacol commented Oct 16, 2023 via email

Copy link
Contributor

@megheaiulian megheaiulian left a comment

Choose a reason for hiding this comment

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

👍

@Mynacol Mynacol removed the request for review from dawidsowa October 22, 2023 09:02
@Mynacol
Copy link
Contributor Author

Mynacol commented Oct 22, 2023

It seems I can't merge this PR. Can one of you guys do it?
Coincidentally, I'd propose myself as (additional) maintainer for this package.

@megheaiulian
Copy link
Contributor

@Mynacol i think you need to add yourself in maintainers/maintainer-list.nix if not already there. And afterwards in meta.maintainers for the package.

@Mynacol
Copy link
Contributor Author

Mynacol commented Oct 22, 2023

I added myself as a maintainer for this package in a second commit. I hope you all are fine with this.

@yayayayaka yayayayaka merged commit e8fde3f into NixOS:master Oct 22, 2023
4 of 5 checks passed
yayayayaka pushed a commit that referenced this pull request Oct 22, 2023
@Mynacol Mynacol deleted the rss-bridge-23-09 branch October 22, 2023 20:25
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

5 participants