diff options
Diffstat (limited to 'pkgs/tools/system')
-rw-r--r-- | pkgs/tools/system/confd/default.nix | 19 | ||||
-rw-r--r-- | pkgs/tools/system/confd/deps.json | 15 | ||||
-rw-r--r-- | pkgs/tools/system/consul-template/default.nix | 16 | ||||
-rw-r--r-- | pkgs/tools/system/evemu/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/system/plan9port/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/system/runit/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/system/s6-rc/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/system/s6/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/system/safe-rm/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/system/storebrowse/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/system/vboot_reference/default.nix | 2 |
11 files changed, 57 insertions, 8 deletions
diff --git a/pkgs/tools/system/confd/default.nix b/pkgs/tools/system/confd/default.nix new file mode 100644 index 000000000000..5da87f4ce46e --- /dev/null +++ b/pkgs/tools/system/confd/default.nix @@ -0,0 +1,19 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "confd-${version}"; + version = "0.9.0"; + rev = "v${version}"; + + goPackagePath = "github.com/kelseyhightower/confd"; + subPackages = [ "./" ]; + + src = fetchFromGitHub { + inherit rev; + owner = "kelseyhightower"; + repo = "confd"; + sha256 = "0rz533575hdcln8ciqaz79wbnga3czj243g7fz8869db6sa7jwlr"; + }; + + goDeps = ./deps.json; +} diff --git a/pkgs/tools/system/confd/deps.json b/pkgs/tools/system/confd/deps.json new file mode 100644 index 000000000000..a3d9753927f1 --- /dev/null +++ b/pkgs/tools/system/confd/deps.json @@ -0,0 +1,15 @@ +[ + { + "include": "../../libs.json", + "packages": [ + "github.com/kelseyhightower/memkv", + "github.com/armon/consul-api", + "github.com/garyburd/redigo", + "github.com/samuel/go-zookeeper", + "github.com/BurntSushi/toml", + "github.com/Sirupsen/logrus", + "github.com/coreos/go-etcd", + "github.com/ugorji/go" + ] + } +] diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix new file mode 100644 index 000000000000..772c7e6d34b3 --- /dev/null +++ b/pkgs/tools/system/consul-template/default.nix @@ -0,0 +1,16 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "consul-template-${version}"; + version = "0.14.0"; + rev = "v${version}"; + + goPackagePath = "github.com/hashicorp/consul-template"; + + src = fetchFromGitHub { + inherit rev; + owner = "hashicorp"; + repo = "consul-template"; + sha256 = "15zsax44g3dwjmmm4fpb54mvsjvjf3b6g3ijskgipvhcy0d3j938"; + }; +} diff --git a/pkgs/tools/system/evemu/default.nix b/pkgs/tools/system/evemu/default.nix index 90833b83683d..2da9a7d035de 100644 --- a/pkgs/tools/system/evemu/default.nix +++ b/pkgs/tools/system/evemu/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = git://git.freedesktop.org/git/evemu; rev = "refs/tags/v${version}"; - sha256 = "1509b524a2483054a45698c485968094dd8c0f857bba7333449e9d05acbfbd2c"; + sha256 = "0qv2ib3rb0wp881sfkzmhpkfc3nbrswdmll3087pmzpwd701g42l"; }; buildInputs = [ diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index 70f792953b85..6d2581550a45 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # Latest, same as on github, google code is old url = "https://plan9port.googlesource.com/plan9"; rev = "71de840"; - sha256 = "1ffece7c0a5775a8bde6a0618c7ae3da4048449008a19e6623e8e5553f133b4c"; + sha256 = "002ma7h7z3wii520dhijikwdc679hpwn0jv5a0c8g299drvzq2wx"; }; patches = [ ./fontsrv.patch ]; diff --git a/pkgs/tools/system/runit/default.nix b/pkgs/tools/system/runit/default.nix index 70c49335eafd..c10e41d709bc 100644 --- a/pkgs/tools/system/runit/default.nix +++ b/pkgs/tools/system/runit/default.nix @@ -9,8 +9,6 @@ stdenv.mkDerivation rec { sha256 = "065s8w62r6chjjs6m9hapcagy33m75nlnxb69vg0f4ngn061dl3g"; }; - phases = [ "unpackPhase" "patchPhase" "buildPhase" "checkPhase" "installPhase" ]; - patches = [ ./Makefile.patch ]; postPatch = '' diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix index 35763e8212e3..b6f3de5f5cde 100644 --- a/pkgs/tools/system/s6-rc/default.nix +++ b/pkgs/tools/system/s6-rc/default.nix @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/s6-rc"; rev = "refs/tags/v${version}"; - sha256 = "0x9ghi1f7zqphzlzyz67z7n7mnnyxf1hghi2wa2f8cdl70nfdi2f"; + sha256 = "1gh72q1h1ds53yrzp481nvzaxkhhpm2kv59pfx4x564gxwdvq3a6"; }; dontDisableStatic = true; diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/tools/system/s6/default.nix index e1e30de5799f..84e79442ffa0 100644 --- a/pkgs/tools/system/s6/default.nix +++ b/pkgs/tools/system/s6/default.nix @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/s6"; rev = "refs/tags/v${version}"; - sha256 = "0j981xslcsra8filaawgwq6daqvxxjs0014lqb7dy3qf7c5pc4l8"; + sha256 = "1jlavi3q6wmcxdcwsy42qcgfkl0ag6hwcgmi4g67dvqs9nqjq2a3"; }; dontDisableStatic = true; diff --git a/pkgs/tools/system/safe-rm/default.nix b/pkgs/tools/system/safe-rm/default.nix index 6afb6a09f2e5..ed4fe7a68482 100644 --- a/pkgs/tools/system/safe-rm/default.nix +++ b/pkgs/tools/system/safe-rm/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://gitorious.org/safe-rm/mainline.git"; rev = "refs/tags/${name}"; - sha256 = "1n8ir96rwsg9r47lp3avl5sw548gvyh12zk5riflmmdvq907yi0s"; + sha256 = "0zkmwxyl1870ar6jr9h537vmqgkckqs9jd1yv6m4qqzdsmg5gdbq"; }; propagatedBuildInputs = [ perl coreutils ]; diff --git a/pkgs/tools/system/storebrowse/default.nix b/pkgs/tools/system/storebrowse/default.nix index aa510a28c231..40332f7b0d44 100644 --- a/pkgs/tools/system/storebrowse/default.nix +++ b/pkgs/tools/system/storebrowse/default.nix @@ -41,5 +41,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://viric.name/cgi-bin/storebrowse; license = stdenv.lib.licenses.agpl3Plus; + broken = true; }; } diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix index 07349e6ec33b..5e0f5801ec94 100644 --- a/pkgs/tools/system/vboot_reference/default.nix +++ b/pkgs/tools/system/vboot_reference/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = https://chromium.googlesource.com/chromiumos/platform/vboot_reference; rev = "refs/changes/${checkout}"; - sha256 = "00qhwhh5ygrcfm9is8hrk1spqdvfs6aa744h10jbr03zics5bvac"; + sha256 = "14d3a93ha5k4al4ib43nyn1ppx7kgb12xw6mkflhx8nxmx8827nc"; }; buildInputs = [ pkgconfig openssl ] ++ |