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

[Backport release 24.05] vencord: 1.10.2 -> 1.10.5 #351216

Merged
merged 4 commits into from
Oct 27, 2024
Merged

[Backport release 24.05] vencord: 1.10.2 -> 1.10.5 #351216

merged 4 commits into from
Oct 27, 2024

Conversation

DontEatOreo
Copy link
Member

Backports:
#345423
#347442
#350964

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.

@DontEatOreo
Copy link
Member Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 351216

x86_64-darwin

❌ 2 packages failed to build:
  • vencord
  • vencord-web-extension

aarch64-darwin

❌ 2 packages failed to build:
  • vencord
  • vencord-web-extension

@DontEatOreo DontEatOreo marked this pull request as draft October 25, 2024 16:38
r-ryantm and others added 4 commits October 25, 2024 19:40
@r-ryantm @DontEatOreo
vencord: 1.10.2 -> 1.10.3
fccd26f 
(cherry picked from commit b87c518)
@r-ryantm @DontEatOreo
vencord: 1.10.3 -> 1.10.4
e3bf33f 
(cherry picked from commit dced718)
@DontEatOreo
vencord: 1.10.4 -> 1.10.5
ea2703d 
Diff: Vendicated/Vencord@v1.10.4...v1.10.5
(cherry picked from commit be43e12)
@DontEatOreo
vencord: add maintainer donteatoreo
feacc94 
(cherry picked from commit 71fc574)
@DontEatOreo DontEatOreo force-pushed the backport-350964-to-release-24.05 branch from 5b3f958 to feacc94 Compare October 25, 2024 16:41
@DontEatOreo
Copy link
Member Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 351216

x86_64-linux

✅ 3 packages built:
  • vencord
  • vencord-web-extension
  • webcord-vencord

@DontEatOreo
Copy link
Member Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 351216

x86_64-darwin

✅ 2 packages built:
  • vencord
  • vencord-web-extension

aarch64-darwin

✅ 2 packages built:
  • vencord
  • vencord-web-extension

@ofborg ofborg bot requested review from Scrumplex, NotAShelf and FlafyDev October 25, 2024 18:46
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Oct 25, 2024
NotAShelf
NotAShelf approved these changes Oct 25, 2024
View reviewed changes
Copy link
Member

@NotAShelf NotAShelf left a comment

Choose a reason for hiding this comment

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

LGTM

Scrumplex
Scrumplex approved these changes Oct 25, 2024
View reviewed changes
Copy link
Member

@Scrumplex Scrumplex left a comment

Choose a reason for hiding this comment

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

changes LGTM

@DontEatOreo DontEatOreo marked this pull request as ready for review October 25, 2024 21:36
@DontEatOreo
Copy link
Member Author

I'm little bit confused. In 9744efc vencord's pnpmDeps.hash got changed

- hash = "sha256-bosCE9gBFCcM3Ww6sJmhps/cl4lovXKMieYpkqAMst8=";
+ hash = "sha256-YBWe4MEmFu8cksOIxuTK0deO7q0QuqgOUc9WkUNBwp0=";

The new hash builds fine on master (nix build github:nixos/nixpkgs/71fc5743a87cbbc0effb44764761205bed7bc5c7#vencord), but it fails here on release-24.05? That's also why the first nixpkgs-review failed

What am I missing here?

Also the CODEOWNERS check fails, but it seems like it's totally unrelated to this PR:

Log 
==> Executing Duplicated Pattern Checker (116.167µs)
    Check OK
==> Executing Valid Syntax Checker (822.484µs)
    Check OK
==> Executing File Exist Checker (6.510747ms)
    [err] line 370: "pkgs/os-specific/linux/lxc/" does not match any files in repository
==> Executing [Experimental] Avoid Shadowing Checker (8.178609ms)
    Check OK
==> Executing Valid Owner Checker (5.924511002s)
    Check OK

5 check(s) executed, 1 failure(s)
Error: Process completed with exit code 3.

@NotAShelf
Copy link
Member

Ah, this reminds me.

#349093 (comment)

@Scrumplex
Copy link
Member

Just regenerate the hash for 24.05. One of the CI checks is gonna fail but there is no good solution here

@DontEatOreo
Copy link
Member Author

DontEatOreo commented Oct 26, 2024 •
edited
Loading

Just regenerate the hash for 24.05.

It already uses the correct hash, the hash before 9744efc works fine on release-24.05

Setting hash to lib.fakeHash returns the current one:

error: hash mismatch in fixed-output derivation '/nix/store/42yp87h55wqhpm8zflv1s44s60d1al50-vencord-pnpm-deps.drv':
         specified: sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
            got:    sha256-bosCE9gBFCcM3Ww6sJmhps/cl4lovXKMieYpkqAMst8=

@wegank wegank added 12.approvals: 2 This PR was reviewed and approved by two reputable people 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Oct 26, 2024
@DontEatOreo DontEatOreo requested a review from Scrumplex October 27, 2024 12:21
Scrumplex
Scrumplex approved these changes Oct 27, 2024
View reviewed changes
Copy link
Member

@Scrumplex Scrumplex left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Ignoring codeowners check failure, as it's unrelated here. LGTM. Thanks!

@Scrumplex Scrumplex merged commit 576ee82 into NixOS:release-24.05 Oct 27, 2024
31 of 34 checks passed
@DontEatOreo DontEatOreo deleted the backport-350964-to-release-24.05 branch October 27, 2024 20:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NotAShelf NotAShelf NotAShelf approved these changes

@Scrumplex Scrumplex Scrumplex approved these changes

@FlafyDev FlafyDev Awaiting requested review from FlafyDev

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes 12.approvals: 2 This PR was reviewed and approved by two reputable people 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@DontEatOreo @NotAShelf @Scrumplex @wegank @r-ryantm