From fe9d78d9751f720a0d85b1d82b4380228005208d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Tue, 20 Dec 2022 18:38:47 +0100 Subject: [PATCH 01/12] lib/versions: add `pad` Pad a version string with zeros to match a given number of components. (cherry picked from commit 03554797153aa90263161784c296ef6518af3358) Reason: Necessary to backport kernel 6.2. --- lib/tests/misc.nix | 15 +++++++++++++++ lib/versions.nix | 15 +++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 9bdc30d85d44..68ae7b70d15f 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -212,6 +212,21 @@ runTests { expected = [ "1" "2" "3" ]; }; + testPadVersionLess = { + expr = versions.pad 3 "1.2"; + expected = "1.2.0"; + }; + + testPadVersionLessExtra = { + expr = versions.pad 3 "1.3-rc1"; + expected = "1.3.0-rc1"; + }; + + testPadVersionMore = { + expr = versions.pad 3 "1.2.3.4"; + expected = "1.2.3"; + }; + testIsStorePath = { expr = let goodPath = diff --git a/lib/versions.nix b/lib/versions.nix index 0e9d81ac78b1..986e7e5f9b37 100644 --- a/lib/versions.nix +++ b/lib/versions.nix @@ -46,4 +46,19 @@ rec { builtins.concatStringsSep "." (lib.take 2 (splitVersion v)); + /* Pad a version string with zeros to match the given number of components. + + Example: + pad 3 "1.2" + => "1.2.0" + pad 3 "1.3-rc1" + => "1.3.0-rc1" + pad 3 "1.2.3.4" + => "1.2.3" + */ + pad = n: version: let + numericVersion = lib.head (lib.splitString "-" version); + versionSuffix = lib.removePrefix numericVersion version; + in lib.concatStringsSep "." (lib.take n (lib.splitVersion numericVersion ++ lib.genList (_: "0") n)) + versionSuffix; + } From 31437fa40a52eaaf7a34654ff60f8ed10e4394e7 Mon Sep 17 00:00:00 2001 From: Tyler Slabinski Date: Thu, 2 Feb 2023 15:54:46 -0500 Subject: [PATCH 02/12] linuxPackages_testing: remove unused options for 6.2 (cherry picked from commit f8f7820433f1abc7a0da38a49ab57448baca1ff2) Reason: Necessary to backport kernel 6.2. --- pkgs/os-specific/linux/kernel/common-config.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 22b71ad7af6f..b3cd95e04ded 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -286,7 +286,7 @@ let DRM_GMA500 = whenAtLeast "5.12" module; DRM_GMA600 = whenOlder "5.13" yes; DRM_GMA3600 = whenOlder "5.12" yes; - DRM_VMWGFX_FBCON = yes; + DRM_VMWGFX_FBCON = whenOlder "6.2" yes; # (experimental) amdgpu support for verde and newer chipsets DRM_AMDGPU_SI = yes; # (stable) amdgpu support for bonaire and newer chipsets @@ -434,7 +434,7 @@ let F2FS_FS_COMPRESSION = whenAtLeast "5.6" yes; UDF_FS = module; - NFSD_V2_ACL = yes; + NFSD_V2_ACL = whenOlder "6.2" yes; NFSD_V3 = whenOlder "5.18" yes; NFSD_V3_ACL = yes; NFSD_V4 = yes; @@ -461,7 +461,7 @@ let CEPH_FS_POSIX_ACL = yes; SQUASHFS_FILE_DIRECT = yes; - SQUASHFS_DECOMP_MULTI_PERCPU = yes; + SQUASHFS_DECOMP_MULTI_PERCPU = whenOlder "6.2" yes; SQUASHFS_XATTR = yes; SQUASHFS_ZLIB = yes; SQUASHFS_LZO = yes; @@ -508,8 +508,8 @@ let SECURITY_APPARMOR = yes; DEFAULT_SECURITY_APPARMOR = yes; - RANDOM_TRUST_CPU = whenAtLeast "4.19" yes; # allow RDRAND to seed the RNG - RANDOM_TRUST_BOOTLOADER = whenAtLeast "5.4" yes; # allow the bootloader to seed the RNG + RANDOM_TRUST_CPU = whenOlder "6.2" (whenAtLeast "4.19" yes); # allow RDRAND to seed the RNG + RANDOM_TRUST_BOOTLOADER = whenOlder "6.2" (whenAtLeast "5.4" yes); # allow the bootloader to seed the RNG MODULE_SIG = no; # r13y, generates a random key during build and bakes it in # Depends on MODULE_SIG and only really helps when you sign your modules @@ -834,7 +834,7 @@ let EFI_STUB = yes; # EFI bootloader in the bzImage itself EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER = - whenAtLeast "5.8" yes; # initrd kernel parameter for EFI + whenOlder "6.2" (whenAtLeast "5.8" yes); # initrd kernel parameter for EFI CGROUPS = yes; # used by systemd FHANDLE = yes; # used by systemd SECCOMP = yes; # used by systemd >= 231 From de6aa650966b8c464d352b8a2a49704599b1da63 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 20 Feb 2023 13:40:41 +0300 Subject: [PATCH 03/12] linux: init 6.2 (cherry picked from commit 522512e7b46054645bba9deefb90547d47dbd149) --- pkgs/os-specific/linux/kernel/linux-6.2.nix | 18 ++++++++++++++++++ pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/linux-kernels.nix | 11 ++++++++++- 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/kernel/linux-6.2.nix diff --git a/pkgs/os-specific/linux/kernel/linux-6.2.nix b/pkgs/os-specific/linux/kernel/linux-6.2.nix new file mode 100644 index 000000000000..61ab8f13e552 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-6.2.nix @@ -0,0 +1,18 @@ +{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args: + +with lib; + +buildLinux (args // rec { + version = "6.2"; + + # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = versions.pad 3 version; + + # branchVersion needs to be x.y + extraMeta.branch = versions.majorMinor version; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; + sha256 = "sha256-dIYvqKtA7a6FuzOFwLcf4QMoi85RhSbWMZeACzy97LE="; + }; +} // (args.argsOverride or { })) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ba5f9e50a07d..178504adfb76 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -822,6 +822,7 @@ mapAliases ({ linuxPackages_5_4 = linuxKernel.packages.linux_5_4; linuxPackages_6_0 = linuxKernel.packages.linux_6_0; linuxPackages_6_1 = linuxKernel.packages.linux_6_1; + linuxPackages_6_2 = linuxKernel.packages.linux_6_2; linuxPackages_hardkernel_4_14 = linuxKernel.packages.hardkernel_4_14; linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1; linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3; @@ -841,6 +842,7 @@ mapAliases ({ linux_5_4 = linuxKernel.kernels.linux_5_4; linux_6_0 = linuxKernel.kernels.linux_6_0; linux_6_1 = linuxKernel.kernels.linux_6_1; + linux_6_2 = linuxKernel.kernels.linux_6_2; linuxPackages_mptcp = throw "'linuxPackages_mptcp' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04 linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04 linux_mptcp_95 = throw "'linux_mptcp_95' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04 diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index f9e193b27a9f..ab1972218811 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -166,6 +166,14 @@ in { ]; }; + linux_6_2 = callPackage ../os-specific/linux/kernel/linux-6.2.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.fix-em-ice-bonding + ]; + }; + linux_testing = let testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ @@ -522,6 +530,7 @@ in { linux_5_19 = throw "linux 5.19 was removed because it reached its end of life upstream"; # Added 2022-11-01 linux_6_0 = throw "linux 6.0 was removed because it reached its end of life upstream"; # Added 2023-01-20 linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1); + linux_6_2 = recurseIntoAttrs (packagesFor kernels.linux_6_2); }; rtPackages = { @@ -581,7 +590,7 @@ in { packageAliases = { linux_default = packages.linux_5_15; # Update this when adding the newest kernel major version! - linux_latest = packages.linux_6_1; + linux_latest = packages.linux_6_2; linux_mptcp = packages.linux_mptcp_95; linux_rt_default = packages.linux_rt_5_4; linux_rt_latest = packages.linux_rt_5_10; From 0eeeac4ed0295af6ed6197cb078d999593f19326 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Thu, 2 Mar 2023 09:49:09 -0800 Subject: [PATCH 04/12] libagent: hardcode the path to gpgconf (cherry picked from commit a6e35308725518dbf4895f5a0c2fd1b8dfa003d0) --- pkgs/development/python-modules/libagent/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index 1aa0346795ee..6aabcfbd0aa4 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -5,6 +5,7 @@ , cryptography , ed25519 , ecdsa +, gnupg , semver , mnemonic , unidecode @@ -30,6 +31,12 @@ buildPythonPackage rec { sha256 = "sha256-RISAy0efdatr9u4CWNRGnlffkC8ksw1NyRpJWKwqz+s="; }; + # hardcode the path to gpgconf in the libagent library + postPatch = '' + substituteInPlace libagent/gpg/keyring.py \ + --replace "util.which('gpgconf')" "'${gnupg}/bin/gpgconf'" + ''; + propagatedBuildInputs = [ unidecode backports-shutil-which From 2b2d58bfae4e293e63828bc274441999f236e10d Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Thu, 2 Mar 2023 10:59:14 -0800 Subject: [PATCH 05/12] libagent: hardcode the path gpg-connect-agent (cherry picked from commit 9d083587eed1df5faaff320807e9ec9d0e0ad231) --- pkgs/development/python-modules/libagent/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index 6aabcfbd0aa4..a93083165260 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -34,7 +34,8 @@ buildPythonPackage rec { # hardcode the path to gpgconf in the libagent library postPatch = '' substituteInPlace libagent/gpg/keyring.py \ - --replace "util.which('gpgconf')" "'${gnupg}/bin/gpgconf'" + --replace "util.which('gpgconf')" "'${gnupg}/bin/gpgconf'" \ + --replace "'gpg-connect-agent'" "'${gnupg}/bin/gpg-connect-agent'" ''; propagatedBuildInputs = [ From 73d0ee5222140cb7939165b8c6234b36541c4612 Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Wed, 1 Mar 2023 13:11:13 +0200 Subject: [PATCH 06/12] pijul: 1.0.0-beta.2 -> 1.0.0-beta.4 (cherry picked from commit 58f0b7fb746f3b473c19a90470444b1ecdf522e5) --- pkgs/applications/version-management/pijul/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index 1841e4ffe224..71adf4804858 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -5,7 +5,6 @@ , libsodium , openssl , xxHash -, zstd , darwin , gitImportSupport ? true , libgit2 ? null @@ -13,18 +12,18 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-beta.2"; + version = "1.0.0-beta.4"; src = fetchCrate { inherit version pname; - sha256 = "sha256-78nzCOR+AZuiAA1OpKKW4kfdUnlN8+qVaO3dknMck58="; + sha256 = "sha256-Sx+ZbT1EONWiQmC/5f4thfE9mmTulhTmUWeqPkQgJh8="; }; - cargoSha256 = "sha256-IhjN0HjIIuP+P8yfZ3NmZpVZBAuetOr4OVZoI8Qfspo="; + cargoSha256 = "sha256-vc7rkLCy489W7MjJYiN8vg4DNS65/ZSIEAcw0vaQJtU="; doCheck = false; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl libsodium xxHash zstd ] + buildInputs = [ openssl libsodium xxHash ] ++ (lib.optionals gitImportSupport [ libgit2 ]) ++ (lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreServices Security SystemConfiguration From 02d18e1a2e8a4de3a95d2aca57b680fb2a1ec989 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 3 Mar 2023 08:34:03 -0600 Subject: [PATCH 07/12] linux: 4.19.274 -> 4.19.275 (cherry picked from commit e8cf0bfcdf9deea8bd65d2475325d9068e5bdf52) --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 825b41032f9a..0e0a7ea9ce50 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.274"; + version = "4.19.275"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1a2w6knszfqg7ilnvxrs0kbgcviq90iqw9wp2d6y3qy9jfhnb8k4"; + sha256 = "02l6f5y1cbjc9997lmcak5j8dllkzr8q47nqscqsyvz2c2hnzsdg"; }; } // (args.argsOverride or {})) From 0cb1e0abb403c387e7f6b3a1a6212195f69513c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 3 Mar 2023 08:34:06 -0600 Subject: [PATCH 08/12] linux: 5.10.170 -> 5.10.172 (cherry picked from commit 248de5d61e84a85405a635f9af0f13b7727701b9) --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index bacd9d702bac..327d24885e6f 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.170"; + version = "5.10.172"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0pw2jnsnq2yxxvl4dkx6f7a8gczj8l484qpd4ibw737vprv1idd2"; + sha256 = "1c9757gma0dksd1ch8pljbsmf586bq66gxqpsv53676z8kivl3gj"; }; } // (args.argsOverride or {})) From 4c5fa89055c7584f5e079ae5093ef3fe21dcc58e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 3 Mar 2023 08:34:09 -0600 Subject: [PATCH 09/12] linux: 5.15.96 -> 5.15.97 (cherry picked from commit aee193bed863d1cc2b9447815cc6c5d415d81e46) --- pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index 49eba2372b67..f928193e6c65 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.96"; + version = "5.15.97"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "167g34xjbqxr5klqp127j2j15pms4jmgs0y7gr8zipiz2i69g39l"; + sha256 = "1cxk1w43apw2b6w6r8m1magz08qzlljzn8ihn42jgamyn7sddp9c"; }; } // (args.argsOverride or { })) From 5c4e90029e54e1edd5aba6d7f3f1fcdb00ab5b8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 3 Mar 2023 08:34:12 -0600 Subject: [PATCH 10/12] linux: 5.4.233 -> 5.4.234 (cherry picked from commit 4d878aaf53d9a571aea7ce37f40541e42f773bba) --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index e2ea5636721e..88091c519d4a 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.233"; + version = "5.4.234"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "09vnp4qcv7kwahbbvjznnv7pxq1cvbn11n0rn5rzx97jnia5f7js"; + sha256 = "1489jnp4vb8p879hq1nx3xgyzjdwj1zalk3x4vcbnc9f7yrrrixc"; }; } // (args.argsOverride or {})) From 65c41a6d757120cf3fd93de4f09ac1abea8b1f87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 3 Mar 2023 08:34:16 -0600 Subject: [PATCH 11/12] linux: 6.1.14 -> 6.1.15 (cherry picked from commit 579cf1274967a87abeda494fa700750753d544ca) --- pkgs/os-specific/linux/kernel/linux-6.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.1.nix b/pkgs/os-specific/linux/kernel/linux-6.1.nix index 3c1108a64ed9..a1e2283d5821 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.1.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.1.14"; + version = "6.1.15"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "03c1pszgm0qwwz7l5fnmbr6ank632bsl81pdx48svizy3q0pcw52"; + sha256 = "1zf48h34cz4chv0n12xlif0n7fdzbri2v8am1nn68bla2vidy5ic"; }; } // (args.argsOverride or { })) From 7055d2a5a96daf4d8feeacccde5f3ebed09891d6 Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Tue, 28 Feb 2023 09:07:33 +0100 Subject: [PATCH 12/12] ocaml: 4.14.0 -> 4.14.1 (cherry picked from commit 5881f783a092168f48ebfa349d24e4cec2041c31) --- pkgs/development/compilers/ocaml/4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ocaml/4.14.nix b/pkgs/development/compilers/ocaml/4.14.nix index 216620d67d60..8ce7967853e7 100644 --- a/pkgs/development/compilers/ocaml/4.14.nix +++ b/pkgs/development/compilers/ocaml/4.14.nix @@ -1,6 +1,6 @@ import ./generic.nix { major_version = "4"; minor_version = "14"; - patch_version = "0"; - sha256 = "sha256:0axcc7c23pf4qinz4vxgkba6pwziwbp9i2ydwzar7x9zlp6diarn"; + patch_version = "1"; + sha256 = "sha256-wSeXTQJCV2z0cGGyCqnIbRe+DWqpaH9uyYNd5nvnu28"; }