nixpkgs/nixos
Alyssa Ross 0d0e7ca769
Merge remote-tracking branch 'nixpkgs/master' into staging-next
Conflicts:
	pkgs/top-level/python-packages.nix
2021-04-23 21:18:11 +00:00
..
doc cudatoolkit-{9,9_0,9_1,9_2}: remove 2021-04-18 11:55:10 +02:00
lib nixosOptionsDoc: add markdown formatting 2021-04-13 10:10:40 -07:00
maintainers treewide: use auto diskSize for make-disk-image 2021-04-22 19:52:49 +02:00
modules Merge remote-tracking branch 'nixpkgs/master' into staging-next 2021-04-23 21:18:11 +00:00
tests Merge master into staging-next 2021-04-22 18:14:27 +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 Revert "release-combined.tested: Temporarily remove the Chromium test" 2021-01-24 15:27:49 +01:00
release-small.nix
release.nix installer: amend release with sd-card file move 2021-02-19 19:00:19 -05: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.