nixpkgs/nixos
Alyssa Ross b898e958da
Merge remote-tracking branch 'nixpkgs/master' into staging-next
Conflicts:
	pkgs/os-specific/linux/libfabric/default.nix
	pkgs/tools/filesystems/btrfs-progs/default.nix
2021-09-22 10:07:27 +00:00
..
doc Merge remote-tracking branch 'nixpkgs/master' into staging-next 2021-09-19 17:08:00 +00:00
lib nixos/testing: remove unused function runInMachine 2021-09-08 06:25:20 -05:00
maintainers amazon images: extend the image-info.json to have a disks object 2021-08-25 10:42:35 -04:00
modules Merge remote-tracking branch 'nixpkgs/master' into staging-next 2021-09-22 10:07:27 +00:00
tests Merge master into staging-next 2021-09-20 18:01:12 +00:00
COPYING
default.nix nixos: fix "nixos-rebuild build-vm-with-bootloader" for EFI systems 2021-01-08 19:36:10 +01:00
README
release-combined.nix release-combined.tested: Add the Sway test 2021-05-27 13:36:48 +02:00
release-small.nix Merge pull request #104322 from grahamc/amazon-image 2020-11-19 18:45:07 -05:00
release.nix NixOS/amazonImageZfs: init 2021-08-25 10:42:35 -04:00

*** NixOS ***

NixOS is a Linux distribution based on the purely functional package
management system Nix.  More information can be found at
https://nixos.org/nixos and in the manual in doc/manual.