Jan Tojnar 8f50f1ce10 Merge branch 'staging-next' into staging ... Resolved the following conflicts: - kernel flags between 09176d28a0 and 2b28822d8d - clojure-lsp between 3fa00685ce and e03c068af5		2021-02-19 17:15:31 +01:00
..
builders	doc: Convert Eclipse from Docbook to CommonMark	2021-02-16 18:58:14 +01:00
contributing	docs: clarify staging	2021-02-19 07:56:09 +01:00
doc-support	Revert "make-tarball.nix: Restore the 'commit' field in packages.json"	2020-03-29 20:57:50 +02:00
functions	Merge pull request #105492 from alunduil/assertOneOf-typo	2021-02-07 18:44:50 +02:00
languages-frameworks	Merge pull request #113167 from mweinelt/pytestcheckhook-paths	2021-02-18 16:59:22 +01:00
old	doc/*: editorconfig fixes	2020-07-31 15:06:53 +10:00
stdenv	doc: Add anchors to meta attributes	2021-02-07 23:11:41 +01:00
using	doc: fix syntax error in BLAS/LAPACK overlay example	2021-02-12 10:37:16 +01:00
.gitignore	doc: format the documentation (#57102)	2019-03-08 21:07:11 -08:00
default.nix	doc: use lib.cleanSource	2021-02-12 08:59:27 -08:00
functions.xml	doc: move fhs and mkShell under builders/special	2019-10-21 11:39:46 +02:00
Makefile	doc: Add staging workflow diagram	2020-12-09 05:26:55 +01:00
manual.xml	Convert fetchers from DocBook to CommonMark	2020-12-17 12:00:49 -03:00
overrides.css	doc: Make callout marks in code unselectable	2020-01-14 15:24:57 +01:00
preface.chapter.md	doc: explicit Markdown anchors for top-level headings; remove metadata	2021-01-01 10:02:57 -08:00
release-notes.xml	treewide: use https for nixos.org and hydra.nixos.org	2020-05-03 22:14:21 -07:00
shell.nix	doc: fix shell.nix (#109816)	2021-01-19 12:46:51 -05:00
style.css	manual: limit text width	2019-01-08 15:08:42 +00:00