MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
nixpkgs/nixos
History
Vladimír Čunát 09f5763784
Merge branch 'master' into staging-next 
Conflicts:
 - pkgs/development/python-modules/pathspec/default.nix
   The hashes are equivalent, so it's not a real conflict.
 - pkgs/top-level/static.nix
   I can't see a solution, deffered redoing this to the later PR:
   https://github.com/NixOS/nixpkgs/pull/136849
2021-09-07 08:43:26 +02:00
..
doc Merge branch 'master' into staging-next 2021-09-07 08:43:26 +02:00
lib nixos/make-zfs-image: init 2021-08-25 10:42:35 -04:00
maintainers amazon images: extend the image-info.json to have a disks object 2021-08-25 10:42:35 -04:00
modules Merge branch 'master' into staging-next 2021-09-07 08:43:26 +02:00
tests Merge pull request #135315 from johnjameswhitman/johnjameswhitman/fix-wlan-sub-interfaces 2021-09-02 09:37:04 +02:00
COPYING
default.nix
README
release-combined.nix
release-small.nix
release.nix NixOS/amazonImageZfs: init 2021-08-25 10:42:35 -04:00

README 

*** 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.