Moving from fetchgit generated by go2nix to fetchFromGitHub where rev is

a tag
This commit is contained in:
Kamil Chmielewski 2016-06-06 12:26:56 +02:00
parent 8dc356c731
commit bbc37e0eb7
23 changed files with 95 additions and 72 deletions

View File

@ -1,4 +1,4 @@
{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: { stdenv, lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec { buildGoPackage rec {
name = "syncthing-${version}"; name = "syncthing-${version}";
@ -9,10 +9,11 @@ buildGoPackage rec {
goPackagePath = "github.com/syncthing/syncthing"; goPackagePath = "github.com/syncthing/syncthing";
src = fetchgit { src = fetchFromGitHub {
inherit rev; inherit rev;
url = "https://github.com/syncthing/syncthing"; owner = "syncthing";
sha256 = "108w7gvm3nbbsgp3h5p84fj4ba0siaz932i7yyryly486gzvpm43"; repo = "syncthing";
sha256 = "0g4sj509h45iq6g7b0pl88rbbn7c7s01774yjc6bl376x1xrl6a1";
}; };
goDeps = ./deps.json; goDeps = ./deps.json;

View File

@ -1,4 +1,4 @@
{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: { stdenv, lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec { buildGoPackage rec {
name = "git-lfs-${version}"; name = "git-lfs-${version}";
@ -7,9 +7,10 @@ buildGoPackage rec {
goPackagePath = "github.com/github/git-lfs"; goPackagePath = "github.com/github/git-lfs";
src = fetchgit { src = fetchFromGitHub {
inherit rev; inherit rev;
url = "https://github.com/github/git-lfs"; owner = "github";
repo = "git-lfs";
sha256 = "0z8giavcvfpzmhnxxsqvsgabjfq5gpka8jy4qvadf60yibxds9fp"; sha256 = "0z8giavcvfpzmhnxxsqvsgabjfq5gpka8jy4qvadf60yibxds9fp";
}; };

View File

@ -1,4 +1,4 @@
{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: { stdenv, lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec { buildGoPackage rec {
name = "textql-${version}"; name = "textql-${version}";
@ -7,9 +7,10 @@ buildGoPackage rec {
goPackagePath = "github.com/dinedal/textql"; goPackagePath = "github.com/dinedal/textql";
src = fetchgit { src = fetchFromGitHub {
inherit rev; inherit rev;
url = "https://github.com/dinedal/textql"; owner = "dinedal";
repo = "textql";
sha256 = "1b61w4pc5gl7m12mphricihzq7ifnzwn0yyw3ypv0d0fj26h5hc3"; sha256 = "1b61w4pc5gl7m12mphricihzq7ifnzwn0yyw3ypv0d0fj26h5hc3";
}; };

View File

@ -1,4 +1,4 @@
{ stdenv, lib, libpcap, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: { stdenv, lib, libpcap, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec { buildGoPackage rec {
name = "etcd-${version}"; name = "etcd-${version}";
@ -7,9 +7,10 @@ buildGoPackage rec {
goPackagePath = "github.com/coreos/etcd"; goPackagePath = "github.com/coreos/etcd";
src = fetchgit { src = fetchFromGitHub {
inherit rev; inherit rev;
url = "https://github.com/coreos/etcd"; owner = "coreos";
repo = "etcd";
sha256 = "1cchlhsdbbqal145cvdiq7rzqqi131iq7z0r2hmzwx414k04wyn7"; sha256 = "1cchlhsdbbqal145cvdiq7rzqqi131iq7z0r2hmzwx414k04wyn7";
}; };

View File

@ -1,4 +1,4 @@
{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: { stdenv, lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec { buildGoPackage rec {
name = "gotty-${version}"; name = "gotty-${version}";
@ -7,10 +7,11 @@ buildGoPackage rec {
goPackagePath = "github.com/yudai/gotty"; goPackagePath = "github.com/yudai/gotty";
src = fetchgit { src = fetchFromGitHub {
inherit rev; inherit rev;
url = "https://github.com/yudai/gotty"; owner = "yudai";
sha256 = "1jc620j4y2r8706r6qn7g2nghiidaaj7f8m2vjgq2gwv288qjafd"; repo = "gotty";
sha256 = "0gvnbr61d5si06ik2j075jg00r9b94ryfgg06nqxkf10dp8lgi09";
}; };
goDeps = ./deps.json; goDeps = ./deps.json;

View File

@ -1,5 +1,5 @@
{ stdenv, lib, sudo, utillinux, coreutils, systemd, cryptsetup, { stdenv, lib, sudo, utillinux, coreutils, systemd, cryptsetup,
buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage, fetchFromGitHub }:
buildGoPackage rec { buildGoPackage rec {
name = "interlock-${version}"; name = "interlock-${version}";
@ -10,10 +10,11 @@ buildGoPackage rec {
subPackages = [ "./cmd/interlock" ]; subPackages = [ "./cmd/interlock" ];
src = fetchgit { src = fetchFromGitHub {
inherit rev; inherit rev;
url = "https://github.com/inversepath/interlock"; owner = "inversepath";
sha256 = "1lnaz0vdg0k21wipc6w8h580cbpymiyasah98yzyzrmwraclb2bb"; repo = "interlock";
sha256 = "06aqx3jy744yx29xyg8ips0dw16186hfqbxdv3hfrmwxmaxhl4lz";
}; };
goDeps = ./deps.json; goDeps = ./deps.json;

View File

@ -1,4 +1,4 @@
{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: { stdenv, lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec { buildGoPackage rec {
name = "mesos-dns-${version}"; name = "mesos-dns-${version}";
@ -10,9 +10,10 @@ buildGoPackage rec {
# Avoid including the benchmarking test helper in the output: # Avoid including the benchmarking test helper in the output:
subPackages = [ "." ]; subPackages = [ "." ];
src = fetchgit { src = fetchFromGitHub {
inherit rev; inherit rev;
url = "https://github.com/mesosphere/mesos-dns"; owner = "mesosphere";
repo = "mesos-dns";
sha256 = "0zs6lcgk43j7jp370qnii7n55cd9pa8gl56r8hy4nagfvlvrcm02"; sha256 = "0zs6lcgk43j7jp370qnii7n55cd9pa8gl56r8hy4nagfvlvrcm02";
}; };

View File

@ -1,4 +1,4 @@
{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: { stdenv, lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec { buildGoPackage rec {
name = "prometheus_cli-${version}"; name = "prometheus_cli-${version}";
@ -7,9 +7,10 @@ buildGoPackage rec {
goPackagePath = "github.com/prometheus/prometheus_cli"; goPackagePath = "github.com/prometheus/prometheus_cli";
src = fetchgit { src = fetchFromGitHub {
inherit rev; inherit rev;
url = "https://github.com/prometheus/prometheus_cli"; owner = "prometheus";
repo = "prometheus_cli";
sha256 = "1qxqrcbd0d4mrjrgqz882jh7069nn5gz1b84rq7d7z1f1dqhczxn"; sha256 = "1qxqrcbd0d4mrjrgqz882jh7069nn5gz1b84rq7d7z1f1dqhczxn";
}; };

View File

@ -1,4 +1,4 @@
{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: { stdenv, lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec { buildGoPackage rec {
name = "collectd-exporter-${version}"; name = "collectd-exporter-${version}";
@ -7,9 +7,10 @@ buildGoPackage rec {
goPackagePath = "github.com/prometheus/collectd_exporter"; goPackagePath = "github.com/prometheus/collectd_exporter";
src= fetchgit { src= fetchFromGitHub {
inherit rev; inherit rev;
url = "https://github.com/prometheus/collectd_exporter"; owner = "prometheus";
repo = "collectd_exporter";
sha256 = "165zsdn0lffb6fvxz75szmm152a6wmia5skb96k1mv59qbmn9fi1"; sha256 = "165zsdn0lffb6fvxz75szmm152a6wmia5skb96k1mv59qbmn9fi1";
}; };

View File

@ -1,4 +1,4 @@
{ stdenv, lib, go, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: { stdenv, lib, go, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec { buildGoPackage rec {
name = "prometheus-${version}"; name = "prometheus-${version}";
@ -7,9 +7,10 @@ buildGoPackage rec {
goPackagePath = "github.com/prometheus/prometheus"; goPackagePath = "github.com/prometheus/prometheus";
src = fetchgit { src = fetchFromGitHub {
inherit rev; inherit rev;
url = "https://github.com/prometheus/prometheus"; owner = "prometheus";
repo = "prometheus";
sha256 = "176198krna2i37dfhwsqi7m36sqn175yiny6n52vj27mc9s8ggzx"; sha256 = "176198krna2i37dfhwsqi7m36sqn175yiny6n52vj27mc9s8ggzx";
}; };

View File

@ -1,4 +1,4 @@
{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: { stdenv, lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec { buildGoPackage rec {
name = "haproxy_exporter-${version}"; name = "haproxy_exporter-${version}";
@ -7,9 +7,10 @@ buildGoPackage rec {
goPackagePath = "github.com/prometheus/haproxy_exporter"; goPackagePath = "github.com/prometheus/haproxy_exporter";
src = fetchgit { src = fetchFromGitHub {
inherit rev; inherit rev;
url = "https://github.com/prometheus/haproxy_exporter"; owner = "prometheus";
repo = "haproxy_exporter";
sha256 = "0cwls1d4hmzjkwc50mjkxjb4sa4q6yq581wlc5sg9mdvl6g91zxr"; sha256 = "0cwls1d4hmzjkwc50mjkxjb4sa4q6yq581wlc5sg9mdvl6g91zxr";
}; };

View File

@ -1,4 +1,4 @@
{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: { stdenv, lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec { buildGoPackage rec {
name = "mesos_exporter-${version}"; name = "mesos_exporter-${version}";
@ -7,9 +7,10 @@ buildGoPackage rec {
goPackagePath = "github.com/prometheus/mesos_exporter"; goPackagePath = "github.com/prometheus/mesos_exporter";
src = fetchgit { src = fetchFromGitHub {
inherit rev; inherit rev;
url = "https://github.com/prometheus/mesos_exporter"; owner = "prometheus";
repo = "mesos_exporter";
sha256 = "059az73j717gd960g4jigrxnvqrjh9jw1c324xpwaafa0bf10llm"; sha256 = "059az73j717gd960g4jigrxnvqrjh9jw1c324xpwaafa0bf10llm";
}; };

View File

@ -1,4 +1,4 @@
{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: { stdenv, lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec { buildGoPackage rec {
name = "mysqld_exporter-${version}"; name = "mysqld_exporter-${version}";
@ -7,9 +7,10 @@ buildGoPackage rec {
goPackagePath = "github.com/prometheus/mysqld_exporter"; goPackagePath = "github.com/prometheus/mysqld_exporter";
src = fetchgit { src = fetchFromGitHub {
inherit rev; inherit rev;
url = "https://github.com/prometheus/mysqld_exporter"; owner = "prometheus";
repo = "mysqld_exporter";
sha256 = "10xnyxyb6saz8pq3ijp424hxy59cvm1b5c9zcbw7ddzzkh1f6jd9"; sha256 = "10xnyxyb6saz8pq3ijp424hxy59cvm1b5c9zcbw7ddzzkh1f6jd9";
}; };

View File

@ -1,4 +1,4 @@
{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: { stdenv, lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec { buildGoPackage rec {
name = "node_exporter-${version}"; name = "node_exporter-${version}";
@ -7,9 +7,10 @@ buildGoPackage rec {
goPackagePath = "github.com/prometheus/node_exporter"; goPackagePath = "github.com/prometheus/node_exporter";
src = fetchgit { src = fetchFromGitHub {
inherit rev; inherit rev;
url = "https://github.com/prometheus/node_exporter"; owner = "prometheus";
repo = "node_exporter";
sha256 = "149fs9yxnbiyd4ww7bxsv730mcskblpzb3cs4v12jnq2v84a4kk4"; sha256 = "149fs9yxnbiyd4ww7bxsv730mcskblpzb3cs4v12jnq2v84a4kk4";
}; };

View File

@ -1,4 +1,4 @@
{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: { stdenv, lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec { buildGoPackage rec {
name = "prom2json-${version}"; name = "prom2json-${version}";
@ -7,9 +7,10 @@ buildGoPackage rec {
goPackagePath = "github.com/prometheus/prom2json"; goPackagePath = "github.com/prometheus/prom2json";
src = fetchgit { src = fetchFromGitHub {
inherit rev; inherit rev;
url = "https://github.com/prometheus/prom2json"; owner = "prometheus";
repo = "prom2json";
sha256 = "0wwh3mz7z81fwh8n78sshvj46akcgjhxapjgfic5afc4nv926zdl"; sha256 = "0wwh3mz7z81fwh8n78sshvj46akcgjhxapjgfic5afc4nv926zdl";
}; };

View File

@ -1,4 +1,4 @@
{ stdenv, lib, go, buildGoPackage, go-bindata, fetchgit, fetchhg, fetchbzr, fetchsvn }: { stdenv, lib, go, buildGoPackage, go-bindata, fetchFromGitHub }:
buildGoPackage rec { buildGoPackage rec {
name = "pushgateway-${version}"; name = "pushgateway-${version}";
@ -7,9 +7,10 @@ buildGoPackage rec {
goPackagePath = "github.com/prometheus/pushgateway"; goPackagePath = "github.com/prometheus/pushgateway";
src = fetchgit { src = fetchFromGitHub {
inherit rev; inherit rev;
url = "https://github.com/prometheus/pushgateway"; owner = "prometheus";
repo = "pushgateway";
sha256 = "17q5z9msip46wh3vxcsq9lvvhbxg75akjjcr2b29zrky8bp2m230"; sha256 = "17q5z9msip46wh3vxcsq9lvvhbxg75akjjcr2b29zrky8bp2m230";
}; };

View File

@ -1,4 +1,4 @@
{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: { stdenv, lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec { buildGoPackage rec {
name = "statsd_bridge-${version}"; name = "statsd_bridge-${version}";
@ -7,9 +7,10 @@ buildGoPackage rec {
goPackagePath = "github.com/prometheus/statsd_bridge"; goPackagePath = "github.com/prometheus/statsd_bridge";
src = fetchgit { src = fetchFromGitHub {
inherit rev; inherit rev;
url = "https://github.com/prometheus/statsd_bridge"; owner = "prometheus";
repo = "statsd_bridge";
sha256 = "1fndpmd1k0a3ar6f7zpisijzc60f2dng5399nld1i1cbmd8jybjr"; sha256 = "1fndpmd1k0a3ar6f7zpisijzc60f2dng5399nld1i1cbmd8jybjr";
}; };

View File

@ -1,4 +1,4 @@
{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: { stdenv, lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec { buildGoPackage rec {
name = "nsq-${version}"; name = "nsq-${version}";
@ -7,9 +7,10 @@ buildGoPackage rec {
goPackagePath = "github.com/bitly/nsq"; goPackagePath = "github.com/bitly/nsq";
src = fetchgit { src = fetchFromGitHub {
inherit rev; inherit rev;
url = "https://github.com/nsqio/nsq"; owner = "bitly";
repo = "nsq";
sha256 = "1r7jgplzn6bgwhd4vn8045n6cmm4iqbzssbjgj7j1c28zbficy2f"; sha256 = "1r7jgplzn6bgwhd4vn8045n6cmm4iqbzssbjgj7j1c28zbficy2f";
}; };

View File

@ -1,4 +1,4 @@
{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: { stdenv, lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec { buildGoPackage rec {
name = "skydns-${version}"; name = "skydns-${version}";
@ -7,9 +7,10 @@ buildGoPackage rec {
goPackagePath = "github.com/skynetservices/skydns"; goPackagePath = "github.com/skynetservices/skydns";
src = fetchgit { src = fetchFromGitHub {
inherit rev; inherit rev;
url = "https://github.com/skynetservices/skydns"; owner = "skynetservices";
repo = "skydns";
sha256 = "0i1iaif79cwnwm7pc8nxfa261cgl4zhm3p2a5a3smhy1ibgccpq7"; sha256 = "0i1iaif79cwnwm7pc8nxfa261cgl4zhm3p2a5a3smhy1ibgccpq7";
}; };

View File

@ -1,4 +1,4 @@
{ stdenv, lib, ncurses, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: { stdenv, lib, ncurses, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec { buildGoPackage rec {
name = "fzf-${version}"; name = "fzf-${version}";
@ -7,9 +7,10 @@ buildGoPackage rec {
goPackagePath = "github.com/junegunn/fzf"; goPackagePath = "github.com/junegunn/fzf";
src = fetchgit { src = fetchFromGitHub {
inherit rev; inherit rev;
url = "https://github.com/junegunn/fzf"; owner = "junegunn";
repo = "fzf";
sha256 = "02qqcnijv8z3736iczbx082yizpqk02g5k746k7sdgfkgyxydppk"; sha256 = "02qqcnijv8z3736iczbx082yizpqk02g5k746k7sdgfkgyxydppk";
}; };

View File

@ -1,4 +1,4 @@
{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: { stdenv, lib, buildGoPackage, fetchFromGitHub }:
let let
tools = [ tools = [
@ -14,9 +14,10 @@ buildGoPackage rec {
goPackagePath = "github.com/mongodb/mongo-tools"; goPackagePath = "github.com/mongodb/mongo-tools";
subPackages = map (t: t + "/main") tools; subPackages = map (t: t + "/main") tools;
src = fetchgit { src = fetchFromGitHub {
inherit rev; inherit rev;
url = "https://github.com/mongodb/mongo-tools"; owner = "mongodb";
repo = "mongo-tools";
sha256 = "142vxgniri1mfy2xmfgxhbdp6k6h8c5milv454krv1b51v43hsbm"; sha256 = "142vxgniri1mfy2xmfgxhbdp6k6h8c5milv454krv1b51v43hsbm";
}; };

View File

@ -1,4 +1,4 @@
{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: { stdenv, lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec { buildGoPackage rec {
name = "flannel-${version}"; name = "flannel-${version}";
@ -7,9 +7,10 @@ buildGoPackage rec {
goPackagePath = "github.com/coreos/flannel"; goPackagePath = "github.com/coreos/flannel";
src = fetchgit { src = fetchFromGitHub {
inherit rev; inherit rev;
url = "https://github.com/coreos/flannel"; owner = "coreos";
repo = "flannel";
sha256 = "19nrilcc41411rag2qm22vdna4kpqm933ry9m82wkd7sqzb50fpw"; sha256 = "19nrilcc41411rag2qm22vdna4kpqm933ry9m82wkd7sqzb50fpw";
}; };
} }

View File

@ -1,4 +1,4 @@
{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: { stdenv, lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec { buildGoPackage rec {
name = "confd-${version}"; name = "confd-${version}";
@ -8,9 +8,10 @@ buildGoPackage rec {
goPackagePath = "github.com/kelseyhightower/confd"; goPackagePath = "github.com/kelseyhightower/confd";
subPackages = [ "./" ]; subPackages = [ "./" ];
src = fetchgit { src = fetchFromGitHub {
inherit rev; inherit rev;
url = "https://github.com/kelseyhightower/confd"; owner = "kelseyhightower";
repo = "confd";
sha256 = "0rz533575hdcln8ciqaz79wbnga3czj243g7fz8869db6sa7jwlr"; sha256 = "0rz533575hdcln8ciqaz79wbnga3czj243g7fz8869db6sa7jwlr";
}; };