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

galaxy-buds-client: 5.1.0 -> 5.1.1 #365231

Merged
merged 1 commit into from
Dec 19, 2024

Conversation

Icy-Thought
Copy link
Contributor

Changelogs

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Dec 14, 2024
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-linux: 1 labels Dec 15, 2024
@khaneliman
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 365231


x86_64-linux

✅ 1 package built:
  • galaxy-buds-client

aarch64-linux

❌ 1 package failed to build:
  • galaxy-buds-client

@khaneliman
Copy link
Contributor

Seems to fail the same way on master.

/build/source/GalaxyBudsClient/GalaxyBudsClient.csproj : error NU1101: Unable to find package Microsoft.NETCore.App.Host.linux-x64. No packages exist with this id in source(s): _nix

Looks like the dotnet flag was only set for x64 https://github.com/NixOS/nixpkgs/pull/365231/files#diff-0481f4c907609b2332cf110e6aad41041f189c410538e7f5613bc5fc9e3697a8R30

@khaneliman
Copy link
Contributor

khaneliman commented Dec 17, 2024

Could probably be simplified... but just tried and it worked.

dotnetFlags =
  lib.optionals stdenv.hostPlatform.isx86_64 [ "-p:Runtimeidentifier=linux-x64" ]
  ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "-p:Runtimeidentifier=linux-arm64" ];

@Icy-Thought
Copy link
Contributor Author

@khaneliman would you like to add those flags to the current PR or should I just do it and rebase?

@khaneliman
Copy link
Contributor

khaneliman commented Dec 18, 2024

@khaneliman would you like to add those flags to the current PR or should I just do it and rebase?

Figured you could add it while you're in here. If you don't feel comfortable, I can do it in a follow up PR.

@Icy-Thought
Copy link
Contributor Author

No worries, I was just thinking of giving credits to the original author of those lines! :)
I am going to add them to my PR right away!

@khaneliman
Copy link
Contributor

Says there is a merge conflict, somehow.

@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Dec 19, 2024
@Icy-Thought
Copy link
Contributor Author

Icy-Thought commented Dec 19, 2024

Very strange.. I can see that deps.nix is the culprit, but I do not understand why that should trigger a merge conflict.

@khaneliman
Copy link
Contributor

Very strange.. I can see that deps.nix is the culprit, but I do not understand why that should trigger a merge conflict.

Just rebase on master and take your changes.

@Icy-Thought
Copy link
Contributor Author

Icy-Thought commented Dec 19, 2024

Alright this is strange. It appears as if something had deleted the deps.nix in master recently for the merge conflict to arise.

@Icy-Thought
Copy link
Contributor Author

DON'T MERGE! Apparently there was a "silent" migration to deps.json instead... Someone notify when there is such change, please...

@khaneliman
Copy link
Contributor

khaneliman commented Dec 19, 2024

DON'T MERGE! Apparently there was a "silent" migration to deps.json instead... Someone notify when there is such change, please...

I vaguely remember a treewide nix -> json conversion being talked about for stuff like this. That could have finally happened, then. #362278

@khaneliman
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 365231


x86_64-linux

✅ 1 package built:
  • galaxy-buds-client

aarch64-linux

✅ 1 package built:
  • galaxy-buds-client

Copy link
Contributor

@khaneliman khaneliman left a comment

Choose a reason for hiding this comment

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

LGTM, thanks for handling that

@khaneliman khaneliman merged commit 6ae600f into NixOS:master Dec 19, 2024
23 of 24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2.status: merge conflict This PR has merge conflicts with the target branch 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.

2 participants