Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2841f7e5eade
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: aacb816eb6ad
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Jul 7, 2017

  1. gx: 20160601-f84ddf7 -> 0.12.0

    @sigma
    sigma committed Jul 7, 2017
    Copy the full SHA
    c4ecdfd View commit details

Commits on Jul 9, 2017

  1. Merge pull request #27213 from sigma/pr/gx 

    gx: 20160601-f84ddf7 -> 0.12.0
    @Mic92
    Mic92 authored Jul 9, 2017
    Copy the full SHA
    aacb816 View commit details
Showing with 231 additions and 74 deletions.
  1. +4 −9 pkgs/tools/package-management/gx/default.nix
  2. +224 −62 pkgs/tools/package-management/gx/deps.nix
  3. +3 −3 pkgs/tools/package-management/gx/go/default.nix
13 changes: 4 additions & 9 deletions pkgs/tools/package-management/gx/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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; {
Loading