diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-22 10:10:40 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-22 10:10:40 +0100 |
| commit | 2219e2578e73751eba538c416902a27ee4cd0ac9 (patch) | |
| tree | 0674019e3b7e3ec693eededa75bb2d36ec2ec6d3 /pkgs/servers | |
| parent | ad1abb2824b46deb74ed6da45ce1961f6684677f (diff) | |
| parent | 90720d0139feaf7421344073430d2a6f5ecbb231 (diff) | |
| download | nixpkgs-2219e2578e73751eba538c416902a27ee4cd0ac9.tar nixpkgs-2219e2578e73751eba538c416902a27ee4cd0ac9.tar.gz nixpkgs-2219e2578e73751eba538c416902a27ee4cd0ac9.tar.bz2 nixpkgs-2219e2578e73751eba538c416902a27ee4cd0ac9.tar.lz nixpkgs-2219e2578e73751eba538c416902a27ee4cd0ac9.tar.xz nixpkgs-2219e2578e73751eba538c416902a27ee4cd0ac9.tar.zst nixpkgs-2219e2578e73751eba538c416902a27ee4cd0ac9.zip | |
Merge staging-next into staging
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 e23c981e0c1..9f297873dd0 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 4045db5e5f2..dd397598c97 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 ]; |