summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorJoachim F <joachifm@users.noreply.github.com>2019-09-27 06:19:18 +0000
committerGitHub <noreply@github.com>2019-09-27 06:19:18 +0000
commitad773d31e210e4828a40e0b6d2a191592a29451a (patch)
treea5bbff9d564d55d2417c6319e3cdae3d1b8b0970 /nixos
parent4ca445c722d283c7cc11dfeb0e50e2d490a3515b (diff)
parentbad07dfac57c36dff1c7b3fd4020fea806d7be93 (diff)
downloadnixpkgs-ad773d31e210e4828a40e0b6d2a191592a29451a.tar
nixpkgs-ad773d31e210e4828a40e0b6d2a191592a29451a.tar.gz
nixpkgs-ad773d31e210e4828a40e0b6d2a191592a29451a.tar.bz2
nixpkgs-ad773d31e210e4828a40e0b6d2a191592a29451a.tar.lz
nixpkgs-ad773d31e210e4828a40e0b6d2a191592a29451a.tar.xz
nixpkgs-ad773d31e210e4828a40e0b6d2a191592a29451a.tar.zst
nixpkgs-ad773d31e210e4828a40e0b6d2a191592a29451a.zip
Merge pull request #69345 from joachifm/feat/split-version
Replace uses of splitString for splitting version strings
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/web-servers/apache-httpd/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 098160ee369..b0374d949fc 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -12,7 +12,7 @@ let
 
   php = mainCfg.phpPackage.override { apacheHttpd = httpd.dev; /* otherwise it only gets .out */ };
 
-  phpMajorVersion = head (splitString "." php.version);
+  phpMajorVersion = lib.versions.major (lib.getVersion php);
 
   mod_perl = pkgs.apacheHttpdPackages.mod_perl.override { apacheHttpd = httpd; };