From 0952c8533920074c6f2182f6a957020327d8155d Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Sun, 8 Dec 2019 12:07:27 +0200 Subject: [PATCH 1/3] subfinder: 2018-07-15 -> 2.2.2 --- pkgs/tools/networking/subfinder/default.nix | 18 +-- pkgs/tools/networking/subfinder/deps.nix | 145 ++++++++++++++++++-- 2 files changed, 140 insertions(+), 23 deletions(-) diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix index 65b88a34fb09..cc2c12e4019d 100644 --- a/pkgs/tools/networking/subfinder/default.nix +++ b/pkgs/tools/networking/subfinder/default.nix @@ -1,16 +1,16 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage { - pname = "subfinder-git"; - version = "2018-07-15"; +buildGoPackage rec { + pname = "subfinder"; + version = "2.2.2"; - goPackagePath = "github.com/subfinder/subfinder"; + goPackagePath = "github.com/projectdiscovery/subfinder"; src = fetchFromGitHub { - owner = "subfinder"; - repo = "subfinder"; - rev = "26596affed961c535676395f443acc5af95ac9e6"; - sha256 = "0m842jyrwlg4kaja1m3kca07jf20fxva0frg66b13zpsm8hdp10q"; + owner = "projectdiscovery"; + repo = pname; + rev = "v${version}"; + sha256 = "0npi625vpwsn1ipvbi0ii5lgskw5gr6fkqkjbhi3v8i4jrvjr2dj"; }; goDeps = ./deps.nix; @@ -22,7 +22,7 @@ buildGoPackage { subdomains for websites. Designed as a passive framework to be useful for bug bounties and safe for penetration testing. ''; - homepage = https://github.com/subfinder/subfinder; + homepage = "https://github.com/projectdiscovery/subfinder"; license = licenses.mit; maintainers = with maintainers; [ fpletz ]; }; diff --git a/pkgs/tools/networking/subfinder/deps.nix b/pkgs/tools/networking/subfinder/deps.nix index 34095c814284..16427eddcf6d 100644 --- a/pkgs/tools/networking/subfinder/deps.nix +++ b/pkgs/tools/networking/subfinder/deps.nix @@ -1,12 +1,48 @@ # file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) [ { - goPackagePath = "github.com/bogdanovich/dns_resolver"; + goPackagePath = "github.com/davecgh/go-spew"; fetch = { type = "git"; - url = "https://github.com/bogdanovich/dns_resolver"; - rev = "a8e42bc6a5b6c9a93be01ca204be7e17f7ba4cd2"; - sha256 = "0l1hgxxqafappw0y18sbkkk2vijclvf1b8x73b0nhi4r74wyib49"; + url = "https://github.com/davecgh/go-spew"; + rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/json-iterator/go"; + fetch = { + type = "git"; + url = "https://github.com/json-iterator/go"; + rev = "03217c3e97663914aec3faafde50d081f197a0a2"; + sha256 = "1kbp9fj6fxfql0ir59zb6v68l4bpwlmk76xm8vaikw1hp6y9bcss"; + }; + } + { + goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; + fetch = { + type = "git"; + url = "https://github.com/konsorten/go-windows-terminal-sequences"; + rev = "f55edac94c9bbba5d6182a4be46d86a2c9b5b50e"; + sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7"; + }; + } + { + goPackagePath = "github.com/logrusorgru/aurora"; + fetch = { + type = "git"; + url = "https://github.com/logrusorgru/aurora"; + rev = "21d75270181e0436fee7bd58b991c212cf309068"; + sha256 = "0vc9qdl6jzq7vazfqgz628gcgsvir56bdi2bkhl54pi92cz9cw0p"; + }; + } + { + goPackagePath = "github.com/m-mizutani/urlscan-go"; + fetch = { + type = "git"; + url = "https://github.com/m-mizutani/urlscan-go"; + rev = "21d37c8d3d34d514f2ef49db9b59cc94f335e9c3"; + sha256 = "1hpymd4ncp78hgpksnw8k27rp0lh832x1pyk3bhj5dm6xmh79g4c"; }; } { @@ -14,17 +50,71 @@ fetch = { type = "git"; url = "https://github.com/miekg/dns"; - rev = "3e6e47bc11bc7f93f9e2f1c7bd6481ba4802808b"; - sha256 = "1vmsnv6r799z5lz5g9l2dh065m9003yfjb18w8n6c053hp8jvrfm"; + rev = "1e224ff5dead8366ed6fcdcb832794be42e73f0e"; + sha256 = "1iv9jznakz8f5swiir0z4zilr9ypavnsc0g4zi1r0vad6npy7zfl"; }; } { - goPackagePath = "github.com/subfinder/urlx"; + goPackagePath = "github.com/modern-go/concurrent"; fetch = { type = "git"; - url = "https://github.com/subfinder/urlx"; - rev = "8e731c8be06edbae81cab15937cd3c291c2a7680"; - sha256 = "11vrx1c0mq1h6lwpsvibd3386wy4kirzmmm8ibrlx2gj0h6pkkcb"; + url = "https://github.com/modern-go/concurrent"; + rev = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"; + sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; + }; + } + { + goPackagePath = "github.com/modern-go/reflect2"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/reflect2"; + rev = "4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd"; + sha256 = "1721y3yr3dpx5dx5ashf063qczk2awy5zjir1jvp1h5hn7qz4i49"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "ba968bfe8b2f7e042a574c888954fccecfa385b4"; + sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "792786c7400a136282c1664665ae0a8db921c6c2"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/rs/xid"; + fetch = { + type = "git"; + url = "https://github.com/rs/xid"; + rev = "15d26544def341f036c5f8dca987a4cbe575032c"; + sha256 = "1vgw1dikqw273awcci6pzifs7shkl5ah4l88j1zjbnpgbiwzlx9j"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "839c75faf7f98a33d445d181f3018b5c3409a45e"; + sha256 = "087k2lxrr9p9dh68yw71d05h5g9p5v26zbwd6j7lghinjfaw334x"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "221dbe5ed46703ee255b1da0dec05086f5035f62"; + sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb"; }; } { @@ -32,8 +122,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "a49355c7e3f8fe157a85be2f77e6e269a0f89602"; - sha256 = "020q1laxjx5kcmnqy4wmdb63zhb0lyq6wpy40axhswzg2nd21s44"; + rev = "86a70503ff7e82ffc18c7b0de83db35da4791e6a"; + sha256 = "0w7ih86lmll9gs2j0z3nmmy148i2yism9z53yp58zwa6d5pjahfn"; }; } { @@ -41,8 +131,35 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "d0887baf81f4598189d4e12a37c6da86f0bba4d0"; - sha256 = "00dmz9a5d3myyb0256b33vf1bk8wv1khhh88kcvbmqsfd6x1n6p5"; + rev = "5ee1b9f4859acd2e99987ef94ec7a58427c53bef"; + sha256 = "0jvzqv6phv64rw4pj86x3j9kp5yx9p34fd38r46rb9464h69ba29"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "ce4227a45e2eb77e5c847278dcc6a626742e2945"; + sha256 = "1s43wvqfml6ml5ks7iv2bis9d664g77mq86v7mfmjhn56x856g35"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "1f64d6156d11335c3f22d9330b0ad14fc1e789ce"; + sha256 = "0k5xcwkd3wmcx54isk7ck9cwp8fapfhyqdz3f13kxp77cxqizazj"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v3"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "4206685974f28e3178b35fa198a59899aa4dee3a"; + sha256 = "1ff5fd8x45cay9100ds63hxd32s7czsrric0ql6a1jrxczsgqk1g"; }; } ] From 52531917eb66fed6df82f7532318a2b586cc07ac Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Sun, 8 Dec 2019 12:07:57 +0200 Subject: [PATCH 2/3] subfinder: add filalex77 to maintainers --- pkgs/tools/networking/subfinder/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix index cc2c12e4019d..5f51e1beb65b 100644 --- a/pkgs/tools/networking/subfinder/default.nix +++ b/pkgs/tools/networking/subfinder/default.nix @@ -24,6 +24,6 @@ buildGoPackage rec { ''; homepage = "https://github.com/projectdiscovery/subfinder"; license = licenses.mit; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz filalex77 ]; }; } From 608c65b671034c38df13ff453538aa80cdfb199f Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Sun, 15 Dec 2019 10:36:39 +0200 Subject: [PATCH 3/3] subfinder: 2.2.2 -> 2.2.4 --- pkgs/tools/networking/subfinder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix index 5f51e1beb65b..cd5f2bf18cbd 100644 --- a/pkgs/tools/networking/subfinder/default.nix +++ b/pkgs/tools/networking/subfinder/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "subfinder"; - version = "2.2.2"; + version = "2.2.4"; goPackagePath = "github.com/projectdiscovery/subfinder"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "0npi625vpwsn1ipvbi0ii5lgskw5gr6fkqkjbhi3v8i4jrvjr2dj"; + sha256 = "00ni835zvgrj8gmmmpjdszrcijyd6apig8rpb4g2z3g016b6gwar"; }; goDeps = ./deps.nix;