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/applications/misc | |
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/applications/misc')
-rw-r--r-- | pkgs/applications/misc/mupdf/default.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/misc/workrave/default.nix | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index ddd325214b2f..7420932e0b68 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -9,8 +9,7 @@ let # OpenJPEG version is hardcoded in package source openJpegVersion = with stdenv; - lib.concatStringsSep "." (lib.lists.take 2 - (lib.splitString "." (lib.getVersion openjpeg))); + lib.versions.majorMinor (lib.getVersion openjpeg); in stdenv.mkDerivation rec { diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix index a3c9d735ff8d..9ad010deb16d 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/applications/misc/workrave/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { in fetchFromGitHub { sha256 = "0v2mx2idaxlsyv5w66b7pknlill9j9i2gqcs3vq54gak7ix9fj1p"; rev = with stdenv.lib; - "v" + concatStringsSep "_" (splitString "." version); + "v" + concatStringsSep "_" (splitVersion version); repo = "workrave"; owner = "rcaelers"; }; |