diff options
| author | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2016-01-18 04:55:25 +0100 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2016-01-18 04:55:25 +0100 |
| commit | 3f10b2874f5fb214db743fbe44a0dcacf39416c9 (patch) | |
| tree | 02d90ce757bf02214c4226cece39b12f19cb16de /pkgs/servers | |
| parent | 34dc7fe49f3266042e8a1986410e98f3b874c6c2 (diff) | |
| parent | f3ae60295f55f3e4ef61449cd9a1875a9dd8f24b (diff) | |
| download | nixlib-3f10b2874f5fb214db743fbe44a0dcacf39416c9.tar nixlib-3f10b2874f5fb214db743fbe44a0dcacf39416c9.tar.gz nixlib-3f10b2874f5fb214db743fbe44a0dcacf39416c9.tar.bz2 nixlib-3f10b2874f5fb214db743fbe44a0dcacf39416c9.tar.lz nixlib-3f10b2874f5fb214db743fbe44a0dcacf39416c9.tar.xz nixlib-3f10b2874f5fb214db743fbe44a0dcacf39416c9.tar.zst nixlib-3f10b2874f5fb214db743fbe44a0dcacf39416c9.zip | |
Merge pull request #12450 from eduarrrd/pshs
pshs: 0.2.6 -> 0.3
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/http/pshs/default.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/servers/http/pshs/default.nix b/pkgs/servers/http/pshs/default.nix index 141f58417fb6..b9a42b4a5f61 100644 --- a/pkgs/servers/http/pshs/default.nix +++ b/pkgs/servers/http/pshs/default.nix @@ -1,19 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, libevent, file, qrencode }: +{ stdenv, fetchurl, pkgconfig, libevent, file, qrencode, miniupnpc }: let - version = "0.2.6"; + version = "0.3"; in stdenv.mkDerivation { name = "pshs-${version}"; src = fetchurl { url = "https://www.bitbucket.org/mgorny/pshs/downloads/pshs-${version}.tar.bz2"; - sha256 = "0n8l5sjnwjqjmw0jzg3hb93n6npg2wahmdg1zrpsw8fyh9ggjg4g"; + sha256 = "0qvy1m9jmbjhbihs1qr9nasbaajl3n0x8bgz1vw9xvpkqymx5i63"; }; - buildInputs = [ pkgconfig libevent file qrencode ]; + buildInputs = [ pkgconfig libevent file qrencode miniupnpc ]; - # TODO: enable ssl once dependencies - # (libssl libcrypto libevent >= 2.1 libevent_openssl) can be met + # SSL requires libevent at 2.1 with ssl support configureFlags = "--disable-ssl"; meta = { |