diff options
| author | Joachim F <joachifm@users.noreply.github.com> | 2019-09-27 06:19:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-27 06:19:18 +0000 |
| commit | ad773d31e210e4828a40e0b6d2a191592a29451a (patch) | |
| tree | a5bbff9d564d55d2417c6319e3cdae3d1b8b0970 /pkgs/os-specific/linux/kernel | |
| parent | 4ca445c722d283c7cc11dfeb0e50e2d490a3515b (diff) | |
| parent | bad07dfac57c36dff1c7b3fd4020fea806d7be93 (diff) | |
| download | nixlib-ad773d31e210e4828a40e0b6d2a191592a29451a.tar nixlib-ad773d31e210e4828a40e0b6d2a191592a29451a.tar.gz nixlib-ad773d31e210e4828a40e0b6d2a191592a29451a.tar.bz2 nixlib-ad773d31e210e4828a40e0b6d2a191592a29451a.tar.lz nixlib-ad773d31e210e4828a40e0b6d2a191592a29451a.tar.xz nixlib-ad773d31e210e4828a40e0b6d2a191592a29451a.tar.zst nixlib-ad773d31e210e4828a40e0b6d2a191592a29451a.zip | |
Merge pull request #69345 from joachifm/feat/split-version
Replace uses of splitString for splitting version strings
Diffstat (limited to 'pkgs/os-specific/linux/kernel')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-5.2.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-5.3.nix | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 07f5974a2fe6..efafd10b0b81 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -6,10 +6,10 @@ buildLinux (args // rec { version = "4.14.146"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed - modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; + modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; # branchVersion needs to be x.y - extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); + extraMeta.branch = versions.majorMinor version; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index a3d2235e9de1..9e1fd6bfd8a7 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -6,10 +6,10 @@ buildLinux (args // rec { version = "4.19.75"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed - modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; + modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; # branchVersion needs to be x.y - extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); + extraMeta.branch = versions.majorMinor version; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; diff --git a/pkgs/os-specific/linux/kernel/linux-5.2.nix b/pkgs/os-specific/linux/kernel/linux-5.2.nix index 34b86ddab9ad..9de8418cc5df 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.2.nix @@ -6,10 +6,10 @@ buildLinux (args // rec { version = "5.2.17"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed - modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; + modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; # branchVersion needs to be x.y - extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); + extraMeta.branch = versions.majorMinor version; src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; diff --git a/pkgs/os-specific/linux/kernel/linux-5.3.nix b/pkgs/os-specific/linux/kernel/linux-5.3.nix index b3a96e356bab..4586e5d64a96 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.3.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.3.nix @@ -6,10 +6,10 @@ buildLinux (args // rec { version = "5.3.1"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed - modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; + modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; # branchVersion needs to be x.y - extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); + extraMeta.branch = versions.majorMinor version; src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; |