diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-12-07 13:39:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-07 13:39:43 +0100 |
| commit | 3561c828d77d49051e4b199ff907bf7e616c5de1 (patch) | |
| tree | b0f9bf61b28555a33814b810cd8fa8b884bd1505 /pkgs/development | |
| parent | 4a609ec5d195ed770a1b30fa49ba19a0947cd819 (diff) | |
| parent | 815143af0f676f4d4dd97d8655244a99f4b174c6 (diff) | |
Merge pull request #272614 from pbsds/use-splitversion
treewide: use lib.splitVersion
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/compilers/openjdk/openjfx/17.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/python-modules/torch/default.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/compilers/openjdk/openjfx/17.nix b/pkgs/development/compilers/openjdk/openjfx/17.nix index 65d6697c6ef7b..b91bde152554d 100644 --- a/pkgs/development/compilers/openjdk/openjfx/17.nix +++ b/pkgs/development/compilers/openjdk/openjfx/17.nix @@ -14,8 +14,8 @@ let java = openjdk17_headless; }); - dashed-icu-version = lib.concatStringsSep "-" (lib.splitString "." (lib.getVersion icu71)); - underscored-icu-version = lib.concatStringsSep "_" (lib.splitString "." (lib.getVersion icu71)); + dashed-icu-version = lib.concatStringsSep "-" (lib.splitVersion (lib.getVersion icu71)); + underscored-icu-version = lib.concatStringsSep "_" (lib.splitVersion (lib.getVersion icu71)); icu-data = fetchurl { url = "https://github.com/unicode-org/icu/releases/download/release-${dashed-icu-version}/icu4c-${underscored-icu-version}-data-bin-l.zip"; hash = "sha256-pVWIy0BkICsthA5mxhR9SJQHleMNnaEcGl/AaLi5qZM="; diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index b648e2d7bf360..986b57c8548e5 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -180,7 +180,7 @@ in buildPythonPackage rec { # Strangely, this is never set in cmake substituteInPlace cmake/public/LoadHIP.cmake \ --replace "set(ROCM_PATH \$ENV{ROCM_PATH})" \ - "set(ROCM_PATH \$ENV{ROCM_PATH})''\nset(ROCM_VERSION ${lib.concatStrings (lib.intersperse "0" (lib.splitString "." rocmPackages.clr.version))})" + "set(ROCM_PATH \$ENV{ROCM_PATH})''\nset(ROCM_VERSION ${lib.concatStrings (lib.intersperse "0" (lib.splitVersion rocmPackages.clr.version))})" '' # Detection of NCCL version doesn't work particularly well when using the static binary. + lib.optionalString cudaSupport '' |