Merge pull request #16271 from zimbatm/gx

Gx

pkgs/tools/package-management/gx/default.nix

@@ -0,0 +1,23 @@
+# This file was generated by go2nix.
+{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+buildGoPackage rec {
+  name = "gx-${version}";
+  version = "20160601-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "f84ddf792ceb329e20c857731154798e1ce87314";
+
+  goPackagePath = "github.com/whyrusleeping/gx";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/whyrusleeping/gx";
+    sha256 = "10a6p9ba526jr6m66x3vsa3xsjlnzv7yma8vyp8d0bf0hs44bpih";
+  };
+
+  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.json;
+}

pkgs/tools/package-management/gx/deps.json

@@ -0,0 +1,200 @@
+[
+  {
+    "goPackagePath": "github.com/anacrolix/missinggo",
+    "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"
+    }
+  },
+  {
+    "goPackagePath": "github.com/blang/semver",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/blang/semver",
+      "rev": "aea32c919a18e5ef4537bbd283ff29594b1b0165",
+      "sha256": "1s80qlij6j6wrh0fhm0l11hbf3qjra67nca5bl7izyfjj4621fcd"
+    }
+  },
+  {
+    "goPackagePath": "github.com/bradfitz/iter",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/bradfitz/iter",
+      "rev": "454541ec3da2a73fc34fd049b19ee5777bf19345",
+      "sha256": "0v07zlq2h2rjz5mdvh0rgizyzcj68qa235gci6hvlrai7igyi57i"
+    }
+  },
+  {
+    "goPackagePath": "github.com/codegangsta/cli",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/codegangsta/cli",
+      "rev": "e5bef42c62aa7d25aba4880dc02b7624f01e9e19",
+      "sha256": "1g0z2klbaivd0w1fwf1k1dkyk8jbq28qd7fvczjv0yj6hg4vz1wq"
+    }
+  },
+  {
+    "goPackagePath": "github.com/ipfs/go-ipfs-api",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/ipfs/go-ipfs-api",
+      "rev": "7c354892da3abdaafb6ac576c100b259b1a73dac",
+      "sha256": "0n8k9ydn2l362vq0bpbjkciw08div3hpc22qygp6zsrlammizcvc"
+    }
+  },
+  {
+    "goPackagePath": "github.com/jbenet/go-base58",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/jbenet/go-base58",
+      "rev": "6237cf65f3a6f7111cd8a42be3590df99a66bc7d",
+      "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": {
+      "type": "git",
+      "url": "https://github.com/jbenet/go-os-rename",
+      "rev": "3ac97f61ef67a6b87b95c1282f6c317ed0e693c2",
+      "sha256": "0fmsmmh9h3l7swf5d56spy9jyrnrvw0vnxgh11mpvxmw5hv3lclr"
+    }
+  },
+  {
+    "goPackagePath": "github.com/jbenet/go-random",
+    "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"
+    }
+  },
+  {
+    "goPackagePath": "github.com/kr/fs",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/kr/fs",
+      "rev": "2788f0dbd16903de03cb8186e5c7d97b69ad387b",
+      "sha256": "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly"
+    }
+  },
+  {
+    "goPackagePath": "github.com/mitchellh/go-homedir",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/mitchellh/go-homedir",
+      "rev": "1111e456ffea841564ac0fa5f69c26ef44dafec9",
+      "sha256": "1ycb1cffgs46jnj4cbpjd46mcl584kxdmldlvfysg0wza9pp4x23"
+    }
+  },
+  {
+    "goPackagePath": "github.com/sabhiram/go-git-ignore",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/sabhiram/go-git-ignore",
+      "rev": "228fcfa2a06e870a3ef238d54c45ea847f492a37",
+      "sha256": "0xyj2zsxjjbyd3ppxvs294c8y2ip181dxhvycaxxx6qysbm2nlzj"
+    }
+  },
+  {
+    "goPackagePath": "github.com/whyrusleeping/go-multipart-files",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/whyrusleeping/go-multipart-files",
+      "rev": "3be93d9f6b618f2b8564bfb1d22f1e744eabbae2",
+      "sha256": "0lf58q5nrxp10v7mj4b0lz01jz8is1xysxwdwkhhs88qxha8vm2f"
+    }
+  },
+  {
+    "goPackagePath": "github.com/whyrusleeping/json-filter",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/whyrusleeping/json-filter",
+      "rev": "e9937f5649231265a56d0a419f062530425401a1",
+      "sha256": "1b7czlx57acbi30b9m1w2lvlxnh65c4pmxaa0546pjjip83byb3s"
+    }
+  },
+  {
+    "goPackagePath": "github.com/whyrusleeping/stump",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/whyrusleeping/stump",
+      "rev": "206f8f13aae1697a6fc1f4a55799faf955971fc5",
+      "sha256": "1s40qdppjnk8gijk7x6kbviiqz62nz3h6gic2q9cwcmq8r5isw7n"
+    }
+  },
+  {
+    "goPackagePath": "github.com/whyrusleeping/tar-utils",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/whyrusleeping/tar-utils",
+      "rev": "beab27159606f5a7c978268dd1c3b12a0f1de8a7",
+      "sha256": "07z4is00ridjp8c6cn68lkg1fz6ksj1q7f26g7ir7qx8mx10fj72"
+    }
+  },
+  {
+    "goPackagePath": "golang.org/x/crypto",
+    "fetch": {
+      "type": "git",
+      "url": "https://go.googlesource.com/crypto",
+      "rev": "f3241ce8505855877cc8a9717bd61a0f7c4ea83c",
+      "sha256": "0wxfnbhaq1m3i5jylww9llm2xl9hk33q6nxyz5i475rfrg0p3wsq"
+    }
+  }
+]

pkgs/tools/package-management/gx/go/default.nix

@@ -0,0 +1,27 @@
+# This file was generated by go2nix.
+{ stdenv, buildGoPackage, fetchgit
+, gx
+}:
+
+buildGoPackage rec {
+  name = "gx-go-${version}";
+  version = "20160611-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "639fc0be1a153c59d8946904cceecf0b66ab2944";
+
+  goPackagePath = "github.com/whyrusleeping/gx-go";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/whyrusleeping/gx-go";
+    sha256 = "0qxp7gqrx1rhcbqvp4jdb3gj1dlj200bdc4gq8pfklc8fcz1lc6l";
+  };
+
+  goDeps = ../deps.json;
+
+  extraSrcs = [
+    {
+      goPackagePath = gx.goPackagePath;
+      src = gx.src;
+    }
+  ];
+}

pkgs/top-level/all-packages.nix

@@ -1839,6 +1839,9 @@ in
     stdenv = stdenv_32bit;
   };
 
+  gx = callPackage ../tools/package-management/gx { };
+  gx-go = callPackage ../tools/package-management/gx/go { };
+
   sbsigntool = callPackage ../tools/security/sbsigntool { };
 
   gsmartcontrol = callPackage ../tools/misc/gsmartcontrol {