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

fx_cast_bridge: adopt buildNpmPackage; rename to fx-cast-bridge #245562

Merged
merged 4 commits into from
Jul 28, 2023

Conversation

PedroHLC
Copy link
Member

@PedroHLC PedroHLC commented Jul 26, 2023

Description of changes

Related to #229475 -- Cc @dotlambda

Plus, it looks like we've been using _ for versioning/specific-versions, and - for separating the names, so I renamed it.

Note that the fx_cast repo hosts both -bridge and a -extension package, and because of that, we have to play around the sourceRoot (and suffixing the package's name).

Things done

Tested on Firefox:
image

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.11 Release Notes (or backporting 23.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.

Copy link
Contributor

@kevincox kevincox left a comment

Choose a reason for hiding this comment

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

I have not run the output but the change looks good.

pkgs/tools/misc/fx_cast/bridge.nix Outdated Show resolved Hide resolved
PedroHLC added a commit to PedroHLC/nixpkgs that referenced this pull request Jul 26, 2023
@kevincox
Copy link
Contributor

I am getting a build error for Firefox. It seems that the package name change is breaking it.

error:
       … from call site

         at /home/kevincox/.cache/nixpkgs-review/pr-245562/nixpkgs/pkgs/top-level/all-packages.nix:35397:16:

        35396|   betterbird-unwrapped = callPackage ../applications/networking/mailreaders/betterbird { };
        35397|   betterbird = wrapThunderbird betterbird-unwrapped {
             |                ^
        35398|     desktopName = "Betterbird";

       … while calling anonymous lambda

         at /home/kevincox/.cache/nixpkgs-review/pr-245562/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/wrapper.nix:4:1:

            3| browser:
            4| args:
             | ^
            5|

       … from call site

         at /home/kevincox/.cache/nixpkgs-review/pr-245562/nixpkgs/pkgs/top-level/all-packages.nix:36131:17:

        36130|
        36131|   wrapFirefox = callPackage ../applications/networking/browsers/firefox/wrapper.nix { };
             |                 ^
        36132|

       … while calling 'callPackageWith'

         at /home/kevincox/.cache/nixpkgs-review/pr-245562/nixpkgs/lib/customisation.nix:122:35:

          121|   */
          122|   callPackageWith = autoArgs: fn: args:
             |                                   ^
          123|     let

       error: evaluation aborted with the following error message: 'Function called without required argument "fx_cast_bridge" at /home/kevincox/.cache/nixpkgs-review/pr-245562/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix:10, did you mean "fx-cast-bridge"?'
https://github.com/NixOS/nixpkgs/pull/245562 failed to build

@PedroHLC PedroHLC requested a review from mweinelt as a code owner July 26, 2023 16:57
@PedroHLC
Copy link
Member Author

I am getting a build error for Firefox. It seems that the package name change is breaking it.

Thanks for the catch, I'll squash that into the main commit once I have enough approvals to merge.

@kevincox
Copy link
Contributor

Result of nixpkgs-review pr 245562 run on x86_64-linux 1

1 package built:
  • fx-cast-bridge

Copy link
Member

@dotlambda dotlambda left a comment

Choose a reason for hiding this comment

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

It would be nice to have the renaming be a separate commit.

pkgs/tools/misc/fx_cast/bridge.nix Outdated Show resolved Hide resolved
pkgs/tools/misc/fx_cast/bridge.nix Outdated Show resolved Hide resolved
pkgs/top-level/aliases.nix Outdated Show resolved Hide resolved
@PedroHLC PedroHLC force-pushed the fx_cast_bridge/buildNpmPackage branch from 64e353b to 7020e61 Compare July 26, 2023 17:20
@PedroHLC PedroHLC force-pushed the fx_cast_bridge/buildNpmPackage branch from 7020e61 to 1a357a9 Compare July 26, 2023 17:22
@PedroHLC
Copy link
Member Author

It would be nice to have the renaming be a separate commit.
Can we move the file to pkgs/tools/misc/fx-cast-bridge/default.nix?
sourceRoot = "source/app";
fx_cast_bridge = fx-cast-bridge;

All addressed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants