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
..
assertions.nix
crashdump.nix	nixos/modules/misc/crashdump: remove idle=poll (fix #66464)	2019-08-13 16:08:22 -07:00
documentation.nix	nixos/documentation: Fix disabledModules being rendered	2020-01-09 17:26:08 +01:00
extra-arguments.nix
ids.nix	Revert "Revert "Merge master into staging-next""	2020-02-05 19:41:25 +01:00
label.nix
lib.nix
locate.nix	nixos/locate: don't create /var/cache	2020-02-01 17:14:52 +00:00
meta.nix
nixops-autoluks.nix	treewide: remove unused variables (#63177)	2019-06-16 19:59:05 +00:00
nixpkgs.nix	nixos/misc: Fix nixpkgs.config merge function	2019-08-10 20:03:11 +02:00
passthru.nix
version.nix	nixos/version: fix case where .git is a symlink	2020-01-20 00:53:44 +01:00