Merge pull request #1113 from flyingcircusio/PL-133043-update-nixpkgs…

…-2024-09-23 Update nixpkgs (2024-09-23)
flyingcircusio · Sep 27, 2024 · e5ed327 · e5ed327
2 parents add0144 + b747520
commit e5ed327
Show file tree

Hide file tree

Showing 8 changed files with 146 additions and 81 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/nixos/platform/kernel.nix b/nixos/platform/kernel.nix
@@ -29,7 +29,7 @@ in {
 
  boot.kernelPackages = if config.flyingcircus.useVerificationKernel
  then pkgs.linuxPackagesFor pkgs.linuxKernelVerify
- else pkgs.linuxKernel.packages.linux_5_15;
+ else pkgs.linuxPackagesFor pkgs.linuxKernelStable;
 
  # Use this spelling if you need to try out custom kernels, try out patches
  # or otherwise deviate from our nixpkgs upstream.

diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix
@@ -120,6 +120,24 @@ builtins.mapAttrs (_: patchPhps phpLogPermissionPatch) {
  };
  };
 
+ linuxKernelStable =
+ let
+ kernelPackage = super.linux_5_15;
+ version = "5.15.164";
+ in
+ kernelPackage.override {
+ argsOverride = {
+ src = super.fetchurl {
+ url = "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz";
+ hash = "sha256-7GCY+u1kuKR7oXcugSputEQ4X3qjxg0+RzmrL9OykYY=";
+ };
+ modDirVersion = version;
+ inherit version;
+ };
+ };
+
+
+
  matomo-beta = super.matomo-beta.overrideAttrs (oldAttrs: {
  installPhase = ''
  runHook preInstall

diff --git a/release/important_packages.json b/release/important_packages.json
@@ -56,8 +56,8 @@
  "gnumake",
  "gnupg",
  "go",
- "go_1_19",
- "go_1_20",
+ "go_1_21",
+ "go_1_22",
  "grafana",
  "grub2",
  "haproxy",
@@ -75,7 +75,10 @@
  "jre",
  "k3s",
  "k3s_1_27",
+ "k3s_1_28",
+ "k3s_1_29",
  "k3s_1_30",
+ "k3s_1_31",
  "keycloak",
  "kubernetes-helm",
  "libffi",
@@ -89,7 +92,8 @@
  "libxml2",
  "libxslt",
  "libyaml",
- "linux_5_15",
+ "linuxKernelStable",
+ "linuxKernelVerify",
  "logrotate",
  "lz4",
  "mailutils",
@@ -213,7 +217,6 @@
  "tomcat10",
  "tomcat9",
  "unzip",
- "unifi7",
  "unifi8",
  "util-linux",
  "varnish",