From 826ff3efc2dc78da1d8be355b354ef2a0e59d183 Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Sun, 5 Jun 2016 10:53:30 +0200 Subject: [PATCH] glide: extracted from goPackages --- pkgs/development/tools/glide/default.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/go-packages.nix | 8 -------- 3 files changed, 19 insertions(+), 9 deletions(-) create mode 100644 pkgs/development/tools/glide/default.nix diff --git a/pkgs/development/tools/glide/default.nix b/pkgs/development/tools/glide/default.nix new file mode 100644 index 000000000000..cc63921976f5 --- /dev/null +++ b/pkgs/development/tools/glide/default.nix @@ -0,0 +1,18 @@ +# This file was generated by go2nix. +{ stdenv, lib, go16Packages, fetchgit, fetchhg, fetchbzr, fetchsvn }: + +with go16Packages; + +buildGoPackage rec { + name = "glide-${version}"; + version = "0.10.2"; + rev = "${version}"; + + goPackagePath = "github.com/Masterminds/glide"; + + src = fetchgit { + inherit rev; + url = "https://github.com/Masterminds/glide"; + sha256 = "1qb2n5i04gabb2snnwfr8wv4ypcp1pdzvgga62m9xkhk4p2w6pwl"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b281ac10a2de..23af18ea0760 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -811,7 +811,7 @@ in gist = callPackage ../tools/text/gist { }; - glide = goPackages.glide.bin // { outputs = [ "bin" ]; }; + glide = callPackage ../development/tools/glide { }; gmic = callPackage ../tools/graphics/gmic { }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index a2d3dc38ce37..0bd9f10f9dd6 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -866,14 +866,6 @@ let sha256 = "124hci9whsvlcywsfz5y20kkj3nhy176a1d5s1lkvsga09yxq6wm"; }; - glide = buildFromGitHub { - rev = "0.10.2"; - owner = "Masterminds"; - repo = "glide"; - sha256 = "1qb2n5i04gabb2snnwfr8wv4ypcp1pdzvgga62m9xkhk4p2w6pwl"; - buildInputs = [ cookoo cli-go go-gypsy vcs ]; - }; - gls = buildFromGitHub { rev = "9a4a02dbe491bef4bab3c24fd9f3087d6c4c6690"; owner = "jtolds";