diff options
| author | Robert Schütz <dev@schuetz-co.de> | 2021-06-25 10:02:10 +0200 |
|---|---|---|
| committer | Robert Schütz <dev@schuetz-co.de> | 2021-06-25 10:02:10 +0200 |
| commit | c1dca92daf8de1a7421d412f2fa68fab16a0289a (patch) | |
| tree | ab8668d289e2b8393c0540720618cfb3e50eca95 /pkgs/os-specific | |
| parent | d437a6cac2086ead6232bc4d84c25c58a33c1b59 (diff) | |
| parent | 5555f34784ef4013e207097f9da8f2861eb5b9e3 (diff) | |
| download | nixpkgs-c1dca92daf8de1a7421d412f2fa68fab16a0289a.tar nixpkgs-c1dca92daf8de1a7421d412f2fa68fab16a0289a.tar.gz nixpkgs-c1dca92daf8de1a7421d412f2fa68fab16a0289a.tar.bz2 nixpkgs-c1dca92daf8de1a7421d412f2fa68fab16a0289a.tar.lz nixpkgs-c1dca92daf8de1a7421d412f2fa68fab16a0289a.tar.xz nixpkgs-c1dca92daf8de1a7421d412f2fa68fab16a0289a.tar.zst nixpkgs-c1dca92daf8de1a7421d412f2fa68fab16a0289a.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-xanmod.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index 1fb963c56c6..3274b1aa20e 100644 --- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.12.12"; + version = "5.12.13"; suffix = "xanmod1-cacule"; in buildLinux (args // rec { @@ -12,7 +12,7 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-99gVqdYhnBx3MDTCCHbxsljmvi+DixHp19vtNwCRM/M="; + sha256 = "sha256-eFIWlguU1hnkAgTbRxSMTStq0X7XW4IT1/9XlQSgdMQ="; }; extraMeta = { diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 20a6aedf9c6..73c3f82e8b0 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -195,12 +195,12 @@ in { # to be adapted zfsStable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.12"; + kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.13"; # this package should point to the latest release. - version = "2.0.4"; + version = "2.0.5"; - sha256 = "sha256-ySTt0K3Lc0Le35XTwjiM5l+nIf9co7wBn+Oma1r8YHo="; + sha256 = "0n0d8ab7ibxxa8znfsprh7jxwgighx5g291v7hi8272vfjrmk1mj"; }; zfsUnstable = common { |