3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/nixos
Jonathan Ringer 14f3686af1
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
  pkgs/applications/terminal-emulators/alacritty/default.nix
  pkgs/servers/clickhouse/default.nix
2021-05-20 09:12:42 -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
modules Merge remote-tracking branch 'origin/master' into staging-next 2021-05-20 09:12:42 -07:00
tests Merge pull request #123598 from pschyska/master 2021-05-20 10:41:30 +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.