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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4c331eb7efc5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e488f62df748
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Nov 26, 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.
    @grahamc
    grahamc committed Nov 26, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6db866c View commit details

Commits on Nov 29, 2018

  1. Merge pull request #51090 from grahamc/revert-disable-zfs 

    Revert "zfs cannot be distributed. Disabling it in the isos."
    @grahamc
    grahamc authored Nov 29, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e488f62 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 nixos/modules/profiles/base.nix
2 changes: 1 addition & 1 deletion nixos/modules/profiles/base.nix
View file
Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@
];

# Include support for various filesystems.
boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" ];
boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "zfs" "ntfs" "cifs" ];

# Configure host id for ZFS to work
networking.hostId = lib.mkDefault "8425e349";