nixpkgs/nixos
Jan Tojnar b8b9f52393 Merge branch 'master' into staging-next
Conflicts:
- pkgs/applications/networking/browsers/firefox/common.nix between 318fae87c0 and f6c5761935.
2022-05-21 17:52:39 +02:00
..
doc Merge master into staging-next 2022-05-19 18:06:51 +00:00
lib Merge pull request #171163 from hercules-ci/nixpkgs-config-doc 2022-05-19 20:51:38 +02:00
maintainers maintainers/create-amis.sh: Add more AWS regions 2022-05-17 10:20:30 +01:00
modules Merge branch 'master' into staging-next 2022-05-21 17:52:39 +02:00
tests Merge pull request #173576 from sternenseemann/xmonad-tests 2022-05-20 11:48:23 +02:00
COPYING
default.nix
README
release-combined.nix nixos/release: add podman, oci-containers.podman to tested 2022-05-03 19:42:33 +10:00
release-small.nix nixos/release: disable nfs3.simple 2022-03-03 06:34:59 +10:00
release.nix nixos/release: add calamares installer 2022-05-03 12:19:20 -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.