nixpkgs/nixos
aszlig 96a9c23f49
Merge branch 'chromium-source-refactor'
Fixes #12794 by reverting the source tree splitup (c92dbff) to use the
source tarball directly into the main Chromium derivation and making the
whole source/ subdirectory obsolete. The reasons for this are explained
in 4f981b4f84.

This also now renames the "sources.nix" file to "upstream-info.nix",
which is a more proper name for the file, because it not only contains
"source code" but also the Chrome binaries needed for the proprietary
plugins (of course "source" could also mean "where to get it", but I
wanted to avoid this ambiguity entirely).

I have successfully built and tested this using the VM tests.

All results can be found here:

https://headcounter.org/hydra/eval/313435
2016-03-21 04:10:06 +01:00
..
doc/manual nixos/manpages: enable linebreaking after slashes 2016-03-19 17:16:59 +01:00
lib Combine ISO generation steps 2016-03-15 14:15:12 +01:00
maintainers virtualization/azure: update the scripts for image maintenance 2016-03-13 13:57:31 +02:00
modules Merge pull request #14066 from jerith666/crashplan-46 2016-03-20 20:10:28 +00:00
tests nixos/tests/chromium: Propagate "system" to pkgs 2016-03-21 03:50:38 +01:00
COPYING Move all of NixOS to nixos/ in preparation of the repository merge 2013-10-10 13:28:20 +02:00
default.nix Revert "Add the tool "nixos-typecheck" that can check an option declaration to:" 2016-03-01 20:52:06 +01:00
README Move all of NixOS to nixos/ in preparation of the repository merge 2013-10-10 13:28:20 +02:00
release-combined.nix NixOS release: Don't depend on chromium 2016-03-15 16:06:09 +01:00
release-small.nix release-small.nix: Drop the grub1 test 2015-08-11 13:51:55 +02:00
release.nix Build most ISOs/OVAs for x86_64-linux only 2016-03-15 14:15:12 +01: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.