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

Jump to bottom

haskell: servant: Don't write to $doc if disabled. #61526

Merged
merged 1 commit into from May 15, 2019
Merged

haskell: servant: Don't write to $doc if disabled. #61526

merged 1 commit into from May 15, 2019

Conversation

nh2
Copy link
Contributor

@nh2 nh2 commented May 14, 2019

Motivation for this change

Until now this broke on enableSeparateDocOutput = false,
as then $out was not defined so it tried to copy stuff to
/share/doc/servant.

Fixes regression introduced in commit be63b19.

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 nix-review --run "nix-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.

@nh2 nh2 requested a review from cleverca22 May 14, 2019 23:56
@nh2 nh2 requested a review from basvandijk as a code owner May 14, 2019 23:56
@nh2 nh2 force-pushed the servant-doc-no-haddock-fix branch from b6d00f1 to c297c11 Compare May 15, 2019 20:00
nh2 added a commit to nh2/cabal2nix that referenced this pull request May 15, 2019
@nh2
Don't hardcode $doc.
e6dcdda 
Split outputs can be disabled, in which case $doc is the empty string.

`outputDoc` always points to the right output variable name
(either "out" or "doc").

See also NixOS/nixpkgs#61526.
@nh2 nh2 mentioned this pull request May 15, 2019
Merged
@nh2
haskell: servant: Don't hardcode $doc.
0ef2bbf 
Until now this broke on `enableSeparateDocOutput = false`,
as then `$doc` was not defined so it tried to copy stuff to
`/share/doc/servant`.

Fixes regression introduced in commit be63b19.
@nh2 nh2 force-pushed the servant-doc-no-haddock-fix branch from c297c11 to 0ef2bbf Compare May 15, 2019 20:45
@matthewbauer matthewbauer merged commit d0ea2df into NixOS:master May 15, 2019
Profpatsch pushed a commit to Profpatsch/cabal2nix that referenced this pull request Mar 7, 2022
@nh2 @Profpatsch
Don't hardcode $doc.
07a748a 
Split outputs can be disabled, in which case $doc is the empty string.

`outputDoc` always points to the right output variable name
(either "out" or "doc").

See also NixOS/nixpkgs#61526.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthewbauer matthewbauer matthewbauer left review comments

@cleverca22 cleverca22 Awaiting requested review from cleverca22

@basvandijk basvandijk Awaiting requested review from basvandijk

Assignees
No one assigned
Labels
6.topic: haskell 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@nh2 @matthewbauer