Frederik Rietdijk 419bc0a4cd Revert "Revert "Merge master into staging-next"" ... In 87a19e9048 I merged staging-next into master using the GitHub gui as intended. In ac241fb7a5 I merged master into staging-next for the next staging cycle, however, I accidentally pushed it to master. Thinking this may cause trouble, I reverted it in 0be87c7979. This was however wrong, as it "removed" master. This reverts commit 0be87c7979.		2020-02-05 19:41:25 +01:00
..
systems
tests	lib/cli,lib/tests/misc: somewhat more standard formatting	2020-01-23 14:47:38 +01:00
asserts.nix
attrsets.nix
cli.nix	lib/cli: mkKey -> mkOptionName, use generators.mkValueStringDefault	2020-01-23 14:47:38 +01:00
customisation.nix
debug.nix
default.nix	Merge pull request #78337 from Profpatsch/lib-improve-cli-module	2020-01-24 21:05:53 +01:00
deprecated.nix
fetchers.nix
filesystem.nix
fixed-points.nix
generators.nix	lib/generators: floats are not supported in mkValueStringDefault	2020-01-23 14:47:38 +01:00
kernel.nix
licenses.nix
lists.nix
meta.nix
minver.nix
modules.nix
options.nix
sources.nix
strings-with-deps.nix
strings.nix	Revert "Revert "Merge master into staging-next""	2020-02-05 19:41:25 +01:00
trivial.nix
types.nix
versions.nix
zip-int-bits.nix