From d80670bdc213c8ace1b48f21b0edbba6ab191ac0 Mon Sep 17 00:00:00 2001 From: Emmanuel Rosa Date: Sun, 14 Jul 2019 18:03:20 +0700 Subject: [PATCH 1/2] syncthing: 1.1.4 -> 1.2.1 syncthing-gtk: add missing runtime dependencies NixOS: fix syncthing-init NixOS test --- nixos/tests/syncthing-init.nix | 8 +- .../networking/syncthing-gtk/default.nix | 4 +- .../networking/syncthing/default.nix | 4 +- .../networking/syncthing/deps.nix | 385 ++++++++++++++++-- 4 files changed, 352 insertions(+), 49 deletions(-) diff --git a/nixos/tests/syncthing-init.nix b/nixos/tests/syncthing-init.nix index 811a466ff94..0de76b688bd 100644 --- a/nixos/tests/syncthing-init.nix +++ b/nixos/tests/syncthing-init.nix @@ -22,9 +22,13 @@ in { }; testScript = '' + my $config; + $machine->waitForUnit("syncthing-init.service"); - $machine->succeed("cat /var/lib/syncthing/config.xml") =~ /${testId}/ or die; - $machine->succeed("cat /var/lib/syncthing/config.xml") =~ /testFolder/ or die; + $config = $machine->succeed("cat /var/lib/syncthing/.config/syncthing/config.xml"); + + $config =~ /${testId}/ or die; + $config =~ /testFolder/ or die; ''; }) diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index 696ced2d246..daf1b57e24d 100644 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchFromGitHub, fetchpatch, libnotify, librsvg, killall , gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook , gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3 -, bcrypt, gobject-introspection, gsettings-desktop-schemas }: +, bcrypt, gobject-introspection, gsettings-desktop-schemas +, pango, gdk_pixbuf, atk }: buildPythonApplication rec { version = "0.9.4"; @@ -18,6 +19,7 @@ buildPythonApplication rec { wrapGAppsHook # For setup hook populating GI_TYPELIB_PATH gobject-introspection + pango gdk_pixbuf atk libnotify ]; buildInputs = [ diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index cc916e069a0..1bf6842cbe9 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -3,14 +3,14 @@ let common = { stname, target, postInstall ? "" }: buildGoPackage rec { - version = "1.1.4"; + version = "1.2.1"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "0a19l1kp4cwyzcd53v9yzv3ms69gn78gajkyfawafr7ls0i8x82f"; + sha256 = "0q1x6kd5kaij8mvs6yll2vqfzrbb31y5hpg6g5kjc8gngwv4rl6v"; }; goPackagePath = "github.com/syncthing/syncthing"; diff --git a/pkgs/applications/networking/syncthing/deps.nix b/pkgs/applications/networking/syncthing/deps.nix index 4a58a490cc5..5193fbea1bf 100644 --- a/pkgs/applications/networking/syncthing/deps.nix +++ b/pkgs/applications/networking/syncthing/deps.nix @@ -9,6 +9,15 @@ sha256 = "1accmpl1llk16a19nlyy991fqrgfay6l53gb64hgmdfmqljdvbk7"; }; } + { + goPackagePath = "github.com/AudriusButkevicius/pfilter"; + fetch = { + type = "git"; + url = "https://github.com/AudriusButkevicius/pfilter"; + rev = "c55ef6137fc6"; + sha256 = "0xzhwyd0w21bhvzl5pinn22hp0y6h44rh3s2ppql69rafc6zd3c6"; + }; + } { goPackagePath = "github.com/AudriusButkevicius/recli"; fetch = { @@ -18,13 +27,31 @@ sha256 = "1m1xna1kb78pkmr1lfmvvnpk9j7c4x71j3a7c6vj7zpzc4srpsmf"; }; } + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "a0175ee3bccc"; + sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "2efee857e7cf"; + sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; + }; + } { goPackagePath = "github.com/beorn7/perks"; fetch = { type = "git"; url = "https://github.com/beorn7/perks"; - rev = "3a771d992973"; - sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; + rev = "v1.0.0"; + sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x"; }; } { @@ -54,6 +81,33 @@ sha256 = "072wqdncz3nd4a3zkhvzzx1y3in1lm29wfvl0d8wrnqs5pyqh0mh"; }; } + { + goPackagePath = "github.com/ccding/go-stun"; + fetch = { + type = "git"; + url = "https://github.com/ccding/go-stun"; + rev = "be486d185f3d"; + sha256 = "1gr0rw1c1y7wh6913lyn5k4ig023by27i36bly6am8dwgrgp34ww"; + }; + } + { + goPackagePath = "github.com/certifi/gocertifi"; + fetch = { + type = "git"; + url = "https://github.com/certifi/gocertifi"; + rev = "d2eda7129713"; + sha256 = "0f3v26xps7gadw4qfmh1kxbpgp0cgqdd61a257xnnvnd7ll6k8dh"; + }; + } + { + goPackagePath = "github.com/cheekybits/genny"; + fetch = { + type = "git"; + url = "https://github.com/cheekybits/genny"; + rev = "v1.0.0"; + sha256 = "1pcir5ic86713aqa51581rfb67rgc3m0c72ddjfcp3yakv9vyq87"; + }; + } { goPackagePath = "github.com/chmduquesne/rollinghash"; fetch = { @@ -90,6 +144,51 @@ sha256 = "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia"; }; } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "github.com/getsentry/raven-go"; + fetch = { + type = "git"; + url = "https://github.com/getsentry/raven-go"; + rev = "v0.2.0"; + sha256 = "0imfwmsb72168fqandf2lxhzhngf2flxhzaar8hcnnfjv2a291lf"; + }; + } + { + goPackagePath = "github.com/go-kit/kit"; + fetch = { + type = "git"; + url = "https://github.com/go-kit/kit"; + rev = "v0.8.0"; + sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0"; + }; + } + { + goPackagePath = "github.com/go-logfmt/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/go-logfmt/logfmt"; + rev = "v0.3.0"; + sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9"; + }; + } + { + goPackagePath = "github.com/go-stack/stack"; + fetch = { + type = "git"; + url = "https://github.com/go-stack/stack"; + rev = "v1.8.0"; + sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; + }; + } { goPackagePath = "github.com/gobwas/glob"; fetch = { @@ -104,8 +203,8 @@ fetch = { type = "git"; url = "https://github.com/gogo/protobuf"; - rev = "v1.2.0"; - sha256 = "1c3y5m08mvrgvlw0kb9pldh3kkqcj99pa8gqmk1g3hp8ih3b2dv0"; + rev = "v1.2.1"; + sha256 = "06yqa6h0kw3gr5pc3qmas7f7435a96zf7iw7p0l00r2hqf6fqq6m"; }; } { @@ -117,13 +216,22 @@ sha256 = "1ky1r9qh54yi9zp2769qrjngzndgd8fn7mja2qfac285n06chmcn"; }; } + { + goPackagePath = "github.com/golang/mock"; + fetch = { + type = "git"; + url = "https://github.com/golang/mock"; + rev = "v1.2.0"; + sha256 = "12ddj2g8ab87id6n2n67vnbhq6p8dvgsq1pzpqfriym4dk8w54fg"; + }; + } { goPackagePath = "github.com/golang/protobuf"; fetch = { type = "git"; url = "https://github.com/golang/protobuf"; - rev = "v1.2.0"; - sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; + rev = "v1.3.1"; + sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl"; }; } { @@ -131,8 +239,17 @@ fetch = { type = "git"; url = "https://github.com/golang/snappy"; - rev = "553a64147049"; - sha256 = "0kssxnih1l722hx9219c7javganjqkqhvl3i0hp0hif6xm6chvqk"; + rev = "v0.0.1"; + sha256 = "0gp3kkzlm3wh37kgkhbqxq3zx07iqbgis5w9mf4d64h6vjq760is"; + }; + } + { + goPackagePath = "github.com/hpcloud/tail"; + fetch = { + type = "git"; + url = "https://github.com/hpcloud/tail"; + rev = "v1.0.0"; + sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0"; }; } { @@ -144,6 +261,24 @@ sha256 = "0fkwkwmhfadwk3cha8616bhqxfkr9gjjnynhhxyldlphixgs3f25"; }; } + { + goPackagePath = "github.com/json-iterator/go"; + fetch = { + type = "git"; + url = "https://github.com/json-iterator/go"; + rev = "v1.1.6"; + sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r"; + }; + } + { + goPackagePath = "github.com/julienschmidt/httprouter"; + fetch = { + type = "git"; + url = "https://github.com/julienschmidt/httprouter"; + rev = "v1.2.0"; + sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; + }; + } { goPackagePath = "github.com/kballard/go-shellquote"; fetch = { @@ -153,6 +288,42 @@ sha256 = "1xjpin4jq1zl84dcn96xhjmn9bsfyszf6g9aqyj2dc0xfi6c88y0"; }; } + { + goPackagePath = "github.com/kisielk/errcheck"; + fetch = { + type = "git"; + url = "https://github.com/kisielk/errcheck"; + rev = "v1.1.0"; + sha256 = "19vd4rxmqbk5lpiav3pf7df3yjlz0l0dwx9mn0gjq5f998iyhy6y"; + }; + } + { + goPackagePath = "github.com/kisielk/gotool"; + fetch = { + type = "git"; + url = "https://github.com/kisielk/gotool"; + rev = "v1.0.0"; + sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; + }; + } + { + goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; + fetch = { + type = "git"; + url = "https://github.com/konsorten/go-windows-terminal-sequences"; + rev = "v1.0.1"; + sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; + }; + } + { + goPackagePath = "github.com/kr/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/kr/logfmt"; + rev = "b84e30acd515"; + sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; + }; + } { goPackagePath = "github.com/kr/pretty"; fetch = { @@ -185,8 +356,44 @@ fetch = { type = "git"; url = "https://github.com/lib/pq"; - rev = "v1.0.0"; - sha256 = "1zqnnyczaf00xi6xh53vq758v5bdlf0iz7kf22l02cal4i6px47i"; + rev = "v1.1.1"; + sha256 = "0g64wlg1l1ybq4x44idksl4pgm055s58jxc6r6x4qhqm5q76h0km"; + }; + } + { + goPackagePath = "github.com/lucas-clemente/quic-go"; + fetch = { + type = "git"; + url = "https://github.com/lucas-clemente/quic-go"; + rev = "v0.11.2"; + sha256 = "0gqm5mc8alg84ra7yxach34il1jvcij8f76qdqcahnd3d2nhjbia"; + }; + } + { + goPackagePath = "github.com/marten-seemann/qtls"; + fetch = { + type = "git"; + url = "https://github.com/marten-seemann/qtls"; + rev = "v0.2.3"; + sha256 = "0b9p7bwkm9hfg1mb565q4nw5k7xyks0z2xagz5fp95azy2psbnfg"; + }; + } + { + goPackagePath = "github.com/maruel/panicparse"; + fetch = { + type = "git"; + url = "https://github.com/maruel/panicparse"; + rev = "v1.2.1"; + sha256 = "05hf68ifb7ww4rpmxyywbj9r0kyap45p1273ncq4qy2ydv042l8j"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "v0.1.1"; + sha256 = "0l640974j804c1yyjfgyxqlsivz0yrzmbql4mhcw2azryigkp08p"; }; } { @@ -194,8 +401,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.4"; - sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; + rev = "v0.0.7"; + sha256 = "1i77aq4gf9as03m8fpfh8fq49n4z9j7548blrcsidm1xhslzk5xd"; }; } { @@ -207,6 +414,15 @@ sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; }; } + { + goPackagePath = "github.com/mgutz/ansi"; + fetch = { + type = "git"; + url = "https://github.com/mgutz/ansi"; + rev = "9520e82c474b"; + sha256 = "00bz22314j26736w1f0q4jy9d9dfaml17vn890n5zqy3cmvmww1j"; + }; + } { goPackagePath = "github.com/minio/sha256-simd"; fetch = { @@ -216,13 +432,40 @@ sha256 = "04fp98nal0wsb26zwhw82spn5camxslc68g3xp8g4af9w6k9g31j"; }; } + { + goPackagePath = "github.com/modern-go/concurrent"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/concurrent"; + rev = "bacd9c7ef1dd"; + sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; + }; + } + { + goPackagePath = "github.com/modern-go/reflect2"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/reflect2"; + rev = "v1.0.1"; + sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; + }; + } + { + goPackagePath = "github.com/mwitkow/go-conntrack"; + fetch = { + type = "git"; + url = "https://github.com/mwitkow/go-conntrack"; + rev = "cc309e4a2223"; + sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; + }; + } { goPackagePath = "github.com/onsi/ginkgo"; fetch = { type = "git"; url = "https://github.com/onsi/ginkgo"; - rev = "6c46eb8334b3"; - sha256 = "0lxmpg3zhn7r2q8c29wcw0sqn5c48ihhb7qfh9m676c9j455rpm8"; + rev = "v1.8.0"; + sha256 = "1326s5fxgasdpz1qqwrw4n5p3k0vz44msnyz14knrhlw5l97lx33"; }; } { @@ -230,8 +473,8 @@ fetch = { type = "git"; url = "https://github.com/onsi/gomega"; - rev = "ba3724c94e4d"; - sha256 = "0fqs7kyqzz2lykbr2xbvd8imvx748xv4lh4d6fdy3wkwxs2f9fhp"; + rev = "v1.5.0"; + sha256 = "1n7i4hksdgv410m43v2sw14bl5vy59dkp6nlw5l76nibbh37syr9"; }; } { @@ -239,8 +482,8 @@ fetch = { type = "git"; url = "https://github.com/oschwald/geoip2-golang"; - rev = "v1.1.0"; - sha256 = "10pvjmbm1wc8xxwqlcfhdj2mciiyfddghmp6jyn7brd4mg65ppy2"; + rev = "v1.3.0"; + sha256 = "0gv7mv65zm14cgjvd0wy91c45f6gi5f9ny42mn4gwfh5kkhb9r40"; }; } { @@ -284,8 +527,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/client_golang"; - rev = "v0.9.2"; - sha256 = "02b4yg6rfag0m3j0i39sillcm5xczwv8h133vn12yr8qw04cnigs"; + rev = "v0.9.4"; + sha256 = "0s134fj4i7k6pxdmxwkdi7amb1882yq33spv15hg3pkpbd3h311p"; }; } { @@ -293,8 +536,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/client_model"; - rev = "5c3871d89910"; - sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0"; + rev = "fd36f4220a90"; + sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5"; }; } { @@ -302,8 +545,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/common"; - rev = "4724e9255275"; - sha256 = "0pcx8hlnrxx5nnmpk786cn99rsgqk1jrd3c9f6fsx8qd8y5iwjy6"; + rev = "v0.4.1"; + sha256 = "0sf4sjdckblz1hqdfvripk3zyp8xq89w7q75kbsyg4c078af896s"; }; } { @@ -311,8 +554,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/procfs"; - rev = "1dc9a6cbc91a"; - sha256 = "1zlv1x30xp7z5c3vn5vp870v4bjim0zcidzc3mr2l3xhazc0svab"; + rev = "v0.0.2"; + sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k"; }; } { @@ -333,13 +576,31 @@ sha256 = "13p7b7pakd9k1c2k0fs1hfim3c8mivz679977ai6zb01s4aw7gyg"; }; } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "v1.2.0"; + sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.1"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + }; + } { goPackagePath = "github.com/stretchr/testify"; fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "v1.2.2"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + rev = "v1.3.0"; + sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; }; } { @@ -347,8 +608,8 @@ fetch = { type = "git"; url = "https://github.com/syncthing/notify"; - rev = "4e389ea6c0d8"; - sha256 = "19gvl14s1l9m82f8c2xsjcr8lmbqrvw1mxkayvfcpimvxfz0j61i"; + rev = "69c7a957d3e2"; + sha256 = "1mmdzyfnmjabyhbipl4bggw4w5nlxyyjp0d93qd824kj07kmsr1f"; }; } { @@ -356,8 +617,8 @@ fetch = { type = "git"; url = "https://github.com/syndtr/goleveldb"; - rev = "34011bf325bc"; - sha256 = "097ja0vyj6p27zrxha9nhk09fj977xsvhmd3bk2hbyvnbw4znnhd"; + rev = "c3a204f8e965"; + sha256 = "18cac90dim2z5g28vazzibxa058q2ynihsmf0vbscwzba6l5s5ms"; }; } { @@ -392,8 +653,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "c2843e01d9a2"; - sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; + rev = "5c40567a22f8"; + sha256 = "17g8fb9vy2sqq8vgz8jdvf6c6d2290gm2qs0i4yzsd86mgn4dlrg"; }; } { @@ -401,8 +662,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "351d144fa1fc"; - sha256 = "1c5x25qjyz83y92bq0lll5kmznyi3m02wd4c54scgf0866gy938k"; + rev = "d28f0bde5980"; + sha256 = "18xj31h70m7xxb7gc86n9i21w6d7djbjz67zfaljm4jqskz6hxkf"; }; } { @@ -410,8 +671,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sync"; - rev = "42b317875d0f"; - sha256 = "0mrjhk7al7yyh76x9flvxy4jm5jyqh2fxbxagpaazxn1xdgkaif3"; + rev = "37e7f081c4d4"; + sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm"; }; } { @@ -419,8 +680,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "d0b11bdaac8a"; - sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl"; + rev = "04f50cda93cb"; + sha256 = "0hmfsz9y1ingwsn482hlzzmzs7kr3cklm0ana0mbdk70isw2bxnw"; }; } { @@ -428,8 +689,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "e19ae1496984"; - sha256 = "1cvnnx8nwx5c7gr6ajs7sldhbqh52n7h6fsa3i21l2lhx6xrsh4w"; + rev = "v0.3.2"; + sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; }; } { @@ -441,6 +702,24 @@ sha256 = "1fx4cf5fpdz00g3c7vxzy92hdcg0vh4yqw00qp5s52j72qixynbk"; }; } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "90fa682c2a6e"; + sha256 = "03ic2xsy51jw9749wl7gszdbz99iijbd2bckgygl6cm9w5m364ak"; + }; + } + { + goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/alecthomas/kingpin.v2"; + rev = "v2.2.6"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; + }; + } { goPackagePath = "gopkg.in/asn1-ber.v1"; fetch = { @@ -459,6 +738,15 @@ sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; }; } + { + goPackagePath = "gopkg.in/fsnotify.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/fsnotify.v1"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } { goPackagePath = "gopkg.in/ldap.v2"; fetch = { @@ -468,13 +756,22 @@ sha256 = "1wf81wy04nhkqs0dg5zkivr4sh37r83bxrfwjz9vr4jq6vmljr3h"; }; } + { + goPackagePath = "gopkg.in/tomb.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/tomb.v1"; + rev = "dd632973f1e7"; + sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; + }; + } { goPackagePath = "gopkg.in/yaml.v2"; fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "287cf08546ab"; - sha256 = "15502klds9wwv567vclb9kx95gs8lnyzn4ybsk6l9fc7a67lk831"; + rev = "v2.2.2"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; }; } ] From fd397919368f43facbc867f540549cca729d0e58 Mon Sep 17 00:00:00 2001 From: Emmanuel Rosa Date: Sat, 10 Aug 2019 18:01:42 +0700 Subject: [PATCH 2/2] syncthing: clean up package Thank you, @Lassulus --- .../networking/syncthing/default.nix | 26 +- .../networking/syncthing/deps.nix | 777 ------------------ 2 files changed, 11 insertions(+), 792 deletions(-) delete mode 100644 pkgs/applications/networking/syncthing/deps.nix diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 1bf6842cbe9..5b847163a2a 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,8 +1,8 @@ -{ buildGoPackage, stdenv, lib, procps, fetchFromGitHub }: +{ buildGoModule, stdenv, lib, procps, fetchFromGitHub }: let common = { stname, target, postInstall ? "" }: - buildGoPackage rec { + buildGoModule rec { version = "1.2.1"; name = "${stname}-${version}"; @@ -15,7 +15,7 @@ let goPackagePath = "github.com/syncthing/syncthing"; - goDeps = ./deps.nix; + modSha256 = "1daixrpdj97ck02853hwp8l158sja5a7a37h0gdbwb1lgf5hsn05"; patches = [ ./add-stcli-target.patch @@ -25,18 +25,14 @@ let buildPhase = '' runHook preBuild - pushd go/src/${goPackagePath} go run build.go -no-upgrade -version v${version} build ${target} - popd runHook postBuild ''; installPhase = '' - pushd go/src/${goPackagePath} runHook preInstall - install -Dm755 ${target} $bin/bin/${target} + install -Dm755 ${target} $out/bin/${target} runHook postInstall - popd ''; inherit postInstall; @@ -65,19 +61,19 @@ in { done '' + lib.optionalString (stdenv.isLinux) '' - mkdir -p $bin/lib/systemd/{system,user} + mkdir -p $out/lib/systemd/{system,user} substitute etc/linux-systemd/system/syncthing-resume.service \ - $bin/lib/systemd/system/syncthing-resume.service \ + $out/lib/systemd/system/syncthing-resume.service \ --replace /usr/bin/pkill ${procps}/bin/pkill substitute etc/linux-systemd/system/syncthing@.service \ - $bin/lib/systemd/system/syncthing@.service \ - --replace /usr/bin/syncthing $bin/bin/syncthing + $out/lib/systemd/system/syncthing@.service \ + --replace /usr/bin/syncthing $out/bin/syncthing substitute etc/linux-systemd/user/syncthing.service \ - $bin/lib/systemd/user/syncthing.service \ - --replace /usr/bin/syncthing $bin/bin/syncthing + $out/lib/systemd/user/syncthing.service \ + --replace /usr/bin/syncthing $out/bin/syncthing ''; }; @@ -101,7 +97,7 @@ in { substitute cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \ $out/lib/systemd/system/strelaysrv.service \ - --replace /usr/bin/strelaysrv $bin/bin/strelaysrv + --replace /usr/bin/strelaysrv $out/bin/strelaysrv ''; }; } diff --git a/pkgs/applications/networking/syncthing/deps.nix b/pkgs/applications/networking/syncthing/deps.nix deleted file mode 100644 index 5193fbea1bf..00000000000 --- a/pkgs/applications/networking/syncthing/deps.nix +++ /dev/null @@ -1,777 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/AudriusButkevicius/go-nat-pmp"; - fetch = { - type = "git"; - url = "https://github.com/AudriusButkevicius/go-nat-pmp"; - rev = "452c97607362"; - sha256 = "1accmpl1llk16a19nlyy991fqrgfay6l53gb64hgmdfmqljdvbk7"; - }; - } - { - goPackagePath = "github.com/AudriusButkevicius/pfilter"; - fetch = { - type = "git"; - url = "https://github.com/AudriusButkevicius/pfilter"; - rev = "c55ef6137fc6"; - sha256 = "0xzhwyd0w21bhvzl5pinn22hp0y6h44rh3s2ppql69rafc6zd3c6"; - }; - } - { - goPackagePath = "github.com/AudriusButkevicius/recli"; - fetch = { - type = "git"; - url = "https://github.com/AudriusButkevicius/recli"; - rev = "v0.0.5"; - sha256 = "1m1xna1kb78pkmr1lfmvvnpk9j7c4x71j3a7c6vj7zpzc4srpsmf"; - }; - } - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cf"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "v1.0.0"; - sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x"; - }; - } - { - goPackagePath = "github.com/bkaradzic/go-lz4"; - fetch = { - type = "git"; - url = "https://github.com/bkaradzic/go-lz4"; - rev = "7224d8d8f27e"; - sha256 = "10lmya17vdqg2pvqni0p73iahni48s1v11ya9a0hcz4jh5vw4dkb"; - }; - } - { - goPackagePath = "github.com/calmh/du"; - fetch = { - type = "git"; - url = "https://github.com/calmh/du"; - rev = "v1.0.1"; - sha256 = "0qb3a6y3p9nkyn3s66k6zcm16y8n8578qh23ddj14cxf2scrr2n2"; - }; - } - { - goPackagePath = "github.com/calmh/xdr"; - fetch = { - type = "git"; - url = "https://github.com/calmh/xdr"; - rev = "v1.1.0"; - sha256 = "072wqdncz3nd4a3zkhvzzx1y3in1lm29wfvl0d8wrnqs5pyqh0mh"; - }; - } - { - goPackagePath = "github.com/ccding/go-stun"; - fetch = { - type = "git"; - url = "https://github.com/ccding/go-stun"; - rev = "be486d185f3d"; - sha256 = "1gr0rw1c1y7wh6913lyn5k4ig023by27i36bly6am8dwgrgp34ww"; - }; - } - { - goPackagePath = "github.com/certifi/gocertifi"; - fetch = { - type = "git"; - url = "https://github.com/certifi/gocertifi"; - rev = "d2eda7129713"; - sha256 = "0f3v26xps7gadw4qfmh1kxbpgp0cgqdd61a257xnnvnd7ll6k8dh"; - }; - } - { - goPackagePath = "github.com/cheekybits/genny"; - fetch = { - type = "git"; - url = "https://github.com/cheekybits/genny"; - rev = "v1.0.0"; - sha256 = "1pcir5ic86713aqa51581rfb67rgc3m0c72ddjfcp3yakv9vyq87"; - }; - } - { - goPackagePath = "github.com/chmduquesne/rollinghash"; - fetch = { - type = "git"; - url = "https://github.com/chmduquesne/rollinghash"; - rev = "a60f8e7142b5"; - sha256 = "0fpaqq4zb0wikgbhn7vwqqj1h865f5xy195vkhivsp922p7qwsjr"; - }; - } - { - goPackagePath = "github.com/d4l3k/messagediff"; - fetch = { - type = "git"; - url = "https://github.com/d4l3k/messagediff"; - rev = "v1.2.1"; - sha256 = "104hl8x57ciaz7mzafg1vp9qggxcyfm8hsv9bmlihbz9ml3nyr8v"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/flynn-archive/go-shlex"; - fetch = { - type = "git"; - url = "https://github.com/flynn-archive/go-shlex"; - rev = "3f9db97f8568"; - sha256 = "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "github.com/getsentry/raven-go"; - fetch = { - type = "git"; - url = "https://github.com/getsentry/raven-go"; - rev = "v0.2.0"; - sha256 = "0imfwmsb72168fqandf2lxhzhngf2flxhzaar8hcnnfjv2a291lf"; - }; - } - { - goPackagePath = "github.com/go-kit/kit"; - fetch = { - type = "git"; - url = "https://github.com/go-kit/kit"; - rev = "v0.8.0"; - sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0"; - }; - } - { - goPackagePath = "github.com/go-logfmt/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/go-logfmt/logfmt"; - rev = "v0.3.0"; - sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9"; - }; - } - { - goPackagePath = "github.com/go-stack/stack"; - fetch = { - type = "git"; - url = "https://github.com/go-stack/stack"; - rev = "v1.8.0"; - sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; - }; - } - { - goPackagePath = "github.com/gobwas/glob"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/glob"; - rev = "51eb1ee00b6d"; - sha256 = "090wzpwsjana1qas8ipwh1pj959gvc4b7vwybzi01f3bmd79jwlp"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "v1.2.1"; - sha256 = "06yqa6h0kw3gr5pc3qmas7f7435a96zf7iw7p0l00r2hqf6fqq6m"; - }; - } - { - goPackagePath = "github.com/golang/groupcache"; - fetch = { - type = "git"; - url = "https://github.com/golang/groupcache"; - rev = "84a468cf14b4"; - sha256 = "1ky1r9qh54yi9zp2769qrjngzndgd8fn7mja2qfac285n06chmcn"; - }; - } - { - goPackagePath = "github.com/golang/mock"; - fetch = { - type = "git"; - url = "https://github.com/golang/mock"; - rev = "v1.2.0"; - sha256 = "12ddj2g8ab87id6n2n67vnbhq6p8dvgsq1pzpqfriym4dk8w54fg"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.3.1"; - sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl"; - }; - } - { - goPackagePath = "github.com/golang/snappy"; - fetch = { - type = "git"; - url = "https://github.com/golang/snappy"; - rev = "v0.0.1"; - sha256 = "0gp3kkzlm3wh37kgkhbqxq3zx07iqbgis5w9mf4d64h6vjq760is"; - }; - } - { - goPackagePath = "github.com/hpcloud/tail"; - fetch = { - type = "git"; - url = "https://github.com/hpcloud/tail"; - rev = "v1.0.0"; - sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0"; - }; - } - { - goPackagePath = "github.com/jackpal/gateway"; - fetch = { - type = "git"; - url = "https://github.com/jackpal/gateway"; - rev = "5795ac81146e"; - sha256 = "0fkwkwmhfadwk3cha8616bhqxfkr9gjjnynhhxyldlphixgs3f25"; - }; - } - { - goPackagePath = "github.com/json-iterator/go"; - fetch = { - type = "git"; - url = "https://github.com/json-iterator/go"; - rev = "v1.1.6"; - sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r"; - }; - } - { - goPackagePath = "github.com/julienschmidt/httprouter"; - fetch = { - type = "git"; - url = "https://github.com/julienschmidt/httprouter"; - rev = "v1.2.0"; - sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; - }; - } - { - goPackagePath = "github.com/kballard/go-shellquote"; - fetch = { - type = "git"; - url = "https://github.com/kballard/go-shellquote"; - rev = "cd60e84ee657"; - sha256 = "1xjpin4jq1zl84dcn96xhjmn9bsfyszf6g9aqyj2dc0xfi6c88y0"; - }; - } - { - goPackagePath = "github.com/kisielk/errcheck"; - fetch = { - type = "git"; - url = "https://github.com/kisielk/errcheck"; - rev = "v1.1.0"; - sha256 = "19vd4rxmqbk5lpiav3pf7df3yjlz0l0dwx9mn0gjq5f998iyhy6y"; - }; - } - { - goPackagePath = "github.com/kisielk/gotool"; - fetch = { - type = "git"; - url = "https://github.com/kisielk/gotool"; - rev = "v1.0.0"; - sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; - }; - } - { - goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; - fetch = { - type = "git"; - url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "v1.0.1"; - sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; - }; - } - { - goPackagePath = "github.com/kr/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/kr/logfmt"; - rev = "b84e30acd515"; - sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; - }; - } - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty"; - rev = "v0.1.0"; - sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; - }; - } - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "v1.1.1"; - sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "v0.1.0"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - }; - } - { - goPackagePath = "github.com/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "v1.1.1"; - sha256 = "0g64wlg1l1ybq4x44idksl4pgm055s58jxc6r6x4qhqm5q76h0km"; - }; - } - { - goPackagePath = "github.com/lucas-clemente/quic-go"; - fetch = { - type = "git"; - url = "https://github.com/lucas-clemente/quic-go"; - rev = "v0.11.2"; - sha256 = "0gqm5mc8alg84ra7yxach34il1jvcij8f76qdqcahnd3d2nhjbia"; - }; - } - { - goPackagePath = "github.com/marten-seemann/qtls"; - fetch = { - type = "git"; - url = "https://github.com/marten-seemann/qtls"; - rev = "v0.2.3"; - sha256 = "0b9p7bwkm9hfg1mb565q4nw5k7xyks0z2xagz5fp95azy2psbnfg"; - }; - } - { - goPackagePath = "github.com/maruel/panicparse"; - fetch = { - type = "git"; - url = "https://github.com/maruel/panicparse"; - rev = "v1.2.1"; - sha256 = "05hf68ifb7ww4rpmxyywbj9r0kyap45p1273ncq4qy2ydv042l8j"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "v0.1.1"; - sha256 = "0l640974j804c1yyjfgyxqlsivz0yrzmbql4mhcw2azryigkp08p"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.7"; - sha256 = "1i77aq4gf9as03m8fpfh8fq49n4z9j7548blrcsidm1xhslzk5xd"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "v1.0.1"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/mgutz/ansi"; - fetch = { - type = "git"; - url = "https://github.com/mgutz/ansi"; - rev = "9520e82c474b"; - sha256 = "00bz22314j26736w1f0q4jy9d9dfaml17vn890n5zqy3cmvmww1j"; - }; - } - { - goPackagePath = "github.com/minio/sha256-simd"; - fetch = { - type = "git"; - url = "https://github.com/minio/sha256-simd"; - rev = "cc1980cb0338"; - sha256 = "04fp98nal0wsb26zwhw82spn5camxslc68g3xp8g4af9w6k9g31j"; - }; - } - { - goPackagePath = "github.com/modern-go/concurrent"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/concurrent"; - rev = "bacd9c7ef1dd"; - sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; - }; - } - { - goPackagePath = "github.com/modern-go/reflect2"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/reflect2"; - rev = "v1.0.1"; - sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; - }; - } - { - goPackagePath = "github.com/mwitkow/go-conntrack"; - fetch = { - type = "git"; - url = "https://github.com/mwitkow/go-conntrack"; - rev = "cc309e4a2223"; - sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; - }; - } - { - goPackagePath = "github.com/onsi/ginkgo"; - fetch = { - type = "git"; - url = "https://github.com/onsi/ginkgo"; - rev = "v1.8.0"; - sha256 = "1326s5fxgasdpz1qqwrw4n5p3k0vz44msnyz14knrhlw5l97lx33"; - }; - } - { - goPackagePath = "github.com/onsi/gomega"; - fetch = { - type = "git"; - url = "https://github.com/onsi/gomega"; - rev = "v1.5.0"; - sha256 = "1n7i4hksdgv410m43v2sw14bl5vy59dkp6nlw5l76nibbh37syr9"; - }; - } - { - goPackagePath = "github.com/oschwald/geoip2-golang"; - fetch = { - type = "git"; - url = "https://github.com/oschwald/geoip2-golang"; - rev = "v1.3.0"; - sha256 = "0gv7mv65zm14cgjvd0wy91c45f6gi5f9ny42mn4gwfh5kkhb9r40"; - }; - } - { - goPackagePath = "github.com/oschwald/maxminddb-golang"; - fetch = { - type = "git"; - url = "https://github.com/oschwald/maxminddb-golang"; - rev = "26fe5ace1c70"; - sha256 = "0szb96zq1jbd9zpf4qn9zng4582ww9mg8zgrqxbkkpf3862r6n49"; - }; - } - { - goPackagePath = "github.com/petermattis/goid"; - fetch = { - type = "git"; - url = "https://github.com/petermattis/goid"; - rev = "3db12ebb2a59"; - sha256 = "0z18a3mr72c52g7g94n08gxw0ksnaafbfwdl5p5jav2sffirb0kd"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.8.1"; - sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "v0.9.4"; - sha256 = "0s134fj4i7k6pxdmxwkdi7amb1882yq33spv15hg3pkpbd3h311p"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "fd36f4220a90"; - sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "v0.4.1"; - sha256 = "0sf4sjdckblz1hqdfvripk3zyp8xq89w7q75kbsyg4c078af896s"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "v0.0.2"; - sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k"; - }; - } - { - goPackagePath = "github.com/rcrowley/go-metrics"; - fetch = { - type = "git"; - url = "https://github.com/rcrowley/go-metrics"; - rev = "e181e095bae9"; - sha256 = "1pwkyw801hy7n94skzk6h177zqcil6ayrmb5gs3jdpsfayh8ia5w"; - }; - } - { - goPackagePath = "github.com/sasha-s/go-deadlock"; - fetch = { - type = "git"; - url = "https://github.com/sasha-s/go-deadlock"; - rev = "v0.2.0"; - sha256 = "13p7b7pakd9k1c2k0fs1hfim3c8mivz679977ai6zb01s4aw7gyg"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "v1.2.0"; - sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.1"; - sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.3.0"; - sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; - }; - } - { - goPackagePath = "github.com/syncthing/notify"; - fetch = { - type = "git"; - url = "https://github.com/syncthing/notify"; - rev = "69c7a957d3e2"; - sha256 = "1mmdzyfnmjabyhbipl4bggw4w5nlxyyjp0d93qd824kj07kmsr1f"; - }; - } - { - goPackagePath = "github.com/syndtr/goleveldb"; - fetch = { - type = "git"; - url = "https://github.com/syndtr/goleveldb"; - rev = "c3a204f8e965"; - sha256 = "18cac90dim2z5g28vazzibxa058q2ynihsmf0vbscwzba6l5s5ms"; - }; - } - { - goPackagePath = "github.com/thejerf/suture"; - fetch = { - type = "git"; - url = "https://github.com/thejerf/suture"; - rev = "v3.0.2"; - sha256 = "03bdrl78jfwk0kw40lj63ga9cxhgccgss8yi9lp5j0m0ml7921gh"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "v1.20.0"; - sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; - }; - } - { - goPackagePath = "github.com/vitrun/qart"; - fetch = { - type = "git"; - url = "https://github.com/vitrun/qart"; - rev = "bf64b92db6b0"; - sha256 = "1xk7qki703xmay9ghi3kq2bjf1iw9dz8wik55739d6i7sn77vvkc"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "5c40567a22f8"; - sha256 = "17g8fb9vy2sqq8vgz8jdvf6c6d2290gm2qs0i4yzsd86mgn4dlrg"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "d28f0bde5980"; - sha256 = "18xj31h70m7xxb7gc86n9i21w6d7djbjz67zfaljm4jqskz6hxkf"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "37e7f081c4d4"; - sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "04f50cda93cb"; - sha256 = "0hmfsz9y1ingwsn482hlzzmzs7kr3cklm0ana0mbdk70isw2bxnw"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.2"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } - { - goPackagePath = "golang.org/x/time"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/time"; - rev = "6dc17368e09b"; - sha256 = "1fx4cf5fpdz00g3c7vxzy92hdcg0vh4yqw00qp5s52j72qixynbk"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "90fa682c2a6e"; - sha256 = "03ic2xsy51jw9749wl7gszdbz99iijbd2bckgygl6cm9w5m364ak"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "v2.2.6"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } - { - goPackagePath = "gopkg.in/asn1-ber.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/asn1-ber.v1"; - rev = "379148ca0225"; - sha256 = "1y8bvzbxpw0lfnn7pbcdwzqj4l90qj6xf88dvv9pxd9yl5g6cskx"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "788fd7840127"; - sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; - }; - } - { - goPackagePath = "gopkg.in/fsnotify.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/fsnotify.v1"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "gopkg.in/ldap.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/ldap.v2"; - rev = "v2.5.1"; - sha256 = "1wf81wy04nhkqs0dg5zkivr4sh37r83bxrfwjz9vr4jq6vmljr3h"; - }; - } - { - goPackagePath = "gopkg.in/tomb.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/tomb.v1"; - rev = "dd632973f1e7"; - sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.2"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; - }; - } -]