diff options
| author | Shea Levy <shea@shealevy.com> | 2018-05-22 16:42:02 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2018-05-22 16:42:02 -0400 |
| commit | 6da6accd303be776bb4e958da52046da86f9cb5c (patch) | |
| tree | d6cd95529b829d4fa8d592c8cd5209b34f68d90a /pkgs/servers | |
| parent | 74083c8cd71071739712213410a6733c98f0af33 (diff) | |
| download | nixlib-6da6accd303be776bb4e958da52046da86f9cb5c.tar nixlib-6da6accd303be776bb4e958da52046da86f9cb5c.tar.gz nixlib-6da6accd303be776bb4e958da52046da86f9cb5c.tar.bz2 nixlib-6da6accd303be776bb4e958da52046da86f9cb5c.tar.lz nixlib-6da6accd303be776bb4e958da52046da86f9cb5c.tar.xz nixlib-6da6accd303be776bb4e958da52046da86f9cb5c.tar.zst nixlib-6da6accd303be776bb4e958da52046da86f9cb5c.zip | |
treewide: Remove uses of builtins.toPath.
toPath has confusing semantics and is never necessary; it can always either just be omitted or replaced by pre-concatenating `/.`. It has been marked as "!!! obsolete?" for more than 10 years in a C++ comment, hopefully removing it will let us properly deprecate and, eventually, remove it.
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/bird/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/monitoring/telegraf/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/nosql/influxdb/default.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index 94bd92abb4f8..f44ae83ec03a 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -17,7 +17,7 @@ let buildInputs = [ readline ]; patches = [ - (./. + (builtins.toPath "/dont-create-sysconfdir-${builtins.substring 0 1 version}.patch")) + (./. + "/dont-create-sysconfdir-${builtins.substring 0 1 version}.patch") ]; configureFlags = [ diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index b7879cc763aa..dc219416fcb9 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { -X main.version=${version} '' ]; - goDeps = ./. + builtins.toPath "/deps-${version}.nix"; + goDeps = ./. + "/deps-${version}.nix"; meta = with lib; { description = "The plugin-driven server agent for collecting & reporting metrics."; diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index 972bd53d95ee..466bf6a60a06 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { excludedPackages = "test"; # Generated with the nix2go - goDeps = ./. + builtins.toPath "/deps-${version}.nix"; + goDeps = ./. + "/deps-${version}.nix"; meta = with lib; { description = "An open-source distributed time series database"; |