1
0
Fork 0
mirror of https://github.com/NixOS/nix-pills synced 2024-09-16 03:30:13 -04:00
Commit graph

377 commits

Author SHA1 Message Date
Henrik 42532b09a3
Merge pull request #244 from jopejoe1/wiki 2024-04-17 19:04:05 +01:00
jopejoe1 e3b6fcc759 replace unoffical wiki links with offical ones 2024-04-17 19:47:21 +02:00
Daniel Sidhion 60c02d07b5
Merge pull request #237 from noamraph/patch-2
Update 07-working-derivation.md - "input derivations" -> "input sources"
2024-04-13 15:22:49 -07:00
Pol Dellaiera 514b3fe4e5
Merge pull request #238 from noamraph/patch-3
Update 09-automatic-runtime-dependencies.md - fix NixOps link
2024-04-12 11:31:30 +02:00
Noam Yorav-Raphael a6ef5303e2
Update 09-automatic-runtime-dependencies.md - fix NixOps link
The link to NixOps was corrupted by mistake in this PR: https://github.com/NixOS/nix-pills/pull/181/files#diff-a53cbc0f08ac225fd5073d54147a9a6ba2ebbdbd0e5164711ab362d0439cc27aR265

It was changed from http://nixos.org/nixops/manual/#chap-introduction to https://nixos.org/manual/nix/stable/introduction.html.

I think that at least for now, it would be better to link to https://github.com/NixOS/nixops, as the old link just links to an obscure in-development HTML document, and the github link starts with a warning "NixOps is in low-maintenance mode and probably not suited for new projects. Use at your own risks", and also links to an experimental NixOps4.
2024-04-10 20:39:17 +03:00
Noam Yorav-Raphael 9d155d9fbe
Update 07-working-derivation.md - "input derivations" -> "input sources"
The text says that `builder.sh` is in the input derivations. It's actually in `inputSrcs`, not `inputDrvs`. Perhaps in the past there was just one list?
2024-04-10 18:57:15 +03:00
Henrik 11f9dce51f
Merge pull request #236 from NixOS/nosu 2024-04-10 07:46:02 +01:00
Jan Tojnar 7e163cde27 preface: Remove mention of root prompt
As far as I can tell, that was dropped in 926e878dce
2024-04-09 22:48:17 +02:00
John Ericson 3febfc1330
Merge pull request #235 from noamraph/patch-1
07-working-derivation.md: use `derivation` instead of `mkDerivation`
2024-04-09 16:09:18 -04:00
Noam Yorav-Raphael c91af2ecc1
07-working-derivation.md: use derivation instead of mkDerivation
When switching from the nix repl to a nix file, `derivation` was replaced with `pkgs.stdenv.mkDerivation`. This was not explained, and the examples work fine without this. It seems to me that when learning that you can define the derivation in a nix file instead of in the repl, there's no need to add another change.

I see that the next chapter uses plain `derivation` in the first examples, and then defines a new function `mkDerivation`. So I'm pretty certain that we should just use plain `derivation` here.
2024-04-09 22:50:29 +03:00
Jan Tojnar 05407a5a2f epub: Remove extra page breaks before headings
The sections are pretty short, leading to unnecessary pagination being required.
2024-04-09 01:46:32 +02:00
Noam Yorav-Raphael 3dd9e04dd9 Put «» around what was originally <replaceable> 2024-04-09 01:46:32 +02:00
Noam Yorav-Raphael 32e1503b84 Manually added backticks for <package> tags in original 2024-04-09 01:46:32 +02:00
Jan Tojnar 511cd615e0 Fix footnote rendering with mdbook-epub
mdbook-epub 0.4.37 will collapse the second footnote into the first one.
This does not happen with HTML output from plain mdbook.
2024-04-09 01:46:32 +02:00
Jan Tojnar dbc985e3d3 Re-add heading id
It was removed in pandoc step for some reason.
2024-04-09 01:46:32 +02:00
Jan Tojnar ffea6cc3c0 README: Remove DocBook-specific instructions 2024-04-09 01:46:32 +02:00
Noam Yorav-Raphael faab265365 make prompts unselectable 2024-04-09 01:46:32 +02:00
Noam Yorav-Raphael a2210a8712 Add redirects from original paths to new paths 2024-04-09 01:46:32 +02:00
Noam Yorav-Raphael 1931980c81 Add highlight.js which supports nix syntax highlighting 2024-04-09 01:46:32 +02:00
Noam Yorav-Raphael 7869d7168e Build the book with Nix 2024-04-09 01:46:32 +02:00
Noam Yorav-Raphael 1699c9f1db Convert code section to fenced, with the appropriate syntax 2024-04-09 01:46:32 +02:00
Noam Yorav-Raphael b4eeb0cdfc Format markdown with Prettier 2024-04-09 01:46:32 +02:00
Noam Yorav-Raphael d7c8d34649 Replace \... with ... 2024-04-09 01:46:32 +02:00
Noam Yorav-Raphael 6f1bbb0d6c Replace \" with ". 2024-04-09 01:46:32 +02:00
Noam Yorav-Raphael cd05ea088e Replace \' with '. 2024-04-09 01:46:32 +02:00
Noam Yorav-Raphael 38c9f8c47c Fix code sections with highlighting, which pandoc missed 2024-04-09 01:46:32 +02:00
Noam Yorav-Raphael f0099a3e28 Support "note" sections, fix inter-links 2024-04-09 01:46:32 +02:00
Noam Yorav-Raphael 6af51f2b0a Remove front matter from 00-preface.md 2024-04-09 01:46:32 +02:00
Noam Yorav-Raphael 21ecfd5217 Automatic conversion using pandoc
I just run `pandoc {fn} -f docbook -t markdown --wrap=none -s -o {fn.with_suffix(".md")}` over all .xml files in pills/, and on /book.xml

I manually created SUMMARY.md based on the list in book.xml.
2024-04-09 01:46:32 +02:00
Noam Yorav-Raphael 9251766cea Remove 3 files which were not referenced
The files were probably included in previous versions and weren't
removed.
2024-04-09 01:46:32 +02:00
Noam Yorav-Raphael 57dc8ac921 Transform <xi:include> elements to include content 2024-04-09 01:46:32 +02:00
Jan Tojnar 8291ca1677 Revert "Convert from docbook to mdbook (#233)"
This reverts commit 4033045782.

To preserve history.
2024-04-09 01:46:08 +02:00
Noam Yorav-Raphael 4033045782
Convert from docbook to mdbook (#233)
* Transform <xi:include> elements to include content

* Remove 3 files which were not referenced

The files were probably included in previous versions and weren't
removed.

* Automatic conversion using pandoc

I just run `pandoc {fn} -f docbook -t markdown --wrap=none -s -o {fn.with_suffix(".md")}` over all .xml files in pills/, and on /book.xml

I manually created SUMMARY.md based on the list in book.xml.

* Remove front matter from 00-preface.md

* Support "note" sections, fix inter-links

* Fix code sections with highlighting, which pandoc missed

* Replace `\'` with `'`.

* Replace `\"` with `"`.

* Replace `\...` with `...`

* Format markdown with Prettier

* Convert code section to fenced, with the appropriate syntax

* Build the book with Nix

* Add highlight.js which supports nix syntax highlighting

* Add redirects from original paths to new paths

* make prompts unselectable

* README: Remove DocBook-specific instructions

(cherry picked from commit 66936f15a5)

* Re-add heading id

It was removed in pandoc step for some reason.

(cherry picked from commit cf39aa5ad9)

* Fix footnote rendering with mdbook-epub

mdbook-epub 0.4.37 will collapse the second footnote into the first one.
This does not happen with HTML output from plain mdbook.

(cherry picked from commit bc9bd13844)

* Manually added backticks for <package> tags in original

* Put «» around what was originally <replaceable>

* epub: Remove extra page breaks before headings

The sections are pretty short, leading to unnecessary pagination being required.

---------

Co-authored-by: Noam Yorav-Raphael <noam.yoravraphael@mobileye.com>
Co-authored-by: Jan Tojnar <jtojnar@gmail.com>
2024-04-08 16:37:11 -07:00
John Ericson 2355217790
Merge pull request #232 from dasJ/fix/formatting
treewide: Format all Nix code according to RFC-166
2024-03-31 00:27:40 -04:00
Janne Heß 14736fe159
treewide: Format all Nix code according to RFC-166 2024-03-30 14:16:44 +01:00
Pol Dellaiera 102ef96805
Merge pull request #230 from proski/typos
Fix typos
2024-02-20 09:04:08 +01:00
Pavel Roskin 3f6eb45c97 Fix typos 2024-02-19 23:27:03 -08:00
Peter Dragos a66fd074cf
Non-content edits to pills 9-14 (#195)
* grammar and readability edits

Co-authored-by: Henrik <i97henka@gmail.com>
2024-02-09 12:47:48 +01:00
Silvan Mosberger 778512e183
Merge pull request #227 from henrik-ch/broken-expression-link
removing broken link for writing expressions
2024-01-11 16:26:42 +01:00
Henrik Karlsson 7a15f1f396 fixing broken writing nix expressions link.
(second attempt)
2024-01-06 18:57:30 +00:00
John Ericson 8f4531178a
Merge pull request #224 from woutdp/master
Add note about using nix show-derivation instead
2023-10-25 21:01:43 -04:00
Wout De Puysseleir ae36c178a3
Add note about using nix show-derivation instead 2023-10-25 15:10:59 -07:00
John Ericson 7f7d68b4fb
Merge pull request #223 from woutdp/master
show-derivation -> derivation show
2023-10-25 17:41:41 -04:00
Wout De Puysseleir 9ab4662818
show-derivation -> derivation show
It looks like the command `nix show-derivation` is deprecated in favor of `nix derivation show`
This replaces all instances of `show-derivation` with `derivation show`
2023-10-25 14:23:20 -07:00
Pol Dellaiera 17da99ff34
Merge pull request #222 from MathiasMalandain/master
Solve a discrepancy in pill 7.7
2023-10-18 11:23:07 +02:00
MathiasMalandain cefdfa8ee1
Update the description of simple.nix in pill 7.7
Solve the discrepancy between the code and its description
2023-10-17 11:27:58 +02:00
Arek Kalandyk b54b78be80
fix(typo): rename mymkDerivation to mkDerivation in conclusion of pill 08 (#220) 2023-09-25 16:17:02 +02:00
Andrew Bruce 961fa9fed4
Grammatical adjustments to Nix Pill 19 (#218)
- tense corrections e.g. "did dive" -> "dived"
- pluralisation corrections
- "is not a special derivation to Nix" -> "is not treated as a special
  derivation by Nix"
- add question marks to headings phrased as questions, or transform them
  into statements
- sentence separation and removal of semicolons
- adverb corrections e.g. "enough contained" -> "sufficiently contained"
- links to sources in GitHub where they felt frustratingly missing
2023-07-15 19:22:19 +02:00
proofconstruction d13c02cb85
Merge pull request #214 from henrik-ch/pill8
Pill 8 update
2023-07-10 13:15:31 -05:00
proofconstruction ea8ef428da
Merge pull request #216 from henrik-ch/pill10
Pill10
2023-07-10 12:23:35 -05:00