public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next-21.05 into staging-21.05

Browse Source
This commit is contained in:
github-actions[bot] 2021-08-17 12:03:22 +00:00 committed by GitHub
commit c1e5f0fe3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/doc/manual/from_md/release-notes/rl-2105.section.xml
View File

@ -84,7 +84,7 @@
</listitem>
<listitem>
<para>
The linux_latest kernel was updated to the 5.12 series. It
The linux_latest kernel was updated to the 5.13 series. It
currently is not officially supported for use with the zfs
filesystem. If you use zfs, you should use a different kernel
version (either the LTS kernel, or track a specific one).

2
nixos/doc/manual/release-notes/rl-2105.section.md
View File

@ -30,7 +30,7 @@ In addition to numerous new and upgraded packages, this release has the followin
- Python optimizations were disabled again. Builds with optimizations enabled are not reproducible. Optimizations can now be enabled with an option.
- The linux_latest kernel was updated to the 5.12 series. It currently is not officially supported for use with the zfs filesystem. If you use zfs, you should use a different kernel version (either the LTS kernel, or track a specific one).
- The linux_latest kernel was updated to the 5.13 series. It currently is not officially supported for use with the zfs filesystem. If you use zfs, you should use a different kernel version (either the LTS kernel, or track a specific one).
## New Services {#sec-release-21.05-new-services}

4
pkgs/tools/nix/nixos-generators/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "nixos-generators";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "nix-community";
repo = "nixos-generators";
rev = version;
sha256 = "1gbj2jw7zv3mnq1lyj4q53jpfj642jy7lvg0kp060znvhws3370y";
sha256 = "1kn2anp8abpi0n3p7j0yczbpy7mdhk8rv84ywyghqdvf2wjmnlnp";
};
nativeBuildInputs = [ makeWrapper ];
installFlags = [ "PREFIX=$(out)" ];