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.

Sign up for GitHub

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

Jump to bottom

tedicross: init at 0.8.7 #58096

Merged
merged 2 commits into from Apr 23, 2019
Merged

tedicross: init at 0.8.7 #58096

merged 2 commits into from Apr 23, 2019

Conversation

pacien
Copy link
Contributor

@pacien pacien commented Mar 22, 2019 •
edited

Motivation for this change

This PR adds a package and a module for the TediCross Discord-Telegram bridge service.

Current upstream blockers
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@pacien pacien force-pushed the tedicross-init branch 3 times, most recently from 1e4e1c2 to 10d9784 Compare March 22, 2019 21:54
@pacien pacien changed the title [WIP] tedicross: init at 0.8.2 tedicross: init at 0.8.3 Mar 22, 2019
@pacien pacien marked this pull request as ready for review March 22, 2019 22:09
@pacien pacien requested a review from infinisil as a code owner March 22, 2019 22:09
@pacien
Copy link
Contributor Author

pacien commented Mar 23, 2019

@GrahamcOfBorg build tedicross

@pacien
Copy link
Contributor Author

pacien commented Mar 29, 2019

Up.

aanderse
aanderse requested changes Apr 14, 2019
View reviewed changes
nixos/modules/services/networking/tedicross.nix Outdated Show resolved Hide resolved
nixos/modules/services/networking/tedicross.nix Outdated Show resolved Hide resolved
nixos/modules/services/networking/tedicross.nix Outdated Show resolved Hide resolved
@pacien
Copy link
Contributor Author

pacien commented Apr 14, 2019

@aanderse Thank you for your review. The PR has been amended accordingly.

@pacien
Copy link
Contributor Author

pacien commented Apr 14, 2019 •
edited

Should I also add myself as a maintainer in the module file too?
I don't see a lot of modules having the meta.maintainers property.

EDIT: apparently this has been introduced quite recently. PR amended.

@aanderse
Copy link
Member

The module LGTM 👍

I'm not familiar with node packaging so i'll defer to someone else on that.

@nixos-discourse
Copy link

This pull request has been mentioned on Nix community. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/13

@infinisil
Copy link
Member

infinisil commented Apr 14, 2019 •
edited

You should add your package to pkgs/development/node-packages/node-packages-v10.json instead and then call the generate.sh script.

This is also described in the manual: https://nixos.org/nixpkgs/manual/#node.js-packages

@pacien pacien force-pushed the tedicross-init branch 2 times, most recently from 86d2e6d to d363e51 Compare April 14, 2019 18:37
@pacien
Copy link
Contributor Author

pacien commented Apr 14, 2019

@infinisil Thanks for the suggestion. The PR has been amended accordingly.

@pacien
Copy link
Contributor Author

pacien commented Apr 17, 2019

Rebased on master's tip.

@GrahamcOfBorg build nodePackages.tedicross

@pacien pacien changed the title tedicross: init at 0.8.3 tedicross: init at 0.8.5 Apr 21, 2019
@pacien
Copy link
Contributor Author

pacien commented Apr 21, 2019

Amended PR to init at 0.8.5 instead of 0.8.3.

@GrahamcOfBorg build nodePackages.tedicross

infinisil
infinisil reviewed Apr 23, 2019
View reviewed changes
nixos/modules/services/networking/tedicross.nix Outdated
ExecStart = "${pkgs.nodePackages.tedicross}/bin/tedicross --config='${configYAML}' --data-dir='${dataDir}'";
Restart = "always";
DynamicUser = true;
StateDirectory = builtins.baseNameOf dataDir;
Copy link
Member

Choose a reason for hiding this comment

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

baseNameOf is in the global namespace, so you can remove the builtins.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Amended.

@pacien pacien changed the title tedicross: init at 0.8.5 tedicross: init at 0.8.7 Apr 23, 2019
@pacien
Copy link
Contributor Author

pacien commented Apr 23, 2019

Amended PR to init at 0.8.7 instead of 0.8.5.

@GrahamcOfBorg build nodePackages.tedicross

@infinisil
Copy link
Member

Oh one last thing I missed: Can you split it into 2 commits, one for the package, one for the NixOS module? After that I'll merge it

@pacien
Copy link
Contributor Author

pacien commented Apr 23, 2019

@infinisil wrote:

Oh one last thing I missed: Can you split it into 2 commits, one for the package, one for the NixOS module? After that I'll merge it

Sure. It's done.

@infinisil infinisil merged commit ca37c23 into NixOS:master Apr 23, 2019
@pacien pacien mentioned this pull request Jun 10, 2019
Closed
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aanderse aanderse aanderse approved these changes

@infinisil infinisil infinisil left review comments

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@pacien @aanderse @nixos-discourse @infinisil @GrahamcOfBorg