nixpkgs/nixos
Graham Christensen 6db866cbd2
Revert "zfs cannot be distributed. Disabling it in the isos."
ZFS's popularity is growing, and not including it by default is a
bit frustrating. On top of that, the base iso includes ZFS
_anyway_ due to other packages depending upon it.

I think we're in the clear to do this on the basis that Oracle
probably doesn't care, it is probably fine (the SFLC agrees) and
we're a small fish. If a copyright holder asks us to, we can
definitely revert it again.

This reverts commit 33d07c7ea9f0d05d47dd4b41ded3b261380acfac.
2018-11-26 17:51:18 -05:00
..
doc Merge pull request #50641 from blaxill/firewallMerge 2018-11-23 11:42:16 +00:00
lib Merge branch 'master' of https://github.com/nixos/nixpkgs into tarball-closureinfo 2018-11-26 12:04:07 +08:00
maintainers google-compute-image: make it a module and the size tuneable (#49854) 2018-11-26 14:51:00 +00:00
modules Revert "zfs cannot be distributed. Disabling it in the isos." 2018-11-26 17:51:18 -05:00
tests Merge pull request #50962 from flokli/gitlab-updater 2018-11-26 18:47:14 +01:00
COPYING
default.nix
README
release-combined.nix nixos/release-combined: remove keymap tests from tested job 2018-06-06 21:02:55 +02:00
release-small.nix
release.nix tests: split into a separate all-tests.nix file 2018-11-11 23:11:46 +09: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.