diff options
author | Kamil Chmielewski <kamil.chm@gmail.com> | 2016-06-05 11:41:41 +0200 |
---|---|---|
committer | Kamil Chmielewski <kamil.chm@gmail.com> | 2016-06-09 11:22:02 +0200 |
commit | 03feac7937c7c2ed89e8dfde8f13a0fa442dca2c (patch) | |
tree | 8c73d8e9c626d1596401a699dc72c0212f7c9031 | |
parent | e89a086f06a2f15a2c476d48b25288936466152e (diff) |
pond: extracted from goPackages
-rw-r--r-- | pkgs/applications/networking/instant-messengers/pond/default.nix | 35 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/pond/deps.json | 12 | ||||
-rw-r--r-- | pkgs/development/go-modules/libs.json | 9 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/go-packages.nix | 36 |
5 files changed, 57 insertions, 37 deletions
diff --git a/pkgs/applications/networking/instant-messengers/pond/default.nix b/pkgs/applications/networking/instant-messengers/pond/default.nix new file mode 100644 index 000000000000..f40bf77bb71c --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pond/default.nix @@ -0,0 +1,35 @@ +# This file was generated by go2nix. +{ stdenv, lib, goPackages, trousers, dclxvi, wrapGAppsHook, pkgconfig, gtk3, gtkspell3, + fetchgit, fetchhg, fetchbzr, fetchsvn }: + +with goPackages; +let + isx86_64 = stdenv.lib.any (n: n == stdenv.system) stdenv.lib.platforms.x86_64; + gui = true; # Might be implemented with nixpkgs config. +in +buildGoPackage rec { + name = "pond-${version}"; + version = "20150830-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "bce6e0dc61803c23699c749e29a83f81da3c41b2"; + + goPackagePath = "github.com/agl/pond"; + + src = fetchgit { + inherit rev; + url = "https://github.com/agl/pond"; + sha256 = "1dmgbg4ak3jkbgmxh0lr4hga1nl623mh7pvsgby1rxl4ivbzwkh4"; + }; + + goDeps = ./deps.json; + + buildInputs = [ trousers pkgconfig gtk3 gtkspell3 ] + ++ stdenv.lib.optional isx86_64 dclxvi + ++ stdenv.lib.optionals gui [ wrapGAppsHook ]; + buildFlags = stdenv.lib.optionalString (!gui) "-tags nogui"; + excludedPackages = "\\(appengine\\|bn256cgo\\)"; + postPatch = stdenv.lib.optionalString isx86_64 '' + grep -r 'bn256' | awk -F: '{print $1}' | xargs sed -i \ + -e "s,golang.org/x/crypto/bn256,github.com/agl/pond/bn256cgo,g" \ + -e "s,bn256\.,bn256cgo.,g" + ''; +} diff --git a/pkgs/applications/networking/instant-messengers/pond/deps.json b/pkgs/applications/networking/instant-messengers/pond/deps.json new file mode 100644 index 000000000000..53f48df3b553 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pond/deps.json @@ -0,0 +1,12 @@ +[ + { + "include": "../../libs.json", + "packages": [ + "golang.org/x/net", + "github.com/golang/protobuf", + "github.com/agl/ed25519", + "golang.org/x/crypto", + "github.com/agl/go-gtk" + ] + } +] diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json index eed4c0e7121c..81ceb71f9351 100644 --- a/pkgs/development/go-modules/libs.json +++ b/pkgs/development/go-modules/libs.json @@ -1177,5 +1177,14 @@ "rev": "d18b67ae0afd61dae240896eae1785f00709aa31", "sha256": "1l78hz8k1ixry5fjw29834jz1q5ysjcpf6kx2ggjj1s6xh0bfzvf" } + }, + { + "goPackagePath": "github.com/agl/go-gtk", + "fetch": { + "type": "git", + "url": "https://github.com/agl/go-gtk", + "rev": "91c1edb38c241d73129e6b098ca1c9fa83abfc15", + "sha256": "156ixlhakpqgyp35rsvmndrqz8aggv5bcmzg9ynpri3b9j6kim4d" + } } ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a9d29823f499..3d37992ed544 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13861,7 +13861,7 @@ in pommed = callPackage ../os-specific/linux/pommed {}; - pond = goPackages.pond.bin // { outputs = [ "bin" ]; }; + pond = callPackage ../applications/networking/instant-messengers/pond { }; ponymix = callPackage ../applications/audio/ponymix { }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index a7699c282729..f1f8e33c59bf 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -1400,21 +1400,6 @@ let propagatedBuildInputs = [ go-querystring ]; }; - go-gtk-agl = buildFromGitHub { - rev = "6937b8d28cf70d583346220b966074cfd3a2e233"; - owner = "agl"; - repo = "go-gtk"; - sha256 = "0jnhsv7ypyhprpy0fndah22v2pbbavr3db6f9wxl1vf34qkns3p4"; - # Examples require many go libs, and gtksourceview seems ready only for - # gtk2 - preConfigure = '' - rm -R example gtksourceview - ''; - nativeBuildInputs = [ pkgs.pkgconfig ]; - propagatedBuildInputs = [ pkgs.gtk3 ]; - buildInputs = [ pkgs.gtkspell3 ]; - }; - go-gypsy = buildFromGitHub { rev = "42fc2c7ee9b8bd0ff636cd2d7a8c0a49491044c5"; owner = "kylelemons"; @@ -2537,27 +2522,6 @@ let sha256 = "139d08cq06jia0arc6cikdnhnaqms07xfay87pzq5ym86fv0agiq"; }; - pond = let - isx86_64 = stdenv.lib.any (n: n == stdenv.system) stdenv.lib.platforms.x86_64; - gui = true; # Might be implemented with nixpkgs config. - in buildFromGitHub { - rev = "bce6e0dc61803c23699c749e29a83f81da3c41b2"; - owner = "agl"; - repo = "pond"; - sha256 = "1dmgbg4ak3jkbgmxh0lr4hga1nl623mh7pvsgby1rxl4ivbzwkh4"; - - buildInputs = [ net crypto protobuf ed25519 pkgs.trousers ] - ++ stdenv.lib.optional isx86_64 pkgs.dclxvi - ++ stdenv.lib.optionals gui [ go-gtk-agl pkgs.wrapGAppsHook ]; - buildFlags = stdenv.lib.optionalString (!gui) "-tags nogui"; - excludedPackages = "\\(appengine\\|bn256cgo\\)"; - postPatch = stdenv.lib.optionalString isx86_64 '' - grep -r 'bn256' | awk -F: '{print $1}' | xargs sed -i \ - -e "s,golang.org/x/crypto/bn256,github.com/agl/pond/bn256cgo,g" \ - -e "s,bn256\.,bn256cgo.,g" - ''; - }; - pongo2 = buildFromGitHub { rev = "5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9"; version = "2014-10-27"; |