From b70c24f1f23f1f0ecb20cac9e5b8145d9705f73f Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Sat, 4 Jun 2016 23:13:30 +0200 Subject: [PATCH] vault: extracted from goPackages --- pkgs/tools/security/vault/default.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/go-packages.nix | 23 ----------------------- 3 files changed, 19 insertions(+), 24 deletions(-) create mode 100644 pkgs/tools/security/vault/default.nix diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix new file mode 100644 index 00000000000..18f33da8ea1 --- /dev/null +++ b/pkgs/tools/security/vault/default.nix @@ -0,0 +1,18 @@ +# This file was generated by go2nix. +{ stdenv, lib, go16Packages, fetchgit, fetchhg, fetchbzr, fetchsvn }: + +with go16Packages; + +buildGoPackage rec { + name = "vault-${version}"; + version = "0.5.2"; + rev = "v${version}"; + + goPackagePath = "github.com/hashicorp/vault"; + + src = fetchgit { + inherit rev; + url = "https://github.com/hashicorp/vault"; + sha256 = "085rk5i480wdlkn2p14yxi8zgsc11595nkkda1i77c4vjkllbkdy"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 271e1eec2dd..b9ceacfb948 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16845,7 +16845,7 @@ in utf8proc = callPackage ../development/libraries/utf8proc { }; - vault = goPackages.vault.bin // { outputs = [ "bin" ]; }; + vault = callPackage ../tools/security/vault { }; vbam = callPackage ../misc/emulators/vbam {}; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index a1085ad0497..ff1ca2f853e 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -3494,29 +3494,6 @@ let sha256 = "0hswk9ihv3js5blp9pk2bpig64zkmyp5p1zhmgydfhb0dr2w8iad"; }; - vault = buildFromGitHub { - rev = "v0.5.2"; - owner = "hashicorp"; - repo = "vault"; - sha256 = "085rk5i480wdlkn2p14yxi8zgsc11595nkkda1i77c4vjkllbkdy"; - - #postPatch = '' - # grep -r '/gen/' | awk -F: '{print $1}' | xargs sed -i 's,/gen/,/apis/,g' - #''; - - # We just want the consul api not all of consul - extraSrcs = [ - { inherit (consul) src goPackagePath; } - ]; - - buildInputs = [ - armon.go-metrics go-radix aws-sdk-go go-etcd structs ldap mysql gocql - golang-lru go-github hashicorp.aws-sdk-go errwrap go-multierror go-syslog - hcl logutils osext pq cli copystructure go-homedir mapstructure - reflectwalk columnize go-zookeeper crypto net oauth2 - ]; - }; - vcs = buildFromGitHub { rev = "1.4.0"; owner = "Masterminds";