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/modules/services | |
| parent | 99537e994f09e8e5499d3d877df0e16da8452ca7 (diff) | |
| download | nixpkgs-9b090ccbca3f7dd26d91db06e96e8bf8282c37ca.tar nixpkgs-9b090ccbca3f7dd26d91db06e96e8bf8282c37ca.tar.gz nixpkgs-9b090ccbca3f7dd26d91db06e96e8bf8282c37ca.tar.bz2 nixpkgs-9b090ccbca3f7dd26d91db06e96e8bf8282c37ca.tar.lz nixpkgs-9b090ccbca3f7dd26d91db06e96e8bf8282c37ca.tar.xz nixpkgs-9b090ccbca3f7dd26d91db06e96e8bf8282c37ca.tar.zst nixpkgs-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/modules/services')
| -rw-r--r-- | nixos/modules/services/databases/mysql.nix | 12 | ||||
| -rw-r--r-- | nixos/modules/services/networking/znc/default.nix | 2 |
2 files changed, 5 insertions, 9 deletions
diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index df74cfc9a26..9f7727bb89f 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 05f97bfa539..0a9848a4934 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; }; |