From be874693ce486078ab019a6e9221f5cdab67e457 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 5 Dec 2022 15:04:14 +0100 Subject: [PATCH 1/2] linuxPackages.apfs: add passthru.tests This allows executing the test with `nix-build -A linuxPackages.apfs.tests`. --- pkgs/os-specific/linux/apfs/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/apfs/default.nix b/pkgs/os-specific/linux/apfs/default.nix index 6b7f596683e4..fc34561164a3 100644 --- a/pkgs/os-specific/linux/apfs/default.nix +++ b/pkgs/os-specific/linux/apfs/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , kernel +, nixosTests }: stdenv.mkDerivation { @@ -24,6 +25,8 @@ stdenv.mkDerivation { "INSTALL_MOD_PATH=$(out)" ]; + passthru.tests.test = nixosTests.apfs; + meta = with lib; { description = "APFS module for linux"; homepage = "https://github.com/linux-apfs/linux-apfs-rw"; From 732b59e37016f247a62819163b85f120e7c79b11 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 5 Dec 2022 14:57:30 +0100 Subject: [PATCH 2/2] linuxPackages.apfs: unstable-2022-08-15 -> unstable-2022-10-20 This fixes a compatibility issue with Linux 6.0: https://github.com/linux-apfs/linux-apfs-rw/commit/e2ca36a76d35aea025e4b76f3ffb18401fa554bc. --- pkgs/os-specific/linux/apfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/apfs/default.nix b/pkgs/os-specific/linux/apfs/default.nix index fc34561164a3..da0660ad1139 100644 --- a/pkgs/os-specific/linux/apfs/default.nix +++ b/pkgs/os-specific/linux/apfs/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation { pname = "apfs"; - version = "unstable-2022-08-15-${kernel.version}"; + version = "unstable-2022-10-20-${kernel.version}"; src = fetchFromGitHub { owner = "linux-apfs"; repo = "linux-apfs-rw"; - rev = "e4bf2d51d3fe8485ad2b28a89c157ada32ee3d77"; - sha256 = "sha256-zvl1H9AIExgt6t2A2w7zDwXmRsmLY8y3P6EfbBuFdh8="; + rev = "e6eb67c92d425d395eac1c4403629391bdd5064d"; + sha256 = "sha256-6rv5qZCjOqt0FaNFhA3tYg6/SdssvoT8kPVhalajgOo="; }; hardeningDisable = [ "pic" ];