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

mautrix-meta: 0.3.2 -> 0.4.0 #342988

Merged
merged 1 commit into from
Sep 20, 2024
Merged

mautrix-meta: 0.3.2 -> 0.4.0 #342988

merged 1 commit into from
Sep 20, 2024

Conversation

eyJhb
Copy link
Member

@eyJhb eyJhb commented Sep 19, 2024

Description of changes

Same changes as #342374 , just with correct commit message.

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.11 Release Notes (or backporting 23.11 and 24.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.

Add a 👍 reaction to pull requests you find important.

@eyJhb eyJhb added the backport release-24.05 Backport PR automatically label Sep 19, 2024
@ofborg ofborg bot requested a review from Rutherther September 19, 2024 09:18
Copy link
Contributor

@SigmaSquadron SigmaSquadron left a comment

Choose a reason for hiding this comment

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

As this is a cherry-pick of @Rutherther's commit, I'd rather see their authorship information included in the commit message.

@eyJhb
Copy link
Member Author

eyJhb commented Sep 19, 2024

As this is a cherry-pick of @Rutherther's commit, I'd rather see their authorship information included in the commit message.

That should be reflected now + contained the original commit message. Is this acceptable? Unsure how I should do it any other way :)

@Rutherther
Copy link
Contributor

Thank you, I have other stuff at mind these days so I didnt get to this.

Copy link
Contributor

@SigmaSquadron SigmaSquadron left a comment

Choose a reason for hiding this comment

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

The git convention is to use Authored-by: Name Lastname <[email protected]>, but this is good enough, as you have the author's acknowledgement.

@SigmaSquadron SigmaSquadron added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Sep 19, 2024
@eyJhb
Copy link
Member Author

eyJhb commented Sep 19, 2024

Thank you, I have other stuff at mind these days so I didn't get to this.

No worries. I was unsure if I should open this PR, and how it might be perceived. Feel free to reach out another time :)

The git convention is to use Authored-by: Name Lastname <[email protected]>, but this is good enough, as you have the author's acknowledgement.

I just used the line from the other PR to get name and email, so that it preserves the original committer. I have however changed the prefix to Authored-by: now, thanks! I just looked at other commits, and couldn't find much.l

EDIT: I think I fixed it now in the proper way :)

This update cannot be done by the nixpkgs bot, as
the structure of the project has been changed, so why wait.

The mautrix-meta project has been moved under "cmd/mautrix-meta"
There is also "cmd/lscli", but since this package is mainly
about mautrix-meta, I think we can stay with this specific cmd.
If we wanted, we could switch to both of them by removing this
`subPackages` attribute.
@wegank wegank removed the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Sep 19, 2024
Copy link
Contributor

@Mindavi Mindavi left a comment

Choose a reason for hiding this comment

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

LGTM but ofborg hasn't built it yet

@SigmaSquadron SigmaSquadron added the 12.approvals: 3+ This PR was reviewed and approved by three or more reputable people label Sep 20, 2024
@eyJhb
Copy link
Member Author

eyJhb commented Sep 20, 2024

LGTM but ofborg hasn't built it yet

It's not going to build them because of olm being marked as insecure, I think.

       c) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
          ‘olm-3.2.16’ to `permittedInsecurePackages` in
          ~/.config/nixpkgs/config.nix, like so:

            {
              permittedInsecurePackages = [
                "olm-3.2.16"
              ];
            }

EDIT: I.e. see the other runs https://github.com/NixOS/nixpkgs/pull/342988/checks?check_run_id=30375767936 :)

@Mindavi Mindavi merged commit 02971f9 into NixOS:master Sep 20, 2024
25 of 27 checks passed
Copy link
Contributor

Successfully created backport PR for release-24.05:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer This PR was created by the maintainer of the package it changes 12.approvals: 3+ This PR was reviewed and approved by three or more reputable people backport release-24.05 Backport PR automatically
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants