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

Commits on Jun 21, 2019

  1. nixos/zfs: Remove requestEncryptionCredentials assertion 

    zfs >= 0.8 supporting encryption is now stable
    @infinisil
    infinisil committed Jun 21, 2019
    Copy the full SHA
    852fe41 View commit details

  2. Merge pull request #63598 from Infinisil/zfs-assertion 

    nixos/zfs: Remove requestEncryptionCredentials assertion
    @Mic92
    Mic92 authored Jun 21, 2019
    Copy the full SHA
    5c12bac View commit details
Showing with 0 additions and 4 deletions.
  1. +0 −4 nixos/modules/tasks/filesystems/zfs.nix
4 changes: 0 additions & 4 deletions nixos/modules/tasks/filesystems/zfs.nix
View file
Original file line number Diff line number Diff line change
@@ -314,10 +314,6 @@ in
assertion = !cfgZfs.forceImportAll || cfgZfs.forceImportRoot;
message = "If you enable boot.zfs.forceImportAll, you must also enable boot.zfs.forceImportRoot";
}
{
assertion = cfgZfs.requestEncryptionCredentials -> cfgZfs.enableUnstable;
message = "This feature is only available for zfs unstable. Set the NixOS option boot.zfs.enableUnstable.";
}
];

virtualisation.lxd.zfsSupport = true;