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/smartd: fix description for docbook #94757

Merged
merged 1 commit into from Aug 6, 2020

Conversation

@jonringer
Copy link
Contributor

jonringer commented Aug 5, 2020

Motivation for this change

escape opening tags fix element order

follow up from: #91432

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
@jonringer jonringer force-pushed the jonringer:fix-smartd-docbook branch from b488c18 to 83001f7 Aug 5, 2020
@jonringer
Copy link
Contributor Author

jonringer commented Aug 5, 2020

docbook now runs again:

[16:18:45] jon@jon-desktop /home/jon/projects/nixpkgs (fix-smartd-docbook)
$ nix-build nixos/release.nix -A manual.x86_64-linux
/nix/store/gqlpwaj92rm8my1vjavx62n035y962nj-nixos-manual-html
@jonringer jonringer force-pushed the jonringer:fix-smartd-docbook branch from 83001f7 to 76afba9 Aug 5, 2020
@jonringer
Copy link
Contributor Author

jonringer commented Aug 5, 2020

actually, it looked hideous with it completely escaped. Fixed elements

@jonringer
Copy link
Contributor Author

jonringer commented Aug 5, 2020

I believe this was the author's original intention, going to merge once ofborg is successful

@zowoq
zowoq approved these changes Aug 5, 2020
@zowoq zowoq merged commit 8d57f75 into NixOS:master Aug 6, 2020
16 checks passed
16 checks passed
tests tests
Details
tests
Details
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="76afba9"; rev="76afba9c2294594b0dd87850928f89946ebcfa67"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="76afba9"; rev="76afba9c2294594b0dd87850928f89946ebcfa67"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="76afba9"; rev="76afba9c2294594b0dd87850928f89946ebcfa67"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="76afba9"; rev="76afba9c2294594b0dd87850928f89946ebcfa67"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="76afba9"; rev="76afba9c2294594b0dd87850928f89946ebcfa67"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="76afba9"; rev="76afba9c2294594b0dd87850928f89946ebcfa67"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="76afba9"; rev="76afba9c2294594b0dd87850928f89946ebcfa67"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@jonringer jonringer deleted the jonringer:fix-smartd-docbook branch Aug 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.