diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-22 09:57:08 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-22 09:57:08 +0100 |
commit | c31cb577aed1e94e467ea1d6455fc275946d3b2d (patch) | |
tree | fcabcf126d5e422fa998925403add39444c2a166 /pkgs/servers | |
parent | 16267b4389c75cba9f0f10664043bd6d47013827 (diff) | |
parent | 9467621b186dcaf8a24772482e0d8a6a581ce0bb (diff) | |
download | nixlib-c31cb577aed1e94e467ea1d6455fc275946d3b2d.tar nixlib-c31cb577aed1e94e467ea1d6455fc275946d3b2d.tar.gz nixlib-c31cb577aed1e94e467ea1d6455fc275946d3b2d.tar.bz2 nixlib-c31cb577aed1e94e467ea1d6455fc275946d3b2d.tar.lz nixlib-c31cb577aed1e94e467ea1d6455fc275946d3b2d.tar.xz nixlib-c31cb577aed1e94e467ea1d6455fc275946d3b2d.tar.zst nixlib-c31cb577aed1e94e467ea1d6455fc275946d3b2d.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/jackett/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/uwsgi/default.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index e23c981e0c1f..9f297873dd0c 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jackett-${version}"; - version = "0.10.434"; + version = "0.10.446"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "1vnkppmv7mw2p9bjcfmfxg66g02dq0020ad4z07gbp4dvixpzsnm"; + sha256 = "1vmgywklax5br3pynjp5b74l2mkmhk3njiccjrl0l7j8ikyar1fw"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 4045db5e5f22..dd397598c97b 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, jansson +{ stdenv, lib, fetchurl, pkgconfig, jansson, pcre # plugins: list of strings, eg. [ "python2" "python3" ] , plugins , pam, withPAM ? false @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python3 pkgconfig ]; - buildInputs = [ jansson ] + buildInputs = [ jansson pcre ] ++ lib.optional withPAM pam ++ lib.optional withSystemd systemd ++ lib.concatMap (x: x.inputs) needed @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_LINK = [ "-lsystemd" ] ++ lib.concatMap (x: x.NIX_CFLAGS_LINK or []) needed; meta = with stdenv.lib; { - homepage = http://uwsgi-docs.readthedocs.org/en/latest/; + homepage = https://uwsgi-docs.readthedocs.org/en/latest/; description = "A fast, self-healing and developer/sysadmin-friendly application container server coded in pure C"; license = licenses.gpl2; maintainers = with maintainers; [ abbradar schneefux ]; |