nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-24 21:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2023-09-19 12:01:22 +00:00 committed by GitHub
commit e22ad0ef4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
30 changed files with 444 additions and 418 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/tests/kernel-generic.nix
View File

@ -32,6 +32,7 @@ let
linux_5_15_hardened
linux_6_1_hardened
linux_6_4_hardened
linux_6_5_hardened
linux_rt_5_4
linux_rt_5_10
linux_rt_5_15

8
pkgs/applications/networking/mailreaders/betterbird/default.nix
View File

@ -12,13 +12,13 @@
let
thunderbird-unwrapped = thunderbirdPackages.thunderbird-102;
version = "102.15.0";
version = "102.15.1";
majVer = lib.versions.major version;
betterbird-patches = fetchFromGitHub {
owner = "Betterbird";
repo = "thunderbird-patches";
rev = "${version}-bb40";
rev = "${version}-bb41";
postFetch = ''
echo "Retrieving external patches"
@ -36,7 +36,7 @@ let
. ./external.sh
rm external.sh
'';
hash = "sha256-7/JEcP76rp0hSSxzlIlHqkcxTSEJQswFhCoOLYntQ5I=";
hash = "sha256-fP763ec4B8LbivzmYHzQ4j39QMxWrymqI8chXfF3KX8=";
};
in ((buildMozillaMach {
pname = "betterbird";
@ -49,7 +49,7 @@ in ((buildMozillaMach {
src = fetchurl {
# https://download.cdn.mozilla.net/pub/thunderbird/releases/
url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
sha512 = "11d4c77049c532753c9b693d69ab9a0bcd0eb13d49f87a511ad8ba680b70041ac6f64c5f9cd5dd44246d46e7695d9bd51146b1fe62b0b7c9fbc862eb53d5cfda";
hash = "sha256-og1Tu7PAHOqGs02jkHU291BCGuKDy1J+72v4Gsu4oDg=";
};
extraPostPatch = thunderbird-unwrapped.extraPostPatch or "" + /* bash */ ''

14
pkgs/applications/version-management/gitlab/data.json
View File

@ -1,15 +1,15 @@
{
"version": "16.3.3",
"repo_hash": "sha256-+h3ksxuphegTvjrKTWk68fgan1n2g64b1sn5nMoYhLc=",
"version": "16.3.4",
"repo_hash": "sha256-VM3yH+6R8FyzwAhXtjbQsoMhPVALvDxQvmwyNZE0JCQ=",
"yarn_hash": "02g51sfpn065513n5ngcw6rqvzaws6yfq0y7gyj4lc4d8fhis088",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v16.3.3-ee",
"rev": "v16.3.4-ee",
"passthru": {
"GITALY_SERVER_VERSION": "16.3.3",
"GITLAB_PAGES_VERSION": "16.3.3",
"GITALY_SERVER_VERSION": "16.3.4",
"GITLAB_PAGES_VERSION": "16.3.4",
"GITLAB_SHELL_VERSION": "14.26.0",
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.3.8",
"GITLAB_WORKHORSE_VERSION": "16.3.3"
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.3.10",
"GITLAB_WORKHORSE_VERSION": "16.3.4"
}
}

4
pkgs/applications/version-management/gitlab/gitaly/default.nix
View File

@ -13,7 +13,7 @@
}:
let
version = "16.3.3";
version = "16.3.4";
package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@ -24,7 +24,7 @@ let
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
hash = "sha256-V9uh5QkvQ1ifO5DNCivg47NBjgE06Ehz7DnmBeU3lVY=";
hash = "sha256-5fNRoxWNBky7dJLFg+OyshfIcAqCAj41hvfrQRPIuzg=";
};
vendorHash = "sha256-abyouKgn31yO3+oeowtxZcuvS6mazVM8zOMEFsyw4C0=";

4
pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gitlab-pages";
version = "16.3.3";
version = "16.3.4";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-pages";
rev = "v${version}";
hash = "sha256-TPXMXuxckALObfEcIguJbGToIGp8b2bpd974epaXpyk=";
hash = "sha256-hz5YCQi1O+/ana/Vpawh2nQj7fmcI6huvKFTG9rVDjw=";
};
vendorHash = "sha256-Pdb+bWsECe7chgvPKFGXxVAWb+AbGF6khVJSdDsHqKM=";

2
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
View File

@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "16.3.3";
version = "16.3.4";
src = fetchFromGitLab {
owner = data.owner;

2
pkgs/build-support/php/hooks/composer-install-hook.sh
View File

@ -41,7 +41,7 @@ composerInstallBuildHook() {
# Since this file cannot be generated in the composer-repository-hook.sh
# because the file contains hardcoded nix store paths, we generate it here.
composer-local-repo-plugin --no-ansi build-local-repo -p "${composerRepository}" > packages.json
composer-local-repo-plugin --no-ansi build-local-repo -m "${composerRepository}" .
# Remove all the repositories of type "composer"
# from the composer.json file.

4
pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix
View File

@ -27,13 +27,13 @@ let
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "composer-local-repo-plugin";
version = "1.0.0";
version = "1.0.2";
src = fetchFromGitHub {
owner = "nix-community";
repo = "composer-local-repo-plugin";
rev = finalAttrs.version;
hash = "sha256-sjWV4JXK8YJ5XLASMPipKlk9u57352wIDV2PPFIP+sk=";
hash = "sha256-L1DPAINlYiC/HdcgDpI72OI58v8LWfhZVuS1vtNDnEw=";
};
COMPOSER_CACHE_DIR = "/dev/null";

19
pkgs/development/coq-modules/compcert/default.nix
View File

@ -5,7 +5,20 @@
, version ? null
}:
let compcert = mkCoqDerivation rec {
let
# https://compcert.org/man/manual002.html
targets = {
x86_64-linux = "x86_64-linux";
aarch64-linux = "aarch64-linux";
x86_64-darwin = "x86_64-macos";
aarch64-darwin = "aarch64-macos";
};
target = targets.${stdenv.hostPlatform.system}
or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
compcert = mkCoqDerivation {
pname = "compcert";
owner = "AbsInt";
@ -49,7 +62,7 @@ let compcert = mkCoqDerivation rec {
-coqdevdir $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/ \
-toolprefix ${tools}/bin/ \
-use-external-Flocq \
${if stdenv.isDarwin then "x86_64-macosx" else "x86_64-linux"}
${target}
'';
installTargets = "documentation install";
@ -80,7 +93,7 @@ let compcert = mkCoqDerivation rec {
description = "Formally verified C compiler";
homepage = "https://compcert.org";
license = licenses.inria-compcert;
platforms = [ "x86_64-linux" "x86_64-darwin" ];
platforms = builtins.attrNames targets;
maintainers = with maintainers; [ thoughtpolice jwiegley vbgl ];
};
}; in

2
pkgs/development/java-modules/jna/default.nix
View File

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
description = "Java Native Access";
license = with licenses; [ lgpl21 asl20 ];
maintainers = with maintainers; [ nagy ];
platforms = platforms.linux;
platforms = platforms.linux ++ platforms.darwin;
changelog = "https://github.com/java-native-access/jna/blob/${version}/CHANGES.md";
};
}

4
pkgs/development/python-modules/adafruit-platformdetect/default.nix
View File

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "adafruit-platformdetect";
version = "3.52.0";
version = "3.52.1";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "Adafruit-PlatformDetect";
inherit version;
hash = "sha256-RydAyIzWRVQ+/xCVPtZ4HQ7eCH8cxeHW1XjEupWlAqc=";
hash = "sha256-iAz+cGFUZWJIHNEzQyGjJkwVj9GOK8onHTO8t3bs13g=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

4
pkgs/development/python-modules/devito/default.nix
View File

@ -26,7 +26,7 @@
buildPythonPackage rec {
pname = "devito";
version = "4.8.1";
version = "4.8.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -35,7 +35,7 @@ buildPythonPackage rec {
owner = "devitocodes";
repo = "devito";
rev = "refs/tags/v${version}";
hash = "sha256-LzqY//205XEOd3/f8k1g4OYndRHMTVplBogGJf5Forw=";
hash = "sha256-zckFU9Q5Rpj0TPeT96lXfR/yp2SYrV4sjAjqN/y8GDw=";
};
pythonRemoveDeps = [

4
pkgs/development/python-modules/hahomematic/default.nix
View File

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "hahomematic";
version = "2023.9.2";
version = "2023.9.3";
format = "pyproject";
disabled = pythonOlder "3.11";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "danielperna84";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-h8zSj1jmqaQtJl3lPYGj7kEBucK7DAOkdUcDo7Opy7w=";
hash = "sha256-j8uM/vEfZO1C4jsYU68nTt/cmhRKsW2MTFG84g53vE4=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/metakernel/default.nix
View File

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "metakernel";
version = "0.30.0";
version = "0.30.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-O5BAfb+6fCbETaJmWsVSayTId/57VjA7U3FGCeNe28Y=";
hash = "sha256-TKBvuGh8DnPDLaOpwOvLZHdj1kBOTE/JLda1nQ6J//U=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/nocaselist/default.nix
View File

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "nocaselist";
version = "1.1.1";
version = "2.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-UnKyMuCCRmlqsm/g670ouJidrJ7lcytQJklQMjtRPSM=";
hash = "sha256-RWqgAMZ3fF0hsCnFLlMvlDKNT7TxWtKk3T3WLbMLOJI=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/requests-pkcs12/default.nix
View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "requests-pkcs12";
version = "1.18";
version = "1.21";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "m-click";
repo = "requests_pkcs12";
rev = version;
hash = "sha256-jZWaTcPM4EO8e+eVpYU8fQ4H53OzlaMUsT/d2DWuU+0=";
hash = "sha256-0avykVnMzClFqjDdC4BW9jnZzupinG5JUwq8TuCWkgo=";
};
propagatedBuildInputs = [

667
pkgs/development/tools/language-servers/typst-lsp/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

27
pkgs/development/tools/language-servers/typst-lsp/default.nix
View File

@ -1,36 +1,41 @@
{ lib
, rustPlatform
, fetchFromGitHub
, fetchpatch
, stdenv
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "typst-lsp";
version = "0.9.5";
version = "0.10.0";
src = fetchFromGitHub {
owner = "nvarner";
repo = "typst-lsp";
rev = "v${version}";
hash = "sha256-rV7vzI4PPyBJX/ofVCXnXd8eH6+UkGaAL7PwhP71t0k=";
hash = "sha256-rsG7YZjy4UgFGsehlslsrOAD5YMpVVBI2MERlxgniVA=";
};
patches = [
# git information isn't available with fetchFromGitHub
# https://github.com/nvarner/typst-lsp/pull/303
(fetchpatch {
name = "fix-build-when-git-information-is-not-available.patch";
url = "https://github.com/nvarner/typst-lsp/commit/420de6235eb1aa492337a8cc43b04134a3ffab00.patch";
hash = "sha256-Rs9pzSUg4YNGzYnX8tbOmCwbPyZ9P18Eyg451fa2Iqg=";
})
];
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"typst-0.7.0" = "sha256-yrtOmlFAKOqAmhCP7n0HQCOQpU3DWyms5foCdUb9QTg=";
"typstfmt_lib-0.2.0" = "sha256-DOh7WQowJXTxI9GDXfy73hvr3J+VcDqSDaClLlUpMsM=";
"typst-0.8.0" = "sha256-q2b/PoNwpzarJbIPzokYgZRD2/Oe/XB40C4VXdwL/NA=";
"typst-syntax-0.7.0" = "sha256-yrtOmlFAKOqAmhCP7n0HQCOQpU3DWyms5foCdUb9QTg=";
"typstfmt_lib-0.2.4" = "sha256-d0vlZqg0RcRvZM7xYdMLX2/UeolUbqZ9H4drJRRKBmc=";
};
};
patches = [
# update typstfmt to symlink its README.md into the library crate
# without this patch, typst-lsp fails to build when dependencies are vendored
# https://github.com/astrale-sharp/typstfmt/pull/81
./update-typstfmt.patch
];
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];

22
pkgs/development/tools/language-servers/typst-lsp/update-typstfmt.patch
View File

@ -1,22 +0,0 @@
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3390,7 +3390,7 @@ dependencies = [
[[package]]
name = "typstfmt_lib"
version = "0.2.0"
-source = "git+https://github.com/astrale-sharp/typstfmt?rev=cf0ac91#cf0ac9189a4a2d47f4bc833f2538dca032534455"
+source = "git+https://github.com/astrale-sharp/typstfmt?rev=45d1ebb6073312d21ce8b4f5dd59b76cfdbe0880#45d1ebb6073312d21ce8b4f5dd59b76cfdbe0880"
dependencies = [
"globmatch",
"itertools 0.10.5",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -70,7 +70,7 @@ tracing-subscriber = { version = "0.3.17", default-features = false, features =
"fmt",
] }
walkdir = "2.3"
-typstfmt_lib = { git = "https://github.com/astrale-sharp/typstfmt", rev = "cf0ac91" }
+typstfmt_lib = { git = "https://github.com/astrale-sharp/typstfmt", rev = "45d1ebb6073312d21ce8b4f5dd59b76cfdbe0880" }
# jaeger
opentelemetry = { version = "0.20.0", optional = true }

5
pkgs/development/tools/qc/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "qc";
version = "0.5.0";
version = "0.5.1";
src = fetchFromGitHub {
owner = "qownnotes";
repo = "qc";
rev = "v${version}";
hash = "sha256-lNS2wrjG70gi6mpIYMvuusuAJL3LkAVh8za+KnBTioc=";
hash = "sha256-SrvcRF2yRGGPTk835ykG+NH9WPoc/bXO5tSj43Q7T3g=";
};
vendorHash = "sha256-7t5rQliLm6pMUHhtev/kNrQ7AOvmA/rR93SwNQhov6o=";
@ -17,6 +17,7 @@ buildGoModule rec {
"-s" "-w" "-X=github.com/qownnotes/qc/cmd.version=${version}"
];
# There are no automated tests
doCheck = false;
subPackages = [ "." ];

6
pkgs/development/tools/rust/cargo-crev/default.nix
View File

@ -14,16 +14,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-crev";
version = "0.24.3";
version = "0.25.0";
src = fetchFromGitHub {
owner = "crev-dev";
repo = "cargo-crev";
rev = "v${version}";
sha256 = "sha256-CCTG58dwO9gYe0WSUXFeaBSgvZ7pbX9S3B3hzabzkjo=";
sha256 = "sha256-Lt8ubK96ntcQJEnQ37nF8N4gJ8nmphwkbM6KJor13lo=";
};
cargoHash = "sha256-p2qAWAZ1Y0GI0t9wHmn5Ww3o5vXpA6rsA/D7HD2x6o0=";
cargoHash = "sha256-cYhzEVHpi7qMCU9fe3wxOQGX6YssJIeo4onLUBtqN6A=";
preCheck = ''
export HOME=$(mktemp -d)

6
pkgs/os-specific/darwin/rectangle/default.nix
View File

@ -7,11 +7,11 @@
stdenvNoCC.mkDerivation rec {
pname = "rectangle";
version = "0.70";
version = "0.71";
src = fetchurl {
url = "https://github.com/rxhanson/Rectangle/releases/download/v${version}/Rectangle${version}.dmg";
hash = "sha256-YJYDzmFfLlXDupyEjoEAin5qynyLjXjuav1DSS/Q5zU=";
hash = "sha256-QsvEBTuLh5GyVzNTKaJAVwPNtYCc/3yH+U8VgXE4nk0=";
};
sourceRoot = ".";
@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation rec {
homepage = "https://rectangleapp.com/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
platforms = platforms.darwin;
maintainers = with maintainers; [ Enzime Intuinewin ];
maintainers = with maintainers; [ Enzime Intuinewin wegank ];
license = licenses.mit;
};
}

10
pkgs/os-specific/linux/kernel/hardened/patches.json
View File

@ -68,5 +68,15 @@
},
"sha256": "1phlx375ln5pslw5vjqm029cdv6pzf4ang10xlrf90x5sb4fgy93",
"version": "6.4.15"
},
"6.5": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-6.5.3-hardened1.patch",
"sha256": "0p92x3f129hmk5r5xmxs5ihvg5cdl2bmqlhqza3wy4314f1kngl7",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.5.3-hardened1/linux-hardened-6.5.3-hardened1.patch"
},
"sha256": "0kzbcc3iar9i0hb99xf9k3b16lxb4f8qzmia0gwxrn3vn7vi7b2c",
"version": "6.5.3"
}
}

4
pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
View File

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "check_ssl_cert";
version = "2.72.0";
version = "2.74.0";
src = fetchFromGitHub {
owner = "matteocorti";
repo = "check_ssl_cert";
rev = "refs/tags/v${version}";
hash = "sha256-0FKxZL+PY9cU64OzzfoxaHv6/neAJPwqOKcBsiSY3dw=";
hash = "sha256-LOvJXF8J11uL70fPs2r48mGFkxqjIgMvtDn0Xrt5myE=";
};
nativeBuildInputs = [

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

@ -6,7 +6,7 @@
let
generic = {
version, sha256
version, hash
, eol ? false, extraVulnerabilities ? []
, packages
}: let
@ -17,7 +17,7 @@ let
src = fetchurl {
url = "https://download.nextcloud.com/server/releases/${pname}-${version}.tar.bz2";
inherit sha256;
inherit hash;
};
# This patch is only necessary for NC version <26.
@ -60,20 +60,20 @@ in {
'';
nextcloud25 = generic {
version = "25.0.10";
sha256 = "sha256-alvh0fWESSS5KbfiKI1gaoahisDWnfT/bUhsSEEXfQI=";
version = "25.0.11";
hash = "sha256-UkOCknG6t9uN8ry3dGZ0y7DS3KlQu7mS5K6UO+N+rtE=";
packages = nextcloud25Packages;
};
nextcloud26 = generic {
version = "26.0.5";
sha256 = "sha256-nhq0aAY4T1hUZdKJY66ZSlirCSgPQet8YJpciwJw1b4=";
version = "26.0.6";
hash = "sha256-LKyP2S0kgjDc0Ea7u0RGmyIPWLAQ5j+V2APZhXVer2Y=";
packages = nextcloud26Packages;
};
nextcloud27 = generic {
version = "27.0.2";
sha256 = "sha256-ei3OpDqjuPswM0fv2kxvN3M8yhE8juFt2fDl+2jHIS8=";
version = "27.1.0";
hash = "sha256-wxZwWeacUXt64H87sLgyQz0yRnWFkIH+lT6kG8ffEkI=";
packages = nextcloud27Packages;
};

4
pkgs/tools/admin/qovery-cli/default.nix
View File

@ -8,13 +8,13 @@
buildGoModule rec {
pname = "qovery-cli";
version = "0.70.0";
version = "0.70.1";
src = fetchFromGitHub {
owner = "Qovery";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-XAgC6c+ZnPQVM/2jhEYAWZ4r4eFOFzwG36Q38sy63+s=";
hash = "sha256-g1X0DUbCwL9XTDeYsYNfXABNnyJqnB+E6nq7NynoMYk=";
};
vendorHash = "sha256-OexoLqlPBr1JSL63lP172YaGJ0GLlxxsJYdXIGhNqjs=";

3
pkgs/tools/security/thc-hydra/default.nix
View File

@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
--replace "-lcurses" "-lncurses"
'';
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-undef-prefix";
nativeBuildInputs = lib.optionals withGUI [ pkg-config makeWrapper ];
buildInputs = [
@ -45,6 +47,5 @@ stdenv.mkDerivation rec {
license = licenses.agpl3Plus;
maintainers = with maintainers; [ offline ];
platforms = platforms.unix;
badPlatforms = platforms.darwin; # fails to build since v9.5
};
}

4
pkgs/tools/text/ugrep/default.nix
View File

@ -12,13 +12,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ugrep";
version = "4.0.5";
version = "4.1.0";
src = fetchFromGitHub {
owner = "Genivia";
repo = "ugrep";
rev = "v${finalAttrs.version}";
hash = "sha256-7cE8kbj8ChvHOPb1F7Fj9talg82nXpXRPt4oBSGSWZw=";
hash = "sha256-FZGZ60+SGCFOfdUOlUXMZee4Il0UmT8zRmsAVX6bGYY=";
};
buildInputs = [

2
pkgs/top-level/all-packages.nix
View File

@ -28371,6 +28371,8 @@ with pkgs;
linux_6_1_hardened = linuxKernel.kernels.linux_6_1_hardened;
linuxPackages_6_4_hardened = linuxKernel.packages.linux_6_4_hardened;
linux_6_4_hardened = linuxKernel.kernels.linux_6_4_hardened;
linuxPackages_6_5_hardened = linuxKernel.packages.linux_6_5_hardened;
linux_6_5_hardened = linuxKernel.kernels.linux_6_5_hardened;
# Hardkernel (Odroid) kernels.
linuxPackages_hardkernel_latest = linuxKernel.packageAliases.linux_hardkernel_latest;

2
pkgs/top-level/linux-kernels.nix
View File

@ -267,6 +267,7 @@ in {
linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { };
linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { };
linux_6_4_hardened = hardenedKernelFor kernels.linux_6_4 { };
linux_6_5_hardened = hardenedKernelFor kernels.linux_6_5 { };
} // lib.optionalAttrs config.allowAliases {
linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11";
@ -626,6 +627,7 @@ in {
linux_5_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_15_hardened);
linux_6_1_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_1_hardened);
linux_6_4_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_4_hardened);
linux_6_5_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_5_hardened);
linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);
linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx);