From 9d0769d4e7ca42bc64da6cc8c1b7454977b02df8 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Thu, 21 Jul 2022 19:46:47 +0000 Subject: [PATCH 01/10] linux_xanmod: rename stable to lts --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- pkgs/top-level/linux-kernels.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 33ddc3f6b6fd..81b006ab69bc 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, buildLinux, ... } @ args: let - stableVariant = { + ltsVariant = { version = "5.15.53"; suffix = "xanmod1"; hash = "sha256-mLgzaXG6QaJ0hfzfNlLbAEldxHK6iHuMVUv6p8zqRBo="; @@ -79,6 +79,6 @@ let } // (args.argsOverride or { })); in { - stable = xanmodKernelFor stableVariant; + lts = xanmodKernelFor ltsVariant; edge = xanmodKernelFor edgeVariant; } diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 5f7f01589295..3983ff979e6d 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -218,7 +218,7 @@ in { ]; }).lqx; - # This contains both the STABLE and EDGE variants of the XanMod kernel + # This contains both the LTS and EDGE variants of the XanMod kernel xanmodKernels = callPackage ../os-specific/linux/kernel/xanmod-kernels.nix; linux_xanmod = (xanmodKernels { @@ -226,7 +226,7 @@ in { kernelPatches.bridge_stp_helper kernelPatches.request_key_helper ]; - }).stable; + }).lts; linux_xanmod_latest = (xanmodKernels { kernelPatches = [ From e5d17fcc91cb7c6b110174027eb2234c7a6a8269 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Thu, 21 Jul 2022 19:49:41 +0000 Subject: [PATCH 02/10] xanmod-kernels: remove explicit WERROR=n --- .../linux/kernel/xanmod-kernels.nix | 68 +++++++++---------- 1 file changed, 31 insertions(+), 37 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 81b006ab69bc..37edacb29835 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -24,51 +24,45 @@ let inherit hash; }; - structuredExtraConfig = - with lib.kernel; - with (lib.kernel.whenHelpers version); - { - # TODO: remove this once https://github.com/NixOS/nixpkgs/pull/175433 is in master - WERROR = no; + structuredExtraConfig = with lib.kernel; { + # removed options + CFS_BANDWIDTH = lib.mkForce (option no); + RT_GROUP_SCHED = lib.mkForce (option no); + SCHED_AUTOGROUP = lib.mkForce (option no); - # removed options - CFS_BANDWIDTH = lib.mkForce (option no); - RT_GROUP_SCHED = lib.mkForce (option no); - SCHED_AUTOGROUP = lib.mkForce (option no); + # AMD P-state driver + X86_AMD_PSTATE = yes; - # AMD P-state driver - X86_AMD_PSTATE = yes; + # Paragon's NTFS3 driver + NTFS3_FS = module; + NTFS3_LZX_XPRESS = yes; + NTFS3_FS_POSIX_ACL = yes; - # Paragon's NTFS3 driver - NTFS3_FS = module; - NTFS3_LZX_XPRESS = yes; - NTFS3_FS_POSIX_ACL = yes; + # Preemptive Full Tickless Kernel at 500Hz + SCHED_CORE = lib.mkForce (option no); + PREEMPT_VOLUNTARY = lib.mkForce no; + PREEMPT = lib.mkForce yes; + NO_HZ_FULL = yes; + HZ_500 = yes; - # Preemptive Full Tickless Kernel at 500Hz - SCHED_CORE = lib.mkForce (option no); - PREEMPT_VOLUNTARY = lib.mkForce no; - PREEMPT = lib.mkForce yes; - NO_HZ_FULL = yes; - HZ_500 = yes; + # Google's BBRv2 TCP congestion Control + TCP_CONG_BBR2 = yes; + DEFAULT_BBR2 = yes; - # Google's BBRv2 TCP congestion Control - TCP_CONG_BBR2 = yes; - DEFAULT_BBR2 = yes; + # FQ-PIE Packet Scheduling + NET_SCH_DEFAULT = yes; + DEFAULT_FQ_PIE = yes; - # FQ-PIE Packet Scheduling - NET_SCH_DEFAULT = yes; - DEFAULT_FQ_PIE = yes; + # Graysky's additional CPU optimizations + CC_OPTIMIZE_FOR_PERFORMANCE_O3 = yes; - # Graysky's additional CPU optimizations - CC_OPTIMIZE_FOR_PERFORMANCE_O3 = yes; + # Futex WAIT_MULTIPLE implementation for Wine / Proton Fsync. + FUTEX = yes; + FUTEX_PI = yes; - # Futex WAIT_MULTIPLE implementation for Wine / Proton Fsync. - FUTEX = yes; - FUTEX_PI = yes; - - # WineSync driver for fast kernel-backed Wine - WINESYNC = module; - }; + # WineSync driver for fast kernel-backed Wine + WINESYNC = module; + }; extraMeta = { branch = lib.versions.majorMinor version; From ac93fd31770aff659dd78e0db55835d026a9d67a Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Thu, 21 Jul 2022 19:56:09 +0000 Subject: [PATCH 03/10] linux_xanmod: 5.15.53 -> 5.15.54 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 37edacb29835..47f2b4947018 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -2,9 +2,9 @@ let ltsVariant = { - version = "5.15.53"; + version = "5.15.54"; suffix = "xanmod1"; - hash = "sha256-mLgzaXG6QaJ0hfzfNlLbAEldxHK6iHuMVUv6p8zqRBo="; + hash = "sha256-0Odo+ZrQok3MMPl/512F8kIQ31mGZH6e9FyVVpXrYf0="; }; edgeVariant = { From b0cfccd50a089f86999da9a4773561d5ca73ec55 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Thu, 21 Jul 2022 20:00:28 +0000 Subject: [PATCH 04/10] linux_xanmod_latest: 5.18.10 -> 5.18.11 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 47f2b4947018..6786c02d6158 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -8,9 +8,9 @@ let }; edgeVariant = { - version = "5.18.10"; + version = "5.18.11"; suffix = "xanmod1"; - hash = "sha256-RtvrJujd854bKf1YPiPavTh9oplpFN9ykr624K17vKE="; + hash = "sha256-UPLwaEWhBu1yriCUJu9L/B8yy+1zxnTQzHaKlT507UY="; }; xanmodKernelFor = { version, suffix, hash }: buildLinux (args // rec { From d726818c37f747124097311e72cf794f5a802dfe Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Thu, 21 Jul 2022 20:01:09 +0000 Subject: [PATCH 05/10] xanmod-kernels: set suffix to a default value --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 6786c02d6158..13a1cb4c4206 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -3,17 +3,15 @@ let ltsVariant = { version = "5.15.54"; - suffix = "xanmod1"; hash = "sha256-0Odo+ZrQok3MMPl/512F8kIQ31mGZH6e9FyVVpXrYf0="; }; edgeVariant = { version = "5.18.11"; - suffix = "xanmod1"; hash = "sha256-UPLwaEWhBu1yriCUJu9L/B8yy+1zxnTQzHaKlT507UY="; }; - xanmodKernelFor = { version, suffix, hash }: buildLinux (args // rec { + xanmodKernelFor = { version, suffix ? "xanmod1", hash }: buildLinux (args // rec { inherit version; modDirVersion = "${version}-${suffix}"; From 9459bcdc130624ded13aabdcfcfe883b44d8f900 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Thu, 21 Jul 2022 20:08:10 +0000 Subject: [PATCH 06/10] linux_xanmod_tt: init at 5.15.54 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 7 +++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/linux-kernels.nix | 10 +++++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 13a1cb4c4206..cca6a8d1cfad 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -11,6 +11,12 @@ let hash = "sha256-UPLwaEWhBu1yriCUJu9L/B8yy+1zxnTQzHaKlT507UY="; }; + ttVariant = { + version = "5.15.54"; + suffix = "xanmod1-tt"; + hash = "sha256-4ck9PAFuIt/TxA/U+moGlVfCudJnzSuAw7ooFG3OJis="; + }; + xanmodKernelFor = { version, suffix ? "xanmod1", hash }: buildLinux (args // rec { inherit version; modDirVersion = "${version}-${suffix}"; @@ -73,4 +79,5 @@ in { lts = xanmodKernelFor ltsVariant; edge = xanmodKernelFor edgeVariant; + tt = xanmodKernelFor ttVariant; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49772490ff0f..a6196bb06830 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23799,6 +23799,8 @@ with pkgs; linux_xanmod = linuxKernel.kernels.linux_xanmod; linuxPackages_xanmod_latest = linuxKernel.packages.linux_xanmod_latest; linux_xanmod_latest = linuxKernel.kernels.linux_xanmod_latest; + linuxPackages_xanmod_tt = linuxKernel.packages.linux_xanmod_tt; + linux_xanmod_tt = linuxKernel.kernels.linux_xanmod_tt; linux-doc = callPackage ../os-specific/linux/kernel/htmldocs.nix { }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 3983ff979e6d..63a95038471c 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -218,7 +218,7 @@ in { ]; }).lqx; - # This contains both the LTS and EDGE variants of the XanMod kernel + # This contains the variants of the XanMod kernel xanmodKernels = callPackage ../os-specific/linux/kernel/xanmod-kernels.nix; linux_xanmod = (xanmodKernels { @@ -235,6 +235,13 @@ in { ]; }).edge; + linux_xanmod_tt = (xanmodKernels { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }).tt; + linux_libre = deblobKernel packageAliases.linux_default.kernel; linux_latest_libre = deblobKernel packageAliases.linux_latest.kernel; @@ -564,6 +571,7 @@ in { linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); linux_xanmod = recurseIntoAttrs (packagesFor kernels.linux_xanmod); linux_xanmod_latest = recurseIntoAttrs (packagesFor kernels.linux_xanmod_latest); + linux_xanmod_tt = recurseIntoAttrs (packagesFor kernels.linux_xanmod_tt); hardkernel_4_14 = recurseIntoAttrs (packagesFor kernels.linux_hardkernel_4_14); From 40e28a7df44c87735cc59e599caf2b8b740ced5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 21 Jul 2022 22:40:35 +0200 Subject: [PATCH 07/10] vault: 1.11.0 -> 1.11.1 --- pkgs/tools/security/vault/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 7bfa2ee54192..32fe50b257ba 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-r/zq4WjkwsqClipWehMGQ7uOqNy73TPufLq+hp6CTPA="; + sha256 = "sha256-U/oRUalDYJ8ChrknfUKcXOqWeml8y869SIWRDMVbpAo="; }; - vendorSha256 = "sha256-9cfza5Gvc0+O2qZ/8Yqf/WqmhrOEzdiTnenTRqfL5W8="; + vendorSha256 = "sha256-qnvmLimuOkJiH1ct1a7WCYh/bcgQ5XY5GzgVbrQyr/0="; subPackages = [ "." ]; From b3d53dee19d3d5f9afc376fa3ba6c618e07df604 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Thu, 21 Jul 2022 21:25:45 +0000 Subject: [PATCH 08/10] xanmod-kernels: move kernelPatches to xanmodKernels --- pkgs/top-level/linux-kernels.nix | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 63a95038471c..fc8ebc60823f 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -219,28 +219,16 @@ in { }).lqx; # This contains the variants of the XanMod kernel - xanmodKernels = callPackage ../os-specific/linux/kernel/xanmod-kernels.nix; - - linux_xanmod = (xanmodKernels { + xanmodKernels = callPackage ../os-specific/linux/kernel/xanmod-kernels.nix { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper ]; - }).lts; + }; - linux_xanmod_latest = (xanmodKernels { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }).edge; - - linux_xanmod_tt = (xanmodKernels { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }).tt; + linux_xanmod = xanmodKernels.lts; + linux_xanmod_latest = xanmodKernels.edge; + linux_xanmod_tt = xanmodKernels.tt; linux_libre = deblobKernel packageAliases.linux_default.kernel; From 91f9185dfbd63a0f65cda3217f89e2c41e2195df Mon Sep 17 00:00:00 2001 From: Michal Date: Fri, 22 Jul 2022 00:43:09 +0100 Subject: [PATCH 09/10] sshs: 3.2.0 -> 3.3.0 --- pkgs/development/tools/sshs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/sshs/default.nix b/pkgs/development/tools/sshs/default.nix index 76cd63876ad8..389afed5e279 100644 --- a/pkgs/development/tools/sshs/default.nix +++ b/pkgs/development/tools/sshs/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "sshs"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "quantumsheep"; repo = pname; rev = version; - sha256 = "D9doNVb2sTnzM8tF8cSJbIoaIYjGurkUHEyhcE3OqQg="; + sha256 = "OTyk3EGlpr5k6QSwGmHFoF3cAJKQEEkWJuV53Wi8ook="; }; - vendorSha256 = "QWFz85bOrTnPGum5atccB5hKeATlZvDAt32by+DO/Fo="; + vendorSha256 = "wClgX08UbItCpWOkWLgmsy7Ad5LlpvXrStN3JHujVww="; ldflags = [ "-s" "-w" "-X github.com/quantumsheep/sshs/cmd.Version=${version}" ]; From 2d372784634e224c5a629d80a19705af655fbc7d Mon Sep 17 00:00:00 2001 From: NANASHI0X74 Date: Fri, 22 Jul 2022 06:46:57 +0200 Subject: [PATCH 10/10] dart: 2.17.0 -> 2.17.3 (#177104) --- pkgs/development/interpreters/dart/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix index bf5ab2dc98fc..8570bb3d72d3 100644 --- a/pkgs/development/interpreters/dart/default.nix +++ b/pkgs/development/interpreters/dart/default.nix @@ -2,7 +2,7 @@ , lib , fetchurl , unzip -, version ? "2.17.0" +, version ? "2.17.3" , sources ? let base = "https://storage.googleapis.com/dart-archive/channels"; x86_64 = "x64"; @@ -10,28 +10,28 @@ aarch64 = "arm64"; # Make sure that if the user overrides version parameter they're # also need to override sources, to avoid mistakes - version = "2.17.0"; + version = "2.17.3"; in { "${version}-aarch64-darwin" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-macos-${aarch64}-release.zip"; - sha256 = "sha256-WXf0SdSEHMaJRfVFgKzb9SY4LBjf1xO5Oki/dzKMEMY="; + sha256 = "sha256-NjkqC9DaaFGN47Qe46xUlsEx2O2bQrKhb1eJyxfr7Vg="; }; "${version}-x86_64-darwin" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip"; - sha256 = "sha256-PwaxUQHIUhRWCOy3IVdGtRyP9LtscqoUJPOZfevN7xs="; + sha256 = "sha256-+6y4lOGS8VyWrZCMSgLFun0E/WOCGlHEE8J5cQiVpUY="; }; "${version}-x86_64-linux" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; - sha256 = "sha256-V7j9lk5HyB1GeuuVsJmmcKt+j1ShzXTUW80f3HeRPYY="; + sha256 = "sha256-aPmgmsYaqxwTWtLmSjm/rAiJANQ5lB3uJ12OqMhUG5U="; }; "${version}-i686-linux" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${i686}-release.zip"; - sha256 = "sha256-YWxFwbcGvssOSL4S5O4jqLzxdUHvbVd9i4cLNyFn/cs="; + sha256 = "sha256-BFIN36OURaWIgBUiO35GkMkhCBHnqtKYPJVetdJ5cZI="; }; "${version}-aarch64-linux" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip"; - sha256 = "sha256-BaHbD9hFhYd9YYCFg0bXxTx++JQzZn2zuF8/Ll+nA2s="; + sha256 = "sha256-yZMke1raq0Mvu01LFE1aUsTEARZWMS0rAI727FHq6ts="; }; } }: