diff options
| author | Joachim Fasting <joachifm@users.noreply.github.com> | 2016-05-18 04:00:58 +0200 |
|---|---|---|
| committer | Joachim Fasting <joachifm@users.noreply.github.com> | 2016-05-18 04:00:58 +0200 |
| commit | 97c1502b2330b7400ca1b73eb737fb23d26b2897 (patch) | |
| tree | bbd8c58e15b96f8608aa3d9b4ffd0d900aaae4e2 /pkgs | |
| parent | 134a9c6ad3eeeec24953e511635b189baed8ca57 (diff) | |
| parent | 300527b31af7f64151c777b8c8f384240d49eb06 (diff) | |
Merge pull request #15500 from cerana/glide-0.10.2
glide: 0.6.1 -> 0.10.2 (using go 1.6)
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/go-packages.nix | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 48716a0c3a0d2..ef67d01d57be8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -799,6 +799,8 @@ in gist = callPackage ../tools/text/gist { }; + glide = go16Packages.glide.bin // { outputs = [ "bin" ]; }; + gmic = callPackage ../tools/graphics/gmic { }; gti = callPackage ../tools/misc/gti { }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index fcf738929100a..9d890431fd095 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -1058,10 +1058,10 @@ let }; glide = buildFromGitHub { - rev = "0.6.1"; + rev = "0.10.2"; owner = "Masterminds"; repo = "glide"; - sha256 = "1v66c2igm8lmljqrrsyq3cl416162yc5l597582bqsnhshj2kk4m"; + sha256 = "1qb2n5i04gabb2snnwfr8wv4ypcp1pdzvgga62m9xkhk4p2w6pwl"; buildInputs = [ cookoo cli-go go-gypsy vcs ]; }; |