nixpkgs/nixos
Jan Tojnar 01a4d350c7
Merge branch 'master' into staging-next
Reverted https://github.com/NixOS/nixpkgs/pull/115228 for kodi to avoid conflict.

It does not look like unzip would be used but not investigating now to speed up merge conflict resolution.
2021-03-13 19:16:43 +01:00
..
doc Merge pull request #106599 from doronbehar/pkg/gnuradio/pkgs 2021-03-13 17:27:40 +00:00
lib nixos/qemu-flags: add ppc64 2021-03-05 01:57:54 -08:00
maintainers amazonImage: Upload disks as GP3 for cheaper & faster IO (#109027) 2021-01-11 13:54:40 -05:00
modules Merge branch 'master' into staging-next 2021-03-13 19:16:43 +01:00
tests Merge branch 'master' into staging-next 2021-03-13 19:16:43 +01:00
COPYING
default.nix nixos: fix "nixos-rebuild build-vm-with-bootloader" for EFI systems 2021-01-08 19:36:10 +01:00
README treewide: use https for nixos.org and hydra.nixos.org 2020-05-03 22:14:21 -07:00
release-combined.nix Revert "release-combined.tested: Temporarily remove the Chromium test" 2021-01-24 15:27:49 +01:00
release-small.nix Merge pull request #104322 from grahamc/amazon-image 2020-11-19 18:45:07 -05:00
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.