diff options
23 files changed, 95 insertions, 72 deletions
diff --git a/pkgs/applications/networking/syncthing012/default.nix b/pkgs/applications/networking/syncthing012/default.nix index 6f6336eef70..9f436d21bc3 100644 --- a/pkgs/applications/networking/syncthing012/default.nix +++ b/pkgs/applications/networking/syncthing012/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "syncthing-${version}"; @@ -9,10 +9,11 @@ buildGoPackage rec { goPackagePath = "github.com/syncthing/syncthing"; - src = fetchgit { + src = fetchFromGitHub { inherit rev; - url = "https://github.com/syncthing/syncthing"; - sha256 = "108w7gvm3nbbsgp3h5p84fj4ba0siaz932i7yyryly486gzvpm43"; + owner = "syncthing"; + repo = "syncthing"; + sha256 = "0g4sj509h45iq6g7b0pl88rbbn7c7s01774yjc6bl376x1xrl6a1"; }; goDeps = ./deps.json; diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index 089997342c0..e5fc8173919 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "git-lfs-${version}"; @@ -7,9 +7,10 @@ buildGoPackage rec { goPackagePath = "github.com/github/git-lfs"; - src = fetchgit { + src = fetchFromGitHub { inherit rev; - url = "https://github.com/github/git-lfs"; + owner = "github"; + repo = "git-lfs"; sha256 = "0z8giavcvfpzmhnxxsqvsgabjfq5gpka8jy4qvadf60yibxds9fp"; }; diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix index 65fbbcb9e04..4caa659c17a 100644 --- a/pkgs/development/tools/textql/default.nix +++ b/pkgs/development/tools/textql/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "textql-${version}"; @@ -7,9 +7,10 @@ buildGoPackage rec { goPackagePath = "github.com/dinedal/textql"; - src = fetchgit { + src = fetchFromGitHub { inherit rev; - url = "https://github.com/dinedal/textql"; + owner = "dinedal"; + repo = "textql"; sha256 = "1b61w4pc5gl7m12mphricihzq7ifnzwn0yyw3ypv0d0fj26h5hc3"; }; diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix index 8bb672c286d..782d7001dee 100644 --- a/pkgs/servers/etcd/default.nix +++ b/pkgs/servers/etcd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, libpcap, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, libpcap, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "etcd-${version}"; @@ -7,9 +7,10 @@ buildGoPackage rec { goPackagePath = "github.com/coreos/etcd"; - src = fetchgit { + src = fetchFromGitHub { inherit rev; - url = "https://github.com/coreos/etcd"; + owner = "coreos"; + repo = "etcd"; sha256 = "1cchlhsdbbqal145cvdiq7rzqqi131iq7z0r2hmzwx414k04wyn7"; }; diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix index 5716779fb9a..b8718898f4b 100644 --- a/pkgs/servers/gotty/default.nix +++ b/pkgs/servers/gotty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "gotty-${version}"; @@ -7,10 +7,11 @@ buildGoPackage rec { goPackagePath = "github.com/yudai/gotty"; - src = fetchgit { + src = fetchFromGitHub { inherit rev; - url = "https://github.com/yudai/gotty"; - sha256 = "1jc620j4y2r8706r6qn7g2nghiidaaj7f8m2vjgq2gwv288qjafd"; + owner = "yudai"; + repo = "gotty"; + sha256 = "0gvnbr61d5si06ik2j075jg00r9b94ryfgg06nqxkf10dp8lgi09"; }; goDeps = ./deps.json; diff --git a/pkgs/servers/interlock/default.nix b/pkgs/servers/interlock/default.nix index 23131553539..5842495e323 100644 --- a/pkgs/servers/interlock/default.nix +++ b/pkgs/servers/interlock/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, sudo, utillinux, coreutils, systemd, cryptsetup, - buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: + buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "interlock-${version}"; @@ -10,10 +10,11 @@ buildGoPackage rec { subPackages = [ "./cmd/interlock" ]; - src = fetchgit { + src = fetchFromGitHub { inherit rev; - url = "https://github.com/inversepath/interlock"; - sha256 = "1lnaz0vdg0k21wipc6w8h580cbpymiyasah98yzyzrmwraclb2bb"; + owner = "inversepath"; + repo = "interlock"; + sha256 = "06aqx3jy744yx29xyg8ips0dw16186hfqbxdv3hfrmwxmaxhl4lz"; }; goDeps = ./deps.json; diff --git a/pkgs/servers/mesos-dns/default.nix b/pkgs/servers/mesos-dns/default.nix index d67aa337476..86944c036e4 100644 --- a/pkgs/servers/mesos-dns/default.nix +++ b/pkgs/servers/mesos-dns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "mesos-dns-${version}"; @@ -10,9 +10,10 @@ buildGoPackage rec { # Avoid including the benchmarking test helper in the output: subPackages = [ "." ]; - src = fetchgit { + src = fetchFromGitHub { inherit rev; - url = "https://github.com/mesosphere/mesos-dns"; + owner = "mesosphere"; + repo = "mesos-dns"; sha256 = "0zs6lcgk43j7jp370qnii7n55cd9pa8gl56r8hy4nagfvlvrcm02"; }; diff --git a/pkgs/servers/monitoring/prometheus/cli.nix b/pkgs/servers/monitoring/prometheus/cli.nix index 20f6e7249ab..21bc242ec46 100644 --- a/pkgs/servers/monitoring/prometheus/cli.nix +++ b/pkgs/servers/monitoring/prometheus/cli.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "prometheus_cli-${version}"; @@ -7,9 +7,10 @@ buildGoPackage rec { goPackagePath = "github.com/prometheus/prometheus_cli"; - src = fetchgit { + src = fetchFromGitHub { inherit rev; - url = "https://github.com/prometheus/prometheus_cli"; + owner = "prometheus"; + repo = "prometheus_cli"; sha256 = "1qxqrcbd0d4mrjrgqz882jh7069nn5gz1b84rq7d7z1f1dqhczxn"; }; diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix index 49701505aa6..bcb1889224c 100644 --- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "collectd-exporter-${version}"; @@ -7,9 +7,10 @@ buildGoPackage rec { goPackagePath = "github.com/prometheus/collectd_exporter"; - src= fetchgit { + src= fetchFromGitHub { inherit rev; - url = "https://github.com/prometheus/collectd_exporter"; + owner = "prometheus"; + repo = "collectd_exporter"; sha256 = "165zsdn0lffb6fvxz75szmm152a6wmia5skb96k1mv59qbmn9fi1"; }; diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index aa76fdc455a..1345914c4f5 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, go, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, go, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "prometheus-${version}"; @@ -7,9 +7,10 @@ buildGoPackage rec { goPackagePath = "github.com/prometheus/prometheus"; - src = fetchgit { + src = fetchFromGitHub { inherit rev; - url = "https://github.com/prometheus/prometheus"; + owner = "prometheus"; + repo = "prometheus"; sha256 = "176198krna2i37dfhwsqi7m36sqn175yiny6n52vj27mc9s8ggzx"; }; diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix index 140bde2c0cb..7de99ecd395 100644 --- a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "haproxy_exporter-${version}"; @@ -7,9 +7,10 @@ buildGoPackage rec { goPackagePath = "github.com/prometheus/haproxy_exporter"; - src = fetchgit { + src = fetchFromGitHub { inherit rev; - url = "https://github.com/prometheus/haproxy_exporter"; + owner = "prometheus"; + repo = "haproxy_exporter"; sha256 = "0cwls1d4hmzjkwc50mjkxjb4sa4q6yq581wlc5sg9mdvl6g91zxr"; }; diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix index 0fdff08ca1d..ddd7a17364b 100644 --- a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "mesos_exporter-${version}"; @@ -7,9 +7,10 @@ buildGoPackage rec { goPackagePath = "github.com/prometheus/mesos_exporter"; - src = fetchgit { + src = fetchFromGitHub { inherit rev; - url = "https://github.com/prometheus/mesos_exporter"; + owner = "prometheus"; + repo = "mesos_exporter"; sha256 = "059az73j717gd960g4jigrxnvqrjh9jw1c324xpwaafa0bf10llm"; }; diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix index d0c1c2073f5..f7256287955 100644 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "mysqld_exporter-${version}"; @@ -7,9 +7,10 @@ buildGoPackage rec { goPackagePath = "github.com/prometheus/mysqld_exporter"; - src = fetchgit { + src = fetchFromGitHub { inherit rev; - url = "https://github.com/prometheus/mysqld_exporter"; + owner = "prometheus"; + repo = "mysqld_exporter"; sha256 = "10xnyxyb6saz8pq3ijp424hxy59cvm1b5c9zcbw7ddzzkh1f6jd9"; }; diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index 3b8d6fe1666..a5dd161b55e 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "node_exporter-${version}"; @@ -7,9 +7,10 @@ buildGoPackage rec { goPackagePath = "github.com/prometheus/node_exporter"; - src = fetchgit { + src = fetchFromGitHub { inherit rev; - url = "https://github.com/prometheus/node_exporter"; + owner = "prometheus"; + repo = "node_exporter"; sha256 = "149fs9yxnbiyd4ww7bxsv730mcskblpzb3cs4v12jnq2v84a4kk4"; }; diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix index 5f45c63d96e..19148ec1cb4 100644 --- a/pkgs/servers/monitoring/prometheus/prom2json.nix +++ b/pkgs/servers/monitoring/prometheus/prom2json.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "prom2json-${version}"; @@ -7,9 +7,10 @@ buildGoPackage rec { goPackagePath = "github.com/prometheus/prom2json"; - src = fetchgit { + src = fetchFromGitHub { inherit rev; - url = "https://github.com/prometheus/prom2json"; + owner = "prometheus"; + repo = "prom2json"; sha256 = "0wwh3mz7z81fwh8n78sshvj46akcgjhxapjgfic5afc4nv926zdl"; }; diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index 83ef4e20931..a1944608ce0 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, go, buildGoPackage, go-bindata, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, go, buildGoPackage, go-bindata, fetchFromGitHub }: buildGoPackage rec { name = "pushgateway-${version}"; @@ -7,9 +7,10 @@ buildGoPackage rec { goPackagePath = "github.com/prometheus/pushgateway"; - src = fetchgit { + src = fetchFromGitHub { inherit rev; - url = "https://github.com/prometheus/pushgateway"; + owner = "prometheus"; + repo = "pushgateway"; sha256 = "17q5z9msip46wh3vxcsq9lvvhbxg75akjjcr2b29zrky8bp2m230"; }; diff --git a/pkgs/servers/monitoring/prometheus/statsd-bridge.nix b/pkgs/servers/monitoring/prometheus/statsd-bridge.nix index 90a35bf4592..0d9f0bb9885 100644 --- a/pkgs/servers/monitoring/prometheus/statsd-bridge.nix +++ b/pkgs/servers/monitoring/prometheus/statsd-bridge.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "statsd_bridge-${version}"; @@ -7,9 +7,10 @@ buildGoPackage rec { goPackagePath = "github.com/prometheus/statsd_bridge"; - src = fetchgit { + src = fetchFromGitHub { inherit rev; - url = "https://github.com/prometheus/statsd_bridge"; + owner = "prometheus"; + repo = "statsd_bridge"; sha256 = "1fndpmd1k0a3ar6f7zpisijzc60f2dng5399nld1i1cbmd8jybjr"; }; diff --git a/pkgs/servers/nsq/default.nix b/pkgs/servers/nsq/default.nix index b716a042577..334b78c9128 100644 --- a/pkgs/servers/nsq/default.nix +++ b/pkgs/servers/nsq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "nsq-${version}"; @@ -7,9 +7,10 @@ buildGoPackage rec { goPackagePath = "github.com/bitly/nsq"; - src = fetchgit { + src = fetchFromGitHub { inherit rev; - url = "https://github.com/nsqio/nsq"; + owner = "bitly"; + repo = "nsq"; sha256 = "1r7jgplzn6bgwhd4vn8045n6cmm4iqbzssbjgj7j1c28zbficy2f"; }; diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix index b02373ef51c..657352634ef 100644 --- a/pkgs/servers/skydns/default.nix +++ b/pkgs/servers/skydns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "skydns-${version}"; @@ -7,9 +7,10 @@ buildGoPackage rec { goPackagePath = "github.com/skynetservices/skydns"; - src = fetchgit { + src = fetchFromGitHub { inherit rev; - url = "https://github.com/skynetservices/skydns"; + owner = "skynetservices"; + repo = "skydns"; sha256 = "0i1iaif79cwnwm7pc8nxfa261cgl4zhm3p2a5a3smhy1ibgccpq7"; }; diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index f9cf313b774..eaf1f1869d6 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, ncurses, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, ncurses, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "fzf-${version}"; @@ -7,9 +7,10 @@ buildGoPackage rec { goPackagePath = "github.com/junegunn/fzf"; - src = fetchgit { + src = fetchFromGitHub { inherit rev; - url = "https://github.com/junegunn/fzf"; + owner = "junegunn"; + repo = "fzf"; sha256 = "02qqcnijv8z3736iczbx082yizpqk02g5k746k7sdgfkgyxydppk"; }; diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix index 723410183f1..113b8b2b4ce 100644 --- a/pkgs/tools/misc/mongodb-tools/default.nix +++ b/pkgs/tools/misc/mongodb-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: let tools = [ @@ -14,9 +14,10 @@ buildGoPackage rec { goPackagePath = "github.com/mongodb/mongo-tools"; subPackages = map (t: t + "/main") tools; - src = fetchgit { + src = fetchFromGitHub { inherit rev; - url = "https://github.com/mongodb/mongo-tools"; + owner = "mongodb"; + repo = "mongo-tools"; sha256 = "142vxgniri1mfy2xmfgxhbdp6k6h8c5milv454krv1b51v43hsbm"; }; diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index c80f5d36567..53b5e4839ba 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "flannel-${version}"; @@ -7,9 +7,10 @@ buildGoPackage rec { goPackagePath = "github.com/coreos/flannel"; - src = fetchgit { + src = fetchFromGitHub { inherit rev; - url = "https://github.com/coreos/flannel"; + owner = "coreos"; + repo = "flannel"; sha256 = "19nrilcc41411rag2qm22vdna4kpqm933ry9m82wkd7sqzb50fpw"; }; } diff --git a/pkgs/tools/system/confd/default.nix b/pkgs/tools/system/confd/default.nix index 5e5e0edcfe5..5da87f4ce46 100644 --- a/pkgs/tools/system/confd/default.nix +++ b/pkgs/tools/system/confd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "confd-${version}"; @@ -8,9 +8,10 @@ buildGoPackage rec { goPackagePath = "github.com/kelseyhightower/confd"; subPackages = [ "./" ]; - src = fetchgit { + src = fetchFromGitHub { inherit rev; - url = "https://github.com/kelseyhightower/confd"; + owner = "kelseyhightower"; + repo = "confd"; sha256 = "0rz533575hdcln8ciqaz79wbnga3czj243g7fz8869db6sa7jwlr"; }; |