nixpkgs/nixos
Jonathan Ringer 46fd0afcb3
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/python-modules/pysdl2/default.nix
	pkgs/top-level/aliases.nix
2022-02-06 18:36:59 -08:00
..
doc Merge branch 'master' into staging-next 2022-02-06 10:29:49 +01:00
lib Merge remote-tracking branch 'origin/master' into staging-next 2022-02-06 18:36:59 -08:00
maintainers nixos/nix-daemon: use structural settings 2022-01-26 21:04:50 -05:00
modules Merge remote-tracking branch 'origin/master' into staging-next 2022-02-06 18:36:59 -08:00
tests Merge pull request #157146 from illustris/cloudinit 2022-02-07 01:27:21 +01:00
COPYING
default.nix
README
release-combined.nix
release-small.nix
release.nix

*** 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.