diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-11-04 01:00:48 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-11-04 01:00:48 -0800 |
| commit | 4251612faa3e1311c72b382539febc7892f59c77 (patch) | |
| tree | d6d939a7aaebc5e8255fc257464aa1abef3da5af /pkgs/top-level/go-packages.nix | |
| parent | b983c6b9b5ffa9c1d5e8c4fffe39abda6c2420df (diff) | |
| parent | 86ba275a99908a30f5139d5e605d0ac1f5d3ea7b (diff) | |
| download | nixlib-4251612faa3e1311c72b382539febc7892f59c77.tar nixlib-4251612faa3e1311c72b382539febc7892f59c77.tar.gz nixlib-4251612faa3e1311c72b382539febc7892f59c77.tar.bz2 nixlib-4251612faa3e1311c72b382539febc7892f59c77.tar.lz nixlib-4251612faa3e1311c72b382539febc7892f59c77.tar.xz nixlib-4251612faa3e1311c72b382539febc7892f59c77.tar.zst nixlib-4251612faa3e1311c72b382539febc7892f59c77.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/top-level/go-packages.nix')
| -rw-r--r-- | pkgs/top-level/go-packages.nix | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 283fba7b440e..b7a72bfcc3b2 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -1050,14 +1050,16 @@ let }; go-bindata = buildGoPackage rec { - version = "3.0.7"; + rev = "a0ff2567cfb70903282db057e799fd826784d41d"; + date = "2015-10-23"; + version = "${date}-${stdenv.lib.strings.substring 0 7 rev}"; name = "go-bindata-${version}"; goPackagePath = "github.com/jteeuwen/go-bindata"; src = fetchFromGitHub { + inherit rev; repo = "go-bindata"; owner = "jteeuwen"; - rev = "v${version}"; - sha256 = "1v8xwwlv6my5ixvis31m3vgz4sdc0cq82855j8gxmjp1scinv432"; + sha256 = "0d6zxv0hgh938rf59p1k5lj0ymrb8kcps2vfrb9kaarxsvg7y69v"; }; subPackages = [ "./" "go-bindata" ]; # don't build testdata @@ -1659,11 +1661,11 @@ let }; ipfs = buildFromGitHub{ - rev = "9c6ec296e396cc6be551c9807ae220fb50dd07d4"; - date = "2015-09-23"; + rev = "43622bd5eed1f62d53d364dc771bbb500939d9e6"; + date = "2015-10-30"; owner = "ipfs"; repo = "go-ipfs"; - sha256 = "0lmj2s9ihl1a5r8yn6w0lvb8z3n6c9b8wi1yvi77vgzm6b6lfl3a"; + sha256 = "0g80b65ysj995dj3mkh3lp4v616fzjl7bx2wf14mkxfri4gr5icb"; }; ldap = buildGoPackage rec { |