diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/networking/pond/default.nix | 34 | ||||
-rw-r--r-- | pkgs/applications/networking/pond/deps.nix | 60 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/go-packages.nix | 34 |
4 files changed, 50 insertions, 80 deletions
diff --git a/pkgs/applications/networking/pond/default.nix b/pkgs/applications/networking/pond/default.nix index 31a7dcd1f561..cec1619f32ef 100644 --- a/pkgs/applications/networking/pond/default.nix +++ b/pkgs/applications/networking/pond/default.nix @@ -1,26 +1,22 @@ -{ stdenv, lib, fetchgit, fetchhg, go_1_3, trousers }: +{ lib, goPackages, fetchgit, trousers }: -let deps = import ./deps.nix { - inherit stdenv lib fetchgit fetchhg; -}; +with goPackages; -in stdenv.mkDerivation rec { - name = "pond"; - - buildInputs = [ go_1_3 trousers ]; +buildGoPackage rec { + rev = "f4e441c77a2039814046ff8219629c547fe8b689"; + name = "pond-${lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/agl/pond"; + src = fetchgit { + inherit rev; + url = "git://github.com/agl/pond.git"; + sha256 = "f2dfc6cb96cc4b8ae732e41d1958b62036f40cb346df2e14f27b5964a1416026"; + }; - unpackPhase = '' - export GOPATH=$PWD - echo $PWD - cp -LR ${deps}/src src - chmod u+w -R src - ''; + subPackages = [ "client" ]; - installPhase = '' - export GOPATH="$PWD" - mkdir -p $out/bin - go build --tags nogui -v -o $out/bin/pond-cli github.com/agl/pond/client - ''; + buildInputs = [ trousers net crypto protobuf ed25519 ]; + + makeFlags = "--tags nogui"; meta = with lib; { description = "Forward secure, asynchronous messaging for the discerning"; diff --git a/pkgs/applications/networking/pond/deps.nix b/pkgs/applications/networking/pond/deps.nix deleted file mode 100644 index 0983ad275e22..000000000000 --- a/pkgs/applications/networking/pond/deps.nix +++ /dev/null @@ -1,60 +0,0 @@ -# This file was generated by go2nix. -{ stdenv, lib, fetchgit, fetchhg}: - -let - goDeps = [ - { - root = "github.com/agl/pond"; - src = fetchgit { - url = "git://github.com/agl/pond.git"; - rev = "f4e441c77a2039814046ff8219629c547fe8b689"; - sha256 = "f2dfc6cb96cc4b8ae732e41d1958b62036f40cb346df2e14f27b5964a1416026"; - }; - } - { - root = "github.com/agl/ed25519"; - src = fetchgit { - url = "git://github.com/agl/ed25519.git"; - rev = "d2b94fd789ea21d12fac1a4443dd3a3f79cda72c"; - sha256 = "83e3010509805d1d315c7aa85a356fda69d91b51ff99ed98a503d63adb3613e9"; - }; - } - { - root = "code.google.com/p/go.crypto"; - src = fetchhg { - url = "https://code.google.com/p/go.crypto"; - rev = "31393df5baea"; - sha256 = "0b95dpsvxxapcjjvhj05fdmyn0mzffamc25hvxy7xgsl2l9yy3nw"; - }; - } - { - root = "code.google.com/p/go.net"; - src = fetchhg { - url = "https://code.google.com/p/go.net"; - rev = "90e232e2462d"; - sha256 = "0hqvkaa0rbxwbi74xa6aqbkf63zk662x5hp3bp8vbhzkc4yl1h59"; - }; - } - { - root = "code.google.com/p/goprotobuf"; - src = fetchhg { - url = "https://code.google.com/p/goprotobuf"; - rev = "36be16571e14"; - sha256 = "14yay2sgfbbs0bx3q03bdqn1kivyvxfdm34rmp2612gvinlll215"; - }; - } - ]; - -in - -stdenv.mkDerivation rec { - name = "go-deps"; - - buildCommand = - lib.concatStrings - (map (dep: '' - mkdir -p $out/src/`dirname ${dep.root}` - ln -s ${dep.src} $out/src/${dep.root} - '') goDeps); -} - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2101fcea4c63..4c5e633db642 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10938,7 +10938,7 @@ let inherit (xorg) libXpm; }; - pond = callPackage ../applications/networking/pond { }; + pond = callPackage ../applications/networking/pond { goPackages = go13Packages; }; potrace = callPackage ../applications/graphics/potrace {}; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index b00d1427052b..d08ebb452ed5 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -9,6 +9,17 @@ let self = _self // overrides; _self = with self; { ## OFFICIAL GO PACKAGES + crypto = buildGoPackage rec { + rev = "31393df5baea"; + name = "go-crypto-${rev}"; + goPackagePath = "code.google.com/p/go.crypto"; + src = fetchhg { + inherit rev; + url = "https://${goPackagePath}"; + sha256 = "0b95dpsvxxapcjjvhj05fdmyn0mzffamc25hvxy7xgsl2l9yy3nw"; + }; + }; + image = buildGoPackage rec { rev = "490b1ad139b3"; name = "go.image-${rev}"; @@ -32,6 +43,18 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ text ]; }; + protobuf = buildGoPackage rec { + rev = "36be16571e14"; + name = "goprotobuf-${rev}"; + goPackagePath = "code.google.com/p/goprotobuf"; + src = fetchhg { + inherit rev; + url = "https://code.google.com/p/goprotobuf"; + sha256 = "14yay2sgfbbs0bx3q03bdqn1kivyvxfdm34rmp2612gvinlll215"; + }; + subPackages = [ "proto" "protoc-gen-go" ]; + }; + text = buildGoPackage rec { rev = "024681b033be"; name = "go.text-${rev}"; @@ -83,6 +106,17 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ pflag ]; }; + ed25519 = buildGoPackage rec { + rev = "d2b94fd789ea21d12fac1a4443dd3a3f79cda72c"; + name = "ed25519-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/agl/ed25519"; + src = fetchgit { + inherit rev; + url = "git://${goPackagePath}.git"; + sha256 = "83e3010509805d1d315c7aa85a356fda69d91b51ff99ed98a503d63adb3613e9"; + }; + }; + goconvey = buildGoPackage rec { version = "1.5.0"; name = "goconvey-${version}"; |