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
..
channel.nix	nixos: add preferLocalBuild=true; on derivations for config files	2019-02-22 20:11:27 +01:00
installation-cd-base.nix	reewide: Purge all uses stdenv.system and top-level system	2018-08-30 17:20:32 -04:00
installation-cd-graphical-base.nix	installer: use sddm in plasma5	2019-10-22 00:28:47 -04:00
installation-cd-graphical-gnome.nix	installer: use sddm in plasma5	2019-10-22 00:28:47 -04:00
installation-cd-graphical-plasma5-new-kernel.nix	nixos/release: rename iso_graphical to iso_plasma5	2020-01-27 16:34:37 -05:00
installation-cd-graphical-plasma5.nix	nixos/release: rename iso_graphical to iso_plasma5	2020-01-27 16:34:37 -05:00
installation-cd-minimal-new-kernel.nix	[bot] nixos/*: remove unused arguments in lambdas	2018-07-20 20:56:59 +00:00
installation-cd-minimal.nix	nixos/installation-cd-minimal: Drop fontconfig	2018-10-27 15:17:13 +03:00
iso-image.nix	Revert "Revert "Merge master into staging-next""	2020-02-05 19:41:25 +01:00
sd-image-aarch64-new-kernel.nix	nixos/sd-image-aarch64-new-kernel: Added to release	2018-12-26 11:03:32 +00:00
sd-image-aarch64.nix	sd-image: don't use installer.cloneConfig option that is not imported	2019-09-01 14:15:33 -04:00
sd-image-armv7l-multiplatform.nix	sd-image: don't use installer.cloneConfig option that is not imported	2019-09-01 14:15:33 -04:00
sd-image-raspberrypi.nix	Various: Add support for raspberry pi 4.	2019-09-17 04:05:16 +01:00
sd-image-raspberrypi4.nix	Various: Add support for raspberry pi 4.	2019-09-17 04:05:16 +01:00
sd-image.nix	nixos: compress make-ext4-fs with zstd	2019-12-13 16:18:04 -08:00
system-tarball-fuloong2f.nix	treewide: replace depecated alias s/mssys/ms-sys/g	2018-03-22 10:13:21 +00:00
system-tarball-pc-readme.txt	http://nixos.org -> https://nixos.org	2014-12-14 11:26:45 +01:00
system-tarball-pc.nix	treewide: use attrs instead of list for types.loaOf options	2020-01-06 10:39:18 -05:00
system-tarball-sheevaplug.nix	treewide: use attrs instead of list for types.loaOf options	2020-01-06 10:39:18 -05:00
system-tarball.nix	treewide: use attrs instead of list for types.loaOf options	2020-01-06 10:39:18 -05:00