diff options
| author | Joachim Fasting <joachifm@fastmail.fm> | 2019-09-24 11:24:13 +0200 |
|---|---|---|
| committer | Joachim Fasting <joachifm@fastmail.fm> | 2019-09-26 17:42:49 +0200 |
| commit | bad07dfac57c36dff1c7b3fd4020fea806d7be93 (patch) | |
| tree | 2032f09b50cd998edf1db3f8122c8d2916a0ad14 /pkgs/development/libraries | |
| parent | 2d4352b1ae57a06670b451f1b4426beff9796628 (diff) | |
| download | nixlib-bad07dfac57c36dff1c7b3fd4020fea806d7be93.tar nixlib-bad07dfac57c36dff1c7b3fd4020fea806d7be93.tar.gz nixlib-bad07dfac57c36dff1c7b3fd4020fea806d7be93.tar.bz2 nixlib-bad07dfac57c36dff1c7b3fd4020fea806d7be93.tar.lz nixlib-bad07dfac57c36dff1c7b3fd4020fea806d7be93.tar.xz nixlib-bad07dfac57c36dff1c7b3fd4020fea806d7be93.tar.zst nixlib-bad07dfac57c36dff1c7b3fd4020fea806d7be93.zip | |
tree-wide: replace uses of splitString "." with lib.versions
Quoting from the splitString docstring: NOTE: this function is not performant and should never be used. This replaces trivial uses of splitString for splitting version strings with the (potentially builtin) splitVersion.
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/science/math/cudnn/generic.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/sqlite/archive-version.nix | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index cf1bdaf64323..3a7c93413d54 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -28,7 +28,7 @@ with stdenv.lib; let version = "19.1.5"; - branch = head (splitString "." version); + branch = versions.major version; in stdenv.mkDerivation { diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix index f0f5829ce465..5a17e807bd43 100644 --- a/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { passthru = { inherit cudatoolkit; - majorVersion = lib.head (lib.splitString "." version); + majorVersion = lib.versions.major version; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/sqlite/archive-version.nix b/pkgs/development/libraries/sqlite/archive-version.nix index 1f312ecef23a..75d70680fbf9 100644 --- a/pkgs/development/libraries/sqlite/archive-version.nix +++ b/pkgs/development/libraries/sqlite/archive-version.nix @@ -1,9 +1,9 @@ lib: version: with lib; - + let - fragments = splitString "." version; + fragments = splitVersion version; major = head fragments; minor = concatMapStrings (fixedWidthNumber 2) (tail fragments); in |