1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs synced 2024-10-22 20:10:32 -04:00
nixpkgs/nixos
Tuomas Tynkkynen 1a06373c0a Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/development/libraries/libclc/default.nix
	pkgs/top-level/all-packages.nix
2018-02-13 16:42:55 +02:00
..
doc/manual Merge remote-tracking branch 'upstream/master' into staging 2018-02-13 16:42:55 +02:00
lib
maintainers
modules Merge remote-tracking branch 'upstream/master' into staging 2018-02-13 16:42:55 +02:00
tests
COPYING
default.nix
README
release-combined.nix
release-small.nix
release.nix

*** NixOS ***

NixOS is a Linux distribution based on the purely functional package
management system Nix.  More information can be found at
http://nixos.org/nixos and in the manual in doc/manual.