Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 09c74d944d8d
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: a0c7949780b8
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 29, 2018

  1. 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 33d07c7.

(cherry picked from commit 6db866c)
    @grahamc
    grahamc committed Nov 29, 2018
    Copy the full SHA
    a0c7949 View commit details
    Browse the repository at this point in the history