Merge pull request #27213 from sigma/pr/gx

gx: 20160601-f84ddf7 -> 0.12.0
2024-12-28 14:22:50 +03:00 · 2017-07-09 13:19:15 +01:00 · 2017-07-09 13:19:15 +01:00 · aacb816eb6
commit aacb816eb6
parent 2841f7e5ea c4ecdfd39e
3 changed files with 249 additions and 92 deletions
--- a/pkgs/tools/package-management/gx/default.nix
+++ b/pkgs/tools/package-management/gx/default.nix
@ -1,24 +1,19 @@
 # This file was generated by go2nix.
-{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:

 buildGoPackage rec {
  name = "gx-${version}";
-  version = "20160601-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "f84ddf792ceb329e20c857731154798e1ce87314";
+  version = "0.12.0";
+  rev = "refs/tags/v${version}";

  goPackagePath = "github.com/whyrusleeping/gx";

  src = fetchgit {
    inherit rev;
    url = "https://github.com/whyrusleeping/gx";
-    sha256 = "10a6p9ba526jr6m66x3vsa3xsjlnzv7yma8vyp8d0bf0hs44bpih";
+    sha256 = "0pvf0j14xnzy01fxilja8xbki0i0g7h7y20jzw74ds5a7ywsdx8r";
  };

-  prePatch = ''
-    substituteInPlace tests/lib/random-dep.go \
-      --replace "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-random" "github.com/jbenet/go-random"
-  '';
-
  goDeps = ./deps.nix;

  meta = with stdenv.lib; {
--- a/pkgs/tools/package-management/gx/deps.nix
+++ b/pkgs/tools/package-management/gx/deps.nix
@ -1,29 +1,11 @@
 [
  {
-    goPackagePath = "github.com/anacrolix/missinggo";
+    goPackagePath = "github.com/agl/ed25519";
    fetch = {
      type = "git";
-      url = "https://github.com/anacrolix/missinggo";
-      rev = "e40875155efce3d98562ca9e265e152c364ada3e";
-      sha256 = "1p1qgnb430dz84d2395i6417jqnlvrx9zwg9rq1ri8d5v7dif4fg";
-    };
-  }
-  {
-    goPackagePath = "github.com/anacrolix/sync";
-    fetch = {
-      type = "git";
-      url = "https://github.com/anacrolix/sync";
-      rev = "812602587b72df6a2a4f6e30536adc75394a374b";
-      sha256 = "0pc38wanzws3vzqj0l5pakg3gn2hacqrb4n7pd0sqz083rss5k0l";
-    };
-  }
-  {
-    goPackagePath = "github.com/anacrolix/utp";
-    fetch = {
-      type = "git";
-      url = "https://github.com/anacrolix/utp";
-      rev = "d7ad5aff2b8a5fa415d1c1ed00b71cfd8b4c69e0";
-      sha256 = "07piwfny3b4prxf2shc512ai0qmrmrj839lbza9clhgcmj1a75d7";
+      url = "https://github.com/agl/ed25519";
+      rev = "5312a61534124124185d41f09206b9fef1d88403";
+      sha256 = "1v8mhkf1m3ga5262s75vabskxvsw5rpqvi5nwhxwiv7gfk6h823i";
    };
  }
  {
@ -31,17 +13,17 @@
    fetch = {
      type = "git";
      url = "https://github.com/blang/semver";
-      rev = "aea32c919a18e5ef4537bbd283ff29594b1b0165";
-      sha256 = "1s80qlij6j6wrh0fhm0l11hbf3qjra67nca5bl7izyfjj4621fcd";
+      rev = "4a1e882c79dcf4ec00d2e29fac74b9c8938d5052";
+      sha256 = "07rk2jzmppw1v06qvsn11l1mwkyg6y9y06jfik316zq8glfh8b3m";
    };
  }
  {
-    goPackagePath = "github.com/bradfitz/iter";
+    goPackagePath = "github.com/btcsuite/btcd";
    fetch = {
      type = "git";
-      url = "https://github.com/bradfitz/iter";
-      rev = "454541ec3da2a73fc34fd049b19ee5777bf19345";
-      sha256 = "0v07zlq2h2rjz5mdvh0rgizyzcj68qa235gci6hvlrai7igyi57i";
+      url = "https://github.com/btcsuite/btcd";
+      rev = "9822ffad6802d3b902442b727a238230194d961f";
+      sha256 = "0mk3qxpn29gsbkvk6rj6jzsw3fn2z51afq890wpk4qz029kvip2h";
    };
  }
  {
@ -49,8 +31,26 @@
    fetch = {
      type = "git";
      url = "https://github.com/codegangsta/cli";
-      rev = "e5bef42c62aa7d25aba4880dc02b7624f01e9e19";
-      sha256 = "1g0z2klbaivd0w1fwf1k1dkyk8jbq28qd7fvczjv0yj6hg4vz1wq";
+      rev = "4b90d79a682b4bf685762c7452db20f2a676ecb2";
+      sha256 = "0ls3lfmbfwirm9j95b6yrw41wgh72lfkp1cvs873zw04si4yvaqr";
+    };
+  }
+  {
+    goPackagePath = "github.com/coreos/go-semver";
+    fetch = {
+      type = "git";
+      url = "https://github.com/coreos/go-semver";
+      rev = "1817cd4bea52af76542157eeabd74b057d1a199e";
+      sha256 = "0hfxcg87ag0zdfarbymfx2qmhcdzm8br39sxvhfc7n37rqdcsh9n";
+    };
+  }
+  {
+    goPackagePath = "github.com/gogo/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gogo/protobuf";
+      rev = "dda3e8acadcc9affc16faf33fbb229db78399245";
+      sha256 = "1f1lm6bgwnrd985n1aagqw0bxfx37z71fwfcijiz9k258vj4wlga";
    };
  }
  {
@ -58,8 +58,26 @@
    fetch = {
      type = "git";
      url = "https://github.com/ipfs/go-ipfs-api";
-      rev = "7c354892da3abdaafb6ac576c100b259b1a73dac";
-      sha256 = "0n8k9ydn2l362vq0bpbjkciw08div3hpc22qygp6zsrlammizcvc";
+      rev = "2da86eb64d56571c123c02ae82140c7b4b95f72a";
+      sha256 = "1ljlzjig0qv2mjzyk2piid12b4043584qskx6ikbz5i16cnbvqsq";
+    };
+  }
+  {
+    goPackagePath = "github.com/ipfs/go-ipfs-util";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ipfs/go-ipfs-util";
+      rev = "f25fcc891281327394bb48000ef0970d11baff2b";
+      sha256 = "1a79ggx0ma9ny39kjm0gzicrn541gyis4fn7kmkkfjjfaj8v5l3y";
+    };
+  }
+  {
+    goPackagePath = "github.com/ipfs/go-log";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ipfs/go-log";
+      rev = "48d644b006ba26f1793bffc46396e981801078e3";
+      sha256 = "0q2bk2s2v626ikm2pjalq4qg4n53yyf1bb81jbljb23iijxrqsbr";
    };
  }
  {
@ -71,33 +89,6 @@
      sha256 = "11yp7yg62bhw6jqdrlf2144bffk12jmb1nvqkm172pdhxfwrp3bf";
    };
  }
-  {
-    goPackagePath = "github.com/jbenet/go-multiaddr";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jbenet/go-multiaddr";
-      rev = "f3dff105e44513821be8fbe91c89ef15eff1b4d4";
-      sha256 = "0rz17cvhslspp2z8jbxah22kndqiq9zl8nlf14ng8hfxdfm1x4n7";
-    };
-  }
-  {
-    goPackagePath = "github.com/jbenet/go-multiaddr-net";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jbenet/go-multiaddr-net";
-      rev = "d4cfd691db9f50e430528f682ca603237b0eaae0";
-      sha256 = "031xb8j5nysw052cm36rjn19c5wkjf8dh8x21vrbyb7220h5zp90";
-    };
-  }
-  {
-    goPackagePath = "github.com/jbenet/go-multihash";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jbenet/go-multihash";
-      rev = "e8d2374934f16a971d1e94a864514a21ac74bf7f";
-      sha256 = "1hlzgmjszn8mfvn848jbnpsvccm9g3m42saavgbh48qdryraqscp";
-    };
-  }
  {
    goPackagePath = "github.com/jbenet/go-os-rename";
    fetch = {
@ -108,21 +99,12 @@
    };
  }
  {
-    goPackagePath = "github.com/jbenet/go-random";
+    goPackagePath = "github.com/jbenet/goprocess";
    fetch = {
      type = "git";
-      url = "https://github.com/jbenet/go-random";
-      rev = "384f606e91f542a98e779e652eed88051618f0f7";
-      sha256 = "0gcshzl9n3apzc0jaxqrjsc038yfrzfyhpdqgbpcnajin83l2msa";
-    };
-  }
-  {
-    goPackagePath = "github.com/jbenet/go-random-files";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jbenet/go-random-files";
-      rev = "737479700b40b4b50e914e963ce8d9d44603e3c8";
-      sha256 = "1klpdc4qkrfy31r7qh00fcz42blswzabmcnry9byd5adhszxj9bw";
+      url = "https://github.com/jbenet/goprocess";
+      rev = "b497e2f366b8624394fb2e89c10ab607bebdde0b";
+      sha256 = "1lnvkzki7vnqn5c4m6bigk0k85haicmg27w903kwg30rdvblm82s";
    };
  }
  {
@ -134,13 +116,139 @@
      sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly";
    };
  }
+  {
+    goPackagePath = "github.com/libp2p/go-floodsub";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-floodsub";
+      rev = "a922092abea58f07c32eabe303ec817569578740";
+      sha256 = "0wbi67jyfvrzfsb9lkrhjgg9k66yk5sww7nvihhc9rdnblygigs3";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-libp2p-crypto";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-libp2p-crypto";
+      rev = "e89e1de117dd65c6129d99d1d853f48bc847cf17";
+      sha256 = "1lb0qzspx99sqbdxbf9dczwcmmirl4h26q9x3v6ris253zmqcbyw";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-libp2p-host";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-libp2p-host";
+      rev = "c1fc482de113ce7e4cdc9453a1c1c0fe4164d985";
+      sha256 = "1hiz5j64s248vml7i4gwjvz59g7l08zjfklhrbmk0cjxwhx9ypy0";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-libp2p-interface-conn";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-libp2p-interface-conn";
+      rev = "95afdbf0c900237f3b9104f1f7cfd3d56175a241";
+      sha256 = "0dv0jc08hfzb8gsi14c2ivancq7pxs8d482l4rw89mg04m2pgnaa";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-libp2p-net";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-libp2p-net";
+      rev = "2680a9894c7aabada540f728a53d7c1a16a1a44a";
+      sha256 = "1k44dz2dk7ahlfls6vk747jy8kbxmjhqyni8zw2wiz6sfm5hyw10";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-libp2p-peer";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-libp2p-peer";
+      rev = "166a39e33e7a2a47a4bf999264f254ecaa4fe232";
+      sha256 = "0kgv1n2c8rfz92vk014sqm1bla7a99w18ydyphjjhc96fmlbrzgl";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-libp2p-peerstore";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-libp2p-peerstore";
+      rev = "744a149e48eb42e032540507c8545d12cc3b7f6f";
+      sha256 = "1bcmqkdlvvxdz9dbqrcfmvhx0wnnk94fb2yl9ys1nx7mnqgl64y8";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-libp2p-protocol";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-libp2p-protocol";
+      rev = "40488c03777c16bfcd65da2f675b192863cbc2dc";
+      sha256 = "1mvhi8pdfyn3lb1j1y4iz2mggnf0dz7ccbmrbij739v6cpjfwwbb";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-libp2p-transport";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-libp2p-transport";
+      rev = "5d3cb5861b59c26052a5fe184e45c381ec17e22d";
+      sha256 = "1v63gavw98f6hs151mqk0bbdl46a9ci9m2pcx807wxdsmfphynar";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-maddr-filter";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-maddr-filter";
+      rev = "90aacb5ee155f0d6f3fa8b34d775de842606c0b1";
+      sha256 = "0ijs599hppj78dg2v7rcglqs82pysygq84yabpis5b99fjp9bay0";
+    };
+  }
  {
    goPackagePath = "github.com/mitchellh/go-homedir";
    fetch = {
      type = "git";
      url = "https://github.com/mitchellh/go-homedir";
-      rev = "1111e456ffea841564ac0fa5f69c26ef44dafec9";
-      sha256 = "1ycb1cffgs46jnj4cbpjd46mcl584kxdmldlvfysg0wza9pp4x23";
+      rev = "b8bc1bf767474819792c23f32d8286a45736f1c6";
+      sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q";
+    };
+  }
+  {
+    goPackagePath = "github.com/multiformats/go-multiaddr";
+    fetch = {
+      type = "git";
+      url = "https://github.com/multiformats/go-multiaddr";
+      rev = "33741da7b3f5773a599d4a03c333704fc560ef34";
+      sha256 = "0idhv960k68jvh0frhh28dw46p527m2g67rjwjh6r5va5sd8qjcd";
+    };
+  }
+  {
+    goPackagePath = "github.com/multiformats/go-multiaddr-net";
+    fetch = {
+      type = "git";
+      url = "https://github.com/multiformats/go-multiaddr-net";
+      rev = "a7b93d11855f04f56908e1385991eb6a400fcc43";
+      sha256 = "1q0d8asxxhxhm774xn29n1x6zni6pmm78lvm3652ipyj026y243k";
+    };
+  }
+  {
+    goPackagePath = "github.com/multiformats/go-multihash";
+    fetch = {
+      type = "git";
+      url = "https://github.com/multiformats/go-multihash";
+      rev = "a52a6a4768da72eba89ea7f59f70e9d42ddd3072";
+      sha256 = "0r6fmzvg4vjwc5wzfqn7jjxndcw8n0galdx6f524yd9bcfdlph5b";
+    };
+  }
+  {
+    goPackagePath = "github.com/multiformats/go-multistream";
+    fetch = {
+      type = "git";
+      url = "https://github.com/multiformats/go-multistream";
+      rev = "b8f1996688ab586031517919b49b1967fca8d5d9";
+      sha256 = "0y2hl78lmnd0rbryfmscgxa6kmjdfz00pz60ymhg8k4cifqai0x2";
    };
  }
  {
@ -148,8 +256,26 @@
    fetch = {
      type = "git";
      url = "https://github.com/sabhiram/go-git-ignore";
-      rev = "228fcfa2a06e870a3ef238d54c45ea847f492a37";
-      sha256 = "0xyj2zsxjjbyd3ppxvs294c8y2ip181dxhvycaxxx6qysbm2nlzj";
+      rev = "87c28ffedb6cb7ff29ae89e0440e9ddee0d95a9e";
+      sha256 = "1qysvwjvbzq1wms09dm0sban58xq22bbkwpd7qnk28r99g6267rl";
+    };
+  }
+  {
+    goPackagePath = "github.com/spaolacci/murmur3";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spaolacci/murmur3";
+      rev = "0d12bf811670bf6a1a63828dfbd003eded177fce";
+      sha256 = "0fv74n0cvgnxpfd04xyiry6ii1ag7mhwwk0kwplpvnbwi8y9yq1x";
+    };
+  }
+  {
+    goPackagePath = "github.com/whyrusleeping/go-logging";
+    fetch = {
+      type = "git";
+      url = "https://github.com/whyrusleeping/go-logging";
+      rev = "0457bb6b88fc1973573aaf6b5145d8d3ae972390";
+      sha256 = "1bl180mhg03hdqhyr5sfjcg16ns2ppal625g9ag5m10l2pvlwnqn";
    };
  }
  {
@ -166,8 +292,26 @@
    fetch = {
      type = "git";
      url = "https://github.com/whyrusleeping/json-filter";
-      rev = "e9937f5649231265a56d0a419f062530425401a1";
-      sha256 = "1b7czlx57acbi30b9m1w2lvlxnh65c4pmxaa0546pjjip83byb3s";
+      rev = "ff25329a9528f01c5175414f16cc0a6a162a5b8b";
+      sha256 = "0cai0drvx4c8j686l908vpcsz3mw3vxi3ziz94b0f3c5ylpj07j7";
+    };
+  }
+  {
+    goPackagePath = "github.com/whyrusleeping/mafmt";
+    fetch = {
+      type = "git";
+      url = "https://github.com/whyrusleeping/mafmt";
+      rev = "15300f9d3a2d71db61951a8705d5ea8878764837";
+      sha256 = "0fiwrj8pla9y8q0m4ifyrh8gacmrz278h2zihdbqbk2b17b002yr";
+    };
+  }
+  {
+    goPackagePath = "github.com/whyrusleeping/progmeter";
+    fetch = {
+      type = "git";
+      url = "https://github.com/whyrusleeping/progmeter";
+      rev = "974d8fe8cd87585865b1370184050e89d606e817";
+      sha256 = "05njc5minpaxzwb6yg5zjr52ar4ar7qkiml45zsrp2ny92dyx07j";
    };
  }
  {
@ -188,13 +332,31 @@
      sha256 = "07z4is00ridjp8c6cn68lkg1fz6ksj1q7f26g7ir7qx8mx10fj72";
    };
  }
+  {
+    goPackagePath = "github.com/whyrusleeping/timecache";
+    fetch = {
+      type = "git";
+      url = "https://github.com/whyrusleeping/timecache";
+      rev = "cfcb2f1abfee846c430233aef0b630a946e0a5a6";
+      sha256 = "0nnra7ivq7cj34rj2ib8hgfdpik3smr1hy7x18svhfin8z1xsj2s";
+    };
+  }
  {
    goPackagePath = "golang.org/x/crypto";
    fetch = {
      type = "git";
      url = "https://go.googlesource.com/crypto";
-      rev = "f3241ce8505855877cc8a9717bd61a0f7c4ea83c";
-      sha256 = "0wxfnbhaq1m3i5jylww9llm2xl9hk33q6nxyz5i475rfrg0p3wsq";
+      rev = "a48ac81e47fd6f9ed1258f3b60ae9e75f93cb7ed";
+      sha256 = "0zpgwc362rghm3fv0s964dqmw6krixzxww2qxhnik9hvf7srapjd";
+    };
+  }
+  {
+    goPackagePath = "leb.io/hashland";
+    fetch = {
+      type = "git";
+      url = "https://github.com/tildeleb/hashland";
+      rev = "e13accbe55f7fa03c73c74ace4cca4c425e47260";
+      sha256 = "1ygfp7kjnm964w2bv61bsyxpw5y6vy6k4pra1lhd5r3nhlxgs31g";
    };
  }
 ]
--- a/pkgs/tools/package-management/gx/go/default.nix
+++ b/pkgs/tools/package-management/gx/go/default.nix
@ -5,15 +5,15 @@

 buildGoPackage rec {
  name = "gx-go-${version}";
-  version = "20160611-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "639fc0be1a153c59d8946904cceecf0b66ab2944";
+  version = "1.5.0";
+  rev = "refs/tags/v${version}";

  goPackagePath = "github.com/whyrusleeping/gx-go";

  src = fetchgit {
    inherit rev;
    url = "https://github.com/whyrusleeping/gx-go";
-    sha256 = "0qxp7gqrx1rhcbqvp4jdb3gj1dlj200bdc4gq8pfklc8fcz1lc6l";
+    sha256 = "0bg4h5lzs293qmlsr9n257vjpr5w6bxb4ampb25gsn3fgy3rvsis";
  };

  goDeps = ../deps.nix;