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

nixos/gollum: enable emoji and file uploads #32373

Merged
merged 4 commits into from Dec 6, 2017
Merged

nixos/gollum: enable emoji and file uploads #32373

merged 4 commits into from Dec 6, 2017

Conversation

P-E-Meunier
Copy link
Contributor

Motivation for this change
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.

@Mic92 Mic92 changed the title Gollum: enable emoji and file uploads nixos/gollum: enable emoji and file uploads Dec 6, 2017
@@ -91,6 +103,8 @@ in
--config ${builtins.toFile "gollum-config.rb" cfg.extraConfig} \
--ref ${cfg.branch} \
${optionalString cfg.mathjax "--mathjax"} \
${optionalString cfg.emoji "--emoji"} \
${if cfg.allowUploads != null then "--allow-uploads ${cfg.allowUploads}" else ""} \
Copy link
Member

Choose a reason for hiding this comment

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

please use also optionalString here.

@@ -91,6 +103,8 @@ in
--config ${builtins.toFile "gollum-config.rb" cfg.extraConfig} \
--ref ${cfg.branch} \
${optionalString cfg.mathjax "--mathjax"} \
${optionalString cfg.emoji "--emoji"} \
${optionalString cfg.allowUploads "--allow-uploads ${cfg.allowUploads}"} \
Copy link
Member

@Mic92 Mic92 Dec 6, 2017

Choose a reason for hiding this comment

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

should be:

-  ${optionalString cfg.allowUploads "--allow-uploads ${cfg.allowUploads}"} \
+ ${optionalString (cfg.allowUploads != null) "--allow-uploads ${cfg.allowUploads}"} \

null does not evaluate to bool.

@Mic92 Mic92 merged commit 3b79220 into NixOS:master Dec 6, 2017
@erictapen
Copy link
Member

Excellent! Was already missing that feature.

maiksensi pushed a commit to maiksensi/nixpkgs that referenced this pull request Dec 6, 2017
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

4 participants