diff options
| author | Shea Levy <shea@shealevy.com> | 2018-09-06 08:09:53 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2018-09-06 08:09:53 -0400 |
| commit | 18337f3ece325ac0b0b26d05e2ccbe5f6398c937 (patch) | |
| tree | 401b66e49052817f7042406b51a71e1597dbbf3e /pkgs/servers | |
| parent | 0af9072e74c9e70af62e828ba4fb21391df2e601 (diff) | |
| parent | 6da6accd303be776bb4e958da52046da86f9cb5c (diff) | |
| download | nixlib-18337f3ece325ac0b0b26d05e2ccbe5f6398c937.tar nixlib-18337f3ece325ac0b0b26d05e2ccbe5f6398c937.tar.gz nixlib-18337f3ece325ac0b0b26d05e2ccbe5f6398c937.tar.bz2 nixlib-18337f3ece325ac0b0b26d05e2ccbe5f6398c937.tar.lz nixlib-18337f3ece325ac0b0b26d05e2ccbe5f6398c937.tar.xz nixlib-18337f3ece325ac0b0b26d05e2ccbe5f6398c937.tar.zst nixlib-18337f3ece325ac0b0b26d05e2ccbe5f6398c937.zip | |
Merge branch 'no-toPath'
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 fc7acc35c19a..5683da5e8e3f 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 031ba423cc40..99380fbae9cb 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 0c549e2b7e9e..e73233bd1447 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"; |