3
0
Fork 0
forked from mirrors/nixpkgs
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
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
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.