From f6d7a567a5ee5d7d46acfdca8e26fe428fbf3313 Mon Sep 17 00:00:00 2001 From: Christine Koppelt Date: Sat, 23 Jul 2016 01:08:33 +0200 Subject: [PATCH] influxdb: parametrize default.nix to prepare packaging of 1.0 (#17161) --- pkgs/servers/nosql/influxdb/default.nix | 12 +++--------- pkgs/servers/nosql/influxdb/v0.nix | 13 +++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 17 insertions(+), 10 deletions(-) create mode 100644 pkgs/servers/nosql/influxdb/v0.nix diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index 9f119b3f138..f0eb408cbc1 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -1,19 +1,13 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub, src, version }: buildGoPackage rec { name = "influxdb-${version}"; - version = "0.13.0"; goPackagePath = "github.com/influxdata/influxdb"; - src = fetchFromGitHub { - owner = "influxdata"; - repo = "influxdb"; - rev = "v${version}"; - sha256 = "0f7af5jb1f65qnslhc7zccml1qvk6xx5naczqfsf4s1zc556fdi4"; - }; - excludedPackages = "test"; + + inherit src; # Generated with the `gdm2nix.rb` script and the `Godeps` file from the # influxdb repo root. diff --git a/pkgs/servers/nosql/influxdb/v0.nix b/pkgs/servers/nosql/influxdb/v0.nix new file mode 100644 index 00000000000..fca5f8ba622 --- /dev/null +++ b/pkgs/servers/nosql/influxdb/v0.nix @@ -0,0 +1,13 @@ +{ lib, buildGoPackage, fetchFromGitHub }@args: + +import ./default.nix (args // rec { + + version = "0.13.0"; + + src = fetchFromGitHub { + owner = "influxdata"; + repo = "influxdb"; + rev = "v${version}"; + sha256 = "0f7af5jb1f65qnslhc7zccml1qvk6xx5naczqfsf4s1zc556fdi4"; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3aad36aa5c..e2f3b800db2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10369,7 +10369,7 @@ in riak = callPackage ../servers/nosql/riak/2.1.1.nix { }; - influxdb = (callPackage ../servers/nosql/influxdb { }).bin // { outputs = [ "bin" ]; }; + influxdb = (callPackage ../servers/nosql/influxdb/v0.nix { }).bin // { outputs = [ "bin" ]; }; hyperdex = callPackage ../servers/nosql/hyperdex { };