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: 3e2378bc45cb
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 471c2cb7b658
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 18, 2018

  1. linuxPackages.{spl,zfs}: 0.7.11 -> 0.7.12

    Robert Schütz committed Nov 18, 2018
    Copy the full SHA
    d9cd9ac View commit details

Commits on Nov 19, 2018

  1. Merge pull request #50460 from dotlambda/zfs-0.7.12 

    linuxPackages.{spl,zfs}: 0.7.11 -> 0.7.12
    @Mic92
    Mic92 authored Nov 19, 2018
    Copy the full SHA
    471c2cb 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
@@ -10,13 +10,13 @@ assert kernel != null;

stdenv.mkDerivation rec {
name = "spl-${version}-${kernel.version}";
version = "0.7.11";
version = "0.7.12";

src = fetchFromGitHub {
owner = "zfsonlinux";
repo = "spl";
rev = "spl-${version}";
sha256 = "15h02g5k3i20y2cycc72vr6hdn8n70jmzqii8dmx9za6bl9nk2rm";
sha256 = "13zqh1g132g63zv54l3bsg5kras9mllkx9wvlnfs13chfr7vpp4p";
};

patches = [ ./install_prefix.patch ];
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
@@ -158,12 +158,12 @@ in {
# to be adapted
zfsStable = common {
# comment/uncomment if breaking kernel versions are known
incompatibleKernelVersion = "4.19";
# incompatibleKernelVersion = "4.19";

# this package should point to the latest release.
version = "0.7.11";
version = "0.7.12";

sha256 = "0m9wkq6wf4cg8w38s3avd0bvybnv0avqwxk3gwz9rgb9rn0m98jg";
sha256 = "1j432nb3a86isghdysir9xi6l5djmb5fbc5s9zr0rwg4ziisskbh";

extraPatches = [
(fetchpatch {