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

Commits on May 6, 2017

  1. kernelPackages.splUnstable: 0.7.0-rc3 -> 0.7.0-rc4

    @Mic92
    Mic92 committed May 6, 2017
    Copy the full SHA
    4ea961c View commit details

  2. kernelPackages.zfsUnstable: 0.7.0-rc3 -> 0.7.0-rc4

    @Mic92
    Mic92 committed May 6, 2017
    Copy the full SHA
    7765e59 View commit details
Showing with 5 additions and 5 deletions.
  1. +2 −2 pkgs/os-specific/linux/spl/default.nix
  2. +3 −3 pkgs/os-specific/linux/zfs/default.nix
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/spl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -66,7 +66,7 @@ in
sha256 = "15qpx2nhprmk14jgb7yqp9dvfb6i3hhhspi77kvian171b0a6112";
};
splUnstable = common {
version = "0.7.0-rc3";
sha256 = "09v5gh7mqdl3bfq5an9iiw9fw3l1skprclxdz7r19bw3ids3lfja";
version = "0.7.0-rc4";
sha256 = "13r5qwrdnaabqfy9fvizvdj4n4cvfv6zy4jh0vijzjvbjd4an9g1";
};
}
6 changes: 3 additions & 3 deletions pkgs/os-specific/linux/zfs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -139,12 +139,12 @@ in
};
zfsUnstable = common {
# comment/uncomment if breaking kernel versions are known
incompatibleKernelVersion = "4.11";
incompatibleKernelVersion = null;

version = "0.7.0-rc3";
version = "0.7.0-rc4";

# this package should point to a version / git revision compatible with the latest kernel release
sha256 = "0js3lazqq8wb4nklqxd6sgbvwqgwnjgz3xi3mm33xf4284gia6pc";
sha256 = "16jiq2h7m2ljg5xv7m5lqmsszzclkhvj1iq1wa9w740la4vl22kf";
extraPatches = [
(fetchpatch {
url = "https://github.com/Mic92/zfs/compare/zfs-0.7.0-rc3...nixos-zfs-0.7.0-rc3.patch";