From 092e6e23b374929ce4bc8d7a8bd6c92beba09560 Mon Sep 17 00:00:00 2001 From: John Chee Date: Thu, 9 Jul 2015 17:54:47 -0700 Subject: [PATCH 1/6] junegunn.go-runewidth: init at travisish patch by @magnetophon --- pkgs/top-level/go-packages.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index bab63e87b30..bd0b95073c5 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -1366,6 +1366,18 @@ let }; }; + junegunn.go-runewidth = buildGoPackage rec { + rev = "travisish"; + name = "go-runewidth-${rev}"; + goPackagePath = "github.com/junegunn/go-runewidth"; + src = fetchFromGitHub { + inherit rev; + owner = "junegunn"; + repo = "go-runewidth"; + sha256 = "07d612val59sibqly5d6znfkp4h4gjd77783jxvmiq6h2fwb964k"; + }; + }; + go-runit = buildGoPackage rec { rev = "a9148323a615e2e1c93b7a9893914a360b4945c8"; name = "go-runit-${stdenv.lib.strings.substring 0 7 rev}"; From 2d006f090e2a516018ebd8f217870194aa76dc48 Mon Sep 17 00:00:00 2001 From: John Chee Date: Thu, 9 Jul 2015 18:02:25 -0700 Subject: [PATCH 2/6] go-shellwords: init at 35d512af75e283aae4ca1fc3d44b159ed66189a4 patch by @magnetophon --- pkgs/top-level/go-packages.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index bd0b95073c5..77d96053e94 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -1378,6 +1378,18 @@ let }; }; + go-shellwords = buildGoPackage rec { + rev = "35d512af75e283aae4ca1fc3d44b159ed66189a4"; + name = "go-shellwords-${rev}"; + goPackagePath = "github.com/junegunn/go-shellwords"; + src = fetchFromGitHub { + inherit rev; + owner = "junegunn"; + repo = "go-shellwords"; + sha256 = "c792abe5fda48d0dfbdc32a84edb86d884a0ccbd9ed49ad48a30cda5ba028a22"; + }; + }; + go-runit = buildGoPackage rec { rev = "a9148323a615e2e1c93b7a9893914a360b4945c8"; name = "go-runit-${stdenv.lib.strings.substring 0 7 rev}"; From fb371c06427b779213488808119216671cba5a26 Mon Sep 17 00:00:00 2001 From: John Chee Date: Thu, 9 Jul 2015 18:03:22 -0700 Subject: [PATCH 3/6] fzf: init at 0.9.13 patch by @magnetophon --- pkgs/tools/misc/fzf/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/misc/fzf/default.nix diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix new file mode 100644 index 00000000000..58c2871ae85 --- /dev/null +++ b/pkgs/tools/misc/fzf/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, goPackages, syncthing, ncurses }: + +with goPackages; + +buildGoPackage rec { + name = "fzf-${version}"; + version = "0.9.13"; + goPackagePath = "github.com/junegunn/fzf"; + src = fetchFromGitHub { + owner = "junegunn"; + repo = "fzf"; + rev = "${version}"; + sha256 = "1m9zbf02d6i47c33jys9lr0krqfjk2dr8jzpfhnrb266qcdb27xi"; + }; + + buildInputs = with goPackages; [ crypto ginkgo gomega junegunn.go-runewidth go-shellwords ncurses syncthing text ]; + + meta = with stdenv.lib; { + homepage = https://github.com/junegunn/fzf; + description = "A command-line fuzzy finder written in Go"; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e6ad3607854..2b9e6d6610a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -878,6 +878,8 @@ let filter_audio = callPackage ../development/libraries/filter_audio { }; + fzf = callPackage ../tools/misc/fzf { }; + gist = callPackage ../tools/text/gist { }; mcrl = callPackage ../tools/misc/mcrl { }; From 9e2da99cc7f58d020673b05f72a5249579cb1cd1 Mon Sep 17 00:00:00 2001 From: John Chee Date: Fri, 10 Jul 2015 10:52:23 -0700 Subject: [PATCH 4/6] fzf: whitespace --- pkgs/tools/misc/fzf/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 58c2871ae85..938a72b74a7 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -13,7 +13,16 @@ buildGoPackage rec { sha256 = "1m9zbf02d6i47c33jys9lr0krqfjk2dr8jzpfhnrb266qcdb27xi"; }; - buildInputs = with goPackages; [ crypto ginkgo gomega junegunn.go-runewidth go-shellwords ncurses syncthing text ]; + buildInputs = with goPackages; [ + crypto + ginkgo + gomega + junegunn.go-runewidth + go-shellwords + ncurses + syncthing + text + ]; meta = with stdenv.lib; { homepage = https://github.com/junegunn/fzf; From ec6e64a371f41887c45c23a9a693cfe586e0616f Mon Sep 17 00:00:00 2001 From: John Chee Date: Sat, 11 Jul 2015 10:30:51 -0700 Subject: [PATCH 5/6] fzf: add magnetophon as a maintainer --- pkgs/tools/misc/fzf/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 938a72b74a7..6b703a3e902 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -28,5 +28,6 @@ buildGoPackage rec { homepage = https://github.com/junegunn/fzf; description = "A command-line fuzzy finder written in Go"; license = licenses.mit; + maintainers = [ maintainers.magnetophon ]; }; } From 17c1428bfb9a5cb7cefeb378fb5fb4cb8301a5d8 Mon Sep 17 00:00:00 2001 From: John Chee Date: Wed, 15 Jul 2015 19:59:20 -0700 Subject: [PATCH 6/6] fzf: 0.9.13 -> 0.10.0 --- pkgs/tools/misc/fzf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 6b703a3e902..5692fc25a32 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -4,13 +4,13 @@ with goPackages; buildGoPackage rec { name = "fzf-${version}"; - version = "0.9.13"; + version = "0.10.0"; goPackagePath = "github.com/junegunn/fzf"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf"; rev = "${version}"; - sha256 = "1m9zbf02d6i47c33jys9lr0krqfjk2dr8jzpfhnrb266qcdb27xi"; + sha256 = "0dx9qwmcrnh31m2n75qmpj1dxm6rr6xsbazy4nwa3bzrb8y6svh2"; }; buildInputs = with goPackages; [