nixpkgs/nixos
Jan Tojnar 8f50f1ce10
Merge branch 'staging-next' into staging
Resolved the following conflicts:

- kernel flags between 09176d28a0 and 2b28822d8d
- clojure-lsp between 3fa00685ce and e03c068af5
2021-02-19 17:15:31 +01:00
..
doc treewide: update 21.03 to 21.05 2021-02-12 14:12:48 -08:00
lib Merge pull request #67493 from clefru/make-disk-image 2021-01-29 07:18:50 +00:00
maintainers amazonImage: Upload disks as GP3 for cheaper & faster IO (#109027) 2021-01-11 13:54:40 -05:00
modules Merge branch 'staging-next' into staging 2021-02-19 17:15:31 +01:00
tests Merge pull request #113584 from sternenseemann/openldap-tests 2021-02-18 20:49:14 +01:00
COPYING
default.nix nixos: fix "nixos-rebuild build-vm-with-bootloader" for EFI systems 2021-01-08 19:36:10 +01:00
README treewide: use https for nixos.org and hydra.nixos.org 2020-05-03 22:14:21 -07:00
release-combined.nix Revert "release-combined.tested: Temporarily remove the Chromium test" 2021-01-24 15:27:49 +01:00
release-small.nix Merge pull request #104322 from grahamc/amazon-image 2020-11-19 18:45:07 -05:00
release.nix lib: Clean up how linux and gcc config is specified 2021-01-23 10:01:28 -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.