From 17770101b51ffcceacd9588f4543a681a179ef7c Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Fri, 3 Jun 2016 18:30:38 +0200 Subject: [PATCH] wego: extracted from goPackages --- pkgs/applications/misc/wego/default.nix | 20 ++++++++++++++++++++ pkgs/applications/misc/wego/deps.json | 10 ++++++++++ pkgs/development/go-modules/libs.json | 9 +++++++++ pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/go-packages.nix | 9 --------- 5 files changed, 40 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/misc/wego/default.nix create mode 100644 pkgs/applications/misc/wego/deps.json diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/applications/misc/wego/default.nix new file mode 100644 index 000000000000..2ce62783100a --- /dev/null +++ b/pkgs/applications/misc/wego/default.nix @@ -0,0 +1,20 @@ +# This file was generated by go2nix. +{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }: + +with goPackages; + +buildGoPackage rec { + name = "wego-${version}"; + version = "20160407-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "81d72ffd761f032fbd73dba4f94bd94c8c2d53d5"; + + goPackagePath = "github.com/schachmat/wego"; + + src = fetchgit { + inherit rev; + url = "https://github.com/schachmat/wego"; + sha256 = "14p3hvv82bsxqnbnzz8hjv75i39kzg154a132n6cdxx3vgw76gck"; + }; + + goDeps = ./deps.json; +} diff --git a/pkgs/applications/misc/wego/deps.json b/pkgs/applications/misc/wego/deps.json new file mode 100644 index 000000000000..2255fdeb69e3 --- /dev/null +++ b/pkgs/applications/misc/wego/deps.json @@ -0,0 +1,10 @@ +[ + { + "include": "../../libs.json", + "packages": [ + "github.com/mattn/go-colorable", + "github.com/mattn/go-runewidth", + "github.com/schachmat/ingo" + ] + } +] diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json index 03107ea8e498..2ee01f42ea22 100644 --- a/pkgs/development/go-modules/libs.json +++ b/pkgs/development/go-modules/libs.json @@ -466,5 +466,14 @@ "rev": "406e5b7bfd8201a36e2bb5f7bdae0b03380c2ce8", "sha256": "0yla9hz15pg63394ygs9iiwzsqyv29labl8p424hijwsc9z9nka8" } + }, + { + "goPackagePath": "github.com/schachmat/ingo", + "fetch": { + "type": "git", + "url": "https://github.com/schachmat/ingo", + "rev": "fab41e4e62cbef5d92998746ec25f7e195100f38", + "sha256": "04yfnch7pdabjjqfl2qxjmsaknvp4m1rbjlv8qrpmnqwjkxzx0hb" + } } ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7b3a0527b2e..e993fc9b1a44 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3714,7 +3714,7 @@ in weather = callPackage ../applications/misc/weather { }; - wego = goPackages.wego.bin // { outputs = [ "bin" ]; }; + wego = (callPackage ../applications/misc/wego { }).bin; wal_e = callPackage ../tools/backup/wal-e { }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 6b51ccacd473..dd171b484d62 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -4008,15 +4008,6 @@ let propagatedBuildInputs = [ ]; }; - wego = buildFromGitHub rec { - rev = "81d72ffd761f032fbd73dba4f94bd94c8c2d53d5"; - version = "2016-04-07"; - owner = "schachmat"; - repo = "wego"; - sha256 = "14p3hvv82bsxqnbnzz8hjv75i39kzg154a132n6cdxx3vgw76gck"; - propagatedBuildInputs = [ go-colorable mattn.go-runewidth ingo ]; - }; - textql = buildFromGitHub rec { rev = "1785cd353c68aa34f97627143b9c2908dfd4ea04"; version = "2.0.3";