diff --git a/pkgs/servers/nosql/influxdb/backup.nix b/pkgs/servers/nosql/influxdb/backup.nix deleted file mode 100644 index 0713f064ca58..000000000000 --- a/pkgs/servers/nosql/influxdb/backup.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, goPackages, fetchgit }: - -with goPackages; - -buildGoPackage rec { - rev = "4556edbffa914a8c17fa1fa1564962a33c6c7596"; - name = "influxdb-backup-${lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/eckardt/influxdb-backup"; - src = fetchgit { - inherit rev; - url = https://github.com/eckardt/influxdb-backup.git; - sha256 = "2928063e6dfe4be7b69c8e72e4d6a5fc557f0c75e9625fadf607d59b8e80e34b"; - }; - - subPackages = [ "influxdb-dump" "influxdb-restore" ]; - - buildInputs = [ eckardt.influxdb-go ]; - - meta = with lib; { - description = "Backup and Restore for InfluxDB"; - homepage = https://github.com/eckardt/influxdb-backup; - maintainers = with maintainers; [ offline ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f649edc8fb67..755d85f36de7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9170,7 +9170,7 @@ let influxdb = callPackage ../servers/nosql/influxdb { }; - influxdb-backup = callPackage ../servers/nosql/influxdb/backup.nix { }; + influxdb-backup = goPackages.influxdb-backup.bin // { outputs = [ "bin" ]; }; hyperdex = callPackage ../servers/nosql/hyperdex { }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 45f5013e81c0..a998f231e52e 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -1521,6 +1521,16 @@ let buildInputs = [ statik crypto gogo.protobuf log4go toml pmylund.go-cache gollectd pat dgnorton.goback mux context gocheck influx.gomdb levigo ]; }; + influxdb-backup = buildFromGitHub rec { + rev = "4556edbffa914a8c17fa1fa1564962a33c6c7596"; + date = "2014-07-28"; + owner = "eckardt"; + repo = "influxdb-backup"; + sha256 = "2928063e6dfe4be7b69c8e72e4d6a5fc557f0c75e9625fadf607d59b8e80e34b"; + + buildInputs = [ eckardt.influxdb-go ]; + }; + eckardt.influxdb-go = buildGoPackage rec { rev = "8b71952efc257237e077c5d0672e936713bad38f"; name = "influxdb-go-${stdenv.lib.strings.substring 0 7 rev}";