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.

Sign up for GitHub

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

Jump to bottom

meritous: 1.4 -> 1.5 #264436

Merged
merged 3 commits into from
Nov 5, 2023
Merged

meritous: 1.4 -> 1.5 #264436

merged 3 commits into from
Nov 5, 2023

Conversation

anthonyroussel
Copy link
Member

@anthonyroussel anthonyroussel commented Oct 30, 2023 •
edited
Loading

Description of changes

https://gitlab.com/meritous/meritous/-/compare/v1.4...v1.5

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/)
  • 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.

anthonyroussel
anthonyroussel commented Oct 30, 2023
View reviewed changes
pkgs/by-name/me/meritous/package.nix
};

prePatch = ''
substituteInPlace Makefile \
--replace "CPPFLAGS +=" "CPPFLAGS += -DSAVES_IN_HOME -DDATADIR=\\\"$out/share/meritous\\\"" \
Copy link
Member Author

Choose a reason for hiding this comment

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

Note for reviewers: SAVES_IN_HOME environment variable has been removed upstream

@ofborg ofborg bot requested a review from alexvorobiev October 31, 2023 00:20
@marsam marsam merged commit 2b81170 into NixOS:master Nov 5, 2023
25 checks passed
@anthonyroussel anthonyroussel deleted the updatess/meritous branch November 5, 2023 13:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexvorobiev alexvorobiev Awaiting requested review from alexvorobiev

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@anthonyroussel @marsam