Commit graph

352 commits

Author SHA1 Message Date
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 66936f15a573e36e7138fc93cecb8d2845296ace)

* Re-add heading id

It was removed in pandoc step for some reason.

(cherry picked from commit cf39aa5ad95cf3d704ecd2aa4055e4c23e74fb6b)

* 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 bc9bd1384427a443dd12674c5ae2ae0c36ffc7ee)

* 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
Henrik
e1b2be6893
Update pills/08-generic-builders.xml
Co-authored-by: Zach Mitchell, PhD <zmitchell@fastmail.com>
2023-06-22 07:49:45 +01:00
Henrik
7dcefdec89
updated patchelf link to github (#215) 2023-06-06 22:28:49 +02:00
Henrik
171fc1a4e0
Update autotools-nix.txt 2023-06-06 17:28:31 +01:00
i97henka
ff7c04d037 hello.nix refresh
updated tarball version and small change to indentation.
2023-06-06 17:23:31 +01:00
i97henka
c564d1b663 updated autotools
removed and reduced use of with.
2023-06-06 17:18:43 +01:00
Henrik
c9b9aae961
Update autotools-nix.txt
now using derivation instead of pkgs.stdenv.mkDerivation
2023-06-06 11:28:42 +01:00
i97henka
04337a7e63 changing to using builtins derivation and rename
renaming to mkDerivation
2023-06-05 21:42:34 +01:00
Henrik
f316006776
Update autotools-nix.txt 2023-06-04 21:21:52 +01:00
Henrik
6cdbf50683
Update autotools-nix.txt 2023-06-04 21:21:20 +01:00
i97henka
b1a8646ce9 updated darwin version accordingly.
not tested
2023-06-04 00:07:16 +01:00
i97henka
6bce7954ef improved indentation 2023-06-04 00:04:42 +01:00
i97henka
5bafd468eb changed function name mymkDerivation
to avoid collision & confusion  with standard function.
2023-06-04 00:01:01 +01:00
i97henka
73658ddd83 updated third version of hello file. 2023-06-03 23:48:26 +01:00
i97henka
d4deaeaebe updated autotools.nix - reduced scope of with. 2023-06-03 23:41:45 +01:00
i97henka
a826d304a0 changing hello.nix
NB Darwin variant still outstanding.
2023-06-03 16:28:36 +01:00
i97henka
b865367523 updating builder new hello version. 2023-06-03 16:20:54 +01:00
i97henka
9ebdbda7a9 updated hello tar gz link. 2023-06-03 15:43:56 +01:00
Henrik
29e1e273b8
with removed from first line (#213)
* with removed from first line

example no longer starts with with (import <nixpkgs> {});

* added inherit example and comments.

Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-06-02 18:17:10 +02:00
Valentin Gagarin
4d59f3bb11
Merge pull request #206 from henrik-ch/remove-install-instructions
removing installation instructions
2023-04-06 18:12:56 +02:00
Valentin Gagarin
a6cf5ed410
fix wording 2023-04-06 18:12:34 +02:00
Sergei Trofimovich
f6fa67fc2b
Merge pull request #211 from mklntf/fix/repository-derivation-snippet
Pill 13: Fix typo in repository derivation snippet
2023-04-05 21:39:48 +01:00
Markus Fuchs
f95dd06a92 Pill 13: Fix typo in repository derivation snippet 2023-04-05 20:57:17 +02:00
Sergei Trofimovich
2f263f3a66
Merge pull request #210 from mistydemeo/wrapped_hello_permissions
Pill 20: allow wrapped hello to be executed
2023-03-31 23:13:23 +01:00
Misty De Méo
560d0beac7
Pill 20: allow wrapped hello to be executed
As written, this produces a script without the execute bit
set, which may confuse users who want to try actually running
it after building.
2023-03-31 14:32:39 -07:00
Sergei Trofimovich
6f9e091269
Merge pull request #209 from mistydemeo/fix_asciidoc_name
Pill 17: fix asciidoc-full name
2023-03-31 22:05:32 +01:00