From 3ac94d096b50e30012d4b13f76eb3a6ce2ea4a1c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 16 May 2026 15:51:10 +0200 Subject: [PATCH] linuxPackages.nullfsvfs: 0.22 -> 0.26, rename from nullfs ZHF #503391 Failing Hydra build: https://hydra.nixos.org/build/328802230 Changes: * https://github.com/abbbi/nullfsvfs/releases/tag/v0.26 * https://github.com/abbbi/nullfsvfs/releases/tag/v0.25 * https://github.com/abbbi/nullfsvfs/releases/tag/v0.24 * https://github.com/abbbi/nullfsvfs/releases/tag/v0.23 --- .../linux/{nullfs => nullfsvfs}/default.nix | 10 +++++----- pkgs/top-level/linux-kernels.nix | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) rename pkgs/os-specific/linux/{nullfs => nullfsvfs}/default.nix (81%) diff --git a/pkgs/os-specific/linux/nullfs/default.nix b/pkgs/os-specific/linux/nullfsvfs/default.nix similarity index 81% rename from pkgs/os-specific/linux/nullfs/default.nix rename to pkgs/os-specific/linux/nullfsvfs/default.nix index c289c63f3a88..ee9b4ab0ab0e 100644 --- a/pkgs/os-specific/linux/nullfs/default.nix +++ b/pkgs/os-specific/linux/nullfsvfs/default.nix @@ -6,14 +6,14 @@ kernelModuleMakeFlags, }: stdenv.mkDerivation rec { - pname = "nullfs"; - version = "0.22"; + pname = "nullfsvfs"; + version = "0.26"; src = fetchFromGitHub { owner = "abbbi"; repo = "nullfsvfs"; rev = "v${version}"; - sha256 = "sha256-UJubWx5QfzLAiYTN1BPaziT3gKsTI0OVCmcuwKX3Gp0="; + sha256 = "sha256-gEvkl8IKekuiQjY+TVaC72vJ310k2A/kXfR5mxdvPpc="; }; hardeningDisable = [ "pic" ]; @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/fs/nullfs/" - install -p -m 644 nullfs.ko $out/lib/modules/${kernel.modDirVersion}/kernel/fs/nullfs/ + mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/fs/nullfsvfs/" + install -p -m 644 nullfsvfs.ko $out/lib/modules/${kernel.modDirVersion}/kernel/fs/nullfsvfs/ runHook postInstall ''; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index fb5e3498c376..fe8ebd43504f 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -621,7 +621,7 @@ in drbd = callPackage ../os-specific/linux/drbd/driver.nix { }; - nullfs = callPackage ../os-specific/linux/nullfs { }; + nullfsvfs = callPackage ../os-specific/linux/nullfsvfs { }; msi-ec = callPackage ../os-specific/linux/msi-ec { }; @@ -647,6 +647,7 @@ in system76-power = lib.warnOnInstantiate "kernelPackages.system76-power is now pkgs.system76-power" pkgs.system76-power; # Added 2024-10-16 system76-scheduler = lib.warnOnInstantiate "kernelPackages.system76-scheduler is now pkgs.system76-scheduler" pkgs.system76-scheduler; # Added 2024-10-16 tuxedo-keyboard = self.tuxedo-drivers; # Added 2024-09-28 + nullfs = self.nullfsvfs; # Added 2026-05-16 phc-intel = throw "phc-intel drivers are no longer supported by any kernel >=4.17"; # added 2025-07-18 prl-tools = throw "Parallel Tools no longer provide any kernel module, please use pkgs.prl-tools instead."; # added 2025-10-04 nvidia_dc_565 = throw "nvidiaPackages.dc_565 has reached end of life, see https://endoflife.date/nvidia"; # added 2026-02-10