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

Repackage everything with node2nix #31655

Merged
merged 3 commits into from Nov 15, 2017

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented Nov 14, 2017

Motivation for this change

Please have a look at the commits to see a detailed description of the changes.
Further effort on #31032

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@Ma27
Copy link
Member Author

Ma27 commented Nov 14, 2017

started nox-review, will leave a comment when this is done.
(/cc @svanderburg )

@grahamc
Copy link
Member

grahamc commented Nov 14, 2017

Ok so how does this reduce the LOC by 60,000?

chmod +x $out/bin/airfield
wrapProgram $out/bin/airfield \
--set NODE_PATH "${runtimeEnv}/lib/node_modules"
'';

meta = {
Copy link
Member Author

Choose a reason for hiding this comment

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

meta might break

@Ma27
Copy link
Member Author

Ma27 commented Nov 14, 2017

@grahamc since I dropped the last remaining references of npm2nix this ancient package set could finally be removed.
I'm currently running nox-review against this PR locally to ensure that nothing breaks because of this.

@Ma27 Ma27 force-pushed the repackage-everything-with-node2nix branch 2 times, most recently from 3616b10 to 2d55e02 Compare November 14, 2017 14:03
@Ma27
Copy link
Member Author

Ma27 commented Nov 14, 2017

nox-review exited with code 0 on my machine.

both packages are available at the default NPM registry.

related to NixOS#31032
Airfield suffered from loose version constraints which
caused severe version (and API) conflicts between its dependencies
and transitive ones.

Furthermore the `npm2nix` packaging is deprecated and needed to be
replaced by `node2nix`.

see NixOS#31032
@Ma27 Ma27 force-pushed the repackage-everything-with-node2nix branch from 2d55e02 to daf76db Compare November 14, 2017 15:38
@Ma27
Copy link
Member Author

Ma27 commented Nov 14, 2017

btw I resolved the merge conflicts...

@c0bw3b
Copy link
Contributor

c0bw3b commented Nov 14, 2017

Great work here!

Bonus: this should close #24271

@copumpkin
Copy link
Member

cc @svanderburg

@svanderburg
Copy link
Member

Great work!

@svanderburg svanderburg merged commit f38e9cb into NixOS:master Nov 15, 2017
@c0bw3b c0bw3b mentioned this pull request Nov 15, 2017
7 tasks
@Ma27 Ma27 deleted the repackage-everything-with-node2nix branch November 15, 2017 12:13
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

6 participants