nixpkgs/nixos
Jonathan Ringer 5cd5b9b97f
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
 pkgs/development/tools/kubie/default.nix
2021-05-21 10:39:34 -07:00
..
doc Merge master into staging-next 2021-05-19 18:34:10 +00:00
lib Merge pull request #123052 from xoe-labs/da-test-vm-innteractive-log-switch 2021-05-20 15:32:54 +02:00
maintainers amazonImage: make statically sized again 2021-05-01 02:19:42 +00:00
modules Merge remote-tracking branch 'origin/master' into staging-next 2021-05-21 10:39:34 -07:00
tests keycloak.tests: Test HTTPS support 2021-05-21 13:09:43 +02:00
COPYING
default.nix
README
release-combined.nix nixos/release-combined: fix a test name 2021-05-17 22:52:28 +02:00
release-small.nix
release.nix Merge pull request #121834 from samueldr/feature/raspberrypi4-image-cleanup 2021-05-10 14:05:02 -04: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.