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

insulator2: 2.12.2 -> 2.13.2 #323882

Merged

Conversation

Stunkymonkey
Copy link
Contributor

@Stunkymonkey Stunkymonkey commented Jul 1, 2024

Description of changes

part of #240174

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.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Jul 1, 2024
@Stunkymonkey Stunkymonkey force-pushed the insulator2-migrate-fixup-yarn-lock branch 2 times, most recently from ea54cda to beac072 Compare October 9, 2024 21:36
@Stunkymonkey
Copy link
Contributor Author

@getchoo i am mostly reverting 328e517 . How did you come up with the changes?

@Stunkymonkey Stunkymonkey marked this pull request as ready for review October 9, 2024 21:50
@getchoo
Copy link
Member

getchoo commented Oct 10, 2024

yarConfigHook is part of the documented way to build Yarn packages

cargo-tauri.hook is also the way most Tauri apps should be built now. Not sure why it's being removed here?

@Stunkymonkey
Copy link
Contributor Author

@getchoo what do you think about the current changes? (i know the commits are not nicely done yet.)

@Stunkymonkey Stunkymonkey force-pushed the insulator2-migrate-fixup-yarn-lock branch from 9bcf28d to ea31168 Compare October 13, 2024 20:43
pkgs/applications/misc/insulator2/default.nix Outdated Show resolved Hide resolved
Comment on lines 39 to 43
# see: https://github.com/andrewinci/insulator2/pull/733
(fetchpatch {
name = "fix-rust-1.80.0";
url = "https://github.com/andrewinci/insulator2/commit/7dbff0777c4364eec68cf90488d99f06b11dfa98.patch";
hash = "sha256-P8rBufYpREP5tOO9vSymvms4f2JbsUEjK7/yn9P7gYk=";
})
Copy link
Member

Choose a reason for hiding this comment

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

I'd prefer we wait for this to have an actual in-tree commit, or just vendor it here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

i submitted one week ago: andrewinci/insulator2#733

i guess this will take much time...

Copy link
Member

Choose a reason for hiding this comment

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

I'd recommend vendoring the patch here then. It's just more reliable than a commit from a fork

Copy link
Contributor Author

Choose a reason for hiding this comment

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

this is already the official repo... the fork would be https://github.com/Stunkymonkey/insulator2

Copy link
Member

Choose a reason for hiding this comment

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

Commit from a GitHub PR isn't guaranteed to be stable. Upstream author may require you to do a force push which may break the visibility of this commit hash. Thus it would be better to add a patch in this repo instead.

And since you already have Cargo.lock here, you can patch Cargo.toml only, and copy Cargo.lock

pkgs/applications/misc/insulator2/default.nix Outdated Show resolved Hide resolved
@Stunkymonkey Stunkymonkey force-pushed the insulator2-migrate-fixup-yarn-lock branch from ea31168 to 35c788f Compare October 14, 2024 20:53
@Aleksanaa Aleksanaa changed the title insulator2: migrate to fixup-yarn-lock insulator2: 2.12.2 -> 2.13.2 Oct 20, 2024
@Stunkymonkey
Copy link
Contributor Author

ping at reviewers

@Stunkymonkey Stunkymonkey force-pushed the insulator2-migrate-fixup-yarn-lock branch from 35c788f to 817fd89 Compare October 27, 2024 19:09
@Aleksanaa Aleksanaa merged commit 01bb882 into NixOS:master Oct 28, 2024
27 of 28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants