public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #69345 from joachifm/feat/split-version

Browse Source 
Replace uses of splitString for splitting version strings
This commit is contained in:
Joachim F
2019-09-27 06:19:18 +00:00
committed by GitHub
parent 4ca445c722 bad07dfac5
commit ad773d31e2
30 changed files with 59 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/cudatoolkit/default.nix
View File

@@ -180,9 +180,7 @@ let
'';
passthru = {
cc = gcc;
majorVersion =
let versionParts = lib.splitString "." version;
in "${lib.elemAt versionParts 0}.${lib.elemAt versionParts 1}";
majorVersion = lib.versions.majorMinor version;
};
meta = with stdenv.lib; {

2
pkgs/development/compilers/llvm/3.9/llvm.nix
View File

@@ -22,7 +22,7 @@ assert (stdenv.hostPlatform != stdenv.buildPlatform) -> !enableSharedLibraries;
let
# Used when creating a versioned symlinks of libLLVM.dylib
versionSuffixes = with stdenv.lib;
let parts = splitString "." version; in
let parts = splitVersion version; in
imap (i: _: concatStringsSep "." (take i parts)) parts;
in

2
pkgs/development/compilers/llvm/4/llvm.nix
View File

@@ -19,7 +19,7 @@
let
# Used when creating a versioned symlinks of libLLVM.dylib
versionSuffixes = with stdenv.lib;
let parts = splitString "." release_version; in
let parts = splitVersion release_version; in
imap (i: _: concatStringsSep "." (take i parts)) parts;
in

2
pkgs/development/compilers/llvm/5/llvm.nix
View File

@@ -18,7 +18,7 @@
let
# Used when creating a versioned symlinks of libLLVM.dylib
versionSuffixes = with stdenv.lib;
let parts = splitString "." release_version; in
let parts = splitVersion release_version; in
imap (i: _: concatStringsSep "." (take i parts)) parts;
in

2
pkgs/development/compilers/llvm/6/llvm.nix
View File

@@ -21,7 +21,7 @@ let
# Used when creating a versioned symlinks of libLLVM.dylib
versionSuffixes = with stdenv.lib;
let parts = splitString "." release_version; in
let parts = splitVersion release_version; in
imap (i: _: concatStringsSep "." (take i parts)) parts;
in

2
pkgs/development/compilers/llvm/7/llvm.nix
View File

@@ -26,7 +26,7 @@ let
# Used when creating a versioned symlinks of libLLVM.dylib
versionSuffixes = with stdenv.lib;
let parts = splitString "." release_version; in
let parts = splitVersion release_version; in
imap (i: _: concatStringsSep "." (take i parts)) parts;
in stdenv.mkDerivation ({

2
pkgs/development/compilers/llvm/8/llvm.nix
View File

@@ -25,7 +25,7 @@ let
# Used when creating a version-suffixed symlink of libLLVM.dylib
shortVersion = with stdenv.lib;
concatStringsSep "." (take 1 (splitString "." release_version));
concatStringsSep "." (take 1 (splitVersion release_version));
in stdenv.mkDerivation ({
name = "llvm-${version}";