Skip to content

Init: statik, Update: easyjson, quicktemplate, nodePackages: meguca, meguca, hydron #57527

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
Merged
merged 6 commits into from Mar 24, 2019
Merged

Init: statik, Update: easyjson, quicktemplate, nodePackages: meguca, meguca, hydron #57527

merged 6 commits into from Mar 24, 2019
+211 −110

Conversation

ghost
Copy link

@ghost ghost commented Mar 12, 2019 •
edited by ghost
Loading

Motivation for this change

Various updates.
#56406 breaks emscripten compiling meguca.
Do not merge until we get the C++ client for meguca compiling, please.

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.

Sorry, something went wrong.

@ghost
Copy link
Author

ghost commented Mar 12, 2019

I may also just disable the C++ client for meguca, as it's still in heavy development, depending on if it can be fixed easily.

@ghost ghost requested a review from infinisil as a code owner March 12, 2019 17:50
@ghost
Copy link
Author

ghost commented Mar 12, 2019

I don't think I requested that review, does github auto-request now?

@ghost
Copy link
Author

ghost commented Mar 12, 2019

Anyway, C++ client compiles fine now, but there's an upstream issue I have to address with db migration.

@GrahamcOfBorg GrahamcOfBorg added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Mar 12, 2019
@ghost
Copy link
Author

ghost commented Mar 12, 2019

Depends on bakape/shamichan#1005

@ghost
Copy link
Author

ghost commented Mar 12, 2019

Everything is working now, ready for build/test/merge.

@veprbl
Copy link
Member

veprbl commented Mar 22, 2019

This needs a rebase. It might be a good idea to split node-packages updates into a separate PR. The reason being that they get merge conflicts very easily and we don't seem to have enough active node experts to merge those quickly enough.

@veprbl veprbl added the 2.status: merge conflict This PR has merge conflicts with the target branch label Mar 22, 2019
@ghost
Copy link
Author

ghost commented Mar 23, 2019 •
edited by ghost
Loading

I'll fix it tomorrow.
Also, node packages has to be in same PR, as the client portion of meguca is dependent on it.
It's just one of those packages~

@ghost
Copy link
Author

ghost commented Mar 23, 2019

@veprbl Ready.

@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-linux: 1-10 and removed 2.status: merge conflict This PR has merge conflicts with the target branch 10.rebuild-linux: 11-100 labels Mar 23, 2019
@ghost
Copy link
Author

ghost commented Mar 23, 2019

@veprbl Picked it out, ready again.

veprbl
veprbl reviewed Mar 23, 2019
View reviewed changes
Copy link
Member

@veprbl veprbl left a comment

Choose a reason for hiding this comment

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

The introduced videoPaths options appear to rather ad-hoc to me. If we go with this approach, we are agreeing that any modification to the contents of ${cfg.dataDir}/www would require a separate option to be made.

@ghost
Copy link
Author

ghost commented Mar 23, 2019

any modification to the contents of ${cfg.dataDir}/www would require a separate option to be made.

The videos is the only thing that will ever change as far as this goes.
If you have a better option, I'm all ears.

@veprbl
Copy link
Member

veprbl commented Mar 23, 2019

The videos is the only thing that will ever change as far as this goes

This is good news.

If you have a better option, I'm all ears.

Sorry, can't make a solution for you. Just pointing what would be a nice property to have.

@ghost ghost mentioned this pull request Mar 24, 2019
Closed
@veprbl
Copy link
Member

veprbl commented Mar 24, 2019

@GrahamcOfBorg build easyjson hydron meguca quicktemplate statik

@veprbl veprbl merged commit cf7f234 into NixOS:master Mar 24, 2019
@ghost ghost deleted the dev/meguca branch March 24, 2019 20:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@infinisil infinisil

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@veprbl @GrahamcOfBorg @Madouura