From e289b62966435e10cca55c986c2ee829b6202817 Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Tue, 30 May 2023 11:21:00 +0900 Subject: [PATCH 01/13] perlPackages.FinanceQuote: 1.55 -> 1.56 Changelog: https://github.com/finance-quote/finance-quote/releases/tag/v1.56 (cherry picked from commit 74dd80c693582318e48e4ddbcceef57e5e54f2c1) --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index eaec5ccfb52d..11fe67cb4fc9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9857,10 +9857,10 @@ with self; { FinanceQuote = buildPerlPackage { pname = "Finance-Quote"; - version = "1.55"; + version = "1.56"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BP/BPSCHUCK/Finance-Quote-1.55.tar.gz"; - hash = "sha256-4uAAtnxmtq9Q1HYYWEkhEFEKVaAwqJEBfUDH3iGLdI8="; + url = "mirror://cpan/authors/id/B/BP/BPSCHUCK/Finance-Quote-1.56.tar.gz"; + hash = "sha256-ER1vBY5kZLdIXAGPidDhiR/OC5aNnG+6G/JU1hLHpKs="; }; buildInputs = [ DateManip DateRange DateSimple DateTime DateTimeFormatISO8601 StringUtil TestKwalitee TestPerlCritic TestPod TestPodCoverage ]; propagatedBuildInputs = [ DateTimeFormatStrptime Encode HTMLTableExtract HTMLTokeParserSimple HTMLTree HTMLTreeBuilderXPath HTTPCookies JSON IOCompress LWPProtocolHttps Readonly StringUtil SpreadsheetXLSX TextTemplate TryTiny WebScraper XMLLibXML libwwwperl ]; From 4362437242be9535b496c1875e2313a0b94c0060 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 16 Jun 2023 21:28:06 +0200 Subject: [PATCH 02/13] nixos/nixpkgs: Make default Nixpkgs lazy when overridden (cherry picked from commit a742767bafecf0644585309b744e24f90cdff207) --- nixos/modules/misc/nixpkgs.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 55ec08acf445..8a20e31d5137 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -337,7 +337,15 @@ in config = { _module.args = { - pkgs = finalPkgs.__splicedPackages; + pkgs = + # We explicitly set the default override priority, so that we do not need + # to evaluate finalPkgs in case an override is placed on `_module.args.pkgs`. + # After all, to determine a definition priority, we need to evaluate `._type`, + # which is somewhat costly for Nixpkgs. With an explicit priority, we only + # evaluate the wrapper to find out that the priority is lower, and then we + # don't need to evaluate `finalPkgs`. + lib.mkOverride lib.modules.defaultOverridePriority + finalPkgs.__splicedPackages; }; assertions = [ From a72520aa9c7001036f33202d327268e8070eed2a Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 16 Jun 2023 21:43:12 +0200 Subject: [PATCH 03/13] lib.modules: Add mergeAttrDefinitionsWithPrio This will let us make assertions involving _module.args.pkgs, which is not an option but a value attribute, and therefore doesn't have its own highestPrio to inspect. The new function gives us that info. (cherry picked from commit 36ea2bbfe81ccf1118fd0ef66b13868fa3cc27e4) --- lib/modules.nix | 42 +++++++++++++++++++ lib/tests/modules.sh | 2 + .../test-mergeAttrDefinitionsWithPrio.nix | 21 ++++++++++ 3 files changed, 65 insertions(+) create mode 100644 lib/tests/modules/test-mergeAttrDefinitionsWithPrio.nix diff --git a/lib/modules.nix b/lib/modules.nix index 4dc8c663b2fe..c7dcccd7a1dc 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -910,6 +910,47 @@ let else opt // { type = opt.type.substSubModules opt.options; options = []; }; + /* + Merge an option's definitions in a way that preserves the priority of the + individual attributes in the option value. + + This does not account for all option semantics, such as readOnly. + + Type: + option -> attrsOf { highestPrio, value } + */ + mergeAttrDefinitionsWithPrio = opt: + let subAttrDefs = + lib.concatMap + ({ value, ... }@def: + map + (value: def // { inherit value; }) + (lib.pushDownProperties value) + ) + opt.definitionsWithLocations; + defsByAttr = + lib.zipAttrs ( + lib.concatLists ( + lib.concatMap + ({ value, ... }@def: + map + (lib.mapAttrsToList (k: value: { ${k} = def // { inherit value; }; })) + (lib.pushDownProperties value) + ) + opt.definitionsWithLocations + ) + ); + in + assert opt.type.name == "attrsOf" || opt.type.name == "lazyAttrsOf"; + lib.mapAttrs + (k: v: + let merging = lib.mergeDefinitions (opt.loc ++ [k]) opt.type.nestedTypes.elemType v; + in { + value = merging.mergedValue; + inherit (merging.defsFinal') highestPrio; + }) + defsByAttr; + /* Properties. */ mkIf = condition: content: @@ -1256,6 +1297,7 @@ private // importJSON importTOML mergeDefinitions + mergeAttrDefinitionsWithPrio mergeOptionDecls # should be private? mkAfter mkAliasAndWrapDefinitions diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 7aebba6b589e..a60228198fd7 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -61,6 +61,8 @@ checkConfigError() { # Shorthand meta attribute does not duplicate the config checkConfigOutput '^"one two"$' config.result ./shorthand-meta.nix +checkConfigOutput '^true$' config.result ./test-mergeAttrDefinitionsWithPrio.nix + # Check boolean option. checkConfigOutput '^false$' config.enable ./declare-enable.nix checkConfigError 'The option .* does not exist. Definition values:\n\s*- In .*: true' config.enable ./define-enable.nix diff --git a/lib/tests/modules/test-mergeAttrDefinitionsWithPrio.nix b/lib/tests/modules/test-mergeAttrDefinitionsWithPrio.nix new file mode 100644 index 000000000000..3233f4151368 --- /dev/null +++ b/lib/tests/modules/test-mergeAttrDefinitionsWithPrio.nix @@ -0,0 +1,21 @@ +{ lib, options, ... }: + +let + defs = lib.modules.mergeAttrDefinitionsWithPrio options._module.args; + assertLazy = pos: throw "${pos.file}:${toString pos.line}:${toString pos.column}: The test must not evaluate this the assertLazy thunk, but it did. Unexpected strictness leads to unexpected errors and performance problems."; +in + +{ + options.result = lib.mkOption { }; + config._module.args = { + default = lib.mkDefault (assertLazy __curPos); + regular = null; + force = lib.mkForce (assertLazy __curPos); + unused = assertLazy __curPos; + }; + config.result = + assert defs.default.highestPrio == (lib.mkDefault (assertLazy __curPos)).priority; + assert defs.regular.highestPrio == lib.modules.defaultOverridePriority; + assert defs.force.highestPrio == (lib.mkForce (assertLazy __curPos)).priority; + true; +} From dba73bef34190e83af483c70115d0508cceeec48 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 16 Jun 2023 21:45:09 +0200 Subject: [PATCH 04/13] nixos/nixpkgs: Don't check when _module.args.pkgs is set (cherry picked from commit 8f31bff7940ed8d8d3e250e6ab7e7bc5b6160f1d) --- nixos/modules/misc/nixpkgs.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 8a20e31d5137..f9d8bccea284 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -55,11 +55,6 @@ let description = "An evaluation of Nixpkgs; the top level attribute set of packages"; }; - # Whether `pkgs` was constructed by this module - not if nixpkgs.pkgs or - # _module.args.pkgs is set. However, determining whether _module.args.pkgs - # is defined elsewhere does not seem feasible. - constructedByMe = !opt.pkgs.isDefined; - hasBuildPlatform = opt.buildPlatform.highestPrio < (mkOptionDefault {}).priority; hasHostPlatform = opt.hostPlatform.isDefined; hasPlatform = hasHostPlatform || hasBuildPlatform; @@ -348,7 +343,17 @@ in finalPkgs.__splicedPackages; }; - assertions = [ + assertions = let + # Whether `pkgs` was constructed by this module. This is false when any of + # nixpkgs.pkgs or _module.args.pkgs is set. + constructedByMe = + # We set it with default priority and it can not be merged, so if the + # pkgs module argument has that priority, it's from us. + (lib.modules.mergeAttrDefinitionsWithPrio options._module.args).pkgs.highestPrio + == lib.modules.defaultOverridePriority + # Although, if nixpkgs.pkgs is set, we did forward it, but we did not construct it. + && !opt.pkgs.isDefined; + in [ ( let nixosExpectedSystem = From 896ee541a7ac8cba1a16299012b8c784700ca5bb Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 23 Jun 2023 18:10:49 +0200 Subject: [PATCH 05/13] lib/modules.nix: Clean up mergeAttrDefinitionsWithPrio impl (cherry picked from commit 895ac176341606688b864bc84312140c065db741) --- lib/modules.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index c7dcccd7a1dc..381675f611df 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -920,14 +920,7 @@ let option -> attrsOf { highestPrio, value } */ mergeAttrDefinitionsWithPrio = opt: - let subAttrDefs = - lib.concatMap - ({ value, ... }@def: - map - (value: def // { inherit value; }) - (lib.pushDownProperties value) - ) - opt.definitionsWithLocations; + let defsByAttr = lib.zipAttrs ( lib.concatLists ( @@ -935,7 +928,7 @@ let ({ value, ... }@def: map (lib.mapAttrsToList (k: value: { ${k} = def // { inherit value; }; })) - (lib.pushDownProperties value) + (pushDownProperties value) ) opt.definitionsWithLocations ) From cded0c9a5c4d57ac3ff46099b6487e7a26eaa000 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Jun 2023 01:21:21 +0000 Subject: [PATCH 06/13] librewolf-unwrapped: 114.0.1-2 -> 114.0.2-1 (cherry picked from commit 391d7c750418d206a3213a52d72349dbb051d336) --- .../networking/browsers/librewolf/src.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 4cf598d49f3e..0208b62f414f 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "114.0.1-2", + "packageVersion": "114.0.2-1", "source": { - "rev": "114.0.1-2", - "sha256": "1di8kfzc27wz89cfq8xgs17lyayikpmqwn5npdzllzppp0dx0894" + "rev": "114.0.2-1", + "sha256": "0snwwr15kd69p6xjbwcika8w04q0qgx6qmv5gy01y9gjc0hcv10q" }, "firefox": { - "version": "114.0.1", - "sha512": "d422982e0271a68aa8064977b3a6b6f9412a30e7261ba06385c416e00e8ba0eb488d81a8929355fc92d35469d3308ec928f00e4de7248ed6390d5d900d7bce8f" + "version": "114.0.2", + "sha512": "1d514d09c6b964b96c6d52d54b89a89a92d53a6fe669e16a6370346c980db4d0ac6c502fa89219c71b680566b9eb982e9b3191c21f81d7326f34f6c837c0a872" } } From 2debc6faac269f11bb5b9b1354af86e8ae4db5d3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 26 Jun 2023 08:54:02 +0200 Subject: [PATCH 07/13] clickhouse: compress tarball (#239873) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit dea415130ab72179e264acdaa864578b8c8077f6) Co-authored-by: Domen Kožar --- pkgs/servers/clickhouse/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 12d2b3228304..ffa10568ffff 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -34,7 +34,10 @@ in mkDerivation rec { repo = "ClickHouse"; rev = "v${version}-lts"; fetchSubmodules = true; - hash = "sha256-fVwwMj0WbyCbe4WfpYMGVM6vXFgHsjg9MUZbNyd+a/w="; + name = "clickhouse-${rev}.tar.gz"; + hash = if stdenv.isDarwin + then "sha256-VaUGbUyDilYPK4iBv/nICOsfeolNQeBSEtC71gBTkpE=" + else "sha256-NH+OW6zr8XBmJr68fX1WIy8Wt7cLWFMskIv7Be0TLEU="; postFetch = '' # delete files that make the source too big rm -rf $out/contrib/llvm-project/llvm/test @@ -44,6 +47,18 @@ in mkDerivation rec { # fix case insensitivity on macos https://github.com/NixOS/nixpkgs/issues/39308 rm -rf $out/contrib/sysroot/linux-* rm -rf $out/contrib/liburing/man + + # compress to not exceed the 2GB output limit + # try to make a deterministic tarball + tar -I 'gzip -n' \ + --sort=name \ + --mtime=1970-01-01 \ + --owner=root --group=root \ + --numeric-owner --mode=go=rX,u+rw,a-s \ + --transform='s@^@source/@S' \ + -cf temp -C "$out" . + rm -r "$out" + mv temp "$out" ''; }; From a5173c3819f44726a6aed01ec0bca6221b162a1c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 26 Jun 2023 08:55:12 +0200 Subject: [PATCH 08/13] clickhouse: 23.3.3.52 -> 23.3.5.9 (#239874) (cherry picked from commit 93163e4bd45596c0921d7160002b7f110a7726f2) Co-authored-by: Yureka --- pkgs/servers/clickhouse/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index ffa10568ffff..4a07e129cfd3 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -1,6 +1,7 @@ { lib , llvmPackages , fetchFromGitHub +, fetchpatch , cmake , ninja , python3 @@ -27,7 +28,7 @@ let else llvmPackages.stdenv).mkDerivation; in mkDerivation rec { pname = "clickhouse"; - version = "23.3.3.52"; + version = "23.3.5.9"; src = fetchFromGitHub rec { owner = "ClickHouse"; @@ -35,9 +36,7 @@ in mkDerivation rec { rev = "v${version}-lts"; fetchSubmodules = true; name = "clickhouse-${rev}.tar.gz"; - hash = if stdenv.isDarwin - then "sha256-VaUGbUyDilYPK4iBv/nICOsfeolNQeBSEtC71gBTkpE=" - else "sha256-NH+OW6zr8XBmJr68fX1WIy8Wt7cLWFMskIv7Be0TLEU="; + hash = "sha256-soF0L69oi95r0zgzPL0DfDhhXfRKekN5u/4+/mt8QwM="; postFetch = '' # delete files that make the source too big rm -rf $out/contrib/llvm-project/llvm/test @@ -53,7 +52,7 @@ in mkDerivation rec { tar -I 'gzip -n' \ --sort=name \ --mtime=1970-01-01 \ - --owner=root --group=root \ + --owner=0 --group=0 \ --numeric-owner --mode=go=rX,u+rw,a-s \ --transform='s@^@source/@S' \ -cf temp -C "$out" . @@ -157,9 +156,11 @@ in mkDerivation rec { "-DENABLE_TESTS=OFF" "-DCOMPILER_CACHE=disabled" "-DENABLE_EMBEDDED_COMPILER=ON" - "-DWERROR=OFF" ]; + # https://github.com/ClickHouse/ClickHouse/issues/49988 + hardeningDisable = [ "fortify" ]; + postInstall = '' rm -rf $out/share/clickhouse-test From 50fd6979153bef4d1763d5aa11597daecb859fd0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Jun 2023 08:19:09 +0000 Subject: [PATCH 09/13] confy: 0.6.4 -> 0.6.5 (cherry picked from commit 47a3e7693860501dac6dbb7672118d8d7344a90f) --- pkgs/applications/misc/confy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/confy/default.nix b/pkgs/applications/misc/confy/default.nix index b015d7059ed3..ec177c0aa725 100644 --- a/pkgs/applications/misc/confy/default.nix +++ b/pkgs/applications/misc/confy/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "confy"; - version = "0.6.4"; + version = "0.6.5"; src = fetchurl { url = "https://git.sr.ht/~fabrixxm/confy/archive/${version}.tar.gz"; - sha256 = "0v74pdyihj7r9gb3k2rkvbphan27ajlvycscd8xzrnsv74lcmbpm"; + sha256 = "sha256-zfuwOZBSGQzJUc36M6C5wSHarLbPFqayQVFo+WbVo7k="; }; nativeBuildInputs = [ From 4dd018709c8abb8291787121ed0f40764e8dd0af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 26 Jun 2023 08:56:12 +0200 Subject: [PATCH 10/13] knot-dns: 3.2.7 -> 3.2.8 https://gitlab.nic.cz/knot/knot-dns/-/releases/v3.2.8 (cherry picked from commit 8870371562828a4f18bdda5b559fcdbeeede6a3e) --- pkgs/servers/dns/knot-dns/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index f5a3dec64e5e..ba394429926a 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.2.7"; + version = "3.2.8"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "d3b7872ac8aa80f7f54ddb1bb3b1e2f90ec55f7270a2c4a9338eab42b7d2767b"; + sha256 = "ef419a428f327def77780bc90eda763b51e6121fe548543da84b9eb96a261a6e"; }; outputs = [ "bin" "out" "dev" ]; @@ -29,12 +29,6 @@ stdenv.mkDerivation rec { ./runtime-deps.patch ]; - # Upstream mistake in 3.2.7: too strict constraint. - postPatch = '' - substituteInPlace configure.ac \ - --replace 'libngtcp2 = 0.13.0' 'libngtcp2 = 0.13.1' - ''; - nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ gnutls liburcu libidn2 libunistring From 304db2d77fbc59107792a042143973b5e9d61a34 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 26 Jun 2023 15:33:16 +0200 Subject: [PATCH 11/13] firefox-beta-unwrapped: 115.0b7 -> 115.0b9 (cherry picked from commit 787a40631ee043cb31283a5945ae5565b08d1504) --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 998f35aac576..7e56f724016d 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -29,11 +29,11 @@ firefox-beta = buildMozillaMach rec { pname = "firefox-beta"; - version = "115.0b7"; + version = "115.0b9"; applicationName = "Mozilla Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "4ae6b74e7a47c06c3630c911d5bbcd6c390f1462f4335c8fd084cf455675c88872864390e22847da16564484b70fbac09625015fc6a4cf10a01ed8052016991e"; + sha512 = "26e030143c09daef8fcdde55ebd020828025694d354e5f1e51308275af07b4c44aef325bb74e5e289b89d469822b2380a4abf47103972f46f12dfd9ac8fad830"; }; meta = { From 94fd9e88acbc9747a13ed3a87e453f5fa8e7b1c4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 26 Jun 2023 15:33:25 +0200 Subject: [PATCH 12/13] firefox-devedition-unwrapped: 115.0b7 -> 115.0b9 (cherry picked from commit 4d3fa82730ebf949a8fb85a18285126ca0247bdf) --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 7e56f724016d..1b4a6236c94e 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -56,12 +56,12 @@ firefox-devedition = buildMozillaMach rec { pname = "firefox-devedition"; - version = "115.0b7"; + version = "115.0b9"; applicationName = "Mozilla Firefox Developer Edition"; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "f360ca7c5eb69d16a54b37a95195f4981c19e7e081cf7d494dafc1838ec69f2beabae5eaed23b0b551e71b32e3d0213383bc43e63416d390aa453bfa8b0f1993"; + sha512 = "8d2a0dc2c64f8fc846077165ea0c97cae04a85db9ffcd23fbf933b25f165ecd85727ba2f432842f2d2f41c5b5bef5eb4ae2536d8492888c334aba0dcec278c47"; }; meta = { From 8dd9a25ceb0499d0bcbf8c9a6448de4b9e9b562e Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Mon, 26 Jun 2023 16:21:36 +0200 Subject: [PATCH 13/13] linux_6_4: init at 6.4 Email release: https://lwn.net/Articles/936310/ Kernel Newbies: https://kernelnewbies.org/Linux_6.4 linux_latest is bumped to linux_6_4 now. (cherry picked from commit 07f4d077d7a5057c19857ccd957445096f978d34) --- pkgs/os-specific/linux/kernel/linux-6.4.nix | 18 ++++++++++++++++++ pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/linux-kernels.nix | 10 +++++++++- 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/kernel/linux-6.4.nix diff --git a/pkgs/os-specific/linux/kernel/linux-6.4.nix b/pkgs/os-specific/linux/kernel/linux-6.4.nix new file mode 100644 index 000000000000..b90750b3b8fb --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-6.4.nix @@ -0,0 +1,18 @@ +{ lib, fetchurl, buildLinux, ... } @ args: + +with lib; + +buildLinux (args // rec { + version = "6.4"; + + # 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-j6BYjwws7KRMrHeg45ukjJ8AprncaXYcAqXT76yNp/M="; + }; +} // (args.argsOverride or { })) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index dc0c012a7333..8a5eefed0df3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -927,6 +927,7 @@ mapAliases ({ linuxPackages_6_1 = linuxKernel.packages.linux_6_1; linuxPackages_6_2 = linuxKernel.packages.linux_6_2; linuxPackages_6_3 = linuxKernel.packages.linux_6_3; + linuxPackages_6_4 = linuxKernel.packages.linux_6_4; linuxPackages_hardkernel_4_14 = linuxKernel.packages.hardkernel_4_14; linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1; linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3; @@ -950,6 +951,7 @@ mapAliases ({ linux_6_1 = linuxKernel.kernels.linux_6_1; linux_6_2 = linuxKernel.kernels.linux_6_2; linux_6_3 = linuxKernel.kernels.linux_6_3; + linux_6_4 = linuxKernel.kernels.linux_6_4; 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 f2fad5895ede..217859245c81 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -187,6 +187,13 @@ in { ]; }; + linux_6_4 = callPackage ../os-specific/linux/kernel/linux-6.4.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + linux_testing = let testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ @@ -570,6 +577,7 @@ in { linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15); linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1); linux_6_3 = recurseIntoAttrs (packagesFor kernels.linux_6_3); + linux_6_4 = recurseIntoAttrs (packagesFor kernels.linux_6_4); } // lib.optionalAttrs config.allowAliases { linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; # Added 2022-11-08 linux_5_18 = throw "linux 5.18 was removed because it reached its end of life upstream"; # Added 2022-09-17 @@ -638,7 +646,7 @@ in { packageAliases = { linux_default = packages.linux_6_1; # Update this when adding the newest kernel major version! - linux_latest = packages.linux_6_3; + linux_latest = packages.linux_6_4; linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake"; linux_rt_default = packages.linux_rt_5_4; linux_rt_latest = packages.linux_rt_6_1;