nixpkgs/nixos
Jonathan Ringer 86f9a32c4c
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/python-modules/hydra/default.nix
2022-01-07 10:31:29 -08:00
..
doc Merge pull request #153273 from Synthetica9/passthru-driverInteractive 2022-01-07 16:04:43 +01:00
lib Merge remote-tracking branch 'origin/master' into staging-next 2022-01-07 10:31:29 -08:00
maintainers create-amis.sh: possible deprecation 2021-11-11 09:04:29 -07:00
modules Merge pull request #153729 from aanderse/nixos/caddy 2022-01-07 08:35:07 -05:00
tests Merge master into staging-next 2022-01-07 00:01:42 +00:00
COPYING
default.nix
README
release-combined.nix
release-small.nix
release.nix lxdImage: split from docker profile, use generators.toYAML 2021-11-03 07:49:54 +01: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.