nixpkgs/nixos
Tuomas Tynkkynen aba0b45b86 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
      pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
2017-03-14 00:49:22 +02:00
..
doc/manual Merge pull request #23512 from matthiasbeyer/doc-fix-xfce 2017-03-06 17:33:13 -05:00
lib make-disk-image.nix: set last fsck time on ext4 images to enable resize-on-startup 2017-02-26 02:02:22 +00:00
maintainers nova-image: refactoring 2017-02-24 22:17:52 +01:00
modules Merge remote-tracking branch 'upstream/master' into staging 2017-03-14 00:49:22 +02:00
tests pump.io: fix tests 2017-03-12 16:01:07 +01:00
COPYING
default.nix Remove nixFallback 2017-03-06 15:54:50 +01:00
README
release-combined.nix nixos: build for aarch64-linux 2017-03-13 17:34:33 -04:00
release-small.nix nixos/release-small.nix: cleanup to use default versions 2017-01-27 15:33:54 +01:00
release.nix nixos: build for aarch64-linux 2017-03-13 17:34:33 -04:00

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