diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-11 06:01:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-11 06:01:28 +0000 |
| commit | cb2a59dda7b112020c8bbe78f63a7bcd706cdbe4 (patch) | |
| tree | 6c1ac74c7d35a481f8586446949e7582e98b23ee /pkgs/os-specific | |
| parent | a4c1084dad00ee05b8b8c5a654e784ac22daeb17 (diff) | |
| parent | 267148d196cb0742fa38e11e67a60a47022f492c (diff) | |
| download | nixpkgs-cb2a59dda7b112020c8bbe78f63a7bcd706cdbe4.tar nixpkgs-cb2a59dda7b112020c8bbe78f63a7bcd706cdbe4.tar.gz nixpkgs-cb2a59dda7b112020c8bbe78f63a7bcd706cdbe4.tar.bz2 nixpkgs-cb2a59dda7b112020c8bbe78f63a7bcd706cdbe4.tar.lz nixpkgs-cb2a59dda7b112020c8bbe78f63a7bcd706cdbe4.tar.xz nixpkgs-cb2a59dda7b112020c8bbe78f63a7bcd706cdbe4.tar.zst nixpkgs-cb2a59dda7b112020c8bbe78f63a7bcd706cdbe4.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/iwd/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 18 |
2 files changed, 13 insertions, 13 deletions
diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index 3f725e3e5b2..72ecaffe5f5 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-GcqmMqrZSgvSrsY8FJbPynNWTzSi5A6kmyq+xJ+2i3Y="; }; - outputs = [ "out" "man" ] + outputs = [ "out" "man" "doc" ] ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "test"; nativeBuildInputs = [ @@ -65,9 +65,9 @@ stdenv.mkDerivation rec { doCheck = true; postInstall = '' - mkdir -p $out/share - cp -a doc $out/share/ - cp -a README AUTHORS TODO $out/share/doc/ + mkdir -p $doc/share/doc + cp -a doc $doc/share/doc/iwd + cp -a README AUTHORS TODO $doc/share/doc/iwd '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' mkdir -p $test/bin cp -a test/* $test/bin/ diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 7341240f95a..e3a856c12a4 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -16,7 +16,7 @@ , enablePython ? true # for determining the latest compatible linuxPackages -, linuxPackages_5_15 ? pkgs.linuxKernel.packages.linux_5_15 +, linuxPackages_5_16 ? pkgs.linuxKernel.packages.linux_5_16 }: 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.16"; - latestCompatibleLinuxPackages = linuxPackages_5_15; + kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.17"; + latestCompatibleLinuxPackages = linuxPackages_5_16; # this package should point to the latest release. - version = "2.1.2"; + version = "2.1.3"; - sha256 = "sha256-7oSFZlmjCr+egImIVf429GrFOKn3L3r4SMnK3LHHmL8="; + sha256 = "10p9s835wj5msspqwnqbfbnh8jmcazzd2v0gj4hn7vvni4p48gfl"; }; zfsUnstable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.16"; - latestCompatibleLinuxPackages = linuxPackages_5_15; + kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.17"; + latestCompatibleLinuxPackages = linuxPackages_5_16; # 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.2"; + version = "2.1.3"; # rev = "0000000000000000000000000000000000000000"; - sha256 = "sha256-7oSFZlmjCr+egImIVf429GrFOKn3L3r4SMnK3LHHmL8="; + sha256 = "10p9s835wj5msspqwnqbfbnh8jmcazzd2v0gj4hn7vvni4p48gfl"; isUnstable = true; }; |