From 33a1044c32d72756facd0af8455f05c46223dcc1 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 21 Aug 2018 00:22:46 +0200 Subject: [PATCH] linuxPackages*.openafs*: use modDirVersion `version` doesn't include .0 patch versions, or suffixes (eg -gnu). For .0 patch versions, this isn't a problem, since the glob takes care of everything after a `.`. It does, however, prevent openafs installing for suffixed kernels. --- pkgs/servers/openafs/1.6/module.nix | 2 +- pkgs/servers/openafs/1.8/module.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/openafs/1.6/module.nix b/pkgs/servers/openafs/1.6/module.nix index bf4f36bb250..809c8af36d9 100644 --- a/pkgs/servers/openafs/1.6/module.nix +++ b/pkgs/servers/openafs/1.6/module.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { installPhase = '' mkdir -p ${modDestDir} - cp src/libafs/MODLOAD-*/libafs-${kernel.version}.* ${modDestDir}/libafs.ko + cp src/libafs/MODLOAD-*/libafs-${kernel.modDirVersion}.* ${modDestDir}/libafs.ko xz -f ${modDestDir}/libafs.ko ''; diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index 356d3cf37c3..57a4ea02ee8 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { installPhase = '' mkdir -p ${modDestDir} - cp src/libafs/MODLOAD-*/libafs-${kernel.version}.* ${modDestDir}/libafs.ko + cp src/libafs/MODLOAD-*/libafs-${kernel.modDirVersion}.* ${modDestDir}/libafs.ko xz -f ${modDestDir}/libafs.ko '';