nixpkgs/nixos
Jörg Thalheim c2fca99f97
Revert "Merge branch 'master' into staging-next"
This reverts commit f19b7b03a0, reversing
changes made to 572a864d02.

Sorry. I pushed the wrong staging-next (the one that had my master
merged in). This was not intended.
2020-12-31 08:50:36 +01:00
..
doc Revert "Merge branch 'master' into staging-next" 2020-12-31 08:50:36 +01:00
lib Merge pull request #104292 from fgaz/image-contents 2020-12-21 19:58:49 +01:00
maintainers
modules Revert "Merge branch 'master' into staging-next" 2020-12-31 08:50:36 +01:00
tests Revert "Merge branch 'master' into staging-next" 2020-12-31 08:50:36 +01:00
COPYING
default.nix
README
release-combined.nix release-combined: Add shadow test 2020-12-23 13:28:52 -05:00
release-small.nix Merge pull request #104322 from grahamc/amazon-image 2020-11-19 18:45:07 -05:00
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.