github-actions[bot]
ac962ee61a
Merge master into staging-next
2021-09-13 00:01:41 +00:00
Sandro
a79648dd7f
Merge pull request #136109 from john-consumable/master
2021-09-13 00:42:54 +02:00
github-actions[bot]
a13bf1828b
Merge master into staging-next
2021-09-12 18:01:21 +00:00
Matthieu Coudron
ab9c7819fe
Merge pull request #136615 from teto/lua-flat
...
Various lua changes/cleanup
2021-09-12 18:08:53 +02:00
github-actions[bot]
45de5d0c9a
Merge master into staging-next
2021-09-12 06:01:00 +00:00
Jörg Thalheim
fc4247e827
Merge pull request #137082 from bobby285271/markdown
...
nixos/doc: Convert more articles to CommonMark
2021-09-12 04:51:20 +01:00
Bobby Rong
7fb52b1325
nixos: nixos/doc/manual/installation/installing.xml to CommonMark
2021-09-12 09:26:37 +08:00
Matthieu Coudron
b97977681e
lua: add LUA_PATH changes to release notes
...
lua interpreters have been patched not to look into FHS folders anymore.
2021-09-12 03:03:56 +02:00
github-actions[bot]
3f2255106a
Merge master into staging-next
2021-09-12 00:01:45 +00:00
John Soo
b1c57920f5
nixos/datadog-agent: Note breaking changes in release notes.
2021-09-11 15:32:14 -07:00
John Soo
e131d6bf51
datadog-agent: Add release note entry.
2021-09-11 15:32:14 -07:00
Timothy DeHerrera
8e2f255cb6
Merge pull request #137325 from figsoda/git-module
...
nixos/git: init
2021-09-11 15:42:22 -06:00
github-actions[bot]
4170ee273c
Merge master into staging-next
2021-09-11 12:01:12 +00:00
Alyssa Ross
2f9ec5838e
nixos/doc: fix merged items in 20.09 rel notes
...
These items (notmuch and device tree) are completely different topics,
so were obviously merged into a single bullet by mistake.
2021-09-11 08:16:31 +00:00
figsoda
44853e8cf3
nixos/git: init
2021-09-10 18:50:04 -04:00
Martin Weinelt
d9341eafa2
Merge branch 'master' into staging-next
2021-09-10 15:04:01 +02:00
Jörg Thalheim
c2b276369d
Merge pull request #137224 from helsinki-systems/dry-activation-scripts-to-changelog
...
nixos/release-notes: Document dry activation scripts
2021-09-10 11:19:12 +01:00
github-actions[bot]
3f7ad651c7
Merge master into staging-next
2021-09-10 06:01:06 +00:00
happysalada
75c7c16df2
release-docs: add ipfs localdiscovery false change
2021-09-10 09:39:55 +09:00
Janne Heß
23b21c77f6
nixos/release-notes: Document dry activation scripts
2021-09-09 22:32:55 +02:00
Bobby Rong
b8efe91ce2
nixos: nixos/doc/manual/development/writing-modules.xml to CommonMark
2021-09-08 17:57:11 +08:00
Bobby Rong
785d40d4d8
nixos: nixos/doc/manual/configuration/profiles.xml to CommonMark
2021-09-08 16:35:17 +08:00
Bobby Rong
2e808c8144
nixos: nixos/doc/manual/configuration/networking.xml to CommonMark
2021-09-08 16:35:16 +08:00
Bobby Rong
4c10e0ff9d
nixos: nixos/doc/manual/configuration/file-systems.xml to CommonMark
2021-09-08 16:35:16 +08:00
Bobby Rong
7d7d2a4455
nixos: nixos/doc/manual/configuration/package-mgmt.xml to CommonMark
2021-09-08 16:35:16 +08:00
Bobby Rong
12a9632ab0
nixos: nixos/doc/manual/devlopment/nixos-tests.xml to CommonMark
2021-09-08 15:47:16 +08:00
Bobby Rong
45c1d8f4aa
nixos: nixos/doc/manual/configuration/config-syntax.xml to CommonMark
2021-09-08 15:47:16 +08:00
Bobby Rong
8ce611b9fb
nixos: nixos/doc/manual/configuration/declarative-packages.xml to CommonMark
2021-09-08 15:47:05 +08:00
Bobby Rong
3d711cfc5e
nixos: nixos/doc/manual/administration/troubleshooting.xml to CommonMark
2021-09-08 14:42:23 +08:00
Bobby Rong
5aaeddee5f
nixos: nixos/doc/manual/administration/containers.xml to CommonMark
2021-09-08 14:40:26 +08:00
github-actions[bot]
80cab1d056
Merge master into staging-next
2021-09-07 18:01:08 +00:00
Ryan Mulligan
c863de29a7
nixos/doc/md-to-db.sh: handle Docbook inclues in CommonMark
...
You can do includes like this:
```{=docbook}
<xi:include href="rl-2111.section.xml" />
```
2021-09-07 06:29:21 -07:00
github-actions[bot]
fbefda3466
Merge master into staging-next
2021-09-07 12:01:13 +00:00
Bobby Rong
745cf36f95
Merge branch 'staging-next-fix' into staging-next
2021-09-07 16:17:21 +08:00
Bobby Rong
90354922c2
nixos/doc: adjust to the new structure of kernel packages
2021-09-07 16:13:15 +08:00
Vladimír Čunát
09f5763784
Merge branch 'master' into staging-next
...
Conflicts:
- pkgs/development/python-modules/pathspec/default.nix
The hashes are equivalent, so it's not a real conflict.
- pkgs/top-level/static.nix
I can't see a solution, deffered redoing this to the later PR:
https://github.com/NixOS/nixpkgs/pull/136849
2021-09-07 08:43:26 +02:00
Jörg Thalheim
00f361a846
Merge pull request #129074 from bobby285271/pr11
...
nixos/doc: convert Chapter 57, 59, 60, 63 to CommonMark
2021-09-07 07:15:42 +01:00
Jörg Thalheim
4015c275ca
Merge pull request #129121 from bobby285271/pr13
...
nixos/doc: convert Chapter 7, 9, 10, 11, 12, 14, 15, 48 to CommonMark
2021-09-07 06:29:45 +01:00
Jörg Thalheim
e622dd1c84
Merge pull request #129154 from bobby285271/pr15
...
nixos/doc: convert Chapter 1, 3, 4 to CommonMark
2021-09-07 06:29:19 +01:00
Jörg Thalheim
c7d32059b1
Merge pull request #129136 from bobby285271/pr14
...
nixos/doc: convert "Chapter 58. Writing NixOS Modules" to CommonMark
2021-09-07 06:28:57 +01:00
Jörg Thalheim
929f0156cc
Merge pull request #128933 from bobby285271/pr5
...
nixos/doc: convert "8.1. LUKS-Encrypted File Systems" to CommonMark
2021-09-07 06:28:37 +01:00
Jörg Thalheim
48dc5e4ba6
Merge pull request #129003 from bobby285271/pr10
...
nixos/doc: convert "2.5. Additional installation notes" to CommonMark
2021-09-07 06:24:42 +01:00
Jörg Thalheim
0d789e992f
Merge pull request #128937 from bobby285271/pr8
...
nixos/doc: convert "Chapter 55. Container Management" to CommonMark
2021-09-07 06:24:21 +01:00
Jörg Thalheim
5de68de484
Merge pull request #128935 from bobby285271/pr7
...
nixos/doc: convert "Chapter 56. Troubleshooting" to CommonMark
2021-09-07 06:20:47 +01:00
Jörg Thalheim
2a55504a99
Merge pull request #128934 from bobby285271/pr6
...
nixos/doc: convert "6.2. Ad-Hoc Package Management" to CommonMark
2021-09-07 06:20:26 +01:00
Jörg Thalheim
96c98af211
Merge pull request #128892 from bobby285271/pr4
...
nixos/doc: convert "Chapter 13. Networking" to CommonMark
2021-09-07 06:20:04 +01:00
Jörg Thalheim
c0735214e1
Merge pull request #129083 from bobby285271/pr12
...
nixos/doc: convert Chapter 49, 50, 51, 52, 53, 54 to CommonMark
2021-09-07 06:19:33 +01:00
Jörg Thalheim
6e17c53b98
Merge pull request #128885 from bobby285271/pr3
...
nixos/doc: convert "Chapter 5. Configuration Syntax" to CommonMark
2021-09-07 03:56:34 +01:00
Jörg Thalheim
b9ed8cbaff
Merge pull request #128878 from bobby285271/pr2
...
nixos/doc: convert "6.1. Declarative Package Management" to CommonMark
2021-09-07 03:55:22 +01:00
Jörg Thalheim
c0e53b6857
Merge pull request #128760 from bobby285271/master
...
nixos/doc: convert "Chapter 45. Profiles" to CommonMark
2021-09-07 03:54:22 +01:00
