diff options
| author | Naïm Favier <n@monade.li> | 2022-12-21 12:49:37 +0100 |
|---|---|---|
| committer | Naïm Favier <n@monade.li> | 2022-12-21 13:23:28 +0100 |
| commit | fc346c5e6282c8e5a4115da7420505a2fbdd3d12 (patch) | |
| tree | 137f654d113d3c17245110572e636bcf3246ee7f /pkgs/os-specific/linux/kernel/linux-testing.nix | |
| parent | 03554797153aa90263161784c296ef6518af3358 (diff) | |
| download | nixpkgs-fc346c5e6282c8e5a4115da7420505a2fbdd3d12.tar nixpkgs-fc346c5e6282c8e5a4115da7420505a2fbdd3d12.tar.gz nixpkgs-fc346c5e6282c8e5a4115da7420505a2fbdd3d12.tar.bz2 nixpkgs-fc346c5e6282c8e5a4115da7420505a2fbdd3d12.tar.lz nixpkgs-fc346c5e6282c8e5a4115da7420505a2fbdd3d12.tar.xz nixpkgs-fc346c5e6282c8e5a4115da7420505a2fbdd3d12.tar.zst nixpkgs-fc346c5e6282c8e5a4115da7420505a2fbdd3d12.zip | |
linux: use `lib.versions.pad` for `modDirVersion`
Diffstat (limited to 'pkgs/os-specific/linux/kernel/linux-testing.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 76db1b11bbd..859df2c53e6 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -7,7 +7,7 @@ buildLinux (args // rec { extraMeta.branch = lib.versions.majorMinor version; # modDirVersion needs to be x.y.z, will always add .0 - modDirVersion = if (modDirVersionArg == null) then builtins.replaceStrings ["-"] [".0-"] version else modDirVersionArg; + modDirVersion = versions.pad 3 version; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; @@ -18,3 +18,4 @@ buildLinux (args // rec { extraMeta.hydraPlatforms = []; } // (args.argsOverride or {})) + // lib.optionalAttrs (modDirVersionArg != null) { modDirVersion = modDirVersionArg; } # legacy |