Merge master into staging-next
This commit is contained in:
commit
f8fad35230
@ -1,8 +1,8 @@
|
||||
{ buildGoPackage, fetchFromGitHub }:
|
||||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "confd";
|
||||
version = "0.9.0";
|
||||
version = "0.16.0";
|
||||
rev = "v${version}";
|
||||
|
||||
goPackagePath = "github.com/kelseyhightower/confd";
|
||||
@ -12,8 +12,13 @@ buildGoPackage rec {
|
||||
inherit rev;
|
||||
owner = "kelseyhightower";
|
||||
repo = "confd";
|
||||
sha256 = "0rz533575hdcln8ciqaz79wbnga3czj243g7fz8869db6sa7jwlr";
|
||||
sha256 = "0q7r6dkgirnmqi3rhqdaai88jqzw52l6jdrrwsf2qq0hva09961p";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
meta = {
|
||||
description = "Manage local application configuration files using templates and data from etcd or consul";
|
||||
homepage = "https://github.com/kelseyhightower/confd";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.zimbatm ];
|
||||
};
|
||||
}
|
||||
|
74
pkgs/tools/system/confd/deps.nix
generated
74
pkgs/tools/system/confd/deps.nix
generated
@ -1,74 +0,0 @@
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/Sirupsen/logrus";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/Sirupsen/logrus";
|
||||
rev = "be52937128b38f1d99787bb476c789e2af1147f1";
|
||||
sha256 = "1m6vvd4pg4lwglhk54lv5mf6cc8h7bi0d9zb3gar4crz531r66y4";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/coreos/go-etcd";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/coreos/go-etcd";
|
||||
rev = "9847b93751a5fbaf227b893d172cee0104ac6427";
|
||||
sha256 = "1ihq01ayqzxvn6hca5j00vl189vi5lm78f0fy2wpk5mrm3xi01l4";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/ugorji/go";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/ugorji/go";
|
||||
rev = "03e33114d4d60a1f37150325e15f51b0fa6fc4f6";
|
||||
sha256 = "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/samuel/go-zookeeper";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/samuel/go-zookeeper";
|
||||
rev = "5bb5cfc093ad18a28148c578f8632cfdb4d802e4";
|
||||
sha256 = "1kpx1ymh7rds0b2km291idnyqi0zck74nd8hnk72crgz7wmpqv6z";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/BurntSushi/toml";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/BurntSushi/toml";
|
||||
rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4";
|
||||
sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/kelseyhightower/memkv";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/kelseyhightower/memkv";
|
||||
rev = "7f9c7f36f45ba80c62fe22779ee78d9b4ca36580";
|
||||
sha256 = "090x65kr3gqh8fc8z4rm9hc2r0v0k7rfm5vsbmhdh21f48ixw540";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/armon/consul-api";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/armon/consul-api";
|
||||
rev = "f79efe463cdbb62f6d5a55f879a63ec554eb13e5";
|
||||
sha256 = "1rkmzfhsazj9p2b6ywvs8yramzvxfxyvplzxi0ldvhcv04887gcp";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/garyburd/redigo";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/garyburd/redigo";
|
||||
rev = "535138d7bcd717d6531c701ef5933d98b1866257";
|
||||
sha256 = "1m7nc1gvv5yqnq8ii75f33485il6y6prf8gxl97dimsw94qccc5v";
|
||||
};
|
||||
}
|
||||
]
|
@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ripgrep";
|
||||
version = "12.1.0";
|
||||
version = "12.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BurntSushi";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1vgkk78c25ia9y4q5psrh7xrlbfdn7dz7bc20kci40n8zr0vjwww";
|
||||
sha256 = "1hqps7l5qrjh9f914r5i6kmcz6f1yb951nv4lby0cjnp5l253kps";
|
||||
};
|
||||
|
||||
cargoSha256 = "143lnf4yah9ik7v8rphv7gbvr2ckhjpmy8zfgqml1n3fqxiqvxnb";
|
||||
cargoSha256 = "03wf9r2csi6jpa7v5sw5lpxkrk4wfzwmzx7k3991q3bdjzcwnnwp";
|
||||
|
||||
cargoBuildFlags = stdenv.lib.optional withPCRE2 "--features pcre2";
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user