diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-24 17:22:28 +0000 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-24 17:22:28 +0000 |
commit | 9b090ccbca3f7dd26d91db06e96e8bf8282c37ca (patch) | |
tree | 1654f2f0cb883fa4cb95def306a933475d065431 /nixos | |
parent | 99537e994f09e8e5499d3d877df0e16da8452ca7 (diff) | |
download | nixlib-9b090ccbca3f7dd26d91db06e96e8bf8282c37ca.tar nixlib-9b090ccbca3f7dd26d91db06e96e8bf8282c37ca.tar.gz nixlib-9b090ccbca3f7dd26d91db06e96e8bf8282c37ca.tar.bz2 nixlib-9b090ccbca3f7dd26d91db06e96e8bf8282c37ca.tar.lz nixlib-9b090ccbca3f7dd26d91db06e96e8bf8282c37ca.tar.xz nixlib-9b090ccbca3f7dd26d91db06e96e8bf8282c37ca.tar.zst nixlib-9b090ccbca3f7dd26d91db06e96e8bf8282c37ca.zip |
treewide: Get rid of most `parseDrvName` without breaking compat
That is because this commit should be merged to both master and release-19.09.
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/databases/mysql.nix | 12 | ||||
-rw-r--r-- | nixos/modules/services/networking/znc/default.nix | 2 | ||||
-rw-r--r-- | nixos/modules/system/boot/loader/grub/grub.nix | 4 |
3 files changed, 7 insertions, 11 deletions
diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index df74cfc9a26b..9f7727bb89f9 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -8,15 +8,11 @@ let mysql = cfg.package; - isMariaDB = - let - pName = _p: (builtins.parseDrvName (_p.name)).name; - in pName mysql == pName pkgs.mariadb; + isMariaDB = lib.getName mysql == lib.getName pkgs.mariadb; + isMysqlAtLeast57 = - let - pName = _p: (builtins.parseDrvName (_p.name)).name; - in (pName mysql == pName pkgs.mysql57) - && ((builtins.compareVersions mysql.version "5.7") >= 0); + (lib.getName mysql == lib.getName pkgs.mysql57) + && (builtins.compareVersions mysql.version "5.7" >= 0); mysqldOptions = "--user=${cfg.user} --datadir=${cfg.dataDir} --basedir=${mysql}"; diff --git a/nixos/modules/services/networking/znc/default.nix b/nixos/modules/services/networking/znc/default.nix index 05f97bfa539f..0a9848a49349 100644 --- a/nixos/modules/services/networking/znc/default.nix +++ b/nixos/modules/services/networking/znc/default.nix @@ -239,7 +239,7 @@ in services.znc = { configFile = mkDefault (pkgs.writeText "znc-generated.conf" semanticString); config = { - Version = (builtins.parseDrvName pkgs.znc.name).version; + Version = lib.getVersion pkgs.znc; Listener.l.Port = mkDefault 5000; Listener.l.SSL = mkDefault true; }; diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index e13f0421d38f..9a4db84f7b73 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -47,8 +47,8 @@ let grub = f grub; grubTarget = f (grub.grubTarget or ""); shell = "${pkgs.runtimeShell}"; - fullName = (builtins.parseDrvName realGrub.name).name; - fullVersion = (builtins.parseDrvName realGrub.name).version; + fullName = lib.getName realGrub; + fullVersion = lib.getVersion realGrub; grubEfi = f grubEfi; grubTargetEfi = if cfg.efiSupport && (cfg.version == 2) then f (grubEfi.grubTarget or "") else ""; bootPath = args.path; |