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

clash-{nyanpasu,verge-rev}: init #281360

Merged
merged 6 commits into from
Mar 10, 2024
Merged

clash-{nyanpasu,verge-rev}: init #281360

merged 6 commits into from
Mar 10, 2024

Conversation

Guanran928
Copy link
Contributor

@Guanran928 Guanran928 commented Jan 16, 2024

Description of changes

clash-nyanpasu: init at 1.4.5
clash-verge-rev: init at 1.5.4

These are two clash-verge forks.

My first two package in nixpkgs, please tell if anything need to be changed. :-)

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

@Guanran928
Copy link
Contributor Author

someone told me that I cannot overrides other packages as a package in nixpkgs... fine.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Jan 16, 2024
@Guanran928
Copy link
Contributor Author

I didn't test the module (yet), as it is 1 AM for me... will continue tomorrow.

@h7x4 h7x4 added the 8.has: module (new) This PR adds a module in `nixos/` label Jan 16, 2024
@Guanran928
Copy link
Contributor Author

seems to be all working now. should be ready for review.

@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Jan 17, 2024
@ofborg ofborg bot added the 11.by: package-maintainer This PR was created by the maintainer of the package it changes label Jan 17, 2024
@Guanran928
Copy link
Contributor Author

Guanran928 commented Feb 6, 2024

(I have no idea why is it automatically requesting piegamesde and Janik-Haag to review...)

@Guanran928
Copy link
Contributor Author

@Guanran928
Copy link
Contributor Author

  • clash-verge-rev: 1.5.0 -> 1.5.3
  • dropped commit clash-verge: gpl3Plus -> gpl3Only

Copy link
Member

@Janik-Haag Janik-Haag left a comment

Choose a reason for hiding this comment

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

Why aren't you building the packages from source?

@Guanran928
Copy link
Contributor Author

Why aren't you building the packages from source?

AFAIK it's using pnpm, which I've heard Nix isn't good at.

@Janik-Haag
Copy link
Member

AFAIK it's using pnpm, which I've heard Nix isn't good at.

uff yeah you are right. I'm not sure what I find uglier using that cursed pnpm fetcher (like the pot package does) or repackging deb files of foss software (this also has actual disadvantages like libs getting installed more often and security updates getting harder if they are possible at all). There also is https://github.com/NixOS/GSoC/blob/main/ideas/2024.md#nixpkgs-pnpm-tooling but it will take a few more month to exist if it ends up existing at all.

@Guanran928
Copy link
Contributor Author

  • clash-verge-rev: 1.5.3 -> 1.5.4

@ofborg ofborg bot added the ofborg-internal-error Ofborg encountered an error label Feb 24, 2024
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Feb 26, 2024
@Guanran928 Guanran928 force-pushed the clash branch 2 times, most recently from 33fec78 to 2e3b032 Compare February 26, 2024 12:30
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Feb 26, 2024
@Janik-Haag Janik-Haag requested a review from wegank February 26, 2024 21:12
Copy link
Member

@Aleksanaa Aleksanaa left a comment

Choose a reason for hiding this comment

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

@wegank wegank marked this pull request as draft March 10, 2024 19:14
@wegank wegank force-pushed the clash branch 2 times, most recently from e4db076 to 91a6f44 Compare March 10, 2024 19:29
@wegank wegank marked this pull request as ready for review March 10, 2024 19:32
@wegank wegank removed their assignment Mar 10, 2024
@wegank wegank merged commit ad272aa into NixOS:master Mar 10, 2024
24 of 25 checks passed
@cole-h cole-h removed the ofborg-internal-error Ofborg encountered an error label Mar 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (new) This PR adds a module in `nixos/` 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: package (new) This PR adds a new package 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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants