diff options
author | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-09-01 12:46:09 +1000 |
---|---|---|
committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-09-08 16:32:39 +1000 |
commit | 9b3bc6b46e921fd5eefcdef544dfa37a04a858a8 (patch) | |
tree | 857b968043d01151a311e47d4fff356dad87acab /pkgs/servers/livepeer | |
parent | 2afb2ae1109018316d01d64e4a8008dbf4394e9d (diff) |
livepeer: 0.2.4 -> 0.5.10
Diffstat (limited to 'pkgs/servers/livepeer')
-rw-r--r-- | pkgs/servers/livepeer/default.nix | 24 | ||||
-rw-r--r-- | pkgs/servers/livepeer/deps.nix | 20 |
2 files changed, 13 insertions, 31 deletions
diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/servers/livepeer/default.nix index 156c0f108ae8..60122d6b451d 100644 --- a/pkgs/servers/livepeer/default.nix +++ b/pkgs/servers/livepeer/default.nix @@ -1,30 +1,32 @@ -{ stdenv, fetchFromGitHub, buildGoPackage -, pkgconfig, ffmpeg_3 +{ stdenv, fetchFromGitHub, buildGoModule +, pkg-config, ffmpeg, gnutls }: -buildGoPackage rec { +buildGoModule rec { pname = "livepeer"; - version = "0.2.4"; + version = "0.5.10"; - goPackagePath = "github.com/livepeer/go-livepeer"; - goDeps = ./deps.nix; + runVend = true; + vendorSha256 = "0i5977skw4b209zvdvgvzfnhqb574067mmfk2gf9y590lgnr86f7"; src = fetchFromGitHub { owner = "livepeer"; repo = "go-livepeer"; - rev = version; - sha256 = "07vhw787wq5q4xm7zvswjdsmr20pwfa39wfkgamb7hkrffn3k2ia"; + rev = "v${version}"; + sha256 = "0qccvnk2yyly7ha9lkcpd6zj5n9xnhdjkl3nllb9xziidsq6p65h"; }; - nativeBuildInputs = [ pkgconfig ]; + # livepeer_cli has a vendoring problem + subPackages = [ "cmd/livepeer" ]; - buildInputs = [ ffmpeg_3 ]; + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ ffmpeg gnutls ]; meta = with stdenv.lib; { description = "Official Go implementation of the Livepeer protocol"; homepage = "https://livepeer.org"; license = licenses.mit; - platforms = platforms.linux; maintainers = with maintainers; [ elitak ]; }; } diff --git a/pkgs/servers/livepeer/deps.nix b/pkgs/servers/livepeer/deps.nix deleted file mode 100644 index 297d0724a496..000000000000 --- a/pkgs/servers/livepeer/deps.nix +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; - } - { - goPackagePath = "github.com/ericxtang/m3u8"; - fetch = { - type = "git"; - url = "https://github.com/ericxtang/m3u8"; - rev = "575aeb9f754a5dabcc03d4aa0ed05ecaee26499e"; - sha256 = "08811y4kg6rgj40v80cwjcwhy094qrfigdwjsgr8d6bn64cf9fz2"; - }; - } -] |