nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-19 22:30:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge release-21.11 into staging-next-21.11

Browse Source
This commit is contained in:
github-actions[bot]
2022-03-26 00:12:42 +00:00
committed by GitHub
parent def120e62d e80f8f4d83
commit 17eefebc8d
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/os-specific/linux/zfs/default.nix
View File

@@ -16,7 +16,7 @@
, enablePython ? true
# for determining the latest compatible linuxPackages
, linuxPackages_5_16 ? pkgs.linuxKernel.packages.linux_5_16
, linuxPackages_5_17 ? pkgs.linuxKernel.packages.linux_5_17
}:
with lib;
@@ -215,28 +215,28 @@ in {
# to be adapted
zfsStable = common {
# check the release notes for compatible kernels
kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.17";
latestCompatibleLinuxPackages = linuxPackages_5_16;
kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.18";
latestCompatibleLinuxPackages = linuxPackages_5_17;
# this package should point to the latest release.
version = "2.1.3";
version = "2.1.4";
sha256 = "10p9s835wj5msspqwnqbfbnh8jmcazzd2v0gj4hn7vvni4p48gfl";
sha256 = "sha256-pHz1N2j+d9p1xleEBwwrmK9mN5gEyM69Suy0dsrkZT4=";
};
zfsUnstable = common {
# check the release notes for compatible kernels
kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.17";
latestCompatibleLinuxPackages = linuxPackages_5_16;
kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.18";
latestCompatibleLinuxPackages = linuxPackages_5_17;
# this package should point to a version / git revision compatible with the latest kernel release
# IMPORTANT: Always use a tagged release candidate or commits from the
# zfs-<version>-staging branch, because this is tested by the OpenZFS
# maintainers.
version = "2.1.3";
version = "2.1.4";
# rev = "0000000000000000000000000000000000000000";
sha256 = "10p9s835wj5msspqwnqbfbnh8jmcazzd2v0gj4hn7vvni4p48gfl";
sha256 = "sha256-pHz1N2j+d9p1xleEBwwrmK9mN5gEyM69Suy0dsrkZT4=";
isUnstable = true;
};

8
pkgs/servers/nextcloud/default.nix
View File

@@ -51,13 +51,13 @@ in {
};
nextcloud22 = generic {
version = "22.2.5";
sha256 = "sha256-gb5N0u5tu4/nI2xIpjXwm2hiSDCrBhIDyN6gKGOsdS8=";
version = "22.2.6";
sha256 = "0f1d0f0cb000c51b11886be25a8adce478846c3233572fcf28b44c5d4036e235";
};
nextcloud23 = generic {
version = "23.0.2";
sha256 = "sha256-ngJGLTjqq2RX/KgHe9Rv54w6qtRC6RpuEuMvp9UbxO4=";
version = "23.0.3";
sha256 = "39401d400fab02a84a175ea6e995b8ed4110fbaea48c876230b4f09755a62986";
};
# tip: get she sha with:
# curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256'