public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #32300 from adisbladis/vault-0_9_0

Browse Source 
vault: 0.8.3 -> 0.9.0
This commit is contained in:
Daiderd Jordan 2017-12-04 13:12:05 +01:00 committed by GitHub
commit 97af9310d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/development/tools/gox/default.nix
View File

@ -1,18 +1,25 @@
{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: { stdenv, lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec { buildGoPackage rec {
name = "gox-${version}"; name = "gox-${version}";
version = "20140904-${stdenv.lib.strings.substring 0 7 rev}"; version = "0.4.0";
rev = "e8e6fd4fe12510cc46893dff18c5188a6a6dc549";
goPackagePath = "github.com/mitchellh/gox"; goPackagePath = "github.com/mitchellh/gox";
src = fetchgit { src = fetchFromGitHub {
inherit rev; owner = "mitchellh";
url = "https://github.com/mitchellh/gox"; repo = "gox";
sha256 = "14jb2vgfr6dv7zlw8i3ilmp125m5l28ljv41a66c9b8gijhm48k1"; rev = "v${version}";
sha256 = "1q4fdkw904mrmh1q5z8pfd3r0gcn5dm776kldqawddy93iiwnp8r";
}; };
goDeps = ./deps.nix; goDeps = ./deps.nix;
meta = with stdenv.lib; {
homepage = https://github.com/mitchellh/gox;
description = "A dead simple, no frills Go cross compile tool";
platforms = platforms.all;
license = licenses.mpl20;
};
} }

4
pkgs/development/tools/gox/deps.nix
View File

@ -4,8 +4,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/mitchellh/iochan"; url = "https://github.com/mitchellh/iochan";
rev = "b584a329b193e206025682ae6c10cdbe03b0cd77"; rev = "87b45ffd0e9581375c491fef3d32130bb15c5bd7";
sha256 = "1fcwdhfci41ibpng2j4c1bqfng578cwzb3c00yw1lnbwwhaq9r6b"; sha256 = "1435kdcx3j1xgr6mm5c7w7hjx015jb20yfqlkp93q143hspf02fx";
}; };
} }
] ]

5
pkgs/tools/security/vault/default.nix
View File

@ -9,13 +9,13 @@ let
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "vault-${version}"; name = "vault-${version}";
version = "0.8.3"; version = "0.9.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hashicorp"; owner = "hashicorp";
repo = "vault"; repo = "vault";
rev = "v${version}"; rev = "v${version}";
sha256 = "1dcmqbcdkj42614am2invb6wf8v29z4sp4d354a4d83rwhyb0qly"; sha256 = "1c3jaajf3wpjczbncvdpyy5vaa62gb9287bj2zi2khvqzvii36b0";
}; };
nativeBuildInputs = [ go gox removeReferencesTo ]; nativeBuildInputs = [ go gox removeReferencesTo ];
@ -23,6 +23,7 @@ in stdenv.mkDerivation rec {
buildPhase = '' buildPhase = ''
patchShebangs ./ patchShebangs ./
substituteInPlace scripts/build.sh --replace 'git rev-parse HEAD' 'echo ${src.rev}' substituteInPlace scripts/build.sh --replace 'git rev-parse HEAD' 'echo ${src.rev}'
sed -i s/'^GIT_DIRTY=.*'/'GIT_DIRTY="+NixOS"'/ scripts/build.sh
mkdir -p src/github.com/hashicorp mkdir -p src/github.com/hashicorp
ln -s $(pwd) src/github.com/hashicorp/vault ln -s $(pwd) src/github.com/hashicorp/vault